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]);
.function = lisp_add_del_map_resolver_command_fn,
};
+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;
+
+ //TODO: Wait for merge https://gerrit.fd.io/r/#/c/1427/
+// if (vnet_lisp_enable_disable_status () == 0)
+// {
+// 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);
+ if (!p)
+ {
+ clib_warning("locator-set %v doesn't exist", a->locator_set_name);
+ return VNET_API_ERROR_INVALID_ARGUMENT;
+ }
+
+ lcm->mreq_itr_rlocs = p[0];
+ }
+ else
+ {
+ lcm->mreq_itr_rlocs = ~0;
+ }
+
+ return 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 _line_input, * line_input = &_line_input;
+ u8 is_add = 1;
+ 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;
+
+ /* Get a line of 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;
+ else if (unformat (line_input, "add %s", &locator_set_name))
+ is_add = 1;
+ else
+ {
+ error = unformat_parse_error(line_input);
+ goto done;
+ }
+ }
+
+ a->is_add = is_add;
+ a->locator_set_name = locator_set_name;
+ 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");
+ }
+
+ vec_free(locator_set_name);
+
+ done:
+ return error;
+
+}
+
+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,
+};
+
+static clib_error_t *
+lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+ locator_set_t * loc_set;
+
+ vlib_cli_output (vm, "%=20s", "itr-rlocs");
+
+ if (~0 == lcm->mreq_itr_rlocs)
+ {
+ return 0;
+ }
+
+ loc_set = pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs);
+
+ vlib_cli_output (vm, "%=20s", loc_set->name);
+
+ return 0;
+}
+
+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,
+};
+
/* Statistics (not really errors) */
#define foreach_lisp_cp_lookup_error \
_(DROP, "drop") \
return s;
}
+ip_interface_address_t *
+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);
+ 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);
+}
+
+void *
+ip_interface_get_first_address (ip_lookup_main_t * lm, u32 sw_if_index,
+ u8 version)
+{
+ ip_interface_address_t * ia;
+
+ ia = ip_interface_get_first_interface_address (lm, sw_if_index, 1);
+ if (!ia)
+ return 0;
+ return ip_interface_address_get_address (lm, ia);
+}
+
+int
+ip_interface_get_first_ip_address (lisp_cp_main_t * lcm, u32 sw_if_index,
+ u8 version, ip_address_t * result)
+{
+ 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);
+ if (!addr)
+ return 0;
+
+ ip_address_set (result, addr, version);
+ return 1;
+}
+
static u32
ip_fib_lookup_with_table (lisp_cp_main_t * lcm, u32 fib_index,
ip_address_t * dst)
return ip6_fib_lookup_with_table (lcm->im6, fib_index, &ip_addr_v6(dst));
}
-static u32
-get_egress_iface_for_dst (lisp_cp_main_t * lcm, ip_address_t * 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)
{
u32 adj_index;
ip_adjacency_t * adj;
- ip_lookup_main_t * lm;
-
- lm = ip_addr_version (dst) == IP4 ?
- &lcm->im4->lookup_main : &lcm->im6->lookup_main;
adj_index = ip_fib_lookup_with_table (lcm, 0, dst);
adj = ip_get_adjacency (lm, adj_index);
if (adj == 0)
return ~0;
+ /* we only want outgoing routes */
+ if (adj->lookup_next_index != IP_LOOKUP_NEXT_ARP
+ && adj->lookup_next_index != IP_LOOKUP_NEXT_REWRITE)
+ return ~0;
+
return adj->rewrite_header.sw_if_index;
}
-void
-get_first_local_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst,
- ip_address_t * result)
+/**
+ * Find the sw_if_index of the interface that would be used to egress towards
+ * dst.
+ */
+u32
+ip_fib_get_egress_iface_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst)
{
- u32 adj_index;
- ip_adjacency_t * adj;
- ip_interface_address_t * ia = 0;
ip_lookup_main_t * lm;
- ip4_address_t * l4 = 0;
- ip6_address_t * l6 = 0;
-
- ASSERT(result != 0);
lm = ip_addr_version (dst) == IP4 ?
&lcm->im4->lookup_main : &lcm->im6->lookup_main;
- adj_index = ip_fib_lookup_with_table (lcm, 0, dst);
- adj = ip_get_adjacency (lm, adj_index);
+ return ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm);
+}
- if (adj == 0)
- return;
+/**
+ * Find first IP of the interface that would be used to egress towards dst.
+ * Returns 1 if the address is found 0 otherwise.
+ */
+int
+ip_fib_get_first_egress_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst,
+ ip_address_t * result)
+{
+ u32 si;
+ ip_lookup_main_t * lm;
+ void * addr = 0;
+ u8 ipver;
- if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP)
- {
- ia = pool_elt_at_index(lm->if_address_pool, adj->if_address_index);
- if (ip_addr_version(dst) == IP4)
- {
- l4 = ip_interface_address_get_address (lm, ia);
- }
- else
- {
- l6 = ip_interface_address_get_address (lm, ia);
- }
- }
- else if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE)
- {
- /* find sw_if_index in rewrite header */
- u32 sw_if_index = adj->rewrite_header.sw_if_index;
+ ASSERT(result != 0);
- /* find suitable address */
- if (ip_addr_version(dst) == IP4)
- {
- /* find the first ip address */
- foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
- sw_if_index, 1 /* unnumbered */,
- ({
- l4 = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
- break;
- }));
- }
- else
- {
- /* find the first ip address */
- foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
- sw_if_index, 1 /* unnumbered */,
- ({
- l6 = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
- break;
- }));
- }
- }
+ 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)
+ return 0;
+
+ /* find the first ip address */
+ addr = ip_interface_get_first_address (lm, si, ipver);
+ if (0 == addr)
+ return 0;
- if (l4)
- ip_address_set (result, l4, IP4);
- else if (l6)
- ip_address_set (result, l6, IP6);
+ ip_address_set (result, addr, ipver);
+ return 1;
}
-void
-get_mr_and_local_iface_ip (lisp_cp_main_t *lcm, ip_address_t * mr_ip,
+int
+get_mr_and_local_iface_ip (lisp_cp_main_t * lcm, ip_address_t * mr_ip,
ip_address_t * sloc)
{
ip_address_t * mrit;
if (vec_len(lcm->map_resolvers) == 0)
{
clib_warning("No map-resolver configured");
- return;
+ 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)
{
- get_first_local_ip_for_dst (lcm, mrit, sloc);
- if (0 != sloc) {
+ if (0 != ip_fib_get_first_egress_ip_for_dst (lcm, mrit, sloc)) {
ip_address_copy(mr_ip, mrit);
- return;
+ return 1;
}
}
clib_warning("Can't find map-resolver and local interface ip!");
- return;
+ return 0;
}
static gid_address_t *
build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set)
{
- ip4_address_t * l4;
- ip6_address_t * l6;
+ void * addr;
u32 i;
locator_t * loc;
u32 * loc_indexp;
loc_indexp = vec_elt_at_index(loc_set->locator_indices, i);
loc = pool_elt_at_index (lcm->locator_pool, loc_indexp[0]);
- ip_addr_version(rloc) = IP4;
/* Add ipv4 locators first TODO sort them */
foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
loc->sw_if_index, 1 /* unnumbered */,
({
- l4 = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
- ip_addr_v4 (rloc) = l4[0];
+ addr = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
+ ip_address_set (rloc, addr, IP4);
ip_prefix_len (ippref) = 32;
vec_add1 (rlocs, gid[0]);
}));
- ip_addr_version(rloc) = IP6;
/* Add ipv6 locators */
foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
loc->sw_if_index, 1 /* unnumbered */,
({
- l6 = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
- ip_addr_v6 (rloc) = l6[0];
+ addr = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
+ ip_address_set (rloc, addr, IP6);
ip_prefix_len (ippref) = 128;
vec_add1 (rlocs, gid[0]);
}));
bi_res[0] = bi;
- if (rlocs)
- vec_free(rlocs);
+ vec_free(rlocs);
return b;
}
mapping_t * map;
pending_map_request_t * pmr;
ip_address_t mr_ip, sloc;
+ u32 ls_index;
/* get locator-set for seid */
if (!lcm->lisp_pitr)
format_gid_address, seid);
return;
}
+ ls_index = map->locator_set_index;
}
else
{
map_index = lcm->pitr_map_index;
map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+ ls_index = map->locator_set_index;
+ }
+
+ /* overwrite locator set if map-request itr-rlocs configured */
+ if (~0 != lcm->mreq_itr_rlocs)
+ {
+ ls_index = lcm->mreq_itr_rlocs;
}
- loc_set = pool_elt_at_index (lcm->locator_set_pool, map->locator_set_index);
+ loc_set = pool_elt_at_index (lcm->locator_set_pool, ls_index);
- /* get local iface ip to use in map-request XXX fib 0 for now*/
- get_mr_and_local_iface_ip (lcm, &mr_ip, &sloc);
+ /* get local iface ip to use in map-request */
+ if (0 == get_mr_and_local_iface_ip (lcm, &mr_ip, &sloc))
+ return;
/* build the encapsulated map request */
b = build_encapsulated_map_request (vm, lcm, seid, deid, loc_set, &mr_ip,
return s;
}
-ip_interface_address_t *
-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);
- 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);
-}
-
-int
-ip_interface_get_first_ip_addres (lisp_cp_main_t * lcm, u32 sw_if_index,
- u8 version, ip_address_t * addr)
-{
- if (version == IP4)
- {
- ip4_address_t * l4;
- ip_lookup_main_t * lm = &lcm->im4->lookup_main;
- ip_interface_address_t * ia = ip_interface_get_first_interface_address (
- lm, sw_if_index, 1 /* unnumbered */);
-
- if (!ia)
- return 0;
-
- l4 = ip_interface_address_get_address (lm, ia);
-
- if (!l4)
- return 0;
-
- ip_addr_v4(addr) = *l4;
- ip_addr_version(addr) = IP4;
- }
- else
- {
- ip6_address_t * l6;
- ip_lookup_main_t * lm = &lcm->im6->lookup_main;
- ip_interface_address_t * ia = ip_interface_get_first_interface_address (
- lm, sw_if_index, 1 /* unnumbered */);
- if (!ia)
- return 0;
-
- l6 = ip_interface_address_get_address (lm, ia);
- if (!l6)
- return 0;
-
- ip_addr_v6(addr) = *l6;
- ip_addr_version(addr) = IP6;
- }
- return 1;
-}
-
static void
del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index,
u32 dst_map_index)
get_locator_pair (lisp_cp_main_t* lcm, mapping_t * lcl_map, mapping_t * rmt_map,
ip_address_t * lcl_loc, ip_address_t * rmt_loc)
{
- u32 i, rv, minp = ~0, limitp = 0, li, check_index = 0, done = 0, esi;
+ u32 i, minp = ~0, limitp = 0, li, check_index = 0, done = 0, esi;
locator_set_t * rmt_ls, * lcl_ls;
ip_address_t _lcl, * lcl = &_lcl;
locator_t * l, * rmt = 0;
/* check if a local locator with a route to remote locator exists */
if (rmt != 0)
{
- esi = get_egress_iface_for_dst (lcm, &gid_address_ip(&rmt->address));
+ esi = ip_fib_get_egress_iface_for_dst (
+ lcm, &gid_address_ip(&rmt->address));
if ((u32) ~0 == esi)
continue;
/* found local locator */
if (sl->sw_if_index == esi)
{
- rv = ip_interface_get_first_ip_addres (lcm, sl->sw_if_index,
- gid_address_ip_version(&rmt->address), lcl);
-
- if (!rv)
+ if (0 == ip_interface_get_first_ip_address (lcm,
+ sl->sw_if_index,
+ gid_address_ip_version(&rmt->address), lcl))
continue;
ip_address_copy(rmt_loc, &gid_address_ip(&rmt->address));
lcm->im6 = &ip6_main;
lcm->vlib_main = vm;
lcm->vnet_main = vnet_get_main();
+ lcm->mreq_itr_rlocs = ~0;
gid_dictionary_init (&lcm->mapping_index_by_gid);
Code Review / vpp.git / blobdiff