ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse ethernet header in ct6_in2out

Browse Source 
fix a debug CLI scripting bug: cp_ip6_address_add_del_command_function
ate any subsequent commands, yielding indigestion.

Change-Id: Iaca7bed5687759da36ae91dc658e758549b71796
Signed-off-by: Dave Barach <dave@barachs.net>
This commit is contained in:
Dave Barach
2019-03-07 16:18:55 -05:00
committed by Florin Coras
parent eaea421e1f
commit 035ea679d5
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/ct6/ct6_in2out.c
View File

@@ -235,7 +235,10 @@ ct6_in2out_inline (vlib_main_t * vm,
/*
* This is an output feature which runs at the last possible
* moment. Assume an ethernet header.
* moment. Assume an ethernet header. Make sure the packet is
* actually ipv6 before we do anything else.
*
* Unfortunately, we have to re-parse the L2 header.
*/
e0 = vlib_buffer_get_current (b[0]);
@@ -245,6 +248,18 @@ ct6_in2out_inline (vlib_main_t * vm,
delta0 += (e0->type == clib_net_to_host_u16 (ETHERNET_TYPE_DOT1AD))
? 8 : 0;
if (PREDICT_TRUE (delta0 == sizeof (*e0)))
{
if (e0->type != clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
goto trace0;
}
else
{
u16 *tagged_etype_ptr = vlib_buffer_get_current (b[0]) + delta0 - 2;
if (*tagged_etype_ptr != clib_host_to_net_u16 (ETHERNET_TYPE_IP6))
goto trace0;
}
ip0 = (ip6_header_t *) (vlib_buffer_get_current (b[0]) + delta0);
/*