X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat64_in2out.c;h=ef322d5b60dfd64a2e175ef846456ba04ffc0f98;hb=bc39e34;hp=9f77ca33fa487da726dedd7039c8b329be73f135;hpb=51e759fd0655b6089360e1ccf2f5341704549fd4;p=vpp.git

diff --git a/src/plugins/nat/nat64_in2out.c b/src/plugins/nat/nat64_in2out.c
index 9f77ca33fa4..ef322d5b60d 100644
--- a/src/plugins/nat/nat64_in2out.c
+++ b/src/plugins/nat/nat64_in2out.c
@@ -190,8 +190,7 @@ nat64_in2out_tcp_udp_set_cb (ip6_header_t * ip6, ip4_header_t * ip4,
 
 	  bibe =
 	    nat64_db_bib_entry_create (db, &ip6->src_address, &out_addr,
-				       sport, clib_host_to_net_u16 (out_port),
-				       fib_index, proto, 0);
+				       sport, out_port, fib_index, proto, 0);
 	  if (!bibe)
 	    return -1;
 	}
@@ -279,8 +278,7 @@ nat64_in2out_icmp_set_cb (ip6_header_t * ip6, ip4_header_t * ip4, void *arg)
 
 	      bibe =
 		nat64_db_bib_entry_create (db, &ip6->src_address,
-					   &out_addr, in_id,
-					   clib_host_to_net_u16 (out_id),
+					   &out_addr, in_id, out_id,
 					   fib_index, IP_PROTOCOL_ICMP, 0);
 	      if (!bibe)
 		return -1;
@@ -604,8 +602,7 @@ nat64_in2out_tcp_udp_hairpinning (vlib_main_t * vm, vlib_buffer_t * b,
 
 	  bibe =
 	    nat64_db_bib_entry_create (db, &ip6->src_address, &out_addr,
-				       sport, clib_host_to_net_u16 (out_port),
-				       fib_index, proto, 0);
+				       sport, out_port, fib_index, proto, 0);
 	  if (!bibe)
 	    return -1;
 	}
@@ -1435,8 +1432,7 @@ nat64_in2out_reass_node_fn (vlib_main_t * vm,
 			nat64_db_bib_entry_create (db,
 						   &ip60->src_address,
 						   &out_addr0, udp0->src_port,
-						   clib_host_to_net_u16
-						   (out_port0), fib_index0,
+						   out_port0, fib_index0,
 						   l4_protocol0, 0);
 		      if (!bibe0)
 			{
@@ -1692,6 +1688,8 @@ nat64_in2out_handoff_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      current_worker_index = next_worker_index;
 	    }
 
+	  ASSERT (to_next_worker != 0);
+
 	  /* enqueue to correct worker thread */
 	  to_next_worker[0] = bi0;
 	  to_next_worker++;