#include <vnet/ipsec-gre/ipsec_gre.h>
#include <vnet/ip/format.h>
#include <vnet/ipsec/ipsec.h>
+#include <vnet/l2/l2_input.h>
#include <vnet/ipsec/esp.h>
u64 key;
ipsec_add_del_ipsec_gre_tunnel_args_t args;
- memset (&args, 0, sizeof (args));
+ clib_memset (&args, 0, sizeof (args));
args.is_add = a->is_add;
args.local_sa_id = a->lsa;
args.remote_sa_id = a->rsa;
return VNET_API_ERROR_INVALID_VALUE;
pool_get_aligned (igm->tunnels, t, CLIB_CACHE_LINE_BYTES);
- memset (t, 0, sizeof (*t));
+ clib_memset (t, 0, sizeof (*t));
if (vec_len (igm->free_ipsec_gre_tunnel_hw_if_indices) > 0)
{
hash_set (igm->tunnel_by_key, key, t - igm->tunnels);
slot = vlib_node_add_named_next_with_slot
- (vnm->vlib_main, hi->tx_node_index, "esp-encrypt",
+ (vnm->vlib_main, hi->tx_node_index, "esp4-encrypt",
IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT);
ASSERT (slot == IPSEC_GRE_OUTPUT_NEXT_ESP_ENCRYPT);
ip4_sw_interface_enable_disable (sw_if_index, 0);
vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ );
/* make sure tunnel is removed from l2 bd or xconnect */
- set_int_l2_mode (igm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
+ set_int_l2_mode (igm->vlib_main, vnm, MODE_L3, sw_if_index, 0,
+ L2_BD_PORT_TYPE_NORMAL, 0, 0);
vec_add1 (igm->free_ipsec_gre_tunnel_hw_if_indices, t->hw_if_index);
igm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
goto done;
}
- memset (a, 0, sizeof (*a));
+ clib_memset (a, 0, sizeof (*a));
a->is_add = is_add;
a->lsa = lsa;
a->rsa = rsa;