#include <vnet/lisp-cp/lisp_msg_serdes.h>
#include <vnet/lisp-gpe/lisp_gpe.h>
+static void
+add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index);
+
+static void
+del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index);
+
+static u8
+compare_locators (lisp_cp_main_t *lcm, u32 * old_ls_indexes,
+ locator_t * new_locators);
+
/* Stores mapping in map-cache. It does NOT program data plane forwarding for
* remote/learned mappings. */
int
{
lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
u32 mi, * map_indexp, map_index, i;
- mapping_t * m;
+ mapping_t * m, * old_map;
u32 ** eid_indexes;
mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->deid);
+ 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)
+ if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid,
+ &a->deid))
{
clib_warning("eid %U found in the eid-table", format_ip_address,
&a->deid);
m->eid = a->deid;
m->locator_set_index = a->locator_set_index;
m->ttl = a->ttl;
+ m->action = a->action;
m->local = a->local;
map_index = m - lcm->mapping_pool;
u32 * map_index_result)
{
uword * table_id, * refc;
- u32 rv;
+ u32 rv, vni;
vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai;
lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ vni = gid_address_vni(&a->deid);
+
/* store/remove mapping from map-cache */
rv = vnet_lisp_add_del_mapping (a, map_index_result);
if (rv)
return rv;
- table_id = hash_get(lcm->table_id_by_vni, /* default for now */ 0);
+ table_id = hash_get(lcm->table_id_by_vni, vni);
if (!table_id)
{
- clib_warning ("vni %d not associated to a vrf!", 0);
+ clib_warning ("vni %d not associated to a vrf!", vni);
return VNET_API_ERROR_INVALID_VALUE;
}
- refc = hash_get(lcm->dp_if_refcount_by_vni, 0);
+ refc = hash_get(lcm->dp_if_refcount_by_vni, vni);
/* enable/disable data-plane interface */
if (a->is_add)
if (!refc)
{
ai->is_add = 1;
- ai->vni = 0; /* default for now, pass vni as parameter */
+ ai->vni = vni;
ai->table_id = table_id[0];
vnet_lisp_gpe_add_del_iface (ai, 0);
+
+ /* counts the number of eids in a vni that use the interface */
+ hash_set(lcm->dp_if_refcount_by_vni, vni, 1);
}
else
{
if (refc[0] == 0)
{
ai->is_add = 0;
- ai->vni = 0; /* default for now, pass vni as parameter */
+ ai->vni = vni;
ai->table_id = table_id[0];
vnet_lisp_gpe_add_del_iface (ai, 0);
+ hash_unset (lcm->dp_if_refcount_by_vni, vni);
}
}
ip_prefix_t * prefp = &gid_address_ippref(&eid);
gid_address_t * eids = 0;
clib_error_t * error = 0;
- u8 * locator_set_name;
+ 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;
- gid_address_type (&eid) = IP_PREFIX;
+ gid_address_type (&eid) = GID_ADDR_IP_PREFIX;
/* Get a line of input. */
if (! unformat_user (input, unformat_line_input, line_input))
vnet_lisp_add_del_local_mapping (a, &map_index);
done:
vec_free(eids);
+ if (locator_set_name)
+ vec_free (locator_set_name);
return error;
}
.function = lisp_add_del_local_eid_command_fn,
};
+static int
+lisp_add_del_negative_static_mapping (gid_address_t * deid,
+ vnet_lisp_add_del_locator_set_args_t * ls, u8 action, u8 is_add)
+{
+ uword * p;
+ mapping_t * map;
+ u32 mi = ~0;
+ lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ uword * refc;
+ vnet_lisp_add_del_mapping_args_t _dm_args, * dm_args = &_dm_args;
+ int rv = 0;
+ u32 ls_index = 0, dst_map_index;
+ vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai;
+
+ memset (dm_args, 0, sizeof (dm_args[0]));
+ u32 vni = gid_address_vni (deid);
+ refc = hash_get (lcm->dp_if_refcount_by_vni, vni);
+
+ p = hash_get (lcm->table_id_by_vni, vni);
+ if (!p)
+ {
+ clib_warning ("vni %d not associated to a vrf!", vni);
+ return VNET_API_ERROR_INVALID_VALUE;
+ }
+
+ if (is_add)
+ {
+ vnet_lisp_add_del_locator_set (ls, &ls_index);
+ /* add mapping */
+ gid_address_copy (&dm_args->deid, deid);
+ dm_args->is_add = 1;
+ dm_args->action = action;
+ dm_args->locator_set_index = ls_index;
+
+ /* create interface or update refcount */
+ if (!refc)
+ {
+ vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai;
+ ai->is_add = 1;
+ ai->vni = vni;
+ ai->table_id = p[0];
+ vnet_lisp_gpe_add_del_iface (ai, 0);
+
+ /* counts the number of eids in a vni that use the interface */
+ hash_set (lcm->dp_if_refcount_by_vni, vni, 1);
+ }
+ else
+ refc[0]++;
+
+ rv = vnet_lisp_add_del_local_mapping (dm_args, &dst_map_index);
+ if (!rv)
+ add_fwd_entry (lcm, lcm->pitr_map_index, dst_map_index);
+ }
+ else
+ {
+ mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, deid);
+ if ((u32)~0 == mi)
+ {
+ clib_warning ("eid %U marked for removal, but not found in "
+ "map-cache!", unformat_gid_address, deid);
+ return VNET_API_ERROR_INVALID_VALUE;
+ }
+
+ /* delete forwarding entry */
+ del_fwd_entry (lcm, 0, mi);
+
+ dm_args->is_add = 0;
+ gid_address_copy (&dm_args->deid, deid);
+ map = pool_elt_at_index (lcm->mapping_pool, mi);
+ dm_args->locator_set_index = map->locator_set_index;
+
+ /* delete mapping associated to fwd entry */
+ vnet_lisp_add_del_mapping (dm_args, 0);
+
+ refc = hash_get (lcm->dp_if_refcount_by_vni, vni);
+ ASSERT(refc != 0);
+ refc[0]--;
+
+ /* remove iface if needed */
+ if (refc[0] == 0)
+ {
+ ai->is_add = 0;
+ ai->vni = vni;
+ ai->table_id = p[0];
+ vnet_lisp_gpe_add_del_iface (ai, 0);
+ hash_unset (lcm->dp_if_refcount_by_vni, vni);
+ }
+ }
+ return rv;
+}
+
+/**
+ * Adds/removes/updates static remote mapping.
+ *
+ * This function also modifies forwarding entries if needed.
+ *
+ * @param deid destination EID
+ * @param seid source EID
+ * @param rlocs vector of remote locators
+ * @param action action for negative map-reply
+ * @param is_add add mapping if non-zero, delete otherwise
+ * @return return code
+ */
+int
+vnet_lisp_add_del_remote_mapping (gid_address_t * deid, gid_address_t * seid,
+ ip_address_t * rlocs, u8 action, u8 is_add)
+{
+ vnet_lisp_add_del_mapping_args_t _dm_args, * dm_args = &_dm_args;
+ vnet_lisp_add_del_mapping_args_t _sm_args, * sm_args = &_sm_args;
+ vnet_lisp_add_del_locator_set_args_t _ls, * ls = &_ls;
+ lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ u32 mi, ls_index = 0, dst_map_index, src_map_index;
+ locator_t loc;
+ ip_address_t * dl;
+ int rc = -1;
+
+ memset (sm_args, 0, sizeof (sm_args[0]));
+ memset (dm_args, 0, sizeof (dm_args[0]));
+ memset (ls, 0, sizeof (ls[0]));
+
+ /* prepare remote locator set */
+ vec_foreach (dl, rlocs)
+ {
+ memset (&loc, 0, sizeof (loc));
+ gid_address_ip (&loc.address) = dl[0];
+ vec_add1 (ls->locators, loc);
+ }
+ src_map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
+
+ mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, deid);
+ /* new mapping */
+ if ((u32)~0 == mi)
+ {
+ ls->is_add = 1;
+ ls->index = ~0;
+
+ /* process a negative mapping */
+ if (0 == vec_len (rlocs))
+ return lisp_add_del_negative_static_mapping (deid, ls,
+ action, is_add);
+
+ if ((u32)~0 == src_map_index)
+ {
+ clib_warning ("seid %U not found!", format_gid_address, seid);
+ goto done;
+ }
+
+ if (!is_add)
+ {
+ clib_warning ("deid %U marked for removal but not "
+ "found!", format_gid_address, deid);
+ goto done;
+ }
+
+ vnet_lisp_add_del_locator_set (ls, &ls_index);
+
+ /* add mapping */
+ gid_address_copy (&dm_args->deid, deid);
+ dm_args->is_add = 1;
+ dm_args->action = action;
+ dm_args->locator_set_index = ls_index;
+ vnet_lisp_add_del_mapping (dm_args, &dst_map_index);
+
+ /* add fwd tunnel */
+ add_fwd_entry (lcm, src_map_index, dst_map_index);
+ }
+ else
+ {
+ /* delete mapping */
+ if (!is_add)
+ {
+ /* delete forwarding entry */
+ del_fwd_entry (lcm, 0, mi);
+ dm_args->is_add = 0;
+ gid_address_copy (&dm_args->deid, deid);
+ mapping_t * map = pool_elt_at_index (lcm->mapping_pool, mi);
+ dm_args->locator_set_index = map->locator_set_index;
+
+ /* delete mapping associated to fwd entry */
+ vnet_lisp_add_del_mapping (dm_args, 0);
+
+ ls->is_add = 0;
+ ls->index = map->locator_set_index;
+ /* delete locator set */
+ vnet_lisp_add_del_locator_set (ls, 0);
+ }
+ /* update existing locator set */
+ else
+ {
+ if ((u32)~0 == src_map_index)
+ {
+ clib_warning ("seid %U not found!", format_gid_address, seid);
+ goto done;
+ }
+
+ mapping_t * old_map;
+ locator_set_t * old_ls;
+ old_map = pool_elt_at_index (lcm->mapping_pool, mi);
+
+ /* update mapping attributes */
+ old_map->action = action;
+
+ old_ls = pool_elt_at_index(lcm->locator_set_pool,
+ old_map->locator_set_index);
+ if (compare_locators (lcm, old_ls->locator_indices,
+ ls->locators))
+ {
+ /* set locator-set index to overwrite */
+ ls->is_add = 1;
+ ls->index = old_map->locator_set_index;
+ vnet_lisp_add_del_locator_set (ls, 0);
+ add_fwd_entry (lcm, src_map_index, mi);
+ }
+ }
+ }
+ /* success */
+ rc = 0;
+done:
+ vec_free (ls->locators);
+ return rc;
+}
+
+/**
+ * Handler for add/del remote mapping CLI.
+ *
+ * @param vm vlib context
+ * @param input input from user
+ * @param cmd cmd
+ * @return pointer to clib error structure
+ */
+static clib_error_t *
+lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ clib_error_t * error = 0;
+ unformat_input_t _line_input, * line_input = &_line_input;
+ u8 is_add = 1;
+ ip_address_t rloc, * rlocs = 0;
+ ip_prefix_t * deid_ippref, * seid_ippref;
+ gid_address_t seid, deid;
+ u8 deid_set = 0;
+ u8 * s = 0;
+ u32 vni, action = ~0;
+
+ /* Get a line of input. */
+ if (! unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ memset (&deid, 0, sizeof (deid));
+ memset (&seid, 0, sizeof (seid));
+
+ seid_ippref = &gid_address_ippref(&seid);
+ deid_ippref = &gid_address_ippref(&deid);
+
+ gid_address_type (&deid) = GID_ADDR_IP_PREFIX;
+ gid_address_type (&seid) = GID_ADDR_IP_PREFIX;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ is_add = 0;
+ if (unformat (line_input, "add"))
+ ;
+ else if (unformat (line_input, "deid %U",
+ unformat_ip_prefix, deid_ippref))
+ {
+ deid_set = 1;
+ }
+ else if (unformat (line_input, "vni %u", &vni))
+ {
+ gid_address_set_vni (&seid, vni);
+ gid_address_set_vni (&deid, vni);
+ }
+ else if (unformat (line_input, "seid %U",
+ unformat_ip_prefix, seid_ippref))
+ ;
+ else if (unformat (line_input, "rloc %U", unformat_ip_address, &rloc))
+ vec_add1 (rlocs, rloc);
+ else if (unformat (line_input, "action %s", &s))
+ {
+ if (!strcmp ((char *)s, "no-action"))
+ action = ACTION_NONE;
+ if (!strcmp ((char *)s, "natively-forward"))
+ action = ACTION_NATIVELY_FORWARDED;
+ if (!strcmp ((char *)s, "send-map-request"))
+ action = ACTION_SEND_MAP_REQUEST;
+ else if (!strcmp ((char *)s, "drop"))
+ action = ACTION_DROP;
+ else
+ {
+ clib_warning ("invalid action: '%s'", s);
+ goto done;
+ }
+ }
+ else
+ {
+ clib_warning ("parse error");
+ goto done;
+ }
+ }
+
+ if (!deid_set)
+ {
+ clib_warning ("missing deid!");
+ goto done;
+ }
+
+ 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;
+ }
+
+ if (is_add && (~0 == action)
+ && 0 == vec_len (rlocs))
+ {
+ clib_warning ("no action set for negative map-reply!");
+ goto done;
+ }
+
+ int rv = vnet_lisp_add_del_remote_mapping (&deid, &seid, rlocs,
+ action, is_add);
+ if (rv)
+ clib_warning ("failed to %s remote mapping!",
+ is_add ? "add" : "delete");
+
+done:
+ unformat_free (line_input);
+ if (s)
+ vec_free (s);
+ return error;
+}
+
+VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = {
+ .path = "lisp remote-mapping",
+ .short_help = "lisp remote-mapping add|del vni <vni>"
+ "deid <dest-eid> seid <src-eid> [action <no-action|natively-forward|"
+ "send-map-request|drop>] rloc <dst-locator> [rloc <dst-locator> ... ]",
+ .function = lisp_add_del_remote_mapping_command_fn,
+};
+
+int
+vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add)
+{
+ lisp_cp_main_t * lcm = vnet_lisp_cp_get_main ();
+ u32 locator_set_index = ~0;
+ mapping_t * m;
+ uword * p;
+
+ p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
+ if (!p)
+ {
+ clib_warning ("locator-set %v doesn't exist", locator_set_name);
+ return -1;
+ }
+ locator_set_index = p[0];
+
+ if (is_add)
+ {
+ pool_get (lcm->mapping_pool, m);
+ m->locator_set_index = locator_set_index;
+ m->local = 1;
+ lcm->pitr_map_index = m - lcm->mapping_pool;
+
+ /* enable pitr mode */
+ lcm->lisp_pitr = 1;
+ }
+ else
+ {
+ /* remove pitr mapping */
+ pool_put_index (lcm->mapping_pool, lcm->pitr_map_index);
+
+ /* disable pitr mode */
+ lcm->lisp_pitr = 0;
+ }
+ return 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)
+{
+ u8 locator_name_set = 0;
+ u8 * locator_set_name = 0;
+ u8 is_add = 1;
+ unformat_input_t _line_input, * line_input = &_line_input;
+
+ /* 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, "ls %_%v%_", &locator_set_name))
+ locator_name_set = 1;
+ else if (unformat (line_input, "disable"))
+ is_add = 0;
+ else
+ return clib_error_return (0, "parse error");
+ }
+
+ if (!locator_name_set)
+ {
+ clib_warning ("No locator set specified!");
+ goto done;
+ }
+ vnet_lisp_pitr_set_locator_set (locator_set_name, is_add);
+
+done:
+ if (locator_set_name)
+ vec_free (locator_set_name);
+ return 0;
+}
+
+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,
+};
+
static clib_error_t *
lisp_show_local_eid_table_command_fn (vlib_main_t * vm,
unformat_input_t * input,
return 0;
}
+clib_error_t *
+vnet_lisp_enable_disable (u8 is_enabled)
+{
+ vnet_lisp_gpe_add_del_iface_args_t _ai, * ai= &_ai;
+ uword * table_id, * refc;
+ u32 i;
+ 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_enabled;
+ error = vnet_lisp_gpe_enable_disable (a);
+ if (error)
+ {
+ return clib_error_return (0, "failed to %s data-plane!",
+ a->is_en ? "enable" : "disable");
+ }
+
+ if (is_enabled)
+ {
+ /* enable all ifaces */
+ for (i = 0; i < vec_len (lcm->local_mappings_indexes); i++)
+ {
+ mapping_t * m = vec_elt_at_index (lcm->mapping_pool, i);
+ ai->is_add = 1;
+ ai->vni = gid_address_vni (&m->eid);
+
+ refc = hash_get (lcm->dp_if_refcount_by_vni, ai->vni);
+ if (!refc)
+ {
+ table_id = hash_get (lcm->table_id_by_vni, ai->vni);
+ if (table_id)
+ {
+ ai->table_id = table_id[0];
+ /* enables interface and adds defaults */
+ vnet_lisp_gpe_add_del_iface (ai, 0);
+ }
+ else
+ return clib_error_return (0, "no table_id found for vni %u!",
+ ai->vni);
+
+ hash_set (lcm->dp_if_refcount_by_vni, ai->vni, 1);
+ }
+ else
+ {
+ refc[0]++;
+ }
+ }
+ }
+ else
+ {
+ /* clear refcount table */
+ hash_free (lcm->dp_if_refcount_by_vni);
+ hash_free (lcm->fwd_entry_by_mapping_index);
+ pool_free (lcm->fwd_entry_pool);
+ }
+
+ /* update global flag */
+ lcm->is_enabled = is_enabled;
+
+ return 0;
+}
+
+static clib_error_t *
+lisp_enable_disable_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_enabled = 0;
+ u8 is_set = 0;
+
+ /* 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, "enable"))
+ {
+ is_set = 1;
+ is_enabled = 1;
+ }
+ else if (unformat (line_input, "disable"))
+ is_set = 1;
+ else
+ {
+ 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 vnet_lisp_enable_disable (is_enabled);
+}
+
+VLIB_CLI_COMMAND (lisp_cp_enable_disable_command) = {
+ .path = "lisp",
+ .short_help = "lisp [enable|disable]",
+ .function = lisp_enable_disable_command_fn,
+};
+
+u8
+vnet_lisp_enable_disable_status (void)
+{
+ 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 ();
+ 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)
+{
+ u8 * msg = 0;
+ msg = format (msg, "feature: %U\ngpe: %U\n",
+ format_lisp_status, format_vnet_lisp_gpe_status);
+ vlib_cli_output (vm, "%v", msg);
+ vec_free (msg);
+ return 0;
+}
+
+VLIB_CLI_COMMAND (lisp_show_status_command) = {
+ .path = "show lisp status",
+ .short_help = "show lisp status",
+ .function = lisp_show_status_command_fn,
+};
static clib_error_t *
lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
done:
vec_free(locators);
- vec_free(locator_set_name);
+ if (locator_set_name)
+ vec_free (locator_set_name);
return error;
}
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> "
- "<priority> <weight>",
+ "p <priority> w <weight>",
.function = lisp_add_del_locator_set_command_fn,
};
typedef struct
{
gid_address_t dst_eid;
- ip4_address_t map_resolver_ip;
+ ip_address_t map_resolver_ip;
} lisp_cp_lookup_trace_t;
u8 *
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_ip4_address, &t->map_resolver_ip, format_gid_address,
+ format_ip_address, &t->map_resolver_ip, format_gid_address,
&t->dst_eid);
return s;
}
}
void
-get_local_iface_ip_for_dst (lisp_cp_main_t *lcm, ip_address_t * dst,
+get_mr_and_local_iface_ip (lisp_cp_main_t *lcm, ip_address_t * mr_ip,
ip_address_t * sloc)
{
u32 adj_index;
ip_adjacency_t * adj;
ip_interface_address_t * ia = 0;
- ip_lookup_main_t * lm = &lcm->im4->lookup_main;
+ ip_lookup_main_t * lm;
ip4_address_t * l4 = 0;
ip6_address_t * l6 = 0;
+ ip_address_t * mrit;
- adj_index = ip_fib_lookup_with_table (lcm, 0, dst);
- adj = ip_get_adjacency (lm, adj_index);
+ if (vec_len(lcm->map_resolvers) == 0)
+ {
+ clib_warning("No map-resolver configured");
+ return;
+ }
- if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP)
+ /* 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)
{
- ia = pool_elt_at_index(lm->if_address_pool, adj->if_address_index);
- if (ip_addr_version(dst) == IP4)
+ lm = ip_addr_version (mrit) == IP4 ?
+ &lcm->im4->lookup_main : &lcm->im6->lookup_main;
+
+ adj_index = ip_fib_lookup_with_table (lcm, 0, mrit);
+ adj = ip_get_adjacency (lm, adj_index);
+
+ if (adj == 0)
+ continue;
+
+ if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP)
{
- l4 = ip_interface_address_get_address (lm, ia);
+ ia = pool_elt_at_index(lm->if_address_pool, adj->if_address_index);
+ if (ip_addr_version(mrit) == IP4)
+ {
+ l4 = ip_interface_address_get_address (lm, ia);
+ }
+ else
+ {
+ l6 = ip_interface_address_get_address (lm, ia);
+ }
}
- else
+ else if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE)
{
- l6 = ip_interface_address_get_address (lm, ia);
+ /* find sw_if_index in rewrite header */
+ u32 sw_if_index = adj->rewrite_header.sw_if_index;
+
+ /* find suitable address */
+ if (ip_addr_version(mrit) == 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;
+ }));
+ }
}
- }
- 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;
- /* find suitable address */
- if (ip_addr_version(dst) == IP4)
+ if (l4)
{
- /* 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;
- }));
+ ip_addr_v4(sloc).as_u32 = l4->as_u32;
+ ip_addr_version(sloc) = IP4;
+ ip_address_copy(mr_ip, mrit);
+ return;
}
- else
+ else if (l6)
{
- /* 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;
- }));
+ clib_memcpy (&ip_addr_v6(sloc), l6, sizeof(*l6));
+ ip_addr_version(sloc) = IP6;
+ ip_address_copy(mr_ip, mrit);
+ return;
}
}
- else
- {
- clib_warning("Can't find local local interface ip for dst %U",
- format_ip_address, dst);
- return;
- }
- if (l4)
- {
- ip_addr_v4(sloc).as_u32 = l4->as_u32;
- ip_addr_version(sloc) = IP4;
- }
- else if (l6)
- {
- clib_memcpy (&ip_addr_v6(sloc), l6, sizeof(*l6));
- ip_addr_version(sloc) = IP6;
- }
- else
- {
- clib_warning("Can't find local interface addr for dst %U",
- format_ip_address, dst);
- }
+ clib_warning("Can't find map-resolver and local interface ip!");
+ return;
}
-
-static ip_address_t *
+static gid_address_t *
build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set)
{
ip4_address_t * l4;
locator_t * loc;
u32 * loc_indexp;
ip_interface_address_t * ia = 0;
- ip_address_t * rlocs = 0;
- ip_address_t _rloc, * rloc = &_rloc;
+ 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);
+ gid_address_type (gid) = GID_ADDR_IP_PREFIX;
for (i = 0; i < vec_len(loc_set->locator_indices); i++)
{
loc_indexp = vec_elt_at_index(loc_set->locator_indices, i);
loc->sw_if_index, 1 /* unnumbered */,
({
l4 = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
- ip_addr_v4(rloc) = l4[0];
- vec_add1(rlocs, rloc[0]);
+ ip_addr_v4 (rloc) = l4[0];
+ ip_prefix_len (ippref) = 32;
+ vec_add1 (rlocs, gid[0]);
}));
ip_addr_version(rloc) = IP6;
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];
- vec_add1(rlocs, rloc[0]);
+ l6 = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
+ ip_addr_v6 (rloc) = l6[0];
+ ip_prefix_len (ippref) = 128;
+ vec_add1 (rlocs, gid[0]);
}));
}
return rlocs;
static vlib_buffer_t *
build_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm,
gid_address_t * seid, gid_address_t * deid,
- locator_set_t * loc_set, u8 is_smr_invoked,
+ 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;
u32 bi;
- ip_address_t * mr_ip, sloc;
- ip_address_t * rlocs = 0;
+ gid_address_t * rlocs = 0;
if (vlib_buffer_alloc (vm, &bi, 1) != 1)
{
/* push ecm: udp-ip-lisp */
lisp_msg_push_ecm (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, seid, deid);
- /* get map-resolver ip XXX use first*/
- mr_ip = vec_elt_at_index(lcm->map_resolvers, 0);
-
- /* get local iface ip to use in map-request XXX fib 0 for now*/
- get_local_iface_ip_for_dst (lcm, mr_ip, &sloc);
-
/* push outer ip header */
- pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, &sloc,
+ pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
mr_ip);
bi_res[0] = bi;
locator_set_t * loc_set;
mapping_t * map;
pending_map_request_t * pmr;
+ ip_address_t mr_ip, sloc;
/* get locator-set for seid */
- map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
- if (map_index == ~0)
+ if (!lcm->lisp_pitr)
{
- clib_warning("No local mapping found in eid-table for %U!",
- format_gid_address, seid);
- return;
- }
+ 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;
+ }
- map = pool_elt_at_index (lcm->mapping_pool, map_index);
+ map = pool_elt_at_index (lcm->mapping_pool, map_index);
- if (!map->local)
+ if (!map->local)
+ {
+ clib_warning("Mapping found for src eid %U is not marked as local!",
+ format_gid_address, seid);
+ return;
+ }
+ }
+ else
{
- clib_warning("Mapping found for src eid %U is not marked as local!",
- format_gid_address, seid);
- return;
+ map_index = lcm->pitr_map_index;
+ map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
}
+
loc_set = pool_elt_at_index (lcm->locator_set_pool, map->locator_set_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);
+
/* build the encapsulated map request */
- b = build_encapsulated_map_request (vm, lcm, seid, deid, loc_set,
- is_smr_invoked, &nonce, &bi);
+ b = build_encapsulated_map_request (vm, lcm, seid, deid, loc_set, &mr_ip,
+ &sloc, is_smr_invoked, &nonce, &bi);
if (!b)
return;
+ /* set fib index and lookup node */
vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0;
- next_index = (ip_prefix_version(&gid_address_ippref(seid)) == IP4) ?
+ next_index = (ip_addr_version(&mr_ip) == IP4) ?
ip4_lookup_node.index : ip6_lookup_node.index;
f = vlib_get_frame_to_node (vm, next_index);
lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
- u32 * from, * to_next_drop;
+ 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;
gid_address_t src, dst;
ip_prefix_t * spref, * dpref;
- gid_address_type (&src) = IP_PREFIX;
+ gid_address_type (&src) = GID_ADDR_IP_PREFIX;
spref = &gid_address_ippref(&src);
- gid_address_type (&dst) = IP_PREFIX;
+ gid_address_type (&dst) = GID_ADDR_IP_PREFIX;
dpref = &gid_address_ippref(&dst);
pi0 = from[0];
ip_prefix_len(spref) = ip_address_max_len (ip_prefix_version(spref));
ip_prefix_len(dpref) = ip_address_max_len (ip_prefix_version(dpref));
- /* send map-request */
- send_encapsulated_map_request (vm, lcm, &src, &dst, 0);
-
- pkts_mapped++;
+ /* 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 == ACTION_SEND_MAP_REQUEST)
+ {
+ /* send map-request */
+ send_encapsulated_map_request (vm, lcm, &src, &dst, 0);
+ pkts_mapped++;
+ }
+ else
+ {
+ si = gid_dictionary_lookup (&lcm->mapping_index_by_gid,
+ &src);
+ if (~0 != si)
+ {
+ add_fwd_entry (lcm, si, di);
+ }
+ }
+ }
+ else
+ {
+ /* send map-request */
+ send_encapsulated_map_request (vm, lcm, &src, &dst, 0);
+ pkts_mapped++;
+ }
if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
{
lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, p0,
sizeof(*tr));
+
+ memset(tr, 0, sizeof(*tr));
gid_address_copy (&tr->dst_eid, &dst);
- clib_memcpy (&tr->map_resolver_ip,
- vec_elt_at_index(lcm->map_resolvers, 0),
- sizeof(ip_address_t));
+ 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));
+ }
}
}
return ip_interface_address_get_address (lm, ia);
}
-void
+static void
del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index,
u32 dst_map_index)
{
a->is_add = 0;
a->dlocator = fe->dst_loc;
a->slocator = fe->src_loc;
- a->vni = 0; // XXX should be part of mapping/eid
+ a->vni = gid_address_vni(&a->deid);
gid_address_copy(&a->deid, &fe->deid);
vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
pool_put(lcm->fwd_entry_pool, fe);
}
-void
+static void
add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index)
{
mapping_t * src_map, * dst_map;
locator_set_t * dst_ls, * src_ls;
- u32 i, minp = ~0;
+ u32 i, minp = ~0, sw_if_index;
locator_t * dl = 0;
uword * feip = 0, * tidp;
+ fwd_entry_t* fe;
vnet_lisp_gpe_add_del_fwd_entry_args_t _a, * a = &_a;
memset (a, 0, sizeof(*a));
src_map = pool_elt_at_index (lcm->mapping_pool, src_map_index);
dst_map = pool_elt_at_index (lcm->mapping_pool, dst_map_index);
+ gid_address_copy (&a->deid, &dst_map->eid);
+ a->vni = gid_address_vni(&a->deid);
+
+ tidp = hash_get(lcm->table_id_by_vni, a->vni);
+ if (!tidp)
+ {
+ clib_warning("vni %d not associated to a vrf!", a->vni);
+ return;
+ }
+ a->table_id = tidp[0];
+
/* XXX simple forwarding policy: first lowest (value) priority locator */
dst_ls = pool_elt_at_index (lcm->locator_set_pool,
dst_map->locator_set_index);
{
u32 li = vec_elt (dst_ls->locator_indices, i);
locator_t * l = pool_elt_at_index (lcm->locator_pool, li);
- if (l->priority < minp && gid_address_type(&l->address) == IP_PREFIX)
+ if (l->priority < minp && gid_address_type(&l->address)
+ == GID_ADDR_IP_PREFIX)
{
minp = l->priority;
dl = l;
}
if (dl)
{
- src_ls = pool_elt_at_index (lcm->locator_set_pool,
- src_map->locator_set_index);
- for (i = 0; i < vec_len (src_ls->locator_indices); i++)
+ src_ls = pool_elt_at_index(lcm->locator_set_pool,
+ src_map->locator_set_index);
+ for (i = 0; i < vec_len(src_ls->locator_indices); i++)
{
u32 li = vec_elt (src_ls->locator_indices, i);
locator_t * sl = pool_elt_at_index (lcm->locator_pool, li);
}
}
}
+
/* insert data plane forwarding entry */
- u32 sw_if_index;
a->is_add = 1;
if (dl)
a->dlocator = gid_address_ip(&dl->address);
a->action = dst_map->action;
}
- gid_address_copy (&a->deid, &dst_map->eid);
- a->vni = 0; // XXX should be part of mapping/eid
-
- tidp = hash_get(lcm->table_id_by_vni, a->vni);
- if (!tidp)
- {
- clib_warning("vni %d not associated to a vrf!", a->vni);
- return;
- }
- a->table_id = tidp[0];
-
+ /* TODO remove */
u8 ipver = ip_prefix_version(&gid_address_ippref(&a->deid));
a->decap_next_index = (ipver == IP4) ?
LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
- /* XXX tunnels work only with IP4 now */
vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
/* add tunnel to fwd entry table XXX check return value from DP insertion */
- fwd_entry_t* fe;
pool_get (lcm->fwd_entry_pool, fe);
fe->dst_loc = a->dlocator;
fe->src_loc = a->slocator;
void
process_map_reply (lisp_cp_main_t * lcm, vlib_buffer_t * b)
{
+ mapping_t * old_map;
+ locator_t * loc;
u32 len = 0, i, ls_index = 0;
void * h;
vnet_lisp_add_del_locator_set_args_t _ls_arg, * ls_arg = &_ls_arg;
if (len == ~0)
{
clib_warning ("Failed to parse mapping record!");
+ vec_foreach (loc, ls_arg->locators)
+ {
+ locator_free (loc);
+ }
vec_free(ls_arg->locators);
return;
}
mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &m_args->deid);
+ old_map = mi != ~0 ? pool_elt_at_index(lcm->mapping_pool, mi) : 0;
/* if mapping already exists, decide if locators (and forwarding) should
* be updated and be done */
- if (mi != ~0)
+ if (old_map != 0 && !gid_address_cmp (&old_map->eid, &m_args->deid))
{
- mapping_t * old_map;
locator_set_t * old_ls;
- old_map = pool_elt_at_index(lcm->mapping_pool, mi);
/* update mapping attributes */
old_map->action = m_args->action;
gid_address_t src, dst;
// u64 nonce;
u32 i, len = 0;
- gid_address_t * itr_rlocs = 0;
+ gid_address_t * itr_rlocs = 0, * rloc;
mreq_hdr = vlib_buffer_get_current (b);
vlib_buffer_pull (b, sizeof(*mreq_hdr));
if (len == ~0)
return;
+ /* TODO: RLOCs are currently unused, so free them for now */
+ vec_foreach (rloc, itr_rlocs)
+ {
+ gid_address_free (rloc);
+ }
+
/* parse eid records and send SMR-invoked map-requests */
for (i = 0; i < MREQ_REC_COUNT(mreq_hdr); i++)
{
Code Review / vpp.git / blobdiff