diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-02-22 11:41:12 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2018-03-21 00:01:44 +0000 |
| commit | 4c53313cd7e9b866412ad3e04b2d91ac098c1398 (patch) | |
| tree | 185aa1f368ea2eb997c2ed46433b31178efc71c9 /src/vnet/ip/ip4_forward.c | |
| parent | 2303cb181b51f63c909cd506125c1f832432865a (diff) | |
reassembly: feature/concurrency
This change makes ip reassembly an interface feature, while adding
concurrency support. Due to this, punt is no longer needed to test
reassembly.
Change-Id: I467669514ec33283ce935be0f1dd08f07684f0c7
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet/ip/ip4_forward.c')
| -rw-r--r-- | src/vnet/ip/ip4_forward.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 19babced33f..7c56a294436 100644 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -1217,14 +1217,8 @@ ip4_local_inline (vlib_main_t * vm, sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX]; sw_if_index1 = vnet_buffer (p1)->sw_if_index[VLIB_RX]; - /* Treat IP frag packets as "experimental" protocol for now - until support of IP frag reassembly is implemented */ - proto0 = - ip4_is_fragment (ip0) ? IP_PROTOCOL_VPP_FRAGMENTATION : - ip0->protocol; - proto1 = - ip4_is_fragment (ip1) ? IP_PROTOCOL_VPP_FRAGMENTATION : - ip1->protocol; + proto0 = ip0->protocol; + proto1 = ip1->protocol; if (head_of_feature_arc == 0) goto skip_checks; @@ -1387,11 +1381,7 @@ ip4_local_inline (vlib_main_t * vm, vnet_buffer (p0)->l3_hdr_offset = p0->current_data; sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX]; - /* Treat IP frag packets as "experimental" protocol for now - until support of IP frag reassembly is implemented */ - proto0 = - ip4_is_fragment (ip0) ? IP_PROTOCOL_VPP_FRAGMENTATION : - ip0->protocol; + proto0 = ip0->protocol; if (head_of_feature_arc == 0 || p0->flags & VNET_BUFFER_F_IS_NATED) goto skip_check; @@ -1482,7 +1472,6 @@ VLIB_REGISTER_NODE (ip4_local_node) = [IP_LOCAL_NEXT_PUNT] = "ip4-punt", [IP_LOCAL_NEXT_UDP_LOOKUP] = "ip4-udp-lookup", [IP_LOCAL_NEXT_ICMP] = "ip4-icmp-input", - [IP_LOCAL_NEXT_REASSEMBLY] = "ip4-reassembly", }, }; /* *INDENT-ON* */ |