}
static void
-sixrd_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0,
- const void *data)
+sixrd_fixup (vlib_main_t * vm,
+ const ip_adjacency_t * adj, vlib_buffer_t * b0, const void *data)
{
ip4_header_t *ip4 = vlib_buffer_get_current (b0);
ip6_header_t *ip6 = vlib_buffer_get_current (b0) + sizeof (ip4_header_t);
}
static void
-ip6ip_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0,
- const void *data)
+ip6ip_fixup (vlib_main_t * vm,
+ const ip_adjacency_t * adj, vlib_buffer_t * b0, const void *data)
{
const ipip_tunnel_t *t = data;
ip4_header_t *ip4 = vlib_buffer_get_current (b0);
ip46_address_t src = ip46_address_initializer, dst =
ip46_address_initializer;
ip_set (&src, ip4_src, true);
- ipip_tunnel_key_t key = {
- .transport = IPIP_TRANSPORT_IP4,
- .fib_index = ip4_fib_index,
- .src = src,
- .dst = dst
- };
+ ipip_tunnel_key_t key;
+
+ ipip_mk_key_i (IPIP_TRANSPORT_IP4, IPIP_MODE_6RD, &src, &dst, ip4_fib_index,
+ &key);
t = ipip_tunnel_db_find (&key);
if (t)
{
ipip_main_t *gm = &ipip_main;
ipip_tunnel_t *t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index);
+ ipip_tunnel_key_t key;
if (!t)
{
gm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
vnet_delete_hw_interface (vnet_get_main (), t->hw_if_index);
- ipip_tunnel_db_remove (t);
+ ipip_mk_key (t, &key);
+ ipip_tunnel_db_remove (t, &key);
pool_put (gm->tunnels, t);
return 0;