summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorVijayabhaskar Katamreddy <vkatamre@cisco.com>2018-06-29 05:03:40 -0700
committerDamjan Marion <dmarion@me.com>2018-07-02 15:07:09 +0000
commitb361076e24e02243605a681b96aa65e9b5e27bfb (patch)
treeff4445fc63319fc15c3512da4035f9d44c4bc401 /src/vnet
parente6c78ee84242e28516769d5703b4f9809691c2a3 (diff)
Fixing ip4-reassembly ip6-reassembly non feature node, next_node_index setting
Change-Id: Ib988d87e6758ffa31862096391f9f286b0797f2b Signed-off-by: Vijayabhaskar Katamreddy <vkatamre@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/buffer.h1
-rw-r--r--src/vnet/ip/ip4_reassembly.c2
-rw-r--r--src/vnet/ip/ip6_reassembly.c1
3 files changed, 2 insertions, 2 deletions
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);