summaryrefslogtreecommitdiffstats
path: root/src/vnet/ip/icmp6.c
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2018-05-23 11:21:42 +0200
committerFlorin Coras <florin.coras@gmail.com>2018-05-23 16:40:39 +0000
commitda6e11b47d47c764b11304524de559dda0d0d223 (patch)
treee219f5491c6253bcdae04969d6a2321183f00bef /src/vnet/ip/icmp6.c
parent8a9c8f1412cb1258340b18a8eb622a835ef3c37b (diff)
VPP-1283: IPv6 PMTU missing MTU value in ICMP6 message.
Fix GRE/IPv6 setting of ip->payload_length (which has never worked). Change-Id: Ie68f1cc7bbb70489d6ec97356132c783f2345e1e Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vnet/ip/icmp6.c')
-rw-r--r--src/vnet/ip/icmp6.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c
index fd5d0ecba38..6ebdef4745e 100644
--- a/src/vnet/ip/icmp6.c
+++ b/src/vnet/ip/icmp6.c
@@ -526,13 +526,15 @@ ip6_icmp_error (vlib_main_t * vm,
b->current_length = 0;
}
}
- p0->current_length =
- p0->current_length > 1280 ? 1280 : p0->current_length;
/* Add IP header and ICMPv6 header including a 4 byte data field */
vlib_buffer_advance (p0,
-sizeof (ip6_header_t) -
sizeof (icmp46_header_t) - 4);
+
+ p0->current_length =
+ p0->current_length > 1280 ? 1280 : p0->current_length;
+
out_ip0 = vlib_buffer_get_current (p0);
icmp0 = (icmp46_header_t *) & out_ip0[1];