From: Vijayabhaskar Katamreddy <vkatamre@cisco.com>
Date: Fri, 29 Jun 2018 12:03:40 +0000 (-0700)
Subject: Fixing ip4-reassembly ip6-reassembly non feature node, next_node_index setting
X-Git-Tag: v18.07-rc1~62
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F13297%2F3;p=vpp.git

Fixing ip4-reassembly ip6-reassembly non feature node, next_node_index setting

Change-Id: Ib988d87e6758ffa31862096391f9f286b0797f2b
Signed-off-by: Vijayabhaskar Katamreddy <vkatamre@cisco.com>
---

diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 60efe6e4027..9d45c7ee354 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -162,7 +162,6 @@ typedef struct
 	/* reassembly */
 	union
 	{
-	  u32 pad[2];		/* do not overlay w/ ip.adj_index[0,1] */
 	  /* in/out variables */
 	  struct
 	  {
diff --git a/src/vnet/ip/ip4_reassembly.c b/src/vnet/ip/ip4_reassembly.c
index e907d84f461..2c9aabd20ac 100644
--- a/src/vnet/ip/ip4_reassembly.c
+++ b/src/vnet/ip/ip4_reassembly.c
@@ -653,6 +653,7 @@ ip4_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
   ip4_header_t *fip = vlib_buffer_get_current (fb);
   ASSERT (fb->current_length >= sizeof (*fip));
   vnet_buffer_opaque_t *fvnb = vnet_buffer (fb);
+  reass->next_index = fvnb->ip.reass.next_index;	// store next_index before it's overwritten
   u32 fragment_first = fvnb->ip.reass.fragment_first =
     ip4_get_fragment_offset_bytes (fip);
   u32 fragment_length =
@@ -662,7 +663,6 @@ ip4_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
   int more_fragments = ip4_get_fragment_more (fip);
   u32 candidate_range_bi = reass->first_bi;
   u32 prev_range_bi = ~0;
-  reass->next_index = fvnb->ip.reass.next_index;	// store next_index before it's overwritten
   fvnb->ip.reass.range_first = fragment_first;
   fvnb->ip.reass.range_last = fragment_last;
   fvnb->ip.reass.next_range_bi = ~0;
diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c
index ff62b01fd39..e84daf6a21c 100644
--- a/src/vnet/ip/ip6_reassembly.c
+++ b/src/vnet/ip/ip6_reassembly.c
@@ -663,6 +663,7 @@ ip6_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
   int consumed = 0;
   vlib_buffer_t *fb = vlib_get_buffer (vm, *bi0);
   vnet_buffer_opaque_t *fvnb = vnet_buffer (fb);
+  reass->next_index = fvnb->ip.reass.next_index;	// store next_index before it's overwritten
   fvnb->ip.reass.ip6_frag_hdr_offset =
     (u8 *) frag_hdr - (u8 *) vlib_buffer_get_current (fb);
   ip6_header_t *fip = vlib_buffer_get_current (fb);