#define LISP_ADJ_SET_KEY(_key, _itf, _nh) \
{ \
- _key.key[0] = (_nh)->ip.v6.as_u64[0]; \
- _key.key[1] = (_nh)->ip.v6.as_u64[1]; \
+ _key.key[0] = ip_addr_v6((_nh)).as_u64[0]; \
+ _key.key[1] = ip_addr_v6((_nh)).as_u64[1]; \
_key.key[2] = (_itf); \
}
{
switch (ip_addr_version (&ladj->remote_rloc))
{
- case IP4:
+ case AF_IP4:
return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
- case IP6:
+ case AF_IP6:
return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
default:
ASSERT (0);
if (ip46_address_is_ip4 (a))
{
clib_memset (b, 0, sizeof (*b));
- ip_address_set (b, &a->ip4, IP4);
+ ip_address_set (b, &a->ip4, AF_IP4);
}
else
{
- ip_address_set (b, &a->ip6, IP6);
+ ip_address_set (b, &a->ip6, AF_IP6);
}
}
fib_protocol_t nh_proto;
ip46_address_t nh;
- ip_address_to_46 (&ladj->remote_rloc, &nh, &nh_proto);
+ nh_proto = ip_address_to_46 (&ladj->remote_rloc, &nh);
/*
* walk all the adjacencies on th lisp interface and restack them
}
static void
-lisp_gpe_increment_stats_counters (lisp_cp_main_t * lcm, ip_adjacency_t * adj,
+lisp_gpe_increment_stats_counters (lisp_cp_main_t * lcm,
+ const ip_adjacency_t * adj,
vlib_buffer_t * b)
{
lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main ();
key.tunnel_index = ladj->tunnel_index;
uword *p = hash_get_mem (lgm->lisp_stats_index_by_key, &key);
- ASSERT (p);
+ ALWAYS_ASSERT (p);
/* compute payload length starting after GPE */
u32 bytes = b->current_length - (lisp_data - b->data - b->current_data);
static void
lisp_gpe_fixup (vlib_main_t * vm,
- ip_adjacency_t * adj, vlib_buffer_t * b, const void *data)
+ const ip_adjacency_t * adj,
+ vlib_buffer_t * b, const void *data)
{
lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();