static int
queue_map_request (gid_address_t * seid, gid_address_t * deid,
- u8 smr_invoked, u8 is_resend);
+ u8 smr_invoked, u8 is_resend);
ip_interface_address_t *
-ip_interface_get_first_interface_address (ip_lookup_main_t *lm, u32 sw_if_index,
- u8 loop)
+ip_interface_get_first_interface_address (ip_lookup_main_t * lm,
+ u32 sw_if_index, u8 loop)
{
vnet_main_t *vnm = vnet_get_main ();
- vnet_sw_interface_t * swif = vnet_get_sw_interface (vnm, sw_if_index);
+ vnet_sw_interface_t *swif = vnet_get_sw_interface (vnm, sw_if_index);
if (loop && swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
sw_if_index = swif->unnumbered_sw_if_index;
u32 ia =
- (vec_len((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ?
- vec_elt((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) :
- (u32) ~0;
- return pool_elt_at_index((lm)->if_address_pool, ia);
+ (vec_len ((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ?
+ vec_elt ((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) :
+ (u32) ~ 0;
+ return pool_elt_at_index ((lm)->if_address_pool, ia);
}
void *
ip_interface_get_first_address (ip_lookup_main_t * lm, u32 sw_if_index,
- u8 version)
+ u8 version)
{
- ip_interface_address_t * ia;
+ ip_interface_address_t *ia;
ia = ip_interface_get_first_interface_address (lm, sw_if_index, 1);
if (!ia)
int
ip_interface_get_first_ip_address (lisp_cp_main_t * lcm, u32 sw_if_index,
- u8 version, ip_address_t * result)
+ u8 version, ip_address_t * result)
{
- ip_lookup_main_t * lm;
- void * addr;
+ ip_lookup_main_t *lm;
+ void *addr;
lm = (version == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
addr = ip_interface_get_first_address (lm, sw_if_index, version);
static u32
ip_fib_lookup_with_table (lisp_cp_main_t * lcm, u32 fib_index,
- ip_address_t * dst)
+ ip_address_t * dst)
{
if (ip_addr_version (dst) == IP4)
- return ip4_fib_lookup_with_table (lcm->im4, fib_index, &ip_addr_v4(dst),
- 0);
+ return ip4_fib_lookup_with_table (lcm->im4, fib_index, &ip_addr_v4 (dst),
+ 0);
else
- return ip6_fib_lookup_with_table (lcm->im6, fib_index, &ip_addr_v6(dst));
+ return ip6_fib_lookup_with_table (lcm->im6, fib_index, &ip_addr_v6 (dst));
}
u32
ip_fib_get_egress_iface_for_dst_with_lm (lisp_cp_main_t * lcm,
- ip_address_t * dst,
- ip_lookup_main_t * lm)
+ ip_address_t * dst,
+ ip_lookup_main_t * lm)
{
u32 adj_index;
- ip_adjacency_t * adj;
+ ip_adjacency_t *adj;
adj_index = ip_fib_lookup_with_table (lcm, 0, dst);
adj = ip_get_adjacency (lm, adj_index);
u32
ip_fib_get_egress_iface_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst)
{
- ip_lookup_main_t * lm;
+ ip_lookup_main_t *lm;
lm = ip_addr_version (dst) == IP4 ?
- &lcm->im4->lookup_main : &lcm->im6->lookup_main;
+ &lcm->im4->lookup_main : &lcm->im6->lookup_main;
return ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm);
}
*/
int
ip_fib_get_first_egress_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst,
- ip_address_t * result)
+ ip_address_t * result)
{
u32 si;
- ip_lookup_main_t * lm;
- void * addr = 0;
+ ip_lookup_main_t *lm;
+ void *addr = 0;
u8 ipver;
- ASSERT(result != 0);
+ ASSERT (result != 0);
- ipver = ip_addr_version(dst);
+ ipver = ip_addr_version (dst);
lm = (ipver == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
si = ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm);
- if ((u32) ~0 == si)
+ if ((u32) ~ 0 == si)
return 0;
/* find the first ip address */
static int
dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_l2, u8 is_add)
{
- uword * dp_table, * intf;
+ uword *dp_table, *intf;
vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai;
if (!is_l2)
{
- dp_table = hash_get(lcm->table_id_by_vni, vni);
+ dp_table = hash_get (lcm->table_id_by_vni, vni);
if (!dp_table)
- {
- clib_warning("vni %d not associated to a vrf!", vni);
- return VNET_API_ERROR_INVALID_VALUE;
- }
+ {
+ clib_warning ("vni %d not associated to a vrf!", vni);
+ return VNET_API_ERROR_INVALID_VALUE;
+ }
}
else
{
- dp_table = hash_get(lcm->bd_id_by_vni, vni);
+ dp_table = hash_get (lcm->bd_id_by_vni, vni);
if (!dp_table)
- {
- clib_warning("vni %d not associated to a bridge domain!", vni);
- return VNET_API_ERROR_INVALID_VALUE;
- }
+ {
+ clib_warning ("vni %d not associated to a bridge domain!", vni);
+ return VNET_API_ERROR_INVALID_VALUE;
+ }
}
- intf = hash_get(is_l2 ? lcm->l2_dp_intf_by_vni :lcm->dp_intf_by_vni, vni);
+ intf = hash_get (is_l2 ? lcm->l2_dp_intf_by_vni : lcm->dp_intf_by_vni, vni);
/* enable/disable data-plane interface */
if (is_add)
{
/* create interface */
if (!intf)
- {
- ai->is_add = 1;
- ai->vni = vni;
- ai->is_l2 = is_l2;
- ai->dp_table = dp_table[0];
+ {
+ ai->is_add = 1;
+ ai->vni = vni;
+ ai->is_l2 = is_l2;
+ ai->dp_table = dp_table[0];
- vnet_lisp_gpe_add_del_iface (ai, 0);
+ vnet_lisp_gpe_add_del_iface (ai, 0);
- /* keep track of vnis for which interfaces have been created */
- hash_set(lcm->dp_intf_by_vni, vni, 1);
- }
+ /* keep track of vnis for which interfaces have been created */
+ hash_set (lcm->dp_intf_by_vni, vni, 1);
+ }
}
else
{
if (intf == 0)
- {
- clib_warning("interface for vni %d doesn't exist!", vni);
- return VNET_API_ERROR_INVALID_VALUE;
- }
+ {
+ clib_warning ("interface for vni %d doesn't exist!", vni);
+ return VNET_API_ERROR_INVALID_VALUE;
+ }
ai->is_add = 0;
ai->vni = vni;
ai->dp_table = dp_table[0];
vnet_lisp_gpe_add_del_iface (ai, 0);
- hash_unset(lcm->dp_intf_by_vni, vni);
+ hash_unset (lcm->dp_intf_by_vni, vni);
}
return 0;
static void
dp_del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
{
- vnet_lisp_gpe_add_del_fwd_entry_args_t _a, * a = &_a;
- fwd_entry_t * fe = 0;
- uword * feip = 0;
- memset(a, 0, sizeof(*a));
+ vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+ fwd_entry_t *fe = 0;
+ uword *feip = 0;
+ memset (a, 0, sizeof (*a));
- feip = hash_get(lcm->fwd_entry_by_mapping_index, dst_map_index);
+ feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
if (!feip)
return;
- fe = pool_elt_at_index(lcm->fwd_entry_pool, feip[0]);
+ fe = pool_elt_at_index (lcm->fwd_entry_pool, feip[0]);
/* delete dp fwd entry */
u32 sw_if_index;
a->is_add = 0;
a->locator_pairs = fe->locator_pairs;
- a->vni = gid_address_vni(&a->rmt_eid);
- gid_address_copy(&a->rmt_eid, &fe->deid);
+ a->vni = gid_address_vni (&a->rmt_eid);
+ gid_address_copy (&a->rmt_eid, &fe->deid);
vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
/* delete entry in fwd table */
- hash_unset(lcm->fwd_entry_by_mapping_index, dst_map_index);
- vec_free(fe->locator_pairs);
- pool_put(lcm->fwd_entry_pool, fe);
+ hash_unset (lcm->fwd_entry_by_mapping_index, dst_map_index);
+ vec_free (fe->locator_pairs);
+ pool_put (lcm->fwd_entry_pool, fe);
}
/**
*
*/
static u32
-get_locator_pairs (lisp_cp_main_t* lcm, mapping_t * lcl_map,
- mapping_t * rmt_map, locator_pair_t ** locator_pairs)
+get_locator_pairs (lisp_cp_main_t * lcm, mapping_t * lcl_map,
+ mapping_t * rmt_map, locator_pair_t ** locator_pairs)
{
u32 i, limitp = 0, li, found = 0, esi;
- locator_set_t * rmt_ls, * lcl_ls;
- ip_address_t _lcl_addr, * lcl_addr = &_lcl_addr;
- locator_t * lp, * rmt = 0;
- uword * checked = 0;
+ locator_set_t *rmt_ls, *lcl_ls;
+ ip_address_t _lcl_addr, *lcl_addr = &_lcl_addr;
+ locator_t *lp, *rmt = 0;
+ uword *checked = 0;
locator_pair_t pair;
- rmt_ls = pool_elt_at_index(lcm->locator_set_pool, rmt_map->locator_set_index);
- lcl_ls = pool_elt_at_index(lcm->locator_set_pool, lcl_map->locator_set_index);
+ rmt_ls =
+ pool_elt_at_index (lcm->locator_set_pool, rmt_map->locator_set_index);
+ lcl_ls =
+ pool_elt_at_index (lcm->locator_set_pool, lcl_map->locator_set_index);
- if (!rmt_ls || vec_len(rmt_ls->locator_indices) == 0)
+ if (!rmt_ls || vec_len (rmt_ls->locator_indices) == 0)
return 0;
while (1)
rmt = 0;
/* find unvisited remote locator with best priority */
- for (i = 0; i < vec_len(rmt_ls->locator_indices); i++)
- {
- if (0 != hash_get(checked, i))
- continue;
-
- li = vec_elt(rmt_ls->locator_indices, i);
- lp = pool_elt_at_index(lcm->locator_pool, li);
-
- /* we don't support non-IP locators for now */
- if (gid_address_type(&lp->address) != GID_ADDR_IP_PREFIX)
- continue;
-
- if ((found && lp->priority == limitp)
- || (!found && lp->priority >= limitp))
- {
- rmt = lp;
-
- /* don't search for locators with lower priority and don't
- * check this locator again*/
- limitp = lp->priority;
- hash_set(checked, i, 1);
- break;
- }
- }
+ for (i = 0; i < vec_len (rmt_ls->locator_indices); i++)
+ {
+ if (0 != hash_get (checked, i))
+ continue;
+
+ li = vec_elt (rmt_ls->locator_indices, i);
+ lp = pool_elt_at_index (lcm->locator_pool, li);
+
+ /* we don't support non-IP locators for now */
+ if (gid_address_type (&lp->address) != GID_ADDR_IP_PREFIX)
+ continue;
+
+ if ((found && lp->priority == limitp)
+ || (!found && lp->priority >= limitp))
+ {
+ rmt = lp;
+
+ /* don't search for locators with lower priority and don't
+ * check this locator again*/
+ limitp = lp->priority;
+ hash_set (checked, i, 1);
+ break;
+ }
+ }
/* check if a local locator with a route to remote locator exists */
if (rmt != 0)
- {
- /* find egress sw_if_index for rmt locator */
- esi = ip_fib_get_egress_iface_for_dst (
- lcm, &gid_address_ip(&rmt->address));
- if ((u32) ~0 == esi)
- continue;
-
- for (i = 0; i < vec_len(lcl_ls->locator_indices); i++)
- {
- li = vec_elt (lcl_ls->locator_indices, i);
- locator_t * sl = pool_elt_at_index (lcm->locator_pool, li);
-
- /* found local locator with the needed sw_if_index*/
- if (sl->sw_if_index == esi)
- {
- /* and it has an address */
- if (0 == ip_interface_get_first_ip_address (lcm,
- sl->sw_if_index,
- gid_address_ip_version(&rmt->address), lcl_addr))
- continue;
-
- memset(&pair, 0, sizeof(pair));
- ip_address_copy (&pair.rmt_loc,
- &gid_address_ip(&rmt->address));
- ip_address_copy(&pair.lcl_loc, lcl_addr);
- pair.weight = rmt->weight;
- vec_add1(locator_pairs[0], pair);
- found = 1;
- }
- }
- }
+ {
+ /* find egress sw_if_index for rmt locator */
+ esi =
+ ip_fib_get_egress_iface_for_dst (lcm,
+ &gid_address_ip (&rmt->address));
+ if ((u32) ~ 0 == esi)
+ continue;
+
+ for (i = 0; i < vec_len (lcl_ls->locator_indices); i++)
+ {
+ li = vec_elt (lcl_ls->locator_indices, i);
+ locator_t *sl = pool_elt_at_index (lcm->locator_pool, li);
+
+ /* found local locator with the needed sw_if_index */
+ if (sl->sw_if_index == esi)
+ {
+ /* and it has an address */
+ if (0 == ip_interface_get_first_ip_address (lcm,
+ sl->sw_if_index,
+ gid_address_ip_version
+ (&rmt->address),
+ lcl_addr))
+ continue;
+
+ memset (&pair, 0, sizeof (pair));
+ ip_address_copy (&pair.rmt_loc,
+ &gid_address_ip (&rmt->address));
+ ip_address_copy (&pair.lcl_loc, lcl_addr);
+ pair.weight = rmt->weight;
+ vec_add1 (locator_pairs[0], pair);
+ found = 1;
+ }
+ }
+ }
else
- break;
+ break;
}
- hash_free(checked);
+ hash_free (checked);
return found;
}
static void
-dp_add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index)
+dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
{
- vnet_lisp_gpe_add_del_fwd_entry_args_t _a, * a = &_a;
- mapping_t * src_map, * dst_map;
+ vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+ mapping_t *src_map, *dst_map;
u32 sw_if_index;
- uword * feip = 0, * dpid;
- fwd_entry_t* fe;
+ uword *feip = 0, *dpid;
+ fwd_entry_t *fe;
u8 type;
- memset (a, 0, sizeof(*a));
+ memset (a, 0, sizeof (*a));
/* remove entry if it already exists */
feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
a->is_add = 1;
gid_address_copy (&a->rmt_eid, &dst_map->eid);
- a->vni = gid_address_vni(&a->rmt_eid);
+ a->vni = gid_address_vni (&a->rmt_eid);
/* get vrf or bd_index associated to vni */
- type = gid_address_type(&dst_map->eid);
+ type = gid_address_type (&dst_map->eid);
if (GID_ADDR_IP_PREFIX == type)
{
- dpid = hash_get(lcm->table_id_by_vni, a->vni);
+ dpid = hash_get (lcm->table_id_by_vni, a->vni);
if (!dpid)
- {
- clib_warning("vni %d not associated to a vrf!", a->vni);
- return;
- }
+ {
+ clib_warning ("vni %d not associated to a vrf!", a->vni);
+ return;
+ }
a->table_id = dpid[0];
}
else if (GID_ADDR_MAC == type)
{
- dpid = hash_get(lcm->bd_id_by_vni, a->vni);
+ dpid = hash_get (lcm->bd_id_by_vni, a->vni);
if (!dpid)
- {
- clib_warning("vni %d not associated to a bridge domain !", a->vni);
- return;
- }
+ {
+ clib_warning ("vni %d not associated to a bridge domain !", a->vni);
+ return;
+ }
a->bd_id = dpid[0];
}
}
/* TODO remove */
- u8 ipver = ip_prefix_version(&gid_address_ippref(&a->rmt_eid));
+ u8 ipver = ip_prefix_version (&gid_address_ippref (&a->rmt_eid));
a->decap_next_index = (ipver == IP4) ?
- LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
+ LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
fe->locator_pairs = a->locator_pairs;
gid_address_copy (&fe->deid, &a->rmt_eid);
hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index,
- fe - lcm->fwd_entry_pool);
+ fe - lcm->fwd_entry_pool);
}
/**
*/
int
vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a,
- u32 * map_index_result)
+ u32 * map_index_result)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- u32 mi, * map_indexp, map_index, i;
- mapping_t * m, * old_map;
- u32 ** eid_indexes;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ u32 mi, *map_indexp, map_index, i;
+ mapping_t *m, *old_map;
+ u32 **eid_indexes;
mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->eid);
old_map = mi != ~0 ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
if (a->is_add)
{
/* TODO check if overwriting and take appropriate actions */
- if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid,
- &a->eid))
- {
- clib_warning ("eid %U found in the eid-table", format_gid_address,
- &a->eid);
- return VNET_API_ERROR_VALUE_EXIST;
- }
-
- pool_get(lcm->mapping_pool, m);
+ if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid, &a->eid))
+ {
+ clib_warning ("eid %U found in the eid-table", format_gid_address,
+ &a->eid);
+ return VNET_API_ERROR_VALUE_EXIST;
+ }
+
+ pool_get (lcm->mapping_pool, m);
gid_address_copy (&m->eid, &a->eid);
m->locator_set_index = a->locator_set_index;
m->ttl = a->ttl;
map_index = m - lcm->mapping_pool;
gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, map_index,
- 1);
+ 1);
- if (pool_is_free_index(lcm->locator_set_pool, a->locator_set_index))
- {
- clib_warning("Locator set with index %d doesn't exist",
- a->locator_set_index);
- return VNET_API_ERROR_INVALID_VALUE;
- }
+ if (pool_is_free_index (lcm->locator_set_pool, a->locator_set_index))
+ {
+ clib_warning ("Locator set with index %d doesn't exist",
+ a->locator_set_index);
+ return VNET_API_ERROR_INVALID_VALUE;
+ }
/* add eid to list of eids supported by locator-set */
vec_validate (lcm->locator_set_to_eids, a->locator_set_index);
- eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids,
- a->locator_set_index);
- vec_add1(eid_indexes[0], map_index);
+ eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
+ a->locator_set_index);
+ vec_add1 (eid_indexes[0], map_index);
if (a->local)
- {
- /* mark as local */
- vec_add1(lcm->local_mappings_indexes, map_index);
- }
+ {
+ /* mark as local */
+ vec_add1 (lcm->local_mappings_indexes, map_index);
+ }
map_index_result[0] = map_index;
}
else
{
if (mi == GID_LOOKUP_MISS)
- {
- clib_warning("eid %U not found in the eid-table", format_gid_address,
- &a->eid);
- return VNET_API_ERROR_INVALID_VALUE;
- }
+ {
+ clib_warning ("eid %U not found in the eid-table",
+ format_gid_address, &a->eid);
+ return VNET_API_ERROR_INVALID_VALUE;
+ }
/* clear locator-set to eids binding */
- eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids,
- a->locator_set_index);
- for (i = 0; i < vec_len(eid_indexes[0]); i++)
- {
- map_indexp = vec_elt_at_index(eid_indexes[0], i);
- if (map_indexp[0] == mi)
- break;
- }
- vec_del1(eid_indexes[0], i);
+ eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
+ a->locator_set_index);
+ for (i = 0; i < vec_len (eid_indexes[0]); i++)
+ {
+ map_indexp = vec_elt_at_index (eid_indexes[0], i);
+ if (map_indexp[0] == mi)
+ break;
+ }
+ vec_del1 (eid_indexes[0], i);
/* remove local mark if needed */
- m = pool_elt_at_index(lcm->mapping_pool, mi);
+ m = pool_elt_at_index (lcm->mapping_pool, mi);
if (m->local)
- {
- u32 k, * lm_indexp;
- for (k = 0; k < vec_len(lcm->local_mappings_indexes); k++)
- {
- lm_indexp = vec_elt_at_index(lcm->local_mappings_indexes, k);
- if (lm_indexp[0] == mi)
- break;
- }
- vec_del1(lcm->local_mappings_indexes, k);
- }
+ {
+ u32 k, *lm_indexp;
+ for (k = 0; k < vec_len (lcm->local_mappings_indexes); k++)
+ {
+ lm_indexp = vec_elt_at_index (lcm->local_mappings_indexes, k);
+ if (lm_indexp[0] == mi)
+ break;
+ }
+ vec_del1 (lcm->local_mappings_indexes, k);
+ }
/* remove mapping from dictionary */
gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, 0, 0);
*/
int
vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
- u32 * map_index_result)
+ u32 * map_index_result)
{
- uword * dp_table = 0;
+ uword *dp_table = 0;
u32 vni;
u8 type;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
if (vnet_lisp_enable_disable_status () == 0)
{
return VNET_API_ERROR_LISP_DISABLED;
}
- vni = gid_address_vni(&a->eid);
- type = gid_address_type(&a->eid);
+ vni = gid_address_vni (&a->eid);
+ type = gid_address_type (&a->eid);
if (GID_ADDR_IP_PREFIX == type)
- dp_table = hash_get(lcm->table_id_by_vni, vni);
+ dp_table = hash_get (lcm->table_id_by_vni, vni);
else if (GID_ADDR_MAC == type)
- dp_table = hash_get(lcm->bd_id_by_vni, vni);
+ dp_table = hash_get (lcm->bd_id_by_vni, vni);
if (!dp_table)
{
- clib_warning("vni %d not associated to a %s!", vni,
- GID_ADDR_IP_PREFIX == type ? "vrf" : "bd");
+ clib_warning ("vni %d not associated to a %s!", vni,
+ GID_ADDR_IP_PREFIX == type ? "vrf" : "bd");
return VNET_API_ERROR_INVALID_VALUE;
}
static clib_error_t *
lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ vlib_cli_command_t * cmd)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- unformat_input_t _line_input, * line_input = &_line_input;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ unformat_input_t _line_input, *line_input = &_line_input;
u8 is_add = 1;
gid_address_t eid;
- gid_address_t * eids = 0;
- clib_error_t * error = 0;
- u8 * locator_set_name = 0;
+ gid_address_t *eids = 0;
+ clib_error_t *error = 0;
+ u8 *locator_set_name = 0;
u32 locator_set_index = 0, map_index = 0;
- uword * p;
- vnet_lisp_add_del_mapping_args_t _a, * a = &_a;
+ uword *p;
+ vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
int rv = 0;
u32 vni = 0;
memset (a, 0, sizeof (*a));
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "add"))
- is_add = 1;
+ is_add = 1;
else if (unformat (line_input, "del"))
- is_add = 0;
+ is_add = 0;
else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
- ;
+ ;
else if (unformat (line_input, "vni %d", &vni))
- gid_address_vni (&eid) = vni;
+ gid_address_vni (&eid) = vni;
else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
- {
- p = hash_get_mem(lcm->locator_set_index_by_name, locator_set_name);
- if (!p)
- {
- error = clib_error_return(0, "locator-set %s doesn't exist",
- locator_set_name);
- goto done;
- }
- locator_set_index = p[0];
- }
+ {
+ p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
+ if (!p)
+ {
+ error = clib_error_return (0, "locator-set %s doesn't exist",
+ locator_set_name);
+ goto done;
+ }
+ locator_set_index = p[0];
+ }
else
- {
- error = unformat_parse_error(line_input);
- goto done;
- }
+ {
+ error = unformat_parse_error (line_input);
+ goto done;
+ }
}
/* XXX treat batch configuration */
- if (GID_ADDR_SRC_DST == gid_address_type(&eid))
+ if (GID_ADDR_SRC_DST == gid_address_type (&eid))
{
- error = clib_error_return(0, "src/dst is not supported for local EIDs!");
+ error =
+ clib_error_return (0, "src/dst is not supported for local EIDs!");
goto done;
}
- gid_address_copy(&a->eid, &eid);
+ gid_address_copy (&a->eid, &eid);
a->is_add = is_add;
a->locator_set_index = locator_set_index;
a->local = 1;
rv = vnet_lisp_add_del_local_mapping (a, &map_index);
if (0 != rv)
- {
- error = clib_error_return(0, "failed to %s local mapping!",
- is_add ? "add" : "delete");
- }
- done:
- vec_free(eids);
+ {
+ error = clib_error_return (0, "failed to %s local mapping!",
+ is_add ? "add" : "delete");
+ }
+done:
+ vec_free (eids);
if (locator_set_name)
vec_free (locator_set_name);
gid_address_free (&a->eid);
return error;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = {
.path = "lisp eid-table",
.short_help = "lisp eid-table add/del [vni <vni>] eid <eid> "
"locator-set <locator-set>",
.function = lisp_add_del_local_eid_command_fn,
};
+/* *INDENT-ON* */
int
vnet_lisp_eid_table_map (u32 vni, u32 dp_id, u8 is_l2, u8 is_add)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- uword * dp_idp, * vnip, ** dp_table_by_vni, ** vni_by_dp_table;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ uword *dp_idp, *vnip, **dp_table_by_vni, **vni_by_dp_table;
if (vnet_lisp_enable_disable_status () == 0)
{
if (is_add)
{
if (dp_idp || vnip)
- {
- clib_warning ("vni %d or vrf %d already used in vrf/vni "
- "mapping!", vni, dp_id);
- return -1;
- }
+ {
+ clib_warning ("vni %d or vrf %d already used in vrf/vni "
+ "mapping!", vni, dp_id);
+ return -1;
+ }
hash_set (dp_table_by_vni[0], vni, dp_id);
hash_set (vni_by_dp_table[0], dp_id, vni);
else
{
if (!dp_idp || !vnip)
- {
- clib_warning ("vni %d or vrf %d not used in any vrf/vni! "
- "mapping!", vni, dp_id);
- return -1;
- }
+ {
+ clib_warning ("vni %d or vrf %d not used in any vrf/vni! "
+ "mapping!", vni, dp_id);
+ return -1;
+ }
hash_unset (dp_table_by_vni[0], vni);
hash_unset (vni_by_dp_table[0], dp_id);
static clib_error_t *
lisp_eid_table_map_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
u8 is_add = 1, is_l2 = 0;
u32 vni = 0, dp_id = 0;
- unformat_input_t _line_input, * line_input = &_line_input;
+ unformat_input_t _line_input, *line_input = &_line_input;
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "del"))
- is_add = 0;
+ is_add = 0;
else if (unformat (line_input, "vni %d", &vni))
- ;
+ ;
else if (unformat (line_input, "vrf %d", &dp_id))
- ;
+ ;
else if (unformat (line_input, "bd %d", &dp_id))
- is_l2 = 1;
+ is_l2 = 1;
else
- {
- return unformat_parse_error (line_input);
- }
+ {
+ return unformat_parse_error (line_input);
+ }
}
vnet_lisp_eid_table_map (vni, dp_id, is_l2, is_add);
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_eid_table_map_command) = {
.path = "lisp eid-table map",
.short_help = "lisp eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>",
.function = lisp_eid_table_map_command_fn,
};
-
+/* *INDENT-ON* */
/* return 0 if the two locator sets are identical 1 otherwise */
static u8
-compare_locators (lisp_cp_main_t *lcm, u32 * old_ls_indexes,
- locator_t * new_locators)
+compare_locators (lisp_cp_main_t * lcm, u32 * old_ls_indexes,
+ locator_t * new_locators)
{
u32 i, old_li;
- locator_t * old_loc, * new_loc;
+ locator_t *old_loc, *new_loc;
- if (vec_len (old_ls_indexes) != vec_len(new_locators))
+ if (vec_len (old_ls_indexes) != vec_len (new_locators))
return 1;
- for (i = 0; i < vec_len(new_locators); i++)
+ for (i = 0; i < vec_len (new_locators); i++)
{
- old_li = vec_elt(old_ls_indexes, i);
- old_loc = pool_elt_at_index(lcm->locator_pool, old_li);
+ old_li = vec_elt (old_ls_indexes, i);
+ old_loc = pool_elt_at_index (lcm->locator_pool, old_li);
- new_loc = vec_elt_at_index(new_locators, i);
+ new_loc = vec_elt_at_index (new_locators, i);
if (locator_cmp (old_loc, new_loc))
- return 1;
+ return 1;
}
return 0;
}
*/
int
vnet_lisp_add_del_mapping (gid_address_t * eid, locator_t * rlocs, u8 action,
- u8 authoritative, u32 ttl, u8 is_add,
- u32 * res_map_index)
+ u8 authoritative, u32 ttl, u8 is_add,
+ u32 * res_map_index)
{
- vnet_lisp_add_del_mapping_args_t _m_args, * m_args = &_m_args;
- vnet_lisp_add_del_locator_set_args_t _ls_args, * ls_args = &_ls_args;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ vnet_lisp_add_del_mapping_args_t _m_args, *m_args = &_m_args;
+ vnet_lisp_add_del_locator_set_args_t _ls_args, *ls_args = &_ls_args;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
u32 mi, ls_index = 0, dst_map_index;
- mapping_t * old_map;
+ mapping_t *old_map;
- if (vnet_lisp_enable_disable_status() == 0)
+ if (vnet_lisp_enable_disable_status () == 0)
{
clib_warning ("LISP is disabled!");
return VNET_API_ERROR_LISP_DISABLED;
ls_args->locators = rlocs;
mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, eid);
- old_map = ((u32) ~0 != mi) ? pool_elt_at_index(lcm->mapping_pool, mi) : 0;
+ old_map = ((u32) ~ 0 != mi) ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
if (is_add)
{
/* overwrite: if mapping already exists, decide if locators should be
* updated and be done */
if (old_map && gid_address_cmp (&old_map->eid, eid) == 0)
- {
- locator_set_t * old_ls;
-
- /* update mapping attributes */
- old_map->action = action;
- old_map->authoritative = authoritative;
- old_map->ttl = ttl;
-
- old_ls = pool_elt_at_index(lcm->locator_set_pool,
- old_map->locator_set_index);
- if (compare_locators (lcm, old_ls->locator_indices,
- ls_args->locators))
- {
- /* set locator-set index to overwrite */
- ls_args->is_add = 1;
- ls_args->index = old_map->locator_set_index;
- vnet_lisp_add_del_locator_set (ls_args, 0);
- if (res_map_index)
- res_map_index[0] = mi;
- }
- }
+ {
+ locator_set_t *old_ls;
+
+ /* update mapping attributes */
+ old_map->action = action;
+ old_map->authoritative = authoritative;
+ old_map->ttl = ttl;
+
+ old_ls = pool_elt_at_index (lcm->locator_set_pool,
+ old_map->locator_set_index);
+ if (compare_locators (lcm, old_ls->locator_indices,
+ ls_args->locators))
+ {
+ /* set locator-set index to overwrite */
+ ls_args->is_add = 1;
+ ls_args->index = old_map->locator_set_index;
+ vnet_lisp_add_del_locator_set (ls_args, 0);
+ if (res_map_index)
+ res_map_index[0] = mi;
+ }
+ }
/* new mapping */
else
- {
- ls_args->is_add = 1;
- ls_args->index = ~0;
+ {
+ ls_args->is_add = 1;
+ ls_args->index = ~0;
- vnet_lisp_add_del_locator_set (ls_args, &ls_index);
+ vnet_lisp_add_del_locator_set (ls_args, &ls_index);
- /* add mapping */
- gid_address_copy (&m_args->eid, eid);
- m_args->is_add = 1;
- m_args->action = action;
- m_args->locator_set_index = ls_index;
- vnet_lisp_map_cache_add_del (m_args, &dst_map_index);
+ /* add mapping */
+ gid_address_copy (&m_args->eid, eid);
+ m_args->is_add = 1;
+ m_args->action = action;
+ m_args->locator_set_index = ls_index;
+ vnet_lisp_map_cache_add_del (m_args, &dst_map_index);
- if (res_map_index)
- res_map_index[0] = dst_map_index;
- }
+ if (res_map_index)
+ res_map_index[0] = dst_map_index;
+ }
}
else
{
if (old_map == 0 || gid_address_cmp (&old_map->eid, eid) != 0)
- {
- clib_warning("cannot delete mapping for eid %U", format_gid_address,
- eid);
- return -1;
- }
+ {
+ clib_warning ("cannot delete mapping for eid %U",
+ format_gid_address, eid);
+ return -1;
+ }
m_args->is_add = 0;
gid_address_copy (&m_args->eid, eid);
/* return old mapping index */
if (res_map_index)
- res_map_index[0] = mi;
+ res_map_index[0] = mi;
}
/* success */
vnet_lisp_clear_all_remote_adjacencies (void)
{
int rv = 0;
- u32 mi, * map_indices = 0, * map_indexp;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- vnet_lisp_add_del_mapping_args_t _dm_args, * dm_args = &_dm_args;
- vnet_lisp_add_del_locator_set_args_t _ls, * ls = &_ls;
+ u32 mi, *map_indices = 0, *map_indexp;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ vnet_lisp_add_del_mapping_args_t _dm_args, *dm_args = &_dm_args;
+ vnet_lisp_add_del_locator_set_args_t _ls, *ls = &_ls;
+ /* *INDENT-OFF* */
pool_foreach_index (mi, lcm->mapping_pool,
- ({
- vec_add1 (map_indices, mi);
- }));
+ ({
+ vec_add1 (map_indices, mi);
+ }));
+ /* *INDENT-ON* */
vec_foreach (map_indexp, map_indices)
- {
- mapping_t * map = pool_elt_at_index (lcm->mapping_pool, map_indexp[0]);
- if (!map->local)
- {
- dp_del_fwd_entry (lcm, 0, map_indexp[0]);
-
- dm_args->is_add = 0;
- gid_address_copy (&dm_args->eid, &map->eid);
- dm_args->locator_set_index = map->locator_set_index;
-
- /* delete mapping associated to fwd entry */
- vnet_lisp_map_cache_add_del (dm_args, 0);
-
- ls->is_add = 0;
- ls->local = 0;
- ls->index = map->locator_set_index;
- /* delete locator set */
- rv = vnet_lisp_add_del_locator_set (ls, 0);
- if (rv != 0)
- goto cleanup;
- }
- }
+ {
+ mapping_t *map = pool_elt_at_index (lcm->mapping_pool, map_indexp[0]);
+ if (!map->local)
+ {
+ dp_del_fwd_entry (lcm, 0, map_indexp[0]);
+
+ dm_args->is_add = 0;
+ gid_address_copy (&dm_args->eid, &map->eid);
+ dm_args->locator_set_index = map->locator_set_index;
+
+ /* delete mapping associated to fwd entry */
+ vnet_lisp_map_cache_add_del (dm_args, 0);
+
+ ls->is_add = 0;
+ ls->local = 0;
+ ls->index = map->locator_set_index;
+ /* delete locator set */
+ rv = vnet_lisp_add_del_locator_set (ls, 0);
+ if (rv != 0)
+ goto cleanup;
+ }
+ }
cleanup:
if (map_indices)
*/
int
lisp_add_del_adjacency (lisp_cp_main_t * lcm, gid_address_t * local_eid,
- gid_address_t * remote_eid, u8 is_add)
+ gid_address_t * remote_eid, u8 is_add)
{
u32 local_mi, remote_mi = ~0;
remote_mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, remote_eid);
if (GID_LOOKUP_MISS == remote_mi)
{
- clib_warning("Remote eid %U not found. Cannot add adjacency!",
- format_gid_address, remote_eid);
+ clib_warning ("Remote eid %U not found. Cannot add adjacency!",
+ format_gid_address, remote_eid);
return -1;
}
/* check if source eid has an associated mapping. If pitr mode is on,
* just use the pitr's mapping */
local_mi = lcm->lisp_pitr ? lcm->pitr_map_index :
- gid_dictionary_lookup (&lcm->mapping_index_by_gid, local_eid);
+ gid_dictionary_lookup (&lcm->mapping_index_by_gid, local_eid);
if (GID_LOOKUP_MISS == local_mi)
- {
- clib_warning("Local eid %U not found. Cannot add adjacency!",
- format_gid_address, local_eid);
+ {
+ clib_warning ("Local eid %U not found. Cannot add adjacency!",
+ format_gid_address, local_eid);
- return -1;
- }
+ return -1;
+ }
/* update forwarding */
dp_add_fwd_entry (lcm, local_mi, remote_mi);
int
vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- return lisp_add_del_adjacency(lcm, &a->seid, &a->deid, a->is_add);
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ return lisp_add_del_adjacency (lcm, &a->seid, &a->deid, a->is_add);
}
/**
*/
static clib_error_t *
lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- clib_error_t * error = 0;
- unformat_input_t _line_input, * line_input = &_line_input;
+ clib_error_t *error = 0;
+ unformat_input_t _line_input, *line_input = &_line_input;
u8 is_add = 1, del_all = 0;
- locator_t rloc, * rlocs = 0, * curr_rloc = 0;
+ locator_t rloc, *rlocs = 0, *curr_rloc = 0;
gid_address_t eid;
u8 eid_set = 0;
u32 vni, action = ~0, p, w;
int rv;
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
- memset(&eid, 0, sizeof(eid));
- memset(&rloc, 0, sizeof(rloc));
+ memset (&eid, 0, sizeof (eid));
+ memset (&rloc, 0, sizeof (rloc));
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "del-all"))
- del_all = 1;
+ del_all = 1;
else if (unformat (line_input, "del"))
- is_add = 0;
+ is_add = 0;
else if (unformat (line_input, "add"))
- ;
+ ;
else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
- eid_set = 1;
+ eid_set = 1;
else if (unformat (line_input, "vni %u", &vni))
- {
- gid_address_vni (&eid) = vni;
- }
+ {
+ gid_address_vni (&eid) = vni;
+ }
else if (unformat (line_input, "p %d w %d", &p, &w))
- {
- if (!curr_rloc)
- {
- clib_warning ("No RLOC configured for setting priority/weight!");
- goto done;
- }
- curr_rloc->priority = p;
- curr_rloc->weight = w;
- }
+ {
+ if (!curr_rloc)
+ {
+ clib_warning
+ ("No RLOC configured for setting priority/weight!");
+ goto done;
+ }
+ curr_rloc->priority = p;
+ curr_rloc->weight = w;
+ }
else if (unformat (line_input, "rloc %U", unformat_ip_address,
- &gid_address_ip(&rloc.address)))
- {
- vec_add1 (rlocs, rloc);
- curr_rloc = &rlocs[vec_len (rlocs) - 1];
- }
+ &gid_address_ip (&rloc.address)))
+ {
+ vec_add1 (rlocs, rloc);
+ curr_rloc = &rlocs[vec_len (rlocs) - 1];
+ }
else if (unformat (line_input, "action %U",
- unformat_negative_mapping_action, &action))
- ;
+ unformat_negative_mapping_action, &action))
+ ;
else
- {
- clib_warning ("parse error");
- goto done;
- }
+ {
+ clib_warning ("parse error");
+ goto done;
+ }
}
if (!eid_set)
if (!del_all)
{
- if (is_add && (~0 == action)
- && 0 == vec_len (rlocs))
- {
- clib_warning ("no action set for negative map-reply!");
- goto done;
- }
+ if (is_add && (~0 == action) && 0 == vec_len (rlocs))
+ {
+ clib_warning ("no action set for negative map-reply!");
+ goto done;
+ }
}
else
{
goto done;
}
- /* TODO build src/dst with seid*/
+ /* TODO build src/dst with seid */
/* if it's a delete, clean forwarding */
if (!is_add)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
rv = lisp_add_del_adjacency (lcm, 0, &eid, /* is_add */ 0);
if (rv)
- {
- goto done;
- }
+ {
+ goto done;
+ }
}
/* add as static remote mapping, i.e., not authoritative and infinite
rv = vnet_lisp_add_del_mapping (&eid, rlocs, action, 0, ~0, is_add, 0);
if (rv)
- clib_warning("failed to %s remote mapping!", is_add ? "add" : "delete");
+ clib_warning ("failed to %s remote mapping!", is_add ? "add" : "delete");
done:
vec_free (rlocs);
return error;
}
-VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = {
- .path = "lisp remote-mapping",
- .short_help = "lisp remote-mapping add|del [del-all] vni <vni> "
- "eid <est-eid> [action <no-action|natively-forward|"
- "send-map-request|drop>] rloc <dst-locator> p <prio> w <weight> "
- "[rloc <dst-locator> ... ]",
- .function = lisp_add_del_remote_mapping_command_fn,
-};
+VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) =
+{
+.path = "lisp remote-mapping",.short_help =
+ "lisp remote-mapping add|del [del-all] vni <vni> "
+ "eid <est-eid> [action <no-action|natively-forward|"
+ "send-map-request|drop>] rloc <dst-locator> p <prio> w <weight> "
+ "[rloc <dst-locator> ... ]",.function =
+ lisp_add_del_remote_mapping_command_fn,};
/**
* Handler for add/del adjacency CLI.
*/
static clib_error_t *
lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ vlib_cli_command_t * cmd)
{
- clib_error_t * error = 0;
- unformat_input_t _line_input, * line_input = &_line_input;
- vnet_lisp_add_del_adjacency_args_t _a, * a = &_a;
+ clib_error_t *error = 0;
+ unformat_input_t _line_input, *line_input = &_line_input;
+ vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
u8 is_add = 1;
- locator_t rloc, * rlocs = 0;
- ip_prefix_t * deid_ippref, * seid_ippref;
+ locator_t rloc, *rlocs = 0;
+ ip_prefix_t *deid_ippref, *seid_ippref;
gid_address_t seid, deid;
- u8 * dmac = gid_address_mac (&deid);
- u8 * smac = gid_address_mac (&seid);
+ u8 *dmac = gid_address_mac (&deid);
+ u8 *smac = gid_address_mac (&seid);
u8 deid_set = 0, seid_set = 0;
- u8 * s = 0;
+ u8 *s = 0;
u32 vni, action = ~0;
int rv;
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
- memset(&deid, 0, sizeof(deid));
- memset(&seid, 0, sizeof(seid));
- memset(&rloc, 0, sizeof(rloc));
+ memset (&deid, 0, sizeof (deid));
+ memset (&seid, 0, sizeof (seid));
+ memset (&rloc, 0, sizeof (rloc));
- seid_ippref = &gid_address_ippref(&seid);
- deid_ippref = &gid_address_ippref(&deid);
+ seid_ippref = &gid_address_ippref (&seid);
+ deid_ippref = &gid_address_ippref (&deid);
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "del"))
- is_add = 0;
+ is_add = 0;
else if (unformat (line_input, "add"))
- ;
+ ;
else if (unformat (line_input, "deid %U",
- unformat_ip_prefix, deid_ippref))
- {
- gid_address_type (&deid) = GID_ADDR_IP_PREFIX;
- deid_set = 1;
- }
- else if (unformat (line_input, "deid %U",
- unformat_mac_address, dmac))
- {
- gid_address_type (&deid) = GID_ADDR_MAC;
- deid_set = 1;
- }
+ unformat_ip_prefix, deid_ippref))
+ {
+ gid_address_type (&deid) = GID_ADDR_IP_PREFIX;
+ deid_set = 1;
+ }
+ else if (unformat (line_input, "deid %U", unformat_mac_address, dmac))
+ {
+ gid_address_type (&deid) = GID_ADDR_MAC;
+ deid_set = 1;
+ }
else if (unformat (line_input, "vni %u", &vni))
- {
- gid_address_vni (&seid) = vni;
- gid_address_vni (&deid) = vni;
- }
- else if (unformat (line_input, "seid %U",
- unformat_ip_prefix, seid_ippref))
- {
- gid_address_type (&seid) = GID_ADDR_IP_PREFIX;
- seid_set = 1;
- }
+ {
+ gid_address_vni (&seid) = vni;
+ gid_address_vni (&deid) = vni;
+ }
else if (unformat (line_input, "seid %U",
- unformat_mac_address, smac))
- {
- gid_address_type (&seid) = GID_ADDR_MAC;
- seid_set = 1;
- }
+ unformat_ip_prefix, seid_ippref))
+ {
+ gid_address_type (&seid) = GID_ADDR_IP_PREFIX;
+ seid_set = 1;
+ }
+ else if (unformat (line_input, "seid %U", unformat_mac_address, smac))
+ {
+ gid_address_type (&seid) = GID_ADDR_MAC;
+ seid_set = 1;
+ }
else
- {
- clib_warning ("parse error");
- goto done;
- }
+ {
+ clib_warning ("parse error");
+ goto done;
+ }
}
if (!deid_set)
* of the deid. This ensures the seid to be configured will be
* either 0/0 or ::/0 */
if (!seid_set)
- ip_prefix_version(seid_ippref) = ip_prefix_version(deid_ippref);
+ ip_prefix_version (seid_ippref) = ip_prefix_version (deid_ippref);
if (is_add &&
- (ip_prefix_version (deid_ippref)
- != ip_prefix_version(seid_ippref)))
- {
- clib_warning ("source and destination EIDs are not"
- " in the same IP family!");
- goto done;
- }
+ (ip_prefix_version (deid_ippref)
+ != ip_prefix_version (seid_ippref)))
+ {
+ clib_warning ("source and destination EIDs are not"
+ " in the same IP family!");
+ goto done;
+ }
}
- if (is_add && (~0 == action)
- && 0 == vec_len (rlocs))
+ if (is_add && (~0 == action) && 0 == vec_len (rlocs))
{
clib_warning ("no action set for negative map-reply!");
goto done;
}
- memset(a, 0, sizeof(a[0]));
+ memset (a, 0, sizeof (a[0]));
gid_address_copy (&a->seid, &deid);
gid_address_copy (&a->deid, &seid);
rv = vnet_lisp_add_del_adjacency (a);
if (rv)
- clib_warning("failed to %s adjacency!", is_add ? "add" : "delete");
+ clib_warning ("failed to %s adjacency!", is_add ? "add" : "delete");
done:
unformat_free (line_input);
return error;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = {
.path = "lisp adjacency",
.short_help = "lisp adjacency add|del vni <vni>"
"send-map-request|drop>] rloc <dst-locator> [rloc <dst-locator> ... ]",
.function = lisp_add_del_adjacency_command_fn,
};
-
+/* *INDENT-ON* */
static clib_error_t *
lisp_show_map_resolvers_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- map_resolver_t * mr;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ map_resolver_t *mr;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
vec_foreach (mr, lcm->map_resolvers)
- {
- vlib_cli_output (vm, "%U", format_ip_address, &mr->address);
- }
+ {
+ vlib_cli_output (vm, "%U", format_ip_address, &mr->address);
+ }
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_show_map_resolvers_command) = {
.path = "show lisp map-resolvers",
.short_help = "show lisp map-resolvers",
.function = lisp_show_map_resolvers_command_fn,
};
+/* *INDENT-ON* */
int
vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
u32 locator_set_index = ~0;
- mapping_t * m;
- uword * p;
+ mapping_t *m;
+ uword *p;
if (vnet_lisp_enable_disable_status () == 0)
{
static clib_error_t *
lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
u8 locator_name_set = 0;
- u8 * locator_set_name = 0;
+ u8 *locator_set_name = 0;
u8 is_add = 1;
- unformat_input_t _line_input, * line_input = &_line_input;
- clib_error_t * error = 0;
+ unformat_input_t _line_input, *line_input = &_line_input;
+ clib_error_t *error = 0;
int rv = 0;
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "ls %_%v%_", &locator_set_name))
- locator_name_set = 1;
+ locator_name_set = 1;
else if (unformat (line_input, "disable"))
- is_add = 0;
+ is_add = 0;
else
- return clib_error_return (0, "parse error");
+ return clib_error_return (0, "parse error");
}
if (!locator_name_set)
rv = vnet_lisp_pitr_set_locator_set (locator_set_name, is_add);
if (0 != rv)
{
- error = clib_error_return(0, "failed to %s pitr!",
- is_add ? "add" : "delete");
+ error = clib_error_return (0, "failed to %s pitr!",
+ is_add ? "add" : "delete");
}
done:
return error;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = {
.path = "lisp pitr",
.short_help = "lisp pitr [disable] ls <locator-set-name>",
.function = lisp_pitr_set_locator_set_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
lisp_show_pitr_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- mapping_t * m;
- locator_set_t * ls;
- u8 * tmp_str = 0;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ mapping_t *m;
+ locator_set_t *ls;
+ u8 *tmp_str = 0;
vlib_cli_output (vm, "%=20s%=16s",
- "pitr", lcm->lisp_pitr ? "locator-set" : "");
+ "pitr", lcm->lisp_pitr ? "locator-set" : "");
- if (!lcm->lisp_pitr) {
- vlib_cli_output (vm, "%=20s", "disable");
- return 0;
- }
+ if (!lcm->lisp_pitr)
+ {
+ vlib_cli_output (vm, "%=20s", "disable");
+ return 0;
+ }
- if (~0 == lcm->pitr_map_index) {
- tmp_str = format(0, "N/A");
- } else {
- m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
- if (~0 != m->locator_set_index) {
- ls = pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
- tmp_str = format(0, "%s", ls->name);
- } else {
- tmp_str = format(0, "N/A");
+ if (~0 == lcm->pitr_map_index)
+ {
+ tmp_str = format (0, "N/A");
}
- }
- vec_add1(tmp_str, 0);
+ else
+ {
+ m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+ if (~0 != m->locator_set_index)
+ {
+ ls =
+ pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
+ tmp_str = format (0, "%s", ls->name);
+ }
+ else
+ {
+ tmp_str = format (0, "N/A");
+ }
+ }
+ vec_add1 (tmp_str, 0);
- vlib_cli_output (vm, "%=20s%=16s",
- "enable", tmp_str);
+ vlib_cli_output (vm, "%=20s%=16s", "enable", tmp_str);
- vec_free(tmp_str);
+ vec_free (tmp_str);
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_show_pitr_command) = {
.path = "show lisp pitr",
.short_help = "Show pitr",
.function = lisp_show_pitr_command_fn,
};
+/* *INDENT-ON* */
static u8 *
format_eid_entry (u8 * s, va_list * args)
{
- vnet_main_t * vnm = va_arg (*args, vnet_main_t *);
- lisp_cp_main_t * lcm = va_arg (*args, lisp_cp_main_t *);
- mapping_t * mapit = va_arg (*args, mapping_t *);
- locator_set_t * ls = va_arg (*args, locator_set_t *);
- gid_address_t * gid = &mapit->eid;
+ vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+ lisp_cp_main_t *lcm = va_arg (*args, lisp_cp_main_t *);
+ mapping_t *mapit = va_arg (*args, mapping_t *);
+ locator_set_t *ls = va_arg (*args, locator_set_t *);
+ gid_address_t *gid = &mapit->eid;
u32 ttl = mapit->ttl;
u8 aut = mapit->authoritative;
- u32 * loc_index;
+ u32 *loc_index;
u8 first_line = 1;
- u8 * loc;
+ u8 *loc;
- u8 * type = ls->local ? format(0, "local(%s)", ls->name)
- : format(0, "remote");
+ u8 *type = ls->local ? format (0, "local(%s)", ls->name)
+ : format (0, "remote");
if (vec_len (ls->locator_indices) == 0)
{
s = format (s, "%-35U%-30s%-20u%-u", format_gid_address, gid,
- type, ttl, aut);
+ type, ttl, aut);
}
else
{
vec_foreach (loc_index, ls->locator_indices)
- {
- locator_t * l = pool_elt_at_index (lcm->locator_pool, loc_index[0]);
- if (l->local)
- loc = format (0, "%U", format_vnet_sw_if_index_name, vnm,
- l->sw_if_index);
- else
- loc = format (0, "%U", format_ip_address,
- &gid_address_ip (&l->address));
-
- if (first_line)
- {
- s = format (s, "%-35U%-20s%-30v%-20u%-u\n", format_gid_address,
- gid, type, loc, ttl, aut);
- first_line = 0;
- }
- else
- s = format (s, "%55s%v\n", "", loc);
- }
+ {
+ locator_t *l = pool_elt_at_index (lcm->locator_pool, loc_index[0]);
+ if (l->local)
+ loc = format (0, "%U", format_vnet_sw_if_index_name, vnm,
+ l->sw_if_index);
+ else
+ loc = format (0, "%U", format_ip_address,
+ &gid_address_ip (&l->address));
+
+ if (first_line)
+ {
+ s = format (s, "%-35U%-20s%-30v%-20u%-u\n", format_gid_address,
+ gid, type, loc, ttl, aut);
+ first_line = 0;
+ }
+ else
+ s = format (s, "%55s%v\n", "", loc);
+ }
}
return s;
}
static clib_error_t *
lisp_show_eid_table_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- mapping_t * mapit;
- unformat_input_t _line_input, * line_input = &_line_input;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ mapping_t *mapit;
+ unformat_input_t _line_input, *line_input = &_line_input;
u32 mi;
gid_address_t eid;
u8 print_all = 1;
u8 filter = 0;
- memset (&eid, 0, sizeof(eid));
+ memset (&eid, 0, sizeof (eid));
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
- print_all = 0;
+ print_all = 0;
else if (unformat (line_input, "local"))
- filter = 1;
- else if (unformat(line_input, "remote"))
- filter = 2;
+ filter = 1;
+ else if (unformat (line_input, "remote"))
+ filter = 2;
else
- return clib_error_return (0, "parse error: '%U'",
- format_unformat_error, line_input);
+ return clib_error_return (0, "parse error: '%U'",
+ format_unformat_error, line_input);
}
vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
- "EID", "type", "locators", "ttl", "autoritative");
+ "EID", "type", "locators", "ttl", "autoritative");
if (print_all)
{
+ /* *INDENT-OFF* */
pool_foreach (mapit, lcm->mapping_pool,
({
locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool,
vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main,
lcm, mapit, ls);
}));
+ /* *INDENT-ON* */
}
else
{
mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &eid);
- if ((u32)~0 == mi)
- return 0;
+ if ((u32) ~ 0 == mi)
+ return 0;
mapit = pool_elt_at_index (lcm->mapping_pool, mi);
- locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool,
- mapit->locator_set_index);
+ locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool,
+ mapit->locator_set_index);
if (filter && !((1 == filter && ls->local) ||
- (2 == filter && !ls->local)))
- {
- return 0;
- }
+ (2 == filter && !ls->local)))
+ {
+ return 0;
+ }
vlib_cli_output (vm, "%U,", format_eid_entry, lcm->vnet_main,
- lcm, mapit, ls);
+ lcm, mapit, ls);
}
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_cp_show_eid_table_command) = {
.path = "show lisp eid-table",
.short_help = "Shows EID table",
.function = lisp_show_eid_table_command_fn,
};
+/* *INDENT-ON* */
/* cleans locator to locator-set data and removes locators not part of
* any locator-set */
clean_locator_to_locator_set (lisp_cp_main_t * lcm, u32 lsi)
{
u32 i, j, *loc_indexp, *ls_indexp, **ls_indexes, *to_be_deleted = 0;
- locator_set_t * ls = pool_elt_at_index(lcm->locator_set_pool, lsi);
- for (i = 0; i < vec_len(ls->locator_indices); i++)
- {
- loc_indexp = vec_elt_at_index(ls->locator_indices, i);
- ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets,
- loc_indexp[0]);
- for (j = 0; j < vec_len(ls_indexes[0]); j++)
- {
- ls_indexp = vec_elt_at_index(ls_indexes[0], j);
- if (ls_indexp[0] == lsi)
- break;
- }
-
- /* delete index for removed locator-set*/
- vec_del1(ls_indexes[0], j);
+ locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool, lsi);
+ for (i = 0; i < vec_len (ls->locator_indices); i++)
+ {
+ loc_indexp = vec_elt_at_index (ls->locator_indices, i);
+ ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
+ loc_indexp[0]);
+ for (j = 0; j < vec_len (ls_indexes[0]); j++)
+ {
+ ls_indexp = vec_elt_at_index (ls_indexes[0], j);
+ if (ls_indexp[0] == lsi)
+ break;
+ }
+
+ /* delete index for removed locator-set */
+ vec_del1 (ls_indexes[0], j);
/* delete locator if it's part of no locator-set */
if (vec_len (ls_indexes[0]) == 0)
- {
- pool_put_index (lcm->locator_pool, loc_indexp[0]);
- vec_add1 (to_be_deleted, i);
- }
+ {
+ pool_put_index (lcm->locator_pool, loc_indexp[0]);
+ vec_add1 (to_be_deleted, i);
+ }
}
if (to_be_deleted)
{
for (i = 0; i < vec_len (to_be_deleted); i++)
- {
- loc_indexp = vec_elt_at_index (to_be_deleted, i);
- vec_del1 (ls->locator_indices, loc_indexp[0]);
- }
+ {
+ loc_indexp = vec_elt_at_index (to_be_deleted, i);
+ vec_del1 (ls->locator_indices, loc_indexp[0]);
+ }
vec_free (to_be_deleted);
}
}
static inline uword *
get_locator_set_index (vnet_lisp_add_del_locator_set_args_t * a, uword * p)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
- ASSERT(a != NULL);
- ASSERT(p != NULL);
+ ASSERT (a != NULL);
+ ASSERT (p != NULL);
/* find locator-set */
if (a->local)
{
- p = hash_get_mem(lcm->locator_set_index_by_name, a->name);
+ p = hash_get_mem (lcm->locator_set_index_by_name, a->name);
}
else
{
static inline int
is_locator_in_locator_set (lisp_cp_main_t * lcm, locator_set_t * ls,
- locator_t * loc)
+ locator_t * loc)
{
- locator_t * itloc;
- u32 * locit;
+ locator_t *itloc;
+ u32 *locit;
- ASSERT(ls != NULL);
- ASSERT(loc != NULL);
+ ASSERT (ls != NULL);
+ ASSERT (loc != NULL);
- vec_foreach(locit, ls->locator_indices)
- {
- itloc = pool_elt_at_index(lcm->locator_pool, locit[0]);
- if ((ls->local && itloc->sw_if_index == loc->sw_if_index) ||
- (!ls->local && !gid_address_cmp(&itloc->address, &loc->address)))
- {
- clib_warning("Duplicate locator");
- return VNET_API_ERROR_VALUE_EXIST;
- }
- }
+ vec_foreach (locit, ls->locator_indices)
+ {
+ itloc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+ if ((ls->local && itloc->sw_if_index == loc->sw_if_index) ||
+ (!ls->local && !gid_address_cmp (&itloc->address, &loc->address)))
+ {
+ clib_warning ("Duplicate locator");
+ return VNET_API_ERROR_VALUE_EXIST;
+ }
+ }
return 0;
}
static inline void
-remove_locator_from_locator_set (locator_set_t * ls, u32 * locit, u32 ls_index,
- u32 loc_id)
+remove_locator_from_locator_set (locator_set_t * ls, u32 * locit,
+ u32 ls_index, u32 loc_id)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- u32 ** ls_indexes = NULL;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ u32 **ls_indexes = NULL;
- ASSERT(ls != NULL);
- ASSERT(locit != NULL);
+ ASSERT (ls != NULL);
+ ASSERT (locit != NULL);
- ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets,
- locit[0]);
- pool_put_index(lcm->locator_pool, locit[0]);
- vec_del1(ls->locator_indices, loc_id);
- vec_del1(ls_indexes[0], ls_index);
+ ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets, locit[0]);
+ pool_put_index (lcm->locator_pool, locit[0]);
+ vec_del1 (ls->locator_indices, loc_id);
+ vec_del1 (ls_indexes[0], ls_index);
}
int
vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
- locator_set_t * ls, u32 * ls_result)
+ locator_set_t * ls, u32 * ls_result)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- locator_t * loc = NULL, *itloc = NULL;
- uword _p = (u32)~0, * p = &_p;
- u32 loc_index = ~0, ls_index = ~0, * locit = NULL, ** ls_indexes = NULL;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ locator_t *loc = NULL, *itloc = NULL;
+ uword _p = (u32) ~ 0, *p = &_p;
+ u32 loc_index = ~0, ls_index = ~0, *locit = NULL, **ls_indexes = NULL;
u32 loc_id = ~0;
int ret = 0;
- ASSERT(a != NULL);
+ ASSERT (a != NULL);
if (vnet_lisp_enable_disable_status () == 0)
{
return VNET_API_ERROR_LISP_DISABLED;
}
- p = get_locator_set_index(a, p);
+ p = get_locator_set_index (a, p);
if (!p)
{
- clib_warning("locator-set %v doesn't exist", a->name);
+ clib_warning ("locator-set %v doesn't exist", a->name);
return VNET_API_ERROR_INVALID_ARGUMENT;
}
if (ls == 0)
{
- ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
+ ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
if (!ls)
- {
- clib_warning("locator-set %d to be overwritten doesn't exist!",
- p[0]);
- return VNET_API_ERROR_INVALID_ARGUMENT;
- }
+ {
+ clib_warning ("locator-set %d to be overwritten doesn't exist!",
+ p[0]);
+ return VNET_API_ERROR_INVALID_ARGUMENT;
+ }
}
if (a->is_add)
{
+ if (ls_result)
+ ls_result[0] = p[0];
- if (ls_result)
- ls_result[0] = p[0];
-
- /* allocate locators */
- vec_foreach (itloc, a->locators)
- {
- ret = is_locator_in_locator_set(lcm, ls, itloc);
- if (0 != ret)
- {
- return ret;
- }
-
- pool_get(lcm->locator_pool, loc);
- loc[0] = itloc[0];
- loc_index = loc - lcm->locator_pool;
-
- vec_add1(ls->locator_indices, loc_index);
-
- vec_validate (lcm->locator_to_locator_sets, loc_index);
- ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets,
- loc_index);
- vec_add1(ls_indexes[0], ls_index);
- }
- }
- else
+ /* allocate locators */
+ vec_foreach (itloc, a->locators)
{
- ls_index = p[0];
+ ret = is_locator_in_locator_set (lcm, ls, itloc);
+ if (0 != ret)
+ {
+ return ret;
+ }
+
+ pool_get (lcm->locator_pool, loc);
+ loc[0] = itloc[0];
+ loc_index = loc - lcm->locator_pool;
+
+ vec_add1 (ls->locator_indices, loc_index);
+
+ vec_validate (lcm->locator_to_locator_sets, loc_index);
+ ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
+ loc_index);
+ vec_add1 (ls_indexes[0], ls_index);
+ }
+ }
+ else
+ {
+ ls_index = p[0];
- itloc = a->locators;
- loc_id = 0;
- vec_foreach (locit, ls->locator_indices)
- {
- loc = pool_elt_at_index(lcm->locator_pool, locit[0]);
-
- if (loc->local && loc->sw_if_index == itloc->sw_if_index)
- {
- remove_locator_from_locator_set(ls, locit,
- ls_index, loc_id);
- }
- if (0 == loc->local &&
- !gid_address_cmp(&loc->address, &itloc->address))
- {
- remove_locator_from_locator_set(ls, locit,
- ls_index, loc_id);
- }
-
- loc_id++;
- }
+ itloc = a->locators;
+ loc_id = 0;
+ vec_foreach (locit, ls->locator_indices)
+ {
+ loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+
+ if (loc->local && loc->sw_if_index == itloc->sw_if_index)
+ {
+ remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
+ }
+ if (0 == loc->local &&
+ !gid_address_cmp (&loc->address, &itloc->address))
+ {
+ remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
+ }
+
+ loc_id++;
}
+ }
return 0;
}
int
vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a,
- u32 * ls_result)
+ u32 * ls_result)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- locator_set_t * ls;
- uword _p = (u32)~0, * p = &_p;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ locator_set_t *ls;
+ uword _p = (u32) ~ 0, *p = &_p;
u32 ls_index;
- u32 ** eid_indexes;
+ u32 **eid_indexes;
int ret = 0;
if (vnet_lisp_enable_disable_status () == 0)
if (a->is_add)
{
- p = get_locator_set_index(a, p);
+ p = get_locator_set_index (a, p);
/* overwrite */
- if (p && p[0] != (u32)~0)
- {
- ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
- if (!ls)
- {
- clib_warning("locator-set %d to be overwritten doesn't exist!",
- p[0]);
- return -1;
- }
-
- /* clean locator to locator-set vectors and remove locators if
- * they're not part of another locator-set */
- clean_locator_to_locator_set (lcm, p[0]);
-
- /* remove locator indices from locator set */
- vec_free(ls->locator_indices);
-
- ls_index = p[0];
-
- if (ls_result)
- ls_result[0] = p[0];
- }
+ if (p && p[0] != (u32) ~ 0)
+ {
+ ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
+ if (!ls)
+ {
+ clib_warning ("locator-set %d to be overwritten doesn't exist!",
+ p[0]);
+ return -1;
+ }
+
+ /* clean locator to locator-set vectors and remove locators if
+ * they're not part of another locator-set */
+ clean_locator_to_locator_set (lcm, p[0]);
+
+ /* remove locator indices from locator set */
+ vec_free (ls->locator_indices);
+
+ ls_index = p[0];
+
+ if (ls_result)
+ ls_result[0] = p[0];
+ }
/* new locator-set */
else
- {
- pool_get(lcm->locator_set_pool, ls);
- memset(ls, 0, sizeof(*ls));
- ls_index = ls - lcm->locator_set_pool;
-
- if (a->local)
- {
- ls->name = vec_dup(a->name);
-
- if (!lcm->locator_set_index_by_name)
- lcm->locator_set_index_by_name = hash_create_vec(
- /* size */0, sizeof(ls->name[0]), sizeof(uword));
- hash_set_mem(lcm->locator_set_index_by_name, ls->name, ls_index);
-
- /* mark as local locator-set */
- vec_add1(lcm->local_locator_set_indexes, ls_index);
- }
- ls->local = a->local;
- if (ls_result)
- ls_result[0] = ls_index;
- }
-
- ret = vnet_lisp_add_del_locator(a, ls, NULL);
+ {
+ pool_get (lcm->locator_set_pool, ls);
+ memset (ls, 0, sizeof (*ls));
+ ls_index = ls - lcm->locator_set_pool;
+
+ if (a->local)
+ {
+ ls->name = vec_dup (a->name);
+
+ if (!lcm->locator_set_index_by_name)
+ lcm->locator_set_index_by_name = hash_create_vec (
+ /* size */
+ 0,
+ sizeof
+ (ls->name
+ [0]),
+ sizeof
+ (uword));
+ hash_set_mem (lcm->locator_set_index_by_name, ls->name,
+ ls_index);
+
+ /* mark as local locator-set */
+ vec_add1 (lcm->local_locator_set_indexes, ls_index);
+ }
+ ls->local = a->local;
+ if (ls_result)
+ ls_result[0] = ls_index;
+ }
+
+ ret = vnet_lisp_add_del_locator (a, ls, NULL);
if (0 != ret)
- {
- return ret;
- }
+ {
+ return ret;
+ }
}
else
{
- p = get_locator_set_index(a, p);
+ p = get_locator_set_index (a, p);
if (!p)
- {
- clib_warning("locator-set %v doesn't exists", a->name);
- return -1;
- }
+ {
+ clib_warning ("locator-set %v doesn't exists", a->name);
+ return -1;
+ }
- ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
+ ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
if (!ls)
- {
- clib_warning("locator-set with index %d doesn't exists", p[0]);
- return -1;
- }
+ {
+ clib_warning ("locator-set with index %d doesn't exists", p[0]);
+ return -1;
+ }
if (lcm->mreq_itr_rlocs == p[0])
- {
- clib_warning ("Can't delete the locator-set used to constrain "
- "the itr-rlocs in map-requests!");
- return -1;
- }
-
- if (vec_len(lcm->locator_set_to_eids) != 0)
- {
- eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids, p[0]);
- if (vec_len(eid_indexes[0]) != 0)
- {
- clib_warning ("Can't delete a locator that supports a mapping!");
- return -1;
- }
- }
+ {
+ clib_warning ("Can't delete the locator-set used to constrain "
+ "the itr-rlocs in map-requests!");
+ return -1;
+ }
+
+ if (vec_len (lcm->locator_set_to_eids) != 0)
+ {
+ eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids, p[0]);
+ if (vec_len (eid_indexes[0]) != 0)
+ {
+ clib_warning
+ ("Can't delete a locator that supports a mapping!");
+ return -1;
+ }
+ }
/* clean locator to locator-sets data */
clean_locator_to_locator_set (lcm, p[0]);
if (ls->local)
- {
- u32 it, lsi;
-
- vec_foreach_index(it, lcm->local_locator_set_indexes)
- {
- lsi = vec_elt(lcm->local_locator_set_indexes, it);
- if (lsi == p[0])
- {
- vec_del1(lcm->local_locator_set_indexes, it);
- break;
- }
- }
- hash_unset_mem(lcm->locator_set_index_by_name, ls->name);
- }
- vec_free(ls->name);
- vec_free(ls->locator_indices);
- pool_put(lcm->locator_set_pool, ls);
+ {
+ u32 it, lsi;
+
+ vec_foreach_index (it, lcm->local_locator_set_indexes)
+ {
+ lsi = vec_elt (lcm->local_locator_set_indexes, it);
+ if (lsi == p[0])
+ {
+ vec_del1 (lcm->local_locator_set_indexes, it);
+ break;
+ }
+ }
+ hash_unset_mem (lcm->locator_set_index_by_name, ls->name);
+ }
+ vec_free (ls->name);
+ vec_free (ls->locator_indices);
+ pool_put (lcm->locator_set_pool, ls);
}
return 0;
}
vnet_lisp_enable_disable (u8 is_enable)
{
u32 vni, dp_table;
- clib_error_t * error = 0;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- vnet_lisp_gpe_enable_disable_args_t _a, * a = &_a;
+ clib_error_t *error = 0;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
a->is_en = is_enable;
error = vnet_lisp_gpe_enable_disable (a);
if (error)
{
return clib_error_return (0, "failed to %s data-plane!",
- a->is_en ? "enable" : "disable");
+ a->is_en ? "enable" : "disable");
}
if (is_enable)
{
/* enable all l2 and l3 ifaces */
+
+ /* *INDENT-OFF* */
hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({
dp_add_del_iface(lcm, vni, 0, 1);
}));
-
hash_foreach(vni, dp_table, lcm->bd_id_by_vni, ({
dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1);
}));
+ /* *INDENT-ON* */
}
else
{
/* clear interface table */
- hash_free(lcm->dp_intf_by_vni);
- hash_free(lcm->fwd_entry_by_mapping_index);
- pool_free(lcm->fwd_entry_pool);
+ hash_free (lcm->dp_intf_by_vni);
+ hash_free (lcm->fwd_entry_by_mapping_index);
+ pool_free (lcm->fwd_entry_pool);
}
/* update global flag */
static clib_error_t *
lisp_enable_disable_command_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ vlib_cli_command_t * cmd)
{
- unformat_input_t _line_input, * line_input = &_line_input;
+ unformat_input_t _line_input, *line_input = &_line_input;
u8 is_enabled = 0;
u8 is_set = 0;
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "enable"))
- {
- is_set = 1;
- is_enabled = 1;
- }
+ {
+ is_set = 1;
+ is_enabled = 1;
+ }
else if (unformat (line_input, "disable"))
- is_set = 1;
+ is_set = 1;
else
- {
- return clib_error_return (0, "parse error: '%U'",
- format_unformat_error, line_input);
- }
+ {
+ return clib_error_return (0, "parse error: '%U'",
+ format_unformat_error, line_input);
+ }
}
if (!is_set)
- return clib_error_return (0, "state not set");
+ return clib_error_return (0, "state not set");
return vnet_lisp_enable_disable (is_enabled);
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_cp_enable_disable_command) = {
.path = "lisp",
.short_help = "lisp [enable|disable]",
.function = lisp_enable_disable_command_fn,
};
+/* *INDENT-ON* */
u8
vnet_lisp_enable_disable_status (void)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
return lcm->is_enabled;
}
static u8 *
format_lisp_status (u8 * s, va_list * args)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
return format (s, "%s", lcm->is_enabled ? "enabled" : "disabled");
}
static clib_error_t *
lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ vlib_cli_command_t * cmd)
{
- u8 * msg = 0;
+ u8 *msg = 0;
msg = format (msg, "feature: %U\ngpe: %U\n",
- format_lisp_status, format_vnet_lisp_gpe_status);
+ format_lisp_status, format_vnet_lisp_gpe_status);
vlib_cli_output (vm, "%v", msg);
vec_free (msg);
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_show_status_command) = {
.path = "show lisp status",
.short_help = "show lisp status",
.function = lisp_show_status_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
-lisp_show_eid_table_map_command_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd)
+lisp_show_eid_table_map_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- hash_pair_t * p;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ hash_pair_t *p;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
vlib_cli_output (vm, "%=10s%=10s", "VNI", "VRF");
+
+ /* *INDENT-OFF* */
hash_foreach_pair (p, lcm->table_id_by_vni,
- {
- vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
- });
+ ({
+ vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
+ }));
+ /* *INDENT-ON* */
+
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_show_eid_table_map_command) = {
.path = "show lisp eid-table map",
.short_help = "show lisp eid-table vni to vrf mappings",
.function = lisp_show_eid_table_map_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
-lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd)
+lisp_add_del_locator_set_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- lisp_gpe_main_t * lgm = &lisp_gpe_main;
- vnet_main_t * vnm = lgm->vnet_main;
- unformat_input_t _line_input, * line_input = &_line_input;
+ lisp_gpe_main_t *lgm = &lisp_gpe_main;
+ vnet_main_t *vnm = lgm->vnet_main;
+ unformat_input_t _line_input, *line_input = &_line_input;
u8 is_add = 1;
- clib_error_t * error = 0;
- u8 * locator_set_name = 0;
- locator_t locator, * locators = 0;
- vnet_lisp_add_del_locator_set_args_t _a, * a = &_a;
+ clib_error_t *error = 0;
+ u8 *locator_set_name = 0;
+ locator_t locator, *locators = 0;
+ vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
u32 ls_index = 0;
int rv = 0;
- memset(&locator, 0, sizeof(locator));
- memset(a, 0, sizeof(a[0]));
+ memset (&locator, 0, sizeof (locator));
+ memset (a, 0, sizeof (a[0]));
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "add %_%v%_", &locator_set_name))
- is_add = 1;
+ is_add = 1;
else if (unformat (line_input, "del %_%v%_", &locator_set_name))
- is_add = 0;
+ is_add = 0;
else if (unformat (line_input, "iface %U p %d w %d",
- unformat_vnet_sw_interface, vnm, &locator.sw_if_index,
- &locator.priority, &locator.weight))
- {
- locator.local = 1;
- vec_add1(locators, locator);
- }
+ unformat_vnet_sw_interface, vnm,
+ &locator.sw_if_index, &locator.priority,
+ &locator.weight))
+ {
+ locator.local = 1;
+ vec_add1 (locators, locator);
+ }
else
- {
- error = unformat_parse_error(line_input);
- goto done;
- }
+ {
+ error = unformat_parse_error (line_input);
+ goto done;
+ }
}
a->name = locator_set_name;
a->is_add = is_add;
a->local = 1;
- rv = vnet_lisp_add_del_locator_set(a, &ls_index);
+ rv = vnet_lisp_add_del_locator_set (a, &ls_index);
if (0 != rv)
{
- error = clib_error_return(0, "failed to %s locator-set!",
- is_add ? "add" : "delete");
+ error = clib_error_return (0, "failed to %s locator-set!",
+ is_add ? "add" : "delete");
}
- done:
- vec_free(locators);
+done:
+ vec_free (locators);
if (locator_set_name)
vec_free (locator_set_name);
return error;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_cp_add_del_locator_set_command) = {
.path = "lisp locator-set",
.short_help = "lisp locator-set add/del <name> [iface <iface-name> "
"p <priority> w <weight>]",
.function = lisp_add_del_locator_set_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
-lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd)
+lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- lisp_gpe_main_t * lgm = &lisp_gpe_main;
- vnet_main_t * vnm = lgm->vnet_main;
- unformat_input_t _line_input, * line_input = &_line_input;
+ lisp_gpe_main_t *lgm = &lisp_gpe_main;
+ vnet_main_t *vnm = lgm->vnet_main;
+ unformat_input_t _line_input, *line_input = &_line_input;
u8 is_add = 1;
- clib_error_t * error = 0;
- u8 * locator_set_name = 0;
+ clib_error_t *error = 0;
+ u8 *locator_set_name = 0;
u8 locator_set_name_set = 0;
- locator_t locator, * locators = 0;
- vnet_lisp_add_del_locator_set_args_t _a, * a = &_a;
+ locator_t locator, *locators = 0;
+ vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
u32 ls_index = 0;
- memset(&locator, 0, sizeof(locator));
- memset(a, 0, sizeof(a[0]));
+ memset (&locator, 0, sizeof (locator));
+ memset (a, 0, sizeof (a[0]));
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "add"))
- is_add = 1;
+ is_add = 1;
else if (unformat (line_input, "del"))
- is_add = 0;
- else if (unformat(line_input, "locator-set %_%v%_", &locator_set_name))
- locator_set_name_set = 1;
+ is_add = 0;
+ else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
+ locator_set_name_set = 1;
else if (unformat (line_input, "iface %U p %d w %d",
- unformat_vnet_sw_interface, vnm, &locator.sw_if_index,
- &locator.priority, &locator.weight))
- {
- locator.local = 1;
- vec_add1(locators, locator);
- }
+ unformat_vnet_sw_interface, vnm,
+ &locator.sw_if_index, &locator.priority,
+ &locator.weight))
+ {
+ locator.local = 1;
+ vec_add1 (locators, locator);
+ }
else
- {
- error = unformat_parse_error(line_input);
- goto done;
- }
+ {
+ error = unformat_parse_error (line_input);
+ goto done;
+ }
}
if (!locator_set_name_set)
{
- error = clib_error_return(0, "locator_set name not set!");
+ error = clib_error_return (0, "locator_set name not set!");
goto done;
- }
+ }
a->name = locator_set_name;
a->locators = locators;
a->is_add = is_add;
a->local = 1;
- vnet_lisp_add_del_locator(a, 0, &ls_index);
+ vnet_lisp_add_del_locator (a, 0, &ls_index);
- done:
- vec_free(locators);
+done:
+ vec_free (locators);
vec_free (locator_set_name);
return error;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_cp_add_del_locator_in_set_command) = {
.path = "lisp locator",
.short_help = "lisp locator add/del locator-set <name> iface <iface-name> "
"p <priority> w <weight>",
.function = lisp_add_del_locator_in_set_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- locator_set_t * lsit;
- locator_t * loc;
- u32 * locit;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+ locator_set_t *lsit;
+ locator_t *loc;
+ u32 *locit;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
vlib_cli_output (vm, "%=20s%=16s%=16s%=16s", "Locator-set", "Locator",
- "Priority", "Weight");
+ "Priority", "Weight");
+
+ /* *INDENT-OFF* */
pool_foreach (lsit, lcm->locator_set_pool,
({
u8 * msg = 0;
vlib_cli_output (vm, "%v", msg);
vec_free (msg);
}));
+ /* *INDENT-ON* */
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_cp_show_locator_sets_command) = {
.path = "show lisp locator-set",
.short_help = "Shows locator-sets",
.function = lisp_cp_show_locator_sets_command_fn,
};
+/* *INDENT-ON* */
static map_resolver_t *
get_map_resolver (ip_address_t * a)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- map_resolver_t * mr;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ map_resolver_t *mr;
vec_foreach (mr, lcm->map_resolvers)
- {
- if (!ip_address_cmp (&mr->address, a))
- {
- return mr;
- }
- }
+ {
+ if (!ip_address_cmp (&mr->address, a))
+ {
+ return mr;
+ }
+ }
return 0;
}
int
vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
u32 i;
- map_resolver_t _mr, * mr = &_mr;
+ map_resolver_t _mr, *mr = &_mr;
if (vnet_lisp_enable_disable_status () == 0)
{
{
if (get_map_resolver (&a->address))
- {
- clib_warning("map-resolver %U already exists!", format_ip_address,
- &a->address);
- return -1;
- }
+ {
+ clib_warning ("map-resolver %U already exists!", format_ip_address,
+ &a->address);
+ return -1;
+ }
memset (mr, 0, sizeof (*mr));
- ip_address_copy(&mr->address, &a->address);
- vec_add1(lcm->map_resolvers, *mr);
+ ip_address_copy (&mr->address, &a->address);
+ vec_add1 (lcm->map_resolvers, *mr);
if (vec_len (lcm->map_resolvers) == 1)
- lcm->do_map_resolver_election = 1;
+ lcm->do_map_resolver_election = 1;
}
else
{
- for (i = 0; i < vec_len(lcm->map_resolvers); i++)
- {
- mr = vec_elt_at_index(lcm->map_resolvers, i);
- if (!ip_address_cmp (&mr->address, &a->address))
- {
- if (!ip_address_cmp (&mr->address, &lcm->active_map_resolver))
- lcm->do_map_resolver_election = 1;
+ for (i = 0; i < vec_len (lcm->map_resolvers); i++)
+ {
+ mr = vec_elt_at_index (lcm->map_resolvers, i);
+ if (!ip_address_cmp (&mr->address, &a->address))
+ {
+ if (!ip_address_cmp (&mr->address, &lcm->active_map_resolver))
+ lcm->do_map_resolver_election = 1;
- vec_del1 (lcm->map_resolvers, i);
- break;
- }
- }
+ vec_del1 (lcm->map_resolvers, i);
+ break;
+ }
+ }
}
return 0;
}
static clib_error_t *
lisp_add_del_map_resolver_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- unformat_input_t _line_input, * line_input = &_line_input;
+ unformat_input_t _line_input, *line_input = &_line_input;
u8 is_add = 1, addr_set = 0;
ip_address_t ip_addr;
- clib_error_t * error = 0;
+ clib_error_t *error = 0;
int rv = 0;
- vnet_lisp_add_del_map_resolver_args_t _a, * a = &_a;
+ vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "add"))
- is_add = 1;
+ is_add = 1;
else if (unformat (line_input, "del"))
- is_add = 0;
+ is_add = 0;
else if (unformat (line_input, "%U", unformat_ip_address, &ip_addr))
- addr_set = 1;
+ addr_set = 1;
else
- {
- error = unformat_parse_error(line_input);
- goto done;
- }
+ {
+ error = unformat_parse_error (line_input);
+ goto done;
+ }
}
if (!addr_set)
{
- error = clib_error_return(0, "Map-resolver address must be set!");
+ error = clib_error_return (0, "Map-resolver address must be set!");
goto done;
}
rv = vnet_lisp_add_del_map_resolver (a);
if (0 != rv)
{
- error = clib_error_return(0, "failed to %s map-resolver!",
- is_add ? "add" : "delete");
+ error = clib_error_return (0, "failed to %s map-resolver!",
+ is_add ? "add" : "delete");
}
- done:
+done:
return error;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = {
.path = "lisp map-resolver",
.short_help = "lisp map-resolver add/del <ip_address>",
.function = lisp_add_del_map_resolver_command_fn,
};
+/* *INDENT-ON* */
int
vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- uword * p = 0;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ uword *p = 0;
if (vnet_lisp_enable_disable_status () == 0)
{
- clib_warning("LISP is disabled!");
+ clib_warning ("LISP is disabled!");
return VNET_API_ERROR_LISP_DISABLED;
}
if (a->is_add)
{
- p = hash_get_mem(lcm->locator_set_index_by_name, a->locator_set_name);
+ p = hash_get_mem (lcm->locator_set_index_by_name, a->locator_set_name);
if (!p)
- {
- clib_warning("locator-set %v doesn't exist", a->locator_set_name);
- return VNET_API_ERROR_INVALID_ARGUMENT;
- }
+ {
+ clib_warning ("locator-set %v doesn't exist", a->locator_set_name);
+ return VNET_API_ERROR_INVALID_ARGUMENT;
+ }
lcm->mreq_itr_rlocs = p[0];
}
static clib_error_t *
lisp_add_del_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- unformat_input_t _line_input, * line_input = &_line_input;
+ unformat_input_t _line_input, *line_input = &_line_input;
u8 is_add = 1;
- u8 * locator_set_name = 0;
- clib_error_t * error = 0;
+ u8 *locator_set_name = 0;
+ clib_error_t *error = 0;
int rv = 0;
- vnet_lisp_add_del_mreq_itr_rloc_args_t _a, * a = &_a;
+ vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
/* Get a line of input. */
- if (! unformat_user (input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (line_input, "del"))
- is_add = 0;
+ is_add = 0;
else if (unformat (line_input, "add %s", &locator_set_name))
- is_add = 1;
+ is_add = 1;
else
- {
- error = unformat_parse_error(line_input);
- goto done;
- }
+ {
+ error = unformat_parse_error (line_input);
+ goto done;
+ }
}
a->is_add = is_add;
rv = vnet_lisp_add_del_mreq_itr_rlocs (a);
if (0 != rv)
{
- error = clib_error_return(0, "failed to %s map-request itr-rlocs!",
- is_add ? "add" : "delete");
+ error = clib_error_return (0, "failed to %s map-request itr-rlocs!",
+ is_add ? "add" : "delete");
}
- vec_free(locator_set_name);
+ vec_free (locator_set_name);
- done:
+done:
return error;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_add_del_map_request_command) = {
.path = "lisp map-request itr-rlocs",
.short_help = "lisp map-request itr-rlocs add/del <locator_set_name>",
.function = lisp_add_del_mreq_itr_rlocs_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- locator_set_t * loc_set;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ locator_set_t *loc_set;
vlib_cli_output (vm, "%=20s", "itr-rlocs");
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (lisp_show_map_request_command) = {
.path = "show lisp map-request itr-rlocs",
.short_help = "Shows map-request itr-rlocs",
.function = lisp_show_mreq_itr_rlocs_command_fn,
};
+/* *INDENT-ON* */
/* Statistics (not really errors) */
#define foreach_lisp_cp_lookup_error \
_(DROP, "drop") \
_(MAP_REQUESTS_SENT, "map-request sent")
-static char * lisp_cp_lookup_error_strings[] = {
+static char *lisp_cp_lookup_error_strings[] = {
#define _(sym,string) string,
foreach_lisp_cp_lookup_error
#undef _
typedef enum
{
#define _(sym,str) LISP_CP_LOOKUP_ERROR_##sym,
- foreach_lisp_cp_lookup_error
+ foreach_lisp_cp_lookup_error
#undef _
LISP_CP_LOOKUP_N_ERROR,
} lisp_cp_lookup_error_t;
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
- lisp_cp_lookup_trace_t * t = va_arg (*args, lisp_cp_lookup_trace_t *);
+ lisp_cp_lookup_trace_t *t = va_arg (*args, lisp_cp_lookup_trace_t *);
s = format (s, "LISP-CP-LOOKUP: map-resolver: %U destination eid %U",
- format_ip_address, &t->map_resolver_ip, format_gid_address,
- &t->dst_eid);
+ format_ip_address, &t->map_resolver_ip, format_gid_address,
+ &t->dst_eid);
return s;
}
int
get_mr_and_local_iface_ip (lisp_cp_main_t * lcm, ip_address_t * mr_ip,
- ip_address_t * sloc)
+ ip_address_t * sloc)
{
- map_resolver_t * mrit;
- ip_address_t * a;
+ map_resolver_t *mrit;
+ ip_address_t *a;
- if (vec_len(lcm->map_resolvers) == 0)
+ if (vec_len (lcm->map_resolvers) == 0)
{
- clib_warning("No map-resolver configured");
+ clib_warning ("No map-resolver configured");
return 0;
}
/* find the first mr ip we have a route to and the ip of the
* iface that has a route to it */
- vec_foreach(mrit, lcm->map_resolvers)
- {
- a = &mrit->address;
- if (0 != ip_fib_get_first_egress_ip_for_dst (lcm, a, sloc))
- {
- ip_address_copy(mr_ip, a);
+ vec_foreach (mrit, lcm->map_resolvers)
+ {
+ a = &mrit->address;
+ if (0 != ip_fib_get_first_egress_ip_for_dst (lcm, a, sloc))
+ {
+ ip_address_copy (mr_ip, a);
- /* also update globals */
- return 1;
- }
- }
+ /* also update globals */
+ return 1;
+ }
+ }
- clib_warning("Can't find map-resolver and local interface ip!");
+ clib_warning ("Can't find map-resolver and local interface ip!");
return 0;
}
static gid_address_t *
build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set)
{
- void * addr;
+ void *addr;
u32 i;
- locator_t * loc;
- u32 * loc_indexp;
- ip_interface_address_t * ia = 0;
- gid_address_t gid_data, * gid = &gid_data;
- gid_address_t * rlocs = 0;
- ip_prefix_t * ippref = &gid_address_ippref (gid);
- ip_address_t * rloc = &ip_prefix_addr (ippref);
+ locator_t *loc;
+ u32 *loc_indexp;
+ ip_interface_address_t *ia = 0;
+ gid_address_t gid_data, *gid = &gid_data;
+ gid_address_t *rlocs = 0;
+ ip_prefix_t *ippref = &gid_address_ippref (gid);
+ ip_address_t *rloc = &ip_prefix_addr (ippref);
memset (gid, 0, sizeof (gid[0]));
gid_address_type (gid) = GID_ADDR_IP_PREFIX;
- for (i = 0; i < vec_len(loc_set->locator_indices); i++)
+ for (i = 0; i < vec_len (loc_set->locator_indices); i++)
{
- loc_indexp = vec_elt_at_index(loc_set->locator_indices, i);
+ loc_indexp = vec_elt_at_index (loc_set->locator_indices, i);
loc = pool_elt_at_index (lcm->locator_pool, loc_indexp[0]);
/* Add ipv4 locators first TODO sort them */
+
+ /* *INDENT-OFF* */
foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
loc->sw_if_index, 1 /* unnumbered */,
({
ip_prefix_normalize (ippref);
vec_add1 (rlocs, gid[0]);
}));
+ /* *INDENT-ON* */
+
}
return rlocs;
}
static vlib_buffer_t *
-build_encapsulated_map_request (lisp_cp_main_t *lcm,
- gid_address_t * seid, gid_address_t * deid,
- locator_set_t * loc_set, ip_address_t * mr_ip,
- ip_address_t * sloc, u8 is_smr_invoked,
- u64 *nonce_res, u32 * bi_res)
+build_encapsulated_map_request (lisp_cp_main_t * lcm,
+ gid_address_t * seid, gid_address_t * deid,
+ locator_set_t * loc_set, ip_address_t * mr_ip,
+ ip_address_t * sloc, u8 is_smr_invoked,
+ u64 * nonce_res, u32 * bi_res)
{
- vlib_buffer_t * b;
+ vlib_buffer_t *b;
u32 bi;
- gid_address_t * rlocs = 0;
- vlib_main_t * vm = lcm->vlib_main;
+ gid_address_t *rlocs = 0;
+ vlib_main_t *vm = lcm->vlib_main;
if (vlib_buffer_alloc (vm, &bi, 1) != 1)
{
/* push outer ip header */
pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
- mr_ip);
+ mr_ip);
bi_res[0] = bi;
- vec_free(rlocs);
+ vec_free (rlocs);
return b;
}
static int
elect_map_resolver (lisp_cp_main_t * lcm)
{
- map_resolver_t * mr;
+ map_resolver_t *mr;
vec_foreach (mr, lcm->map_resolvers)
- {
- if (!mr->is_down)
- {
- ip_address_copy (&lcm->active_map_resolver, &mr->address);
- lcm->do_map_resolver_election = 0;
- return 1;
- }
- }
+ {
+ if (!mr->is_down)
+ {
+ ip_address_copy (&lcm->active_map_resolver, &mr->address);
+ lcm->do_map_resolver_election = 0;
+ return 1;
+ }
+ }
return 0;
}
_send_encapsulated_map_request(lcm, seid, deid, smr, 1)
static int
-_send_encapsulated_map_request (lisp_cp_main_t *lcm,
- gid_address_t * seid, gid_address_t * deid,
- u8 is_smr_invoked, u8 is_resend)
-{
- map_resolver_t * mr;
- u32 next_index, bi = 0, * to_next, map_index;
- vlib_buffer_t * b;
- vlib_frame_t * f;
+_send_encapsulated_map_request (lisp_cp_main_t * lcm,
+ gid_address_t * seid, gid_address_t * deid,
+ u8 is_smr_invoked, u8 is_resend)
+{
+ map_resolver_t *mr;
+ u32 next_index, bi = 0, *to_next, map_index;
+ vlib_buffer_t *b;
+ vlib_frame_t *f;
u64 nonce = 0;
- locator_set_t * loc_set;
- mapping_t * map;
- pending_map_request_t * pmr, * duplicate_pmr = 0;
+ locator_set_t *loc_set;
+ mapping_t *map;
+ pending_map_request_t *pmr, *duplicate_pmr = 0;
ip_address_t sloc;
u32 ls_index;
ASSERT (*lcm->pending_map_request_lock);
/* if there is already a pending request remember it */
+
+ /* *INDENT-OFF* */
pool_foreach(pmr, lcm->pending_map_requests_pool,
({
if (!gid_address_cmp (&pmr->src, seid)
break;
}
}));
+ /* *INDENT-ON* */
if (!is_resend && duplicate_pmr)
{
{
map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
if (map_index == ~0)
- {
- clib_warning("No local mapping found in eid-table for %U!",
- format_gid_address, seid);
- return -1;
- }
+ {
+ clib_warning ("No local mapping found in eid-table for %U!",
+ format_gid_address, seid);
+ return -1;
+ }
map = pool_elt_at_index (lcm->mapping_pool, map_index);
if (!map->local)
- {
- clib_warning("Mapping found for src eid %U is not marked as local!",
- format_gid_address, seid);
- return -1;
- }
+ {
+ clib_warning
+ ("Mapping found for src eid %U is not marked as local!",
+ format_gid_address, seid);
+ return -1;
+ }
ls_index = map->locator_set_index;
}
else
loc_set = pool_elt_at_index (lcm->locator_set_pool, ls_index);
while (lcm->do_map_resolver_election
- | (0 == ip_fib_get_first_egress_ip_for_dst (lcm,
- &lcm->active_map_resolver,
- &sloc)))
+ | (0 == ip_fib_get_first_egress_ip_for_dst (lcm,
+ &lcm->active_map_resolver,
+ &sloc)))
{
if (0 == elect_map_resolver (lcm))
- /* all Mrs are down */
- {
- if (duplicate_pmr)
- duplicate_pmr->to_be_removed = 1;
+ /* all Mrs are down */
+ {
+ if (duplicate_pmr)
+ duplicate_pmr->to_be_removed = 1;
- /* restart MR checking by marking all of them up */
- vec_foreach (mr, lcm->map_resolvers)
- mr->is_down = 0;
+ /* restart MR checking by marking all of them up */
+ vec_foreach (mr, lcm->map_resolvers) mr->is_down = 0;
- return -1;
- }
+ return -1;
+ }
}
/* build the encapsulated map request */
b = build_encapsulated_map_request (lcm, seid, deid, loc_set,
- &lcm->active_map_resolver,
- &sloc, is_smr_invoked, &nonce, &bi);
+ &lcm->active_map_resolver,
+ &sloc, is_smr_invoked, &nonce, &bi);
if (!b)
return -1;
/* set fib index to default and lookup node */
- vnet_buffer(b)->sw_if_index[VLIB_TX] = 0;
- next_index = (ip_addr_version(&lcm->active_map_resolver) == IP4) ?
- ip4_lookup_node.index : ip6_lookup_node.index;
+ vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
+ next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
+ ip4_lookup_node.index : ip6_lookup_node.index;
f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
if (duplicate_pmr)
/* if there is a pending request already update it */
{
- if (clib_fifo_elts(duplicate_pmr->nonces) >= PENDING_MREQ_QUEUE_LEN)
- {
- /* remove the oldest nonce */
- u64 CLIB_UNUSED(tmp), * nonce_del;
- nonce_del = clib_fifo_head(duplicate_pmr->nonces);
- hash_unset (lcm->pending_map_requests_by_nonce, nonce_del[0]);
- clib_fifo_sub1 (duplicate_pmr->nonces, tmp);
- }
+ if (clib_fifo_elts (duplicate_pmr->nonces) >= PENDING_MREQ_QUEUE_LEN)
+ {
+ /* remove the oldest nonce */
+ u64 CLIB_UNUSED (tmp), *nonce_del;
+ nonce_del = clib_fifo_head (duplicate_pmr->nonces);
+ hash_unset (lcm->pending_map_requests_by_nonce, nonce_del[0]);
+ clib_fifo_sub1 (duplicate_pmr->nonces, tmp);
+ }
clib_fifo_add1 (duplicate_pmr->nonces, nonce);
hash_set (lcm->pending_map_requests_by_nonce, nonce,
- duplicate_pmr - lcm->pending_map_requests_pool);
+ duplicate_pmr - lcm->pending_map_requests_pool);
}
else
{
/* add map-request to pending requests table */
- pool_get(lcm->pending_map_requests_pool, pmr);
+ pool_get (lcm->pending_map_requests_pool, pmr);
memset (pmr, 0, sizeof (*pmr));
gid_address_copy (&pmr->src, seid);
gid_address_copy (&pmr->dst, deid);
pmr->is_smr_invoked = is_smr_invoked;
reset_pending_mr_counters (pmr);
hash_set (lcm->pending_map_requests_by_nonce, nonce,
- pmr - lcm->pending_map_requests_pool);
+ pmr - lcm->pending_map_requests_pool);
}
return 0;
}
static void
-get_src_and_dst_ip (void *hdr, ip_address_t * src, ip_address_t *dst)
+get_src_and_dst_ip (void *hdr, ip_address_t * src, ip_address_t * dst)
{
- ip4_header_t * ip4 = hdr;
- ip6_header_t * ip6;
+ ip4_header_t *ip4 = hdr;
+ ip6_header_t *ip6;
if ((ip4->ip_version_and_header_length & 0xF0) == 0x40)
{
- ip_address_set(src, &ip4->src_address, IP4);
- ip_address_set(dst, &ip4->dst_address, IP4);
+ ip_address_set (src, &ip4->src_address, IP4);
+ ip_address_set (dst, &ip4->dst_address, IP4);
}
else
{
ip6 = hdr;
- ip_address_set(src, &ip6->src_address, IP6);
- ip_address_set(dst, &ip6->dst_address, IP6);
+ ip_address_set (src, &ip6->src_address, IP6);
+ ip_address_set (dst, &ip6->dst_address, IP6);
}
}
static u32
lisp_get_vni_from_buffer_ip (lisp_cp_main_t * lcm, vlib_buffer_t * b,
- u8 version)
+ u8 version)
{
- uword * vnip;
+ uword *vnip;
u32 vni = ~0, table_id = ~0, fib_index;
if (version == IP4)
{
- ip4_fib_t * fib;
- ip4_main_t * im4 = &ip4_main;
+ ip4_fib_t *fib;
+ ip4_main_t *im4 = &ip4_main;
fib_index = vec_elt (im4->fib_index_by_sw_if_index,
- vnet_buffer (b)->sw_if_index[VLIB_RX]);
+ vnet_buffer (b)->sw_if_index[VLIB_RX]);
fib = find_ip4_fib_by_table_index_or_id (im4, fib_index,
- IP4_ROUTE_FLAG_FIB_INDEX);
+ IP4_ROUTE_FLAG_FIB_INDEX);
table_id = fib->table_id;
}
else
{
- ip6_fib_t * fib;
- ip6_main_t * im6 = &ip6_main;
+ ip6_fib_t *fib;
+ ip6_main_t *im6 = &ip6_main;
fib_index = vec_elt (im6->fib_index_by_sw_if_index,
- vnet_buffer (b)->sw_if_index[VLIB_RX]);
+ vnet_buffer (b)->sw_if_index[VLIB_RX]);
fib = find_ip6_fib_by_table_index_or_id (im6, fib_index,
- IP6_ROUTE_FLAG_FIB_INDEX);
+ IP6_ROUTE_FLAG_FIB_INDEX);
table_id = fib->table_id;
}
always_inline u32
lisp_get_vni_from_buffer_eth (lisp_cp_main_t * lcm, vlib_buffer_t * b)
{
- uword * vnip;
+ uword *vnip;
u32 vni = ~0;
u32 sw_if_index0;
- l2input_main_t * l2im = &l2input_main;
- l2_input_config_t * config;
- l2_bridge_domain_t * bd_config;
+ l2input_main_t *l2im = &l2input_main;
+ l2_input_config_t *config;
+ l2_bridge_domain_t *bd_config;
- sw_if_index0 = vnet_buffer(b)->sw_if_index[VLIB_RX];
- config = vec_elt_at_index(l2im->configs, sw_if_index0);
+ sw_if_index0 = vnet_buffer (b)->sw_if_index[VLIB_RX];
+ config = vec_elt_at_index (l2im->configs, sw_if_index0);
bd_config = vec_elt_at_index (l2im->bd_configs, config->bd_index);
vnip = hash_get (lcm->vni_by_bd_id, bd_config->bd_id);
if (vnip)
vni = vnip[0];
else
- clib_warning("bridge domain %d is not mapped to any vni!",
- config->bd_index);
+ clib_warning ("bridge domain %d is not mapped to any vni!",
+ config->bd_index);
return vni;
}
always_inline void
-get_src_and_dst_eids_from_buffer (lisp_cp_main_t *lcm, vlib_buffer_t * b,
- gid_address_t * src, gid_address_t * dst)
+get_src_and_dst_eids_from_buffer (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+ gid_address_t * src, gid_address_t * dst)
{
u32 vni = 0;
u16 type;
memset (src, 0, sizeof (*src));
memset (dst, 0, sizeof (*dst));
- type = vnet_buffer(b)->lisp.overlay_afi;
+ type = vnet_buffer (b)->lisp.overlay_afi;
if (LISP_AFI_IP == type || LISP_AFI_IP6 == type)
{
- ip4_header_t * ip;
+ ip4_header_t *ip;
u8 version, preflen;
- gid_address_type(src) = GID_ADDR_IP_PREFIX;
- gid_address_type(dst) = GID_ADDR_IP_PREFIX;
+ gid_address_type (src) = GID_ADDR_IP_PREFIX;
+ gid_address_type (dst) = GID_ADDR_IP_PREFIX;
ip = vlib_buffer_get_current (b);
- get_src_and_dst_ip (ip, &gid_address_ip(src), &gid_address_ip(dst));
+ get_src_and_dst_ip (ip, &gid_address_ip (src), &gid_address_ip (dst));
- version = gid_address_ip_version(src);
+ version = gid_address_ip_version (src);
preflen = ip_address_max_len (version);
- gid_address_ippref_len(src) = preflen;
- gid_address_ippref_len(dst) = preflen;
+ gid_address_ippref_len (src) = preflen;
+ gid_address_ippref_len (dst) = preflen;
vni = lisp_get_vni_from_buffer_ip (lcm, b, version);
gid_address_vni (dst) = vni;
}
else if (LISP_AFI_MAC == type)
{
- ethernet_header_t * eh;
+ ethernet_header_t *eh;
eh = vlib_buffer_get_current (b);
- gid_address_type(src) = GID_ADDR_MAC;
- gid_address_type(dst) = GID_ADDR_MAC;
- mac_copy(&gid_address_mac(src), eh->src_address);
- mac_copy(&gid_address_mac(dst), eh->dst_address);
+ gid_address_type (src) = GID_ADDR_MAC;
+ gid_address_type (dst) = GID_ADDR_MAC;
+ mac_copy (&gid_address_mac (src), eh->src_address);
+ mac_copy (&gid_address_mac (dst), eh->dst_address);
/* get vni */
vni = lisp_get_vni_from_buffer_eth (lcm, b);
static uword
lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node,
- vlib_frame_t * from_frame)
+ vlib_frame_t * from_frame)
{
- u32 * from, * to_next_drop, di, si;
- lisp_cp_main_t *lcm = vnet_lisp_cp_get_main();
+ u32 *from, *to_next_drop, di, si;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
u32 pkts_mapped = 0;
uword n_left_from, n_left_to_next_drop;
while (n_left_from > 0)
{
vlib_get_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
- to_next_drop, n_left_to_next_drop);
+ to_next_drop, n_left_to_next_drop);
while (n_left_from > 0 && n_left_to_next_drop > 0)
- {
- u32 pi0;
- vlib_buffer_t * b0;
- gid_address_t src, dst;
-
- pi0 = from[0];
- from += 1;
- n_left_from -= 1;
- to_next_drop[0] = pi0;
- to_next_drop += 1;
- n_left_to_next_drop -= 1;
-
- b0 = vlib_get_buffer (vm, pi0);
- b0->error = node->errors[LISP_CP_LOOKUP_ERROR_DROP];
-
- /* src/dst eid pair */
- get_src_and_dst_eids_from_buffer (lcm, b0, &src, &dst);
-
- /* if we have remote mapping for destination already in map-chache
- add forwarding tunnel directly. If not send a map-request */
- di = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &dst);
- if (~0 != di)
- {
- mapping_t * m = vec_elt_at_index (lcm->mapping_pool, di);
- /* send a map-request also in case of negative mapping entry
- with corresponding action */
- if (m->action == LISP_SEND_MAP_REQUEST)
- {
- /* send map-request */
- queue_map_request (&src, &dst, 0 /* smr_invoked */,
- 0 /* is_resend */);
- pkts_mapped++;
- }
- else
- {
- si = gid_dictionary_lookup (&lcm->mapping_index_by_gid,
- &src);
- if (~0 != si)
- {
- dp_add_fwd_entry (lcm, si, di);
- }
- }
- }
- else
- {
- /* send map-request */
- queue_map_request (&src, &dst, 0 /* smr_invoked */,
- 0 /* is_resend */);
- pkts_mapped++;
- }
-
- if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
- {
- lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, b0,
- sizeof(*tr));
-
- memset(tr, 0, sizeof(*tr));
- gid_address_copy (&tr->dst_eid, &dst);
- if (vec_len(lcm->map_resolvers) > 0)
- {
- clib_memcpy (&tr->map_resolver_ip,
- vec_elt_at_index(lcm->map_resolvers, 0),
- sizeof(ip_address_t));
- }
- }
- gid_address_free (&dst);
- gid_address_free (&src);
- }
-
- vlib_put_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP, n_left_to_next_drop);
+ {
+ u32 pi0;
+ vlib_buffer_t *b0;
+ gid_address_t src, dst;
+
+ pi0 = from[0];
+ from += 1;
+ n_left_from -= 1;
+ to_next_drop[0] = pi0;
+ to_next_drop += 1;
+ n_left_to_next_drop -= 1;
+
+ b0 = vlib_get_buffer (vm, pi0);
+ b0->error = node->errors[LISP_CP_LOOKUP_ERROR_DROP];
+
+ /* src/dst eid pair */
+ get_src_and_dst_eids_from_buffer (lcm, b0, &src, &dst);
+
+ /* if we have remote mapping for destination already in map-chache
+ add forwarding tunnel directly. If not send a map-request */
+ di = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &dst);
+ if (~0 != di)
+ {
+ mapping_t *m = vec_elt_at_index (lcm->mapping_pool, di);
+ /* send a map-request also in case of negative mapping entry
+ with corresponding action */
+ if (m->action == LISP_SEND_MAP_REQUEST)
+ {
+ /* send map-request */
+ queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
+ 0 /* is_resend */ );
+ pkts_mapped++;
+ }
+ else
+ {
+ si = gid_dictionary_lookup (&lcm->mapping_index_by_gid,
+ &src);
+ if (~0 != si)
+ {
+ dp_add_fwd_entry (lcm, si, di);
+ }
+ }
+ }
+ else
+ {
+ /* send map-request */
+ queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
+ 0 /* is_resend */ );
+ pkts_mapped++;
+ }
+
+ if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, b0,
+ sizeof (*tr));
+
+ memset (tr, 0, sizeof (*tr));
+ gid_address_copy (&tr->dst_eid, &dst);
+ if (vec_len (lcm->map_resolvers) > 0)
+ {
+ clib_memcpy (&tr->map_resolver_ip,
+ vec_elt_at_index (lcm->map_resolvers, 0),
+ sizeof (ip_address_t));
+ }
+ }
+ gid_address_free (&dst);
+ gid_address_free (&src);
+ }
+
+ vlib_put_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
+ n_left_to_next_drop);
}
vlib_node_increment_counter (vm, node->node_index,
- LISP_CP_LOOKUP_ERROR_MAP_REQUESTS_SENT,
- pkts_mapped);
+ LISP_CP_LOOKUP_ERROR_MAP_REQUESTS_SENT,
+ pkts_mapped);
return from_frame->n_vectors;
}
+/* *INDENT-OFF* */
VLIB_REGISTER_NODE (lisp_cp_lookup_node) = {
.function = lisp_cp_lookup,
.name = "lisp-cp-lookup",
[LISP_CP_LOOKUP_NEXT_IP6_LOOKUP] = "ip6-lookup",
},
};
+/* *INDENT-ON* */
/* lisp_cp_input statistics */
#define foreach_lisp_cp_input_error \
_(DROP, "drop") \
_(MAP_REPLIES_RECEIVED, "map-replies received")
-static char * lisp_cp_input_error_strings[] = {
+static char *lisp_cp_input_error_strings[] = {
#define _(sym,string) string,
foreach_lisp_cp_input_error
#undef _
typedef enum
{
#define _(sym,str) LISP_CP_INPUT_ERROR_##sym,
- foreach_lisp_cp_input_error
+ foreach_lisp_cp_input_error
#undef _
LISP_CP_INPUT_N_ERROR,
} lisp_cp_input_error_t;
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
- CLIB_UNUSED(lisp_cp_input_trace_t * t) = va_arg (*args, lisp_cp_input_trace_t *);
+ CLIB_UNUSED (lisp_cp_input_trace_t * t) =
+ va_arg (*args, lisp_cp_input_trace_t *);
s = format (s, "LISP-CP-INPUT: TODO");
return s;
}
void *
-process_map_reply (void * arg)
+process_map_reply (void *arg)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- vlib_buffer_t * b = arg;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ vlib_buffer_t *b = arg;
u32 len = 0, i, ttl, dst_map_index = 0;
- void * h;
- pending_map_request_t * pmr;
+ void *h;
+ pending_map_request_t *pmr;
locator_t probed;
- map_reply_hdr_t * mrep_hdr;
- u64 nonce, * noncep;
+ map_reply_hdr_t *mrep_hdr;
+ u64 nonce, *noncep;
gid_address_t deid;
- uword * pmr_index;
+ uword *pmr_index;
u8 authoritative, action;
- locator_t * locators = 0, * loc;
+ locator_t *locators = 0, *loc;
mrep_hdr = vlib_buffer_get_current (b);
lisp_pending_map_request_lock (lcm);
/* Check pending requests table and nonce */
- nonce = MREP_NONCE(mrep_hdr);
- pmr_index = hash_get(lcm->pending_map_requests_by_nonce, nonce);
+ nonce = MREP_NONCE (mrep_hdr);
+ pmr_index = hash_get (lcm->pending_map_requests_by_nonce, nonce);
if (!pmr_index)
{
- clib_warning("No pending map-request entry with nonce %lu!", nonce);
+ clib_warning ("No pending map-request entry with nonce %lu!", nonce);
goto done;
}
- pmr = pool_elt_at_index(lcm->pending_map_requests_pool, pmr_index[0]);
+ pmr = pool_elt_at_index (lcm->pending_map_requests_pool, pmr_index[0]);
- vlib_buffer_pull (b, sizeof(*mrep_hdr));
+ vlib_buffer_pull (b, sizeof (*mrep_hdr));
- for (i = 0; i < MREP_REC_COUNT(mrep_hdr); i++)
+ for (i = 0; i < MREP_REC_COUNT (mrep_hdr); i++)
{
h = vlib_buffer_get_current (b);
- ttl = clib_net_to_host_u32 (MAP_REC_TTL(h));
- action = MAP_REC_ACTION(h);
- authoritative = MAP_REC_AUTH(h);
+ ttl = clib_net_to_host_u32 (MAP_REC_TTL (h));
+ action = MAP_REC_ACTION (h);
+ authoritative = MAP_REC_AUTH (h);
len = lisp_msg_parse_mapping_record (b, &deid, &locators, &probed);
if (len == ~0)
- {
- clib_warning ("Failed to parse mapping record!");
- vec_foreach (loc, locators)
- {
- locator_free (loc);
- }
- vec_free(locators);
- goto done;
- }
+ {
+ clib_warning ("Failed to parse mapping record!");
+ vec_foreach (loc, locators)
+ {
+ locator_free (loc);
+ }
+ vec_free (locators);
+ goto done;
+ }
/* insert/update mappings cache */
- vnet_lisp_add_del_mapping (&deid, locators, action, authoritative, ttl, 1,
- &dst_map_index);
+ vnet_lisp_add_del_mapping (&deid, locators, action, authoritative, ttl,
+ 1, &dst_map_index);
- /* try to program forwarding only if mapping saved or updated*/
- if ((u32) ~0 != dst_map_index)
- lisp_add_del_adjacency (lcm, &pmr->src, &deid, 1);
+ /* try to program forwarding only if mapping saved or updated */
+ if ((u32) ~ 0 != dst_map_index)
+ lisp_add_del_adjacency (lcm, &pmr->src, &deid, 1);
- vec_free(locators);
+ vec_free (locators);
}
/* remove pending map request entry */
+
+ /* *INDENT-OFF* */
clib_fifo_foreach (noncep, pmr->nonces, ({
hash_unset(lcm->pending_map_requests_by_nonce, noncep[0]);
}));
- clib_fifo_free(pmr->nonces);
- pool_put(lcm->pending_map_requests_pool, pmr);
+ /* *INDENT-ON* */
+
+ clib_fifo_free (pmr->nonces);
+ pool_put (lcm->pending_map_requests_pool, pmr);
done:
lisp_pending_map_request_unlock (lcm);
}
void
-process_map_request (vlib_main_t * vm, lisp_cp_main_t * lcm, vlib_buffer_t * b)
+process_map_request (vlib_main_t * vm, lisp_cp_main_t * lcm,
+ vlib_buffer_t * b)
{
- map_request_hdr_t * mreq_hdr;
+ map_request_hdr_t *mreq_hdr;
gid_address_t src, dst;
// u64 nonce;
u32 i, len = 0;
- gid_address_t * itr_rlocs = 0, * rloc;
+ gid_address_t *itr_rlocs = 0, *rloc;
mreq_hdr = vlib_buffer_get_current (b);
- vlib_buffer_pull (b, sizeof(*mreq_hdr));
+ vlib_buffer_pull (b, sizeof (*mreq_hdr));
// nonce = MREQ_NONCE(mreq_hdr);
- if (!MREQ_SMR(mreq_hdr)) {
- clib_warning("Only SMR Map-Requests supported for now!");
+ if (!MREQ_SMR (mreq_hdr))
+ {
+ clib_warning ("Only SMR Map-Requests supported for now!");
return;
- }
+ }
/* parse src eid */
len = lisp_msg_parse_addr (b, &src);
return;
/* for now we don't do anything with the itr's rlocs */
- len = lisp_msg_parse_itr_rlocs (b, &itr_rlocs, MREQ_ITR_RLOC_COUNT(mreq_hdr) + 1);
+ len =
+ lisp_msg_parse_itr_rlocs (b, &itr_rlocs,
+ MREQ_ITR_RLOC_COUNT (mreq_hdr) + 1);
if (len == ~0)
return;
/* TODO: RLOCs are currently unused, so free them for now */
vec_foreach (rloc, itr_rlocs)
- {
- gid_address_free (rloc);
- }
+ {
+ gid_address_free (rloc);
+ }
/* parse eid records and send SMR-invoked map-requests */
- for (i = 0; i < MREQ_REC_COUNT(mreq_hdr); i++)
+ for (i = 0; i < MREQ_REC_COUNT (mreq_hdr); i++)
{
- memset(&dst, 0, sizeof(dst));
+ memset (&dst, 0, sizeof (dst));
len = lisp_msg_parse_eid_rec (b, &dst);
if (len == ~0)
- {
- clib_warning("Can't parse map-request EID-record");
- return;
- }
+ {
+ clib_warning ("Can't parse map-request EID-record");
+ return;
+ }
/* send SMR-invoked map-requests */
- queue_map_request (&dst, &src, 1 /* invoked */, 0 /* resend */);
+ queue_map_request (&dst, &src, 1 /* invoked */ , 0 /* resend */ );
}
}
static void
queue_map_reply (vlib_buffer_t * b)
{
- vlib_buffer_t * a = clib_mem_alloc (sizeof (a[0]) + b->current_length);
+ vlib_buffer_t *a = clib_mem_alloc (sizeof (a[0]) + b->current_length);
- clib_memcpy (a->data, b->data + b->current_data,
- b->current_length);
+ clib_memcpy (a->data, b->data + b->current_data, b->current_length);
a->current_length = b->current_length;
a->current_data = 0;
vl_api_rpc_call_main_thread (process_map_reply, (u8 *) a, sizeof (a[0])
- + a->current_length);
+ + a->current_length);
clib_mem_free (a);
}
static uword
lisp_cp_input (vlib_main_t * vm, vlib_node_runtime_t * node,
- vlib_frame_t * from_frame)
+ vlib_frame_t * from_frame)
{
- u32 n_left_from, * from, * to_next_drop;
+ u32 n_left_from, *from, *to_next_drop;
lisp_msg_type_e type;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
u32 n_left_to_next_drop;
vlib_get_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
- to_next_drop, n_left_to_next_drop);
+ to_next_drop, n_left_to_next_drop);
while (n_left_from > 0 && n_left_to_next_drop > 0)
- {
- u32 bi0;
- vlib_buffer_t * b0;
-
- bi0 = from[0];
- from += 1;
- n_left_from -= 1;
- to_next_drop[0] = bi0;
- to_next_drop += 1;
- n_left_to_next_drop -= 1;
-
- b0 = vlib_get_buffer (vm, bi0);
-
- type = lisp_msg_type(vlib_buffer_get_current (b0));
- switch (type)
- {
- case LISP_MAP_REPLY:
- queue_map_reply (b0);
- break;
- case LISP_MAP_REQUEST:
- process_map_request(vm, lcm, b0);
- break;
- default:
- clib_warning("Unsupported LISP message type %d", type);
- break;
- }
-
- b0->error = node->errors[LISP_CP_INPUT_ERROR_DROP];
-
- if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
- {
-
- }
- }
-
- vlib_put_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP, n_left_to_next_drop);
+ {
+ u32 bi0;
+ vlib_buffer_t *b0;
+
+ bi0 = from[0];
+ from += 1;
+ n_left_from -= 1;
+ to_next_drop[0] = bi0;
+ to_next_drop += 1;
+ n_left_to_next_drop -= 1;
+
+ b0 = vlib_get_buffer (vm, bi0);
+
+ type = lisp_msg_type (vlib_buffer_get_current (b0));
+ switch (type)
+ {
+ case LISP_MAP_REPLY:
+ queue_map_reply (b0);
+ break;
+ case LISP_MAP_REQUEST:
+ process_map_request (vm, lcm, b0);
+ break;
+ default:
+ clib_warning ("Unsupported LISP message type %d", type);
+ break;
+ }
+
+ b0->error = node->errors[LISP_CP_INPUT_ERROR_DROP];
+
+ if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+
+ }
+ }
+
+ vlib_put_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
+ n_left_to_next_drop);
}
return from_frame->n_vectors;
}
+/* *INDENT-OFF* */
VLIB_REGISTER_NODE (lisp_cp_input_node) = {
.function = lisp_cp_input,
.name = "lisp-cp-input",
[LISP_CP_INPUT_NEXT_DROP] = "error-drop",
},
};
+/* *INDENT-ON* */
clib_error_t *
-lisp_cp_init (vlib_main_t *vm)
+lisp_cp_init (vlib_main_t * vm)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
- clib_error_t * error = 0;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ clib_error_t *error = 0;
if ((error = vlib_call_init_function (vm, lisp_gpe_init)))
return error;
lcm->im4 = &ip4_main;
lcm->im6 = &ip6_main;
lcm->vlib_main = vm;
- lcm->vnet_main = vnet_get_main();
+ lcm->vnet_main = vnet_get_main ();
lcm->mreq_itr_rlocs = ~0;
lcm->lisp_pitr = 0;
lcm->do_map_resolver_election = 1;
/* default vrf mapped to vni 0 */
- hash_set(lcm->table_id_by_vni, 0, 0);
- hash_set(lcm->vni_by_table_id, 0, 0);
+ hash_set (lcm->table_id_by_vni, 0, 0);
+ hash_set (lcm->vni_by_table_id, 0, 0);
udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp,
- lisp_cp_input_node.index, 1 /* is_ip4 */);
+ lisp_cp_input_node.index, 1 /* is_ip4 */ );
udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp6,
- lisp_cp_input_node.index, 0 /* is_ip4 */);
+ lisp_cp_input_node.index, 0 /* is_ip4 */ );
return 0;
}
static void *
-send_map_request_thread_fn (void * arg)
+send_map_request_thread_fn (void *arg)
{
- map_request_args_t * a = arg;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ map_request_args_t *a = arg;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
lisp_pending_map_request_lock (lcm);
static int
queue_map_request (gid_address_t * seid, gid_address_t * deid,
- u8 smr_invoked, u8 is_resend)
+ u8 smr_invoked, u8 is_resend)
{
map_request_args_t a;
a.smr_invoked = smr_invoked;
vl_api_rpc_call_main_thread (send_map_request_thread_fn,
- (u8 *) &a, sizeof (a));
+ (u8 *) & a, sizeof (a));
return 0;
}
static void
update_pending_request (pending_map_request_t * r, f64 dt)
{
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
- map_resolver_t * mr;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+ map_resolver_t *mr;
if (r->time_to_expire - dt < 0)
/* it's time to decide what to do with this pending request */
{
if (r->retries_num >= NUMBER_OF_RETRIES)
- /* too many retries -> assume current map resolver is not available */
- {
- mr = get_map_resolver (&lcm->active_map_resolver);
- if (!mr)
- {
- clib_warning ("Map resolver %U not found - probably deleted "
- "by the user recently.", format_ip_address,
- &lcm->active_map_resolver);
- }
- else
- {
- clib_warning ("map resolver %U is unreachable, ignoring",
- format_ip_address, &lcm->active_map_resolver);
-
- /* mark current map resolver unavailable so it won't be
- * selected next time */
- mr->is_down = 1;
- mr->last_update = vlib_time_now (lcm->vlib_main);
- }
-
- reset_pending_mr_counters (r);
- elect_map_resolver (lcm);
-
- /* try to find a next eligible map resolver and re-send */
- queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
- 1 /* resend */);
- }
+ /* too many retries -> assume current map resolver is not available */
+ {
+ mr = get_map_resolver (&lcm->active_map_resolver);
+ if (!mr)
+ {
+ clib_warning ("Map resolver %U not found - probably deleted "
+ "by the user recently.", format_ip_address,
+ &lcm->active_map_resolver);
+ }
+ else
+ {
+ clib_warning ("map resolver %U is unreachable, ignoring",
+ format_ip_address, &lcm->active_map_resolver);
+
+ /* mark current map resolver unavailable so it won't be
+ * selected next time */
+ mr->is_down = 1;
+ mr->last_update = vlib_time_now (lcm->vlib_main);
+ }
+
+ reset_pending_mr_counters (r);
+ elect_map_resolver (lcm);
+
+ /* try to find a next eligible map resolver and re-send */
+ queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
+ 1 /* resend */ );
+ }
else
- {
- /* try again */
- queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
- 1 /* resend */);
- r->retries_num++;
- r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
- }
+ {
+ /* try again */
+ queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
+ 1 /* resend */ );
+ r->retries_num++;
+ r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
+ }
}
else
r->time_to_expire -= dt;
static void
remove_dead_pending_map_requests (lisp_cp_main_t * lcm)
{
- u64 * nonce;
- pending_map_request_t * pmr;
- u32 * to_be_removed = 0, * pmr_index;
+ u64 *nonce;
+ pending_map_request_t *pmr;
+ u32 *to_be_removed = 0, *pmr_index;
ASSERT (*lcm->pending_map_request_lock);
+ /* *INDENT-OFF* */
pool_foreach (pmr, lcm->pending_map_requests_pool,
- ({
- if (pmr->to_be_removed)
- {
- clib_fifo_foreach (nonce, pmr->nonces, ({
- hash_unset (lcm->pending_map_requests_by_nonce, nonce[0]);
- }));
+ ({
+ if (pmr->to_be_removed)
+ {
+ clib_fifo_foreach (nonce, pmr->nonces, ({
+ hash_unset (lcm->pending_map_requests_by_nonce, nonce[0]);
+ }));
- vec_add1 (to_be_removed, pmr - lcm->pending_map_requests_pool);
- }
- }));
+ vec_add1 (to_be_removed, pmr - lcm->pending_map_requests_pool);
+ }
+ }));
+ /* *INDENT-ON* */
vec_foreach (pmr_index, to_be_removed)
pool_put_index (lcm->pending_map_requests_by_nonce, pmr_index[0]);
static uword
send_map_resolver_service (vlib_main_t * vm,
- vlib_node_runtime_t * rt,
- vlib_frame_t * f)
+ vlib_node_runtime_t * rt, vlib_frame_t * f)
{
f64 period = 2.0;
- pending_map_request_t * pmr;
- lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ pending_map_request_t *pmr;
+ lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
while (1)
{
(void) vlib_process_get_events (vm, 0);
lisp_pending_map_request_lock (lcm);
+
+ /* *INDENT-OFF* */
pool_foreach (pmr, lcm->pending_map_requests_pool,
- ({
- if (!pmr->to_be_removed)
- update_pending_request (pmr, period);
- }));
+ ({
+ if (!pmr->to_be_removed)
+ update_pending_request (pmr, period);
+ }));
+ /* *INDENT-ON* */
remove_dead_pending_map_requests (lcm);
return 0;
}
+/* *INDENT-OFF* */
VLIB_REGISTER_NODE (lisp_retry_service_node,static) = {
.function = send_map_resolver_service,
.type = VLIB_NODE_TYPE_PROCESS,
.name = "lisp-retry-service",
.process_log2_n_stack_bytes = 16,
};
+/* *INDENT-ON* */
-VLIB_INIT_FUNCTION(lisp_cp_init);
+VLIB_INIT_FUNCTION (lisp_cp_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
u32 mac_parse (u8 * offset, u8 * a);
-typedef u16 (*size_to_write_fct)(void *);
-typedef void * (*cast_fct)(gid_address_t *);
-typedef u16 (*serdes_fct)(u8 *, void *);
-typedef u8 (*addr_len_fct)(void *);
-typedef void (*copy_fct)(void *, void *);
-typedef void (*free_fct)(void *);
-typedef int (*cmp_fct)(void *, void *);
+typedef u16 (*size_to_write_fct) (void *);
+typedef void *(*cast_fct) (gid_address_t *);
+typedef u16 (*serdes_fct) (u8 *, void *);
+typedef u8 (*addr_len_fct) (void *);
+typedef void (*copy_fct) (void *, void *);
+typedef void (*free_fct) (void *);
+typedef int (*cmp_fct) (void *, void *);
size_to_write_fct size_to_write_fcts[GID_ADDR_TYPES] =
{ ip_prefix_size_to_write, lcaf_size_to_write, mac_size_to_write,
- sd_size_to_write };
+ sd_size_to_write
+};
serdes_fct write_fcts[GID_ADDR_TYPES] =
{ ip_prefix_write, lcaf_write, mac_write, sd_write };
cast_fct cast_fcts[GID_ADDR_TYPES] =
int name ## _cmp (void *, void *);
foreach_lcaf_type
#undef _
-
#define CONCAT(a,b) a##_##b
#define IF(c, t, e) CONCAT(IF, c)(t, e)
#define IF_0(t, e) e
#define IF_1(t, e) t
-
-#define EXPAND_FCN(cond, fcn) \
+#define EXPAND_FCN(cond, fcn) \
IF(cond, fcn, NULL)
-
-cmp_fct lcaf_cmp_fcts[LCAF_TYPES] =
- {
-#define _(cond, name) \
+ cmp_fct lcaf_cmp_fcts[LCAF_TYPES] =
+{
+#define _(cond, name) \
EXPAND_FCN(cond, name##_cmp),
-foreach_lcaf_type
+ foreach_lcaf_type
#undef _
- };
+};
-addr_len_fct lcaf_body_length_fcts[LCAF_TYPES] =
- {
-#define _(cond, name) \
+addr_len_fct lcaf_body_length_fcts[LCAF_TYPES] = {
+#define _(cond, name) \
EXPAND_FCN(cond, name##_length),
-foreach_lcaf_type
+ foreach_lcaf_type
#undef _
- };
+};
-copy_fct lcaf_copy_fcts[LCAF_TYPES] =
- {
-#define _(cond, name) \
+copy_fct lcaf_copy_fcts[LCAF_TYPES] = {
+#define _(cond, name) \
EXPAND_FCN(cond, name##_copy),
-foreach_lcaf_type
+ foreach_lcaf_type
#undef _
- };
+};
-free_fct lcaf_free_fcts[LCAF_TYPES] =
- {
-#define _(cond, name) \
+free_fct lcaf_free_fcts[LCAF_TYPES] = {
+#define _(cond, name) \
EXPAND_FCN(cond, name##_free),
-foreach_lcaf_type
+ foreach_lcaf_type
#undef _
- };
+};
-size_to_write_fct lcaf_size_to_write_fcts[LCAF_TYPES] =
- {
-#define _(cond, name) \
+size_to_write_fct lcaf_size_to_write_fcts[LCAF_TYPES] = {
+#define _(cond, name) \
EXPAND_FCN(cond, name##_size_to_write),
-foreach_lcaf_type
+ foreach_lcaf_type
#undef _
- };
+};
-serdes_fct lcaf_write_fcts[LCAF_TYPES] =
- {
-#define _(cond, name) \
+serdes_fct lcaf_write_fcts[LCAF_TYPES] = {
+#define _(cond, name) \
EXPAND_FCN(cond, name##_write),
-foreach_lcaf_type
+ foreach_lcaf_type
#undef _
- };
+};
-serdes_fct lcaf_parse_fcts[LCAF_TYPES] =
- {
-#define _(cond, name) \
+serdes_fct lcaf_parse_fcts[LCAF_TYPES] = {
+#define _(cond, name) \
EXPAND_FCN(cond, name##_parse),
-foreach_lcaf_type
+ foreach_lcaf_type
#undef _
- };
+};
u8 *
format_ip_address (u8 * s, va_list * args)
{
- ip_address_t * a = va_arg (*args, ip_address_t *);
- u8 ver = ip_addr_version(a);
+ ip_address_t *a = va_arg (*args, ip_address_t *);
+ u8 ver = ip_addr_version (a);
if (ver == IP4)
{
- return format (s, "%U", format_ip4_address, &ip_addr_v4(a));
+ return format (s, "%U", format_ip4_address, &ip_addr_v4 (a));
}
else if (ver == IP6)
{
- return format (s, "%U", format_ip6_address, &ip_addr_v6(a));
+ return format (s, "%U", format_ip6_address, &ip_addr_v6 (a));
}
else
{
uword
unformat_ip_address (unformat_input_t * input, va_list * args)
{
- ip_address_t * a = va_arg(*args, ip_address_t *);
- if (unformat(input, "%U", unformat_ip4_address, &ip_addr_v4(a)))
- ip_addr_version(a) = IP4;
- else if (unformat_user (input, unformat_ip6_address, &ip_addr_v6(a)))
- ip_addr_version(a) = IP6;
+ ip_address_t *a = va_arg (*args, ip_address_t *);
+ if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (a)))
+ ip_addr_version (a) = IP4;
+ else if (unformat_user (input, unformat_ip6_address, &ip_addr_v6 (a)))
+ ip_addr_version (a) = IP6;
else
return 0;
return 1;
u8 *
format_ip_prefix (u8 * s, va_list * args)
{
- ip_prefix_t * a = va_arg (*args, ip_prefix_t *);
- return format (s, "%U/%d", format_ip_address, &ip_prefix_addr(a), ip_prefix_len(a));
+ ip_prefix_t *a = va_arg (*args, ip_prefix_t *);
+ return format (s, "%U/%d", format_ip_address, &ip_prefix_addr (a),
+ ip_prefix_len (a));
}
uword
unformat_ip_prefix (unformat_input_t * input, va_list * args)
{
- ip_prefix_t * a = va_arg(*args, ip_prefix_t *);
- if (unformat (input, "%U/%d", unformat_ip_address, &ip_prefix_addr(a),
- &ip_prefix_len(a)))
+ ip_prefix_t *a = va_arg (*args, ip_prefix_t *);
+ if (unformat (input, "%U/%d", unformat_ip_address, &ip_prefix_addr (a),
+ &ip_prefix_len (a)))
{
- if ((ip_prefix_version(a) == IP4 && 32 < ip_prefix_len(a)) ||
- (ip_prefix_version(a) == IP6 && 128 < ip_prefix_length(a)))
- {
- clib_warning("Prefix length to big: %d!", ip_prefix_len(a));
- return 0;
- }
- ip_prefix_normalize(a);
+ if ((ip_prefix_version (a) == IP4 && 32 < ip_prefix_len (a)) ||
+ (ip_prefix_version (a) == IP6 && 128 < ip_prefix_length (a)))
+ {
+ clib_warning ("Prefix length to big: %d!", ip_prefix_len (a));
+ return 0;
+ }
+ ip_prefix_normalize (a);
}
else
- return 0;
+ return 0;
return 1;
}
uword
unformat_mac_address (unformat_input_t * input, va_list * args)
{
- u8 * a = va_arg(*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
- &a[4], &a[5]);
+ &a[4], &a[5]);
}
u8 *
format_mac_address (u8 * s, va_list * args)
{
- u8 * a = va_arg (*args, u8 *);
+ u8 *a = va_arg (*args, u8 *);
return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[0], a[1], a[2], a[3], a[4], a[5]);
+ a[0], a[1], a[2], a[3], a[4], a[5]);
}
u8 *
format_fid_address (u8 * s, va_list * args)
{
- fid_address_t * a = va_arg(*args, fid_address_t *);
+ fid_address_t *a = va_arg (*args, fid_address_t *);
switch (fid_addr_type (a))
{
u8 *
format_gid_address (u8 * s, va_list * args)
{
- gid_address_t * a = va_arg(*args, gid_address_t *);
- u8 type = gid_address_type(a);
+ gid_address_t *a = va_arg (*args, gid_address_t *);
+ u8 type = gid_address_type (a);
switch (type)
{
case GID_ADDR_IP_PREFIX:
- return format (s, "[%d] %U", gid_address_vni(a), format_ip_prefix,
- &gid_address_ippref(a));
+ return format (s, "[%d] %U", gid_address_vni (a), format_ip_prefix,
+ &gid_address_ippref (a));
case GID_ADDR_SRC_DST:
- return format (s, "[%d] %U|%U", gid_address_vni(a),
- format_fid_address, &gid_address_sd_src(a),
- format_fid_address, &gid_address_sd_dst(a));
+ return format (s, "[%d] %U|%U", gid_address_vni (a),
+ format_fid_address, &gid_address_sd_src (a),
+ format_fid_address, &gid_address_sd_dst (a));
case GID_ADDR_MAC:
- return format (s, "[%d] %U", gid_address_vni(a), format_mac_address,
- &gid_address_mac(a));
+ return format (s, "[%d] %U", gid_address_vni (a), format_mac_address,
+ &gid_address_mac (a));
default:
- clib_warning("Can't format gid type %d", type);
+ clib_warning ("Can't format gid type %d", type);
return 0;
}
return 0;
uword
unformat_fid_address (unformat_input_t * i, va_list * args)
{
- fid_address_t * a = va_arg (*args, fid_address_t *);
+ fid_address_t *a = va_arg (*args, fid_address_t *);
ip_prefix_t ippref;
- u8 mac[6] = {0};
+ u8 mac[6] = { 0 };
if (unformat (i, "%U", unformat_ip_prefix, &ippref))
{
uword
unformat_gid_address (unformat_input_t * input, va_list * args)
{
- gid_address_t * a = va_arg(*args, gid_address_t *);
- u8 mac[6] = {0};
+ gid_address_t *a = va_arg (*args, gid_address_t *);
+ u8 mac[6] = { 0 };
ip_prefix_t ippref;
fid_address_t sim1, sim2;
memset (&sim2, 0, sizeof (sim2));
if (unformat (input, "%U|%U", unformat_fid_address, &sim1,
- unformat_fid_address, &sim2))
+ unformat_fid_address, &sim2))
{
- gid_address_sd_src(a) = sim1;
- gid_address_sd_dst(a) = sim2;
- gid_address_type(a) = GID_ADDR_SRC_DST;
+ gid_address_sd_src (a) = sim1;
+ gid_address_sd_dst (a) = sim2;
+ gid_address_type (a) = GID_ADDR_SRC_DST;
}
else if (unformat (input, "%U", unformat_ip_prefix, &ippref))
{
- ip_prefix_copy (&gid_address_ippref(a), &ippref);
- gid_address_type(a) = GID_ADDR_IP_PREFIX;
+ ip_prefix_copy (&gid_address_ippref (a), &ippref);
+ gid_address_type (a) = GID_ADDR_IP_PREFIX;
}
else if (unformat (input, "%U", unformat_mac_address, mac))
{
- mac_copy (gid_address_mac(a), mac);
- gid_address_type(a) = GID_ADDR_MAC;
+ mac_copy (gid_address_mac (a), mac);
+ gid_address_type (a) = GID_ADDR_MAC;
}
else
return 0;
uword
unformat_negative_mapping_action (unformat_input_t * input, va_list * args)
{
- u32 * action = va_arg(*args, u32 *);
- u8 * s = 0;
+ u32 *action = va_arg (*args, u32 *);
+ u8 *s = 0;
if (unformat (input, "%s", &s))
{
if (!strcmp ((char *) s, "no-action"))
- action[0] = LISP_NO_ACTION;
+ action[0] = LISP_NO_ACTION;
else if (!strcmp ((char *) s, "natively-forward"))
- action[0] = LISP_FORWARD_NATIVE;
+ action[0] = LISP_FORWARD_NATIVE;
else if (!strcmp ((char *) s, "send-map-request"))
- action[0] = LISP_SEND_MAP_REQUEST;
+ action[0] = LISP_SEND_MAP_REQUEST;
else if (!strcmp ((char *) s, "drop"))
- action[0] = LISP_DROP;
+ action[0] = LISP_DROP;
else
- {
- clib_warning("invalid action: '%s'", s);
- action[0] = LISP_DROP;
- }
+ {
+ clib_warning ("invalid action: '%s'", s);
+ action[0] = LISP_DROP;
+ }
}
else
return 0;
- vec_free(s);
+ vec_free (s);
return 1;
}
ip_address_size (ip_address_t * a)
{
switch (ip_addr_version (a))
- {
+ {
case IP4:
- return sizeof(ip4_address_t);
+ return sizeof (ip4_address_t);
break;
case IP6:
- return sizeof(ip6_address_t);
+ return sizeof (ip6_address_t);
break;
- }
+ }
return 0;
}
ip_version_to_size (u8 ver)
{
switch (ver)
- {
+ {
case IP4:
- return sizeof(ip4_address_t);
+ return sizeof (ip4_address_t);
break;
case IP6:
- return sizeof(ip6_address_t);
+ return sizeof (ip6_address_t);
break;
- }
+ }
return 0;
}
ip_version_to_max_plen (u8 ver)
{
switch (ver)
- {
+ {
case IP4:
return 32;
break;
case IP6:
return 128;
break;
- }
+ }
return 0;
}
}
u16
-ip_address_iana_afi(ip_address_t *a)
+ip_address_iana_afi (ip_address_t * a)
{
- return ip_version_to_iana_afi(ip_addr_version(a));
+ return ip_version_to_iana_afi (ip_addr_version (a));
}
u8
u32
ip4_address_put (u8 * b, ip4_address_t * a)
{
- *(u16 *)b = clib_host_to_net_u16(ip_version_to_iana_afi(IP4));
+ *(u16 *) b = clib_host_to_net_u16 (ip_version_to_iana_afi (IP4));
u8 *p = b + sizeof (u16);
- clib_memcpy (p, a, sizeof(*a));
- return ip4_address_size_to_put();
+ clib_memcpy (p, a, sizeof (*a));
+ return ip4_address_size_to_put ();
}
u32
ip6_address_put (u8 * b, ip6_address_t * a)
{
- *(u16 *)b = clib_host_to_net_u16(ip_version_to_iana_afi(IP6));
+ *(u16 *) b = clib_host_to_net_u16 (ip_version_to_iana_afi (IP6));
u8 *p = b + sizeof (u16);
- clib_memcpy (p, a, sizeof(*a));
- return ip6_address_size_to_put();
+ clib_memcpy (p, a, sizeof (*a));
+ return ip6_address_size_to_put ();
}
u32
ip_address_put (u8 * b, ip_address_t * a)
{
u32 len = ip_address_size (a);
- *(u16 *) b = clib_host_to_net_u16(ip_address_iana_afi (a));
- u8 * p = b + sizeof (u16);
+ *(u16 *) b = clib_host_to_net_u16 (ip_address_iana_afi (a));
+ u8 *p = b + sizeof (u16);
clib_memcpy (p, &ip_addr_addr (a), len);
return (len + sizeof (u16));
}
u32
-ip_address_parse(void * offset, u16 iana_afi, ip_address_t *dst)
+ip_address_parse (void *offset, u16 iana_afi, ip_address_t * dst)
{
- ip_addr_version(dst) = ip_iana_afi_to_version (iana_afi);
- u8 size = ip_version_to_size (ip_addr_version(dst));
- clib_memcpy (&ip_addr_addr(dst), offset + sizeof(u16), size);
- return(sizeof(u16) + size);
+ ip_addr_version (dst) = ip_iana_afi_to_version (iana_afi);
+ u8 size = ip_version_to_size (ip_addr_version (dst));
+ clib_memcpy (&ip_addr_addr (dst), offset + sizeof (u16), size);
+ return (sizeof (u16) + size);
}
u32
-lcaf_hdr_parse (void * offset, lcaf_t * lcaf)
+lcaf_hdr_parse (void *offset, lcaf_t * lcaf)
{
- lcaf_hdr_t * lh = offset;
+ lcaf_hdr_t *lh = offset;
lcaf->type = lh->type;
/* this is a bit of hack: since the LCAF Instance ID is the
- only message that uses reserved2 field, we can set it here.
- If any LCAF format starts using reserved2 field as well this needs
- to be moved elsewhere */
+ only message that uses reserved2 field, we can set it here.
+ If any LCAF format starts using reserved2 field as well this needs
+ to be moved elsewhere */
lcaf_vni_len (lcaf) = lh->reserved2;
return sizeof (lh[0]);
static u16
fid_addr_parse (u8 * p, fid_address_t * a)
{
- u16 afi = clib_net_to_host_u16 ( *(u16 *) p);
+ u16 afi = clib_net_to_host_u16 (*(u16 *) p);
fid_addr_type (a) = iana_afi_to_fid_addr_type (afi);
- ip_address_t * ip_addr = &ip_prefix_addr (&fid_addr_ippref (a));
+ ip_address_t *ip_addr = &ip_prefix_addr (&fid_addr_ippref (a));
switch (fid_addr_type (a))
{
}
u16
-sd_parse (u8 * p, void * a)
+sd_parse (u8 * p, void *a)
{
- lcaf_src_dst_hdr_t * sd_hdr;
- gid_address_t * g = a;
+ lcaf_src_dst_hdr_t *sd_hdr;
+ gid_address_t *g = a;
u16 size = 0;
- fid_address_t * src = &gid_address_sd_src (g);
- fid_address_t * dst = &gid_address_sd_dst (g);
+ fid_address_t *src = &gid_address_sd_src (g);
+ fid_address_t *dst = &gid_address_sd_dst (g);
gid_address_type (g) = GID_ADDR_SRC_DST;
- sd_hdr = (lcaf_src_dst_hdr_t *)(p + size);
+ sd_hdr = (lcaf_src_dst_hdr_t *) (p + size);
size += sizeof (sd_hdr[0]);
size += fid_addr_parse (p + size, src);
if (fid_addr_type (src) == FID_ADDR_IP_PREF)
{
- ip_prefix_t * ippref = &fid_addr_ippref (src);
- ip_prefix_len(ippref) = LCAF_SD_SRC_ML(sd_hdr);
+ ip_prefix_t *ippref = &fid_addr_ippref (src);
+ ip_prefix_len (ippref) = LCAF_SD_SRC_ML (sd_hdr);
}
if (fid_addr_type (dst) == FID_ADDR_IP_PREF)
{
- ip_prefix_t * ippref = &fid_addr_ippref (dst);
- ip_prefix_len(ippref) = LCAF_SD_DST_ML(sd_hdr);
+ ip_prefix_t *ippref = &fid_addr_ippref (dst);
+ ip_prefix_len (ippref) = LCAF_SD_DST_ML (sd_hdr);
}
return size;
}
try_parse_src_dst_lcaf (u8 * p, gid_address_t * a)
{
lcaf_t lcaf;
- u16 size = sizeof (u16); /* skip AFI */
+ u16 size = sizeof (u16); /* skip AFI */
size += lcaf_hdr_parse (p + size, &lcaf);
}
u16
-vni_parse (u8 * p, void * a)
+vni_parse (u8 * p, void *a)
{
- lcaf_t * lcaf = a;
- gid_address_t * g = a;
+ lcaf_t *lcaf = a;
+ gid_address_t *g = a;
u16 size = 0;
- gid_address_vni (g) = clib_net_to_host_u32 ( *(u32 *) p);
+ gid_address_vni (g) = clib_net_to_host_u32 (*(u32 *) p);
size += sizeof (u32);
gid_address_vni_mask (g) = lcaf_vni_len (lcaf);
if (LISP_AFI_LCAF == afi)
{
u16 len = try_parse_src_dst_lcaf (p + size, g);
- if ((u16)~0 == len)
- return ~0;
+ if ((u16) ~ 0 == len)
+ return ~0;
size += len;
}
else
}
u16
-no_addr_parse (u8 * p, void * a)
+no_addr_parse (u8 * p, void *a)
{
/* do nothing */
return 0;
}
u32
-lcaf_parse (void * offset, gid_address_t *addr)
+lcaf_parse (void *offset, gid_address_t * addr)
{
/* skip AFI type */
offset += sizeof (u16);
- lcaf_t * lcaf = &gid_address_lcaf (addr);
+ lcaf_t *lcaf = &gid_address_lcaf (addr);
u32 size = lcaf_hdr_parse (offset, lcaf);
u8 type = lcaf_type (lcaf);
clib_warning ("Unsupported LCAF type: %u", type);
return ~0;
}
- size += (*lcaf_parse_fcts[type])(offset + size, lcaf);
+ size += (*lcaf_parse_fcts[type]) (offset + size, lcaf);
return sizeof (u16) + size;
}
void
-vni_free (void * a)
+vni_free (void *a)
{
- vni_t * v = a;
+ vni_t *v = a;
gid_address_free (vni_gid (v));
clib_mem_free (vni_gid (v));
}
void
-no_addr_free (void * a)
+no_addr_free (void *a)
{
/* nothing to do */
}
void
-sd_free (void * a)
+sd_free (void *a)
{
/* nothing */
}
void
-gid_address_free (gid_address_t *a)
+gid_address_free (gid_address_t * a)
{
if (gid_address_type (a) != GID_ADDR_LCAF)
return;
- lcaf_t * lcaf = &gid_address_lcaf (a);
+ lcaf_t *lcaf = &gid_address_lcaf (a);
u8 lcaf_type = lcaf_type (lcaf);
- (*lcaf_free_fcts[lcaf_type])(lcaf);
+ (*lcaf_free_fcts[lcaf_type]) (lcaf);
}
int
ip_address_cmp (ip_address_t * ip1, ip_address_t * ip2)
{
int res = 0;
- if (ip_addr_version (ip1) != ip_addr_version(ip2))
+ if (ip_addr_version (ip1) != ip_addr_version (ip2))
return -1;
- res = memcmp (&ip_addr_addr(ip1), &ip_addr_addr(ip2), ip_address_size (ip1));
+ res =
+ memcmp (&ip_addr_addr (ip1), &ip_addr_addr (ip2), ip_address_size (ip1));
if (res < 0)
res = 2;
}
void
-ip_address_copy (ip_address_t * dst , ip_address_t * src)
+ip_address_copy (ip_address_t * dst, ip_address_t * src)
{
clib_memcpy (dst, src, sizeof (ip_address_t));
}
void
-ip_address_copy_addr (void * dst , ip_address_t * src)
+ip_address_copy_addr (void *dst, ip_address_t * src)
{
- clib_memcpy (dst, src, ip_address_size(src));
+ clib_memcpy (dst, src, ip_address_size (src));
}
void
-ip_address_set(ip_address_t * dst, void * src, u8 version)
+ip_address_set (ip_address_t * dst, void *src, u8 version)
{
- clib_memcpy(dst, src, ip_version_to_size(version));
- ip_addr_version(dst) = version;
+ clib_memcpy (dst, src, ip_version_to_size (version));
+ ip_addr_version (dst) = version;
}
static void
ASSERT (ip4);
if (32 <= preflen)
- {
- return;
- }
+ {
+ return;
+ }
mask = pow2_mask (preflen) << (32 - preflen);
mask = clib_host_to_net_u32 (mask);
ip_prefix_normalize_ip6 (ip6_address_t * ip6, u8 preflen)
{
u8 mask_6[16];
- u32 * m;
- u8 j ,i0, i1;
+ u32 *m;
+ u8 j, i0, i1;
ASSERT (ip6);
memset (mask_6, 0, sizeof (mask_6));
if (128 <= preflen)
- {
- return;
- }
+ {
+ return;
+ }
i1 = preflen % 32;
i0 = preflen / 32;
- m = (u32 * ) &mask_6[0];
+ m = (u32 *) & mask_6[0];
for (j = 0; j < i0; j++)
{
}
if (i1)
- {
- m[i0] = clib_host_to_net_u32 (pow2_mask(i1) << (32 - i1));
- }
+ {
+ m[i0] = clib_host_to_net_u32 (pow2_mask (i1) << (32 - i1));
+ }
- for (j = 0; j < sizeof(mask_6); j++)
+ for (j = 0; j < sizeof (mask_6); j++)
{
ip6->as_u8[j] &= mask_6[j];
}
}
void
-ip_prefix_normalize(ip_prefix_t * a)
+ip_prefix_normalize (ip_prefix_t * a)
{
- u8 preflen = ip_prefix_len(a);
+ u8 preflen = ip_prefix_len (a);
switch (ip_prefix_version (a))
- {
+ {
case IP4:
- ip_prefix_normalize_ip4(&ip_prefix_v4(a), preflen);
+ ip_prefix_normalize_ip4 (&ip_prefix_v4 (a), preflen);
break;
case IP6:
- ip_prefix_normalize_ip6(&ip_prefix_v6(a), preflen);
+ ip_prefix_normalize_ip6 (&ip_prefix_v6 (a), preflen);
break;
default:
- ASSERT(0);
- }
+ ASSERT (0);
+ }
}
void *
ip_prefix_cast (gid_address_t * a)
{
- return &gid_address_ippref(a);
+ return &gid_address_ippref (a);
}
u16
-ip_prefix_size_to_write (void * pref)
+ip_prefix_size_to_write (void *pref)
{
ip_prefix_t *a = (ip_prefix_t *) pref;
return ip_address_size_to_write (&ip_prefix_addr (a));
}
u16
-ip_prefix_write (u8 * p, void * gid)
+ip_prefix_write (u8 * p, void *gid)
{
- gid_address_t * g = gid;
+ gid_address_t *g = gid;
ip_prefix_t *a = &gid_address_ippref (g);
switch (ip_prefix_version (a))
- {
+ {
case IP4:
return ip4_address_put (p, &ip_prefix_v4 (a));
break;
case IP6:
return ip6_address_put (p, &ip_prefix_v6 (a));
break;
- }
+ }
return 0;
}
u8
ip_prefix_length (void *a)
{
- return ip_prefix_len((ip_prefix_t *) a);
+ return ip_prefix_len ((ip_prefix_t *) a);
}
void
-ip_prefix_copy (void * dst , void * src)
+ip_prefix_copy (void *dst, void *src)
{
clib_memcpy (dst, src, sizeof (ip_prefix_t));
}
void
-mac_copy (void * dst , void * src)
+mac_copy (void *dst, void *src)
{
clib_memcpy (dst, src, 6);
}
void
-sd_copy (void * dst , void * src)
+sd_copy (void *dst, void *src)
{
clib_memcpy (dst, src, sizeof (source_dest_t));
}
int
-ip_prefix_cmp(ip_prefix_t * p1, ip_prefix_t * p2)
+ip_prefix_cmp (ip_prefix_t * p1, ip_prefix_t * p2)
{
int cmp = 0;
ip_prefix_normalize (p1);
ip_prefix_normalize (p2);
- cmp = ip_address_cmp (&ip_prefix_addr(p1), &ip_prefix_addr(p2));
+ cmp = ip_address_cmp (&ip_prefix_addr (p1), &ip_prefix_addr (p2));
if (cmp == 0)
- {
- if (ip_prefix_len(p1) < ip_prefix_len(p2))
- {
- cmp = 1;
- }
- else
{
- if (ip_prefix_len(p1) > ip_prefix_len(p2))
- cmp = 2;
+ if (ip_prefix_len (p1) < ip_prefix_len (p2))
+ {
+ cmp = 1;
+ }
+ else
+ {
+ if (ip_prefix_len (p1) > ip_prefix_len (p2))
+ cmp = 2;
+ }
}
- }
return cmp;
}
void
-no_addr_copy (void * dst, void * src)
+no_addr_copy (void *dst, void *src)
{
/* nothing to do */
}
void
-vni_copy (void * dst, void * src)
+vni_copy (void *dst, void *src)
{
- vni_t * vd = dst;
- vni_t * vs = src;
+ vni_t *vd = dst;
+ vni_t *vs = src;
clib_memcpy (vd, vs, sizeof (vd[0]));
vni_gid (vd) = clib_mem_alloc (sizeof (gid_address_t));
}
void
-lcaf_copy (void * dst , void * src)
+lcaf_copy (void *dst, void *src)
{
- lcaf_t * lcaf_dst = dst;
- lcaf_t * lcaf_src = src;
+ lcaf_t *lcaf_dst = dst;
+ lcaf_t *lcaf_src = src;
lcaf_type (lcaf_dst) = lcaf_type (lcaf_src);
- (*lcaf_copy_fcts[lcaf_type (lcaf_src)])(dst, src);
+ (*lcaf_copy_fcts[lcaf_type (lcaf_src)]) (dst, src);
}
u8
return 0;
}
-u8 sd_length (void * a)
+u8
+sd_length (void *a)
{
return 0;
}
}
u8
-no_addr_length (void * a)
+no_addr_length (void *a)
{
return 0;
}
u8
-vni_length (void * a)
+vni_length (void *a)
{
- vni_t * v = a;
- return (sizeof (u32) /* VNI size */
- + gid_address_size_to_put (vni_gid (v)) /* vni body size*/);
+ vni_t *v = a;
+ return (sizeof (u32) /* VNI size */
+ + gid_address_size_to_put (vni_gid (v)) /* vni body size */ );
}
u16
-lcaf_write (u8 * p, void * a)
+lcaf_write (u8 * p, void *a)
{
u16 size = 0, len;
- lcaf_t * lcaf = a;
+ lcaf_t *lcaf = a;
u8 type = lcaf_type (lcaf);
lcaf_hdr_t _h, *h = &_h;
size += sizeof (u16);
memset (h, 0, sizeof (h[0]));
LCAF_TYPE (h) = type;
- u16 lcaf_len = (*lcaf_body_length_fcts[type])(lcaf);
+ u16 lcaf_len = (*lcaf_body_length_fcts[type]) (lcaf);
LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
clib_memcpy (p + size, h, sizeof (h[0]));
size += sizeof (h[0]);
- len = (*lcaf_write_fcts[type])(p + size, lcaf);
+ len = (*lcaf_write_fcts[type]) (p + size, lcaf);
- if ((u16)~0 == len)
+ if ((u16) ~ 0 == len)
return ~0;
return size + len;
}
u16
-mac_write (u8 * p, void * a)
+mac_write (u8 * p, void *a)
{
- *(u16 *)p = clib_host_to_net_u16 (LISP_AFI_MAC);
- clib_memcpy(p + sizeof (u16), a, 6);
+ *(u16 *) p = clib_host_to_net_u16 (LISP_AFI_MAC);
+ clib_memcpy (p + sizeof (u16), a, 6);
return mac_size_to_write (a);
}
}
u16
-sd_write (u8 * p, void * a)
+sd_write (u8 * p, void *a)
{
- source_dest_t * sd = a;
+ source_dest_t *sd = a;
u16 size = 0;
lcaf_hdr_t _h, *h = &_h;
lcaf_src_dst_hdr_t sd_hdr;
size += sizeof (h[0]);
memset (&sd_hdr, 0, sizeof (sd_hdr));
- LCAF_SD_SRC_ML(&sd_hdr) = fid_address_length (&sd_src (sd));
- LCAF_SD_DST_ML(&sd_hdr) = fid_address_length (&sd_dst (sd));
+ LCAF_SD_SRC_ML (&sd_hdr) = fid_address_length (&sd_src (sd));
+ LCAF_SD_DST_ML (&sd_hdr) = fid_address_length (&sd_dst (sd));
clib_memcpy (p + size, &sd_hdr, sizeof (sd_hdr));
size += sizeof (sd_hdr);
u16 len = fid_addr_write (p + size, &sd_src (sd));
- if ((u16)~0 == len)
+ if ((u16) ~ 0 == len)
return ~0;
size += len;
len = fid_addr_write (p + size, &sd_dst (sd));
- if ((u16)~0 == len)
+ if ((u16) ~ 0 == len)
return ~0;
size += len;
}
u16
-vni_write (u8 * p, void * a)
+vni_write (u8 * p, void *a)
{
lcaf_hdr_t _h, *h = &_h;
- gid_address_t * g = a;
+ gid_address_t *g = a;
u16 size = 0, len;
/* put lcaf header */
size += sizeof (u16);
memset (h, 0, sizeof (h[0]));
LCAF_TYPE (h) = LCAF_INSTANCE_ID;
- u16 lcaf_len = sizeof (u32) /* Instance ID size */
+ u16 lcaf_len = sizeof (u32) /* Instance ID size */
+ gid_address_size_to_put_no_vni (g);
LCAF_LENGTH (h) = clib_host_to_net_u16 (lcaf_len);
LCAF_RES2 (h) = gid_address_vni_mask (g);
clib_memcpy (p + size, h, sizeof (h[0]));
size += sizeof (h[0]);
- u32 * afip = (u32 *)(p + size);
+ u32 *afip = (u32 *) (p + size);
afip[0] = clib_host_to_net_u32 (gid_address_vni (g));
size += sizeof (u32);
/* write src/dst LCAF */
{
len = sd_write (p + size, g);
- if ((u16)~0 == len)
- return ~0;
+ if ((u16) ~ 0 == len)
+ return ~0;
}
else
/* write the actual address */
len = gid_address_put_no_vni (p + size, g);
- if ((u16)~0 == len)
+ if ((u16) ~ 0 == len)
return ~0;
return size + len;
}
u16
-no_addr_write (u8 * p, void * a)
+no_addr_write (u8 * p, void *a)
{
/* do nothing; return AFI field size */
return sizeof (u16);
}
u16
-no_addr_size_to_write (void * a)
+no_addr_size_to_write (void *a)
{
- return sizeof (u16); /* AFI field length */
+ return sizeof (u16); /* AFI field length */
}
static u16
}
u16
-vni_size_to_write (void * a)
+vni_size_to_write (void *a)
{
- gid_address_t * g = a;
+ gid_address_t *g = a;
- u16 lcaf_size = sizeof (u32)
- + sizeof (u16) /* LCAF AFI field size */
- + sizeof (lcaf_hdr_t);
+ u16 lcaf_size = sizeof (u32) + sizeof (u16) /* LCAF AFI field size */
+ + sizeof (lcaf_hdr_t);
if (gid_address_type (g) == GID_ADDR_SRC_DST)
/* special case where nested LCAF is supported */
return lcaf_size + sd_size_to_write (g);
else
- return lcaf_size
- + gid_address_size_to_put_no_vni (g);
+ return lcaf_size + gid_address_size_to_put_no_vni (g);
}
u16
-lcaf_size_to_write (void * a)
+lcaf_size_to_write (void *a)
{
- lcaf_t * lcaf = (lcaf_t *) a;
+ lcaf_t *lcaf = (lcaf_t *) a;
u32 size = 0, len;
u8 type = lcaf_type (lcaf);
- size += sizeof (u16); /* AFI size */
+ size += sizeof (u16); /* AFI size */
- len = (*lcaf_size_to_write_fcts[type])(lcaf);
+ len = (*lcaf_size_to_write_fcts[type]) (lcaf);
if (~0 == len)
return ~0;
}
u16
-sd_size_to_write (void * a)
+sd_size_to_write (void *a)
{
- source_dest_t * sd = a;
+ source_dest_t *sd = a;
return sizeof (u16)
+ sizeof (lcaf_hdr_t)
+ sizeof (lcaf_src_dst_hdr_t)
}
u16
-mac_size_to_write (void * a)
+mac_size_to_write (void *a)
{
return sizeof (u16) + 6;
}
u8
-gid_address_len (gid_address_t *a)
+gid_address_len (gid_address_t * a)
{
gid_address_type_t type = gid_address_type (a);
- return (*addr_len_fcts[type])((*cast_fcts[type])(a));
+ return (*addr_len_fcts[type]) ((*cast_fcts[type]) (a));
}
static u16
gid_address_put_no_vni (u8 * b, gid_address_t * gid)
{
gid_address_type_t type = gid_address_type (gid);
- return (*write_fcts[type])(b, (*cast_fcts[type])(gid));
+ return (*write_fcts[type]) (b, (*cast_fcts[type]) (gid));
}
u16
gid_address_size_to_put_no_vni (gid_address_t * gid)
{
gid_address_type_t type = gid_address_type (gid);
- return (*size_to_write_fcts[type])((*cast_fcts[type])(gid));
+ return (*size_to_write_fcts[type]) ((*cast_fcts[type]) (gid));
}
u16
void *
gid_address_cast (gid_address_t * gid, gid_address_type_t type)
{
- return (*cast_fcts[type])(gid);
+ return (*cast_fcts[type]) (gid);
}
void
-gid_address_copy(gid_address_t * dst, gid_address_t * src)
+gid_address_copy (gid_address_t * dst, gid_address_t * src)
{
- gid_address_type_t type = gid_address_type(src);
- (*copy_fcts[type])((*cast_fcts[type])(dst), (*cast_fcts[type])(src));
- gid_address_type(dst) = type;
- gid_address_vni(dst) = gid_address_vni(src);
- gid_address_vni_mask(dst) = gid_address_vni_mask(src);
+ gid_address_type_t type = gid_address_type (src);
+ (*copy_fcts[type]) ((*cast_fcts[type]) (dst), (*cast_fcts[type]) (src));
+ gid_address_type (dst) = type;
+ gid_address_vni (dst) = gid_address_vni (src);
+ gid_address_vni_mask (dst) = gid_address_vni_mask (src);
}
u32
}
u32
-gid_address_parse (u8 * offset, gid_address_t *a)
+gid_address_parse (u8 * offset, gid_address_t * a)
{
lisp_afi_e afi;
int len = 0;
switch (afi)
{
case LISP_AFI_NO_ADDR:
- len = sizeof(u16);
- gid_address_type(a) = GID_ADDR_NO_ADDRESS;
+ len = sizeof (u16);
+ gid_address_type (a) = GID_ADDR_NO_ADDRESS;
break;
case LISP_AFI_IP:
- len = ip_address_parse (offset, afi, &gid_address_ip(a));
- gid_address_type(a) = GID_ADDR_IP_PREFIX;
- /* this should be modified outside if needed*/
- gid_address_ippref_len(a) = 32;
+ len = ip_address_parse (offset, afi, &gid_address_ip (a));
+ gid_address_type (a) = GID_ADDR_IP_PREFIX;
+ /* this should be modified outside if needed */
+ gid_address_ippref_len (a) = 32;
break;
case LISP_AFI_IP6:
- len = ip_address_parse (offset, afi, &gid_address_ip(a));
- gid_address_type(a) = GID_ADDR_IP_PREFIX;
- /* this should be modified outside if needed*/
- gid_address_ippref_len(a) = 128;
+ len = ip_address_parse (offset, afi, &gid_address_ip (a));
+ gid_address_type (a) = GID_ADDR_IP_PREFIX;
+ /* this should be modified outside if needed */
+ gid_address_ippref_len (a) = 128;
break;
case LISP_AFI_LCAF:
- gid_address_type(a) = GID_ADDR_LCAF;
+ gid_address_type (a) = GID_ADDR_LCAF;
len = lcaf_parse (offset, a);
break;
case LISP_AFI_MAC:
len = mac_parse (offset, gid_address_mac (a));
- gid_address_type(a) = GID_ADDR_MAC;
+ gid_address_type (a) = GID_ADDR_MAC;
break;
default:
- clib_warning("LISP AFI %d not supported!", afi);
+ clib_warning ("LISP AFI %d not supported!", afi);
return ~0;
}
return len;
}
void
-gid_address_ip_set(gid_address_t * dst, void * src, u8 version)
+gid_address_ip_set (gid_address_t * dst, void *src, u8 version)
{
- ip_address_set (&gid_address_ip(dst), src, version);
+ ip_address_set (&gid_address_ip (dst), src, version);
}
int
-no_addr_cmp (void * a1, void * a2)
+no_addr_cmp (void *a1, void *a2)
{
return 0;
}
int
-vni_cmp (void * a1, void * a2)
+vni_cmp (void *a1, void *a2)
{
- vni_t * v1 = a1;
- vni_t * v2 = a2;
+ vni_t *v1 = a1;
+ vni_t *v2 = a2;
if (vni_mask_len (v1) != vni_mask_len (v2))
return -1;
}
static int
-fid_addr_cmp (fid_address_t * a1,
- fid_address_t * a2)
+fid_addr_cmp (fid_address_t * a1, fid_address_t * a2)
{
if (fid_addr_type (a1) != fid_addr_type (a2))
return -1;
switch (fid_addr_type (a1))
{
- case FID_ADDR_IP_PREF:
- return ip_prefix_cmp (&fid_addr_ippref (a1),
- &fid_addr_ippref (a2));
+ case FID_ADDR_IP_PREF:
+ return ip_prefix_cmp (&fid_addr_ippref (a1), &fid_addr_ippref (a2));
- case FID_ADDR_MAC:
- return memcmp (&fid_addr_mac (a1),
- &fid_addr_mac (a2), 6);
+ case FID_ADDR_MAC:
+ return memcmp (&fid_addr_mac (a1), &fid_addr_mac (a2), 6);
- default:
- return -1;
+ default:
+ return -1;
}
return -1;
}
int
-sd_cmp (void * a1, void * a2)
+sd_cmp (void *a1, void *a2)
{
- source_dest_t * sd1 = a1;
- source_dest_t * sd2 = a2;
+ source_dest_t *sd1 = a1;
+ source_dest_t *sd2 = a2;
- if (fid_addr_cmp (&sd_dst(sd1), &sd_dst(sd2)))
+ if (fid_addr_cmp (&sd_dst (sd1), &sd_dst (sd2)))
return -1;
- if (fid_addr_cmp (&sd_src(sd1), &sd_src(sd2)))
+ if (fid_addr_cmp (&sd_src (sd1), &sd_src (sd2)))
return -1;
return 0;
}
int
gid_address_cmp (gid_address_t * a1, gid_address_t * a2)
{
- lcaf_t * lcaf1, * lcaf2;
+ lcaf_t *lcaf1, *lcaf2;
int cmp = -1;
if (!a1 || !a2)
return -1;
- if (gid_address_type(a1) != gid_address_type(a2))
+ if (gid_address_type (a1) != gid_address_type (a2))
return -1;
- if (gid_address_vni(a1) != gid_address_vni(a2))
+ if (gid_address_vni (a1) != gid_address_vni (a2))
return -1;
- if (gid_address_vni_mask(a1) != gid_address_vni_mask(a2))
+ if (gid_address_vni_mask (a1) != gid_address_vni_mask (a2))
return -1;
- switch (gid_address_type(a1))
+ switch (gid_address_type (a1))
{
case GID_ADDR_NO_ADDRESS:
if (a1 == a2)
- cmp = 0;
+ cmp = 0;
else
- cmp = 2;
+ cmp = 2;
break;
case GID_ADDR_IP_PREFIX:
- cmp = ip_prefix_cmp (&gid_address_ippref(a1), &gid_address_ippref(a2));
+ cmp =
+ ip_prefix_cmp (&gid_address_ippref (a1), &gid_address_ippref (a2));
break;
case GID_ADDR_LCAF:
lcaf1 = &gid_address_lcaf (a1);
lcaf2 = &gid_address_lcaf (a2);
if (lcaf_type (lcaf1) == lcaf_type (lcaf2))
- cmp = (*lcaf_cmp_fcts[lcaf_type (lcaf1)])(lcaf1, lcaf2);
+ cmp = (*lcaf_cmp_fcts[lcaf_type (lcaf1)]) (lcaf1, lcaf2);
break;
case GID_ADDR_MAC:
cmp = memcmp (gid_address_mac (a1), gid_address_mac (a2),
- sizeof (gid_address_mac (a1)));
+ sizeof (gid_address_mac (a1)));
break;
case GID_ADDR_SRC_DST:
}
u32
-locator_parse (void * b, locator_t * loc)
+locator_parse (void *b, locator_t * loc)
{
- locator_hdr_t * h;
- u8 status = 1; /* locator up */
+ locator_hdr_t *h;
+ u8 status = 1; /* locator up */
int len;
h = b;
- if (!LOC_REACHABLE(h) && LOC_LOCAL(h))
+ if (!LOC_REACHABLE (h) && LOC_LOCAL (h))
status = 0;
- len = gid_address_parse (LOC_ADDR(h), &loc->address);
+ len = gid_address_parse (LOC_ADDR (h), &loc->address);
if (len == ~0)
return len;
loc->state = status;
loc->local = 0;
- loc->priority = LOC_PRIORITY(h);
- loc->weight = LOC_WEIGHT(h);
- loc->mpriority = LOC_MPRIORITY(h);
- loc->mweight = LOC_MWEIGHT(h);
+ loc->priority = LOC_PRIORITY (h);
+ loc->weight = LOC_WEIGHT (h);
+ loc->mpriority = LOC_MPRIORITY (h);
+ loc->mweight = LOC_MWEIGHT (h);
- return sizeof(locator_hdr_t) + len;
+ return sizeof (locator_hdr_t) + len;
}
void
locator_copy (locator_t * dst, locator_t * src)
{
/* TODO if gid become more complex, this will need to be changed! */
- clib_memcpy (dst, src, sizeof(*dst));
+ clib_memcpy (dst, src, sizeof (*dst));
if (!src->local)
gid_address_copy (&dst->address, &src->address);
}
if (!l->local)
gid_address_free (&l->address);
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
Code Review / vpp.git / commitdiff