diff options
author | Ole Troan <ot@cisco.com> | 2018-09-19 12:38:51 +0200 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2018-09-27 08:47:40 +0000 |
commit | 282093f1fe783b5d36a014d4495995cd64e2e3fb (patch) | |
tree | 09e6536da14c262d33991383e408b2c35d361b4a /src/plugins/map/ip6_map_t.c | |
parent | e23edac38ec239115689fe252b4b41a3556f6280 (diff) |
IPIP and IPv6 fragmentation
- Error where ICMPv6 error code doesn't reset VLIB_TX = -1
Leading to crash for ICMP generated on tunnelled packets
- Missed setting VNET_BUFFER_F_LOCALLY_ORIGINATED, so
IP in IPv6 packets never got fragmented.
- Add support for fragmentation of buffer chains.
- Remove support for inner fragmentation in frag code itself.
Change-Id: If9a97301b7e35ca97ffa5c0fada2b9e7e7dbfb27
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/map/ip6_map_t.c')
-rw-r--r-- | src/plugins/map/ip6_map_t.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/map/ip6_map_t.c b/src/plugins/map/ip6_map_t.c index 01ed810bb9f..aa4fa4dbd5c 100644 --- a/src/plugins/map/ip6_map_t.c +++ b/src/plugins/map/ip6_map_t.c @@ -264,7 +264,6 @@ ip6_map_t_icmp (vlib_main_t * vm, { //Send to fragmentation node if necessary vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu; - vnet_buffer (p0)->ip_frag.header_offset = 0; vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP; next0 = IP6_MAPT_ICMP_NEXT_IP4_FRAG; } @@ -348,7 +347,6 @@ ip6_map_t_fragmented (vlib_main_t * vm, { //Send to fragmentation node if necessary vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu; - vnet_buffer (p0)->ip_frag.header_offset = 0; vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP; next0 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG; @@ -366,7 +364,6 @@ ip6_map_t_fragmented (vlib_main_t * vm, { //Send to fragmentation node if necessary vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu; - vnet_buffer (p1)->ip_frag.header_offset = 0; vnet_buffer (p1)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP; next1 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG; @@ -405,7 +402,6 @@ ip6_map_t_fragmented (vlib_main_t * vm, { //Send to fragmentation node if necessary vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu; - vnet_buffer (p0)->ip_frag.header_offset = 0; vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP; next0 = IP6_MAPT_FRAGMENTED_NEXT_IP4_FRAG; @@ -466,7 +462,6 @@ ip6_map_t_tcp_udp (vlib_main_t * vm, { //Send to fragmentation node if necessary vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu; - vnet_buffer (p0)->ip_frag.header_offset = 0; vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP; next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG; @@ -484,7 +479,6 @@ ip6_map_t_tcp_udp (vlib_main_t * vm, { //Send to fragmentation node if necessary vnet_buffer (p1)->ip_frag.mtu = vnet_buffer (p1)->map_t.mtu; - vnet_buffer (p1)->ip_frag.header_offset = 0; vnet_buffer (p1)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP; next1 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG; @@ -523,7 +517,6 @@ ip6_map_t_tcp_udp (vlib_main_t * vm, { //Send to fragmentation node if necessary vnet_buffer (p0)->ip_frag.mtu = vnet_buffer (p0)->map_t.mtu; - vnet_buffer (p0)->ip_frag.header_offset = 0; vnet_buffer (p0)->ip_frag.next_index = IP4_FRAG_NEXT_IP4_LOOKUP; next0 = IP6_MAPT_TCP_UDP_NEXT_IP4_FRAG; |