diff options
| author |   Klement Sekera <klement.sekera@gmail.com> | 2024-04-13 11:03:49 +0200 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2024-10-07 10:57:24 +0000 |
| commit | 911c0fb23aef158567aaf38b0798ac48fd957d8e (patch) | |
| tree | 39acc6f2af1ef57fa4a6e64faeb355c55f8357f5 /src/vnet/buffer.h | |
| parent | 0b1bd9df33c02585e3be2fe048e5427b9574b699 (diff) | |
ip: fix ip4 shallow reassembly output feature handoff
Use a new frame queue for output feature instead of passing frames
to standard feature.
Fixes bug where save_rewrite_length gets overwritten on reassembly
handoff.
Type: fix
Change-Id: I6c6191aec5f1c89e1ca0510a08781e390d327bbf
Signed-off-by: Klement Sekera <klement.sekera@gmail.com>
Diffstat (limited to 'src/vnet/buffer.h')
| -rw-r--r-- | src/vnet/buffer.h | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h index 2f34aa4b5fc..e60b8ffb810 100644 --- a/src/vnet/buffer.h +++ b/src/vnet/buffer.h @@ -219,16 +219,12 @@ typedef struct struct { /* input variables */ - struct - { - u32 next_index; /* index of next node - used by custom apps */ - u32 error_next_index; /* index of next node if error - used by custom apps */ - }; + u32 next_index; /* index of next node - used by custom apps */ + u32 error_next_index; /* index of next node if error - used by + custom apps */ + u8 _save_rewrite_length; /* handoff variables */ - struct - { - u16 owner_thread_index; - }; + u16 owner_thread_index; }; /* output variables */ struct @@ -422,25 +418,26 @@ typedef struct STATIC_ASSERT (VNET_REWRITE_TOTAL_BYTES <= VLIB_BUFFER_PRE_DATA_SIZE, "VNET_REWRITE_TOTAL_BYTES too big"); -STATIC_ASSERT (STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) - == STRUCT_SIZE_OF (vnet_buffer_opaque_t, - ip.reass.save_rewrite_length) - && STRUCT_SIZE_OF (vnet_buffer_opaque_t, - ip.reass.save_rewrite_length) == - STRUCT_SIZE_OF (vnet_buffer_opaque_t, mpls.save_rewrite_length) - && STRUCT_SIZE_OF (vnet_buffer_opaque_t, - mpls.save_rewrite_length) == 1 - && VNET_REWRITE_TOTAL_BYTES < UINT8_MAX, - "save_rewrite_length member must be able to hold the max value of rewrite length"); - -STATIC_ASSERT (STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) - == STRUCT_OFFSET_OF (vnet_buffer_opaque_t, - ip.reass.save_rewrite_length) - && STRUCT_OFFSET_OF (vnet_buffer_opaque_t, - mpls.save_rewrite_length) == - STRUCT_OFFSET_OF (vnet_buffer_opaque_t, - ip.reass.save_rewrite_length), - "save_rewrite_length must be aligned so that reass doesn't overwrite it"); +STATIC_ASSERT ( + STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) == + STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.reass.save_rewrite_length) && + STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) == + STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.reass._save_rewrite_length) && + STRUCT_SIZE_OF (vnet_buffer_opaque_t, ip.reass.save_rewrite_length) == + STRUCT_SIZE_OF (vnet_buffer_opaque_t, mpls.save_rewrite_length) && + STRUCT_SIZE_OF (vnet_buffer_opaque_t, mpls.save_rewrite_length) == 1 && + VNET_REWRITE_TOTAL_BYTES < UINT8_MAX, + "save_rewrite_length member must be able to hold the max value of rewrite " + "length"); + +STATIC_ASSERT ( + STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) == + STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.reass.save_rewrite_length) && + STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.save_rewrite_length) == + STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.reass._save_rewrite_length) && + STRUCT_OFFSET_OF (vnet_buffer_opaque_t, mpls.save_rewrite_length) == + STRUCT_OFFSET_OF (vnet_buffer_opaque_t, ip.reass.save_rewrite_length), + "save_rewrite_length must be aligned so that reass doesn't overwrite it"); /* * The opaque field of the vlib_buffer_t is interpreted as a |