X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_forward.c;h=9c195e68802e710fc3ac3e52aa249d2f36d4ac0e;hb=1bd2c019eba5c893d634cc496bd6d54c00020d7e;hp=69ae86d5b2cc5d323dfd94a87a9e8cfd0c4e996b;hpb=ba4a5bf884516769211e75d11884a1e458323a21;p=vpp.git

diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 69ae86d5b2c..9c195e68802 100644
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -1021,31 +1021,23 @@ u16
 ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
 				   ip6_header_t * ip0, int *bogus_lengthp)
 {
-  ip_csum_t sum0;
-  u16 payload_length_host_byte_order;
+  ip_csum_t sum0 = 0;
+  u16 payload_length, payload_length_host_byte_order;
   u32 i;
   u32 headers_size = sizeof (ip0[0]);
   u8 *data_this_buffer;
+  u8 next_hdr = ip0->protocol;
 
   ASSERT (bogus_lengthp);
   *bogus_lengthp = 0;
 
-  /* Initialize checksum with ip header. */
-  sum0 = ip0->payload_length + clib_host_to_net_u16 (ip0->protocol);
   payload_length_host_byte_order = clib_net_to_host_u16 (ip0->payload_length);
   data_this_buffer = (u8 *) (ip0 + 1);
-
-  for (i = 0; i < ARRAY_LEN (ip0->src_address.as_uword); i++)
-    {
-      sum0 = ip_csum_with_carry
-	(sum0, clib_mem_unaligned (&ip0->src_address.as_uword[i], uword));
-      sum0 = ip_csum_with_carry
-	(sum0, clib_mem_unaligned (&ip0->dst_address.as_uword[i], uword));
-    }
+  payload_length = ip0->payload_length;
 
   /* some icmp packets may come with a "router alert" hop-by-hop extension header (e.g., mldv2 packets)
    * or UDP-Ping packets */
-  if (PREDICT_FALSE (ip0->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
+  if (PREDICT_FALSE (next_hdr == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS))
     {
       u32 skip_bytes;
       ip6_hop_by_hop_ext_t *ext_hdr =
@@ -1060,6 +1052,24 @@ ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0,
 
       payload_length_host_byte_order -= skip_bytes;
       headers_size += skip_bytes;
+
+      /* pseudo-header adjustments:
+       *   exclude ext header bytes from payload length
+       *   use payload IP proto rather than ext header IP proto
+       */
+      payload_length = clib_host_to_net_u16 (payload_length_host_byte_order);
+      next_hdr = ext_hdr->next_hdr;
+    }
+
+  /* Initialize checksum with ip pseudo-header. */
+  sum0 = payload_length + clib_host_to_net_u16 (next_hdr);
+
+  for (i = 0; i < ARRAY_LEN (ip0->src_address.as_uword); i++)
+    {
+      sum0 = ip_csum_with_carry
+	(sum0, clib_mem_unaligned (&ip0->src_address.as_uword[i], uword));
+      sum0 = ip_csum_with_carry
+	(sum0, clib_mem_unaligned (&ip0->dst_address.as_uword[i], uword));
     }
 
   if (p0)
@@ -1734,10 +1744,7 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 					       0);
 		}
 	    }
-	  else
-	    {
-	      p0->flags &= ~VNET_BUFFER_F_LOCALLY_ORIGINATED;
-	    }
+
 	  is_locally_originated1 =
 	    p1->flags & VNET_BUFFER_F_LOCALLY_ORIGINATED;
 	  if (PREDICT_TRUE (!is_locally_originated1))
@@ -1765,10 +1772,7 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 					       0);
 		}
 	    }
-	  else
-	    {
-	      p1->flags &= ~VNET_BUFFER_F_LOCALLY_ORIGINATED;
-	    }
+
 	  adj0 = adj_get (adj_index0);
 	  adj1 = adj_get (adj_index1);
 
@@ -1855,8 +1859,12 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 	    {
 	      /* before we paint on the next header, update the L4
 	       * checksums if required, since there's no offload on a tunnel */
-	      calc_checksums (vm, p0);
-	      calc_checksums (vm, p1);
+	      vnet_calc_checksums_inline (vm, p0, 0 /* is_ip4 */ ,
+					  1 /* is_ip6 */ ,
+					  0 /* with gso */ );
+	      vnet_calc_checksums_inline (vm, p1, 0 /* is_ip4 */ ,
+					  1 /* is_ip6 */ ,
+					  0 /* with gso */ );
 	    }
 
 	  /* Guess we are only writing on simple Ethernet header. */
@@ -1951,7 +1959,9 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 
 	  if (is_midchain)
 	    {
-	      calc_checksums (vm, p0);
+	      vnet_calc_checksums_inline (vm, p0, 0 /* is_ip4 */ ,
+					  1 /* is_ip6 */ ,
+					  0 /* with gso */ );
 	    }
 
 	  /* Guess we are only writing on simple Ethernet header. */