X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fout2in.c;h=7c6fae6ec91b05a7be8eb25bda2d0e7f4a8ec948;hb=bc2e640db7533394a3de7bdffd78fadf2a2ffd9f;hp=9549a45c07ebaab1aafcabecf04c9d69e4bde860;hpb=9654a37fac7fe2b425576eb0237b8d24ae44e1b1;p=vpp.git

diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c
index 9549a45c07e..7c6fae6ec91 100755
--- a/src/plugins/nat/out2in.c
+++ b/src/plugins/nat/out2in.c
@@ -893,12 +893,11 @@ VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
 				 dst_address /* changed member */ );
 	  ip0->checksum = ip_csum_fold (sum0);
 
+	  old_port0 = udp0->dst_port;
+	  new_port0 = udp0->dst_port = s0->in2out.port;
+
 	  if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
 	    {
-	      old_port0 = tcp0->dst_port;
-	      tcp0->dst_port = s0->in2out.port;
-	      new_port0 = tcp0->dst_port;
-
 	      sum0 = tcp0->checksum;
 	      sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
 				     ip4_header_t,
@@ -914,9 +913,6 @@ VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
 	    {
 	      if (PREDICT_FALSE (udp0->checksum))
 		{
-		  old_port0 = udp0->dst_port;
-		  new_port0 = udp0->dst_port = s0->in2out.port;
-
 		  sum0 = udp0->checksum;
 		  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
 					 ip4_header_t,
@@ -1070,12 +1066,11 @@ VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
 				 dst_address /* changed member */ );
 	  ip1->checksum = ip_csum_fold (sum1);
 
+	  old_port1 = udp1->dst_port;
+	  new_port1 = udp1->dst_port = s1->in2out.port;
+
 	  if (PREDICT_TRUE (proto1 == SNAT_PROTOCOL_TCP))
 	    {
-	      old_port1 = tcp1->dst_port;
-	      tcp1->dst_port = s1->in2out.port;
-	      new_port1 = tcp1->dst_port;
-
 	      sum1 = tcp1->checksum;
 	      sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
 				     ip4_header_t,
@@ -1091,9 +1086,6 @@ VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
 	    {
 	      if (PREDICT_FALSE (udp1->checksum))
 		{
-		  old_port1 = udp1->dst_port;
-		  new_port1 = udp1->dst_port = s1->in2out.port;
-
 		  sum1 = udp1->checksum;
 		  sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
 					 ip4_header_t,
@@ -1284,12 +1276,11 @@ VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
 				 dst_address /* changed member */ );
 	  ip0->checksum = ip_csum_fold (sum0);
 
+	  old_port0 = udp0->dst_port;
+	  new_port0 = udp0->dst_port = s0->in2out.port;
+
 	  if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
 	    {
-	      old_port0 = tcp0->dst_port;
-	      tcp0->dst_port = s0->in2out.port;
-	      new_port0 = tcp0->dst_port;
-
 	      sum0 = tcp0->checksum;
 	      sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
 				     ip4_header_t,
@@ -1305,9 +1296,6 @@ VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
 	    {
 	      if (PREDICT_FALSE (udp0->checksum))
 		{
-		  old_port0 = udp0->dst_port;
-		  new_port0 = udp0->dst_port = s0->in2out.port;
-
 		  sum0 = udp0->checksum;
 		  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
 					 ip4_header_t,