diff options
| author |   John Lo <loj@cisco.com> | 2016-06-07 09:14:07 -0400 |
|---|---|---|
| committer | John Lo <loj@cisco.com> | 2016-06-07 09:14:07 -0400 |
| commit | 3ef822e1c3eedef8dd3cd95a000a012667641f37 (patch) | |
| tree | 25db4989f30fa255c5f68f70d6974218c8ad5bd9 /vnet/vnet/vxlan/vxlan.h | |
| parent | 30097b5d2270ddf124eb0a03fcd2ad85bab78834 (diff) | |
VPP-110: vxlan encap node should never touch a deleted tunnel
Remove usage of dummy encap string for output from BD to a tunnel which
has been deleted. Instead, use a node l2-outpt-del-tunnel so that if
there are stale entries in the L2FIB for any deleted tunnel sw_if_index,
l2-output will send packets using this entry to the l2-output-tunnel-del
node which just setup the proper drop reason before sending packets
to the error-drop node to drop the packet.
Change-Id: I590982ee25e924ab74e2855c55c58baf29a9fad4
Signed-off-by: John Lo <loj@cisco.com>
Diffstat (limited to 'vnet/vnet/vxlan/vxlan.h')
| -rw-r--r-- | vnet/vnet/vxlan/vxlan.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vnet/vnet/vxlan/vxlan.h b/vnet/vnet/vxlan/vxlan.h index 1c70c75793a..703741af60b 100644 --- a/vnet/vnet/vxlan/vxlan.h +++ b/vnet/vnet/vxlan/vxlan.h @@ -20,6 +20,7 @@ #include <vnet/vnet.h> #include <vnet/ip/ip.h> #include <vnet/l2/l2_input.h> +#include <vnet/l2/l2_output.h> #include <vnet/l2/l2_bd.h> #include <vnet/ethernet/ethernet.h> #include <vnet/vxlan/vxlan_packet.h> @@ -126,13 +127,6 @@ typedef struct { /* Free vlib hw_if_indices */ u32 * free_vxlan_tunnel_hw_if_indices; - /* Dummy rewrite for deleted vxlan_tunnels with hw_if_indices as above */ - u64 dummy4_str [sizeof(ip4_vxlan_header_t)/sizeof(u64) + 2]; -#define vxlan4_dummy_rewrite ((u8 *) &vxlan_main.dummy4_str[1]) - - u64 dummy6_str [sizeof(ip6_vxlan_header_t)/sizeof(u64) + 2]; -#define vxlan6_dummy_rewrite ((u8 *) &vxlan_main.dummy6_str[1]) - /* Mapping from sw_if_index to tunnel index */ u32 * tunnel_index_by_sw_if_index; |