X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Flisp-cp%2Fcontrol.c;h=4e955c4de472d37ad9a6c0c9288d26ff0e13e199;hb=6cc6f9175c46d9a98db43f47da35119e2b59aa00;hp=1e3b98ff5c68ebdc184bd3be9a8ac466e4d693ec;hpb=b0ccf03b6e1d29b473e092d42768ced9f2ae8508;p=vpp.git diff --git a/vnet/vnet/lisp-cp/control.c b/vnet/vnet/lisp-cp/control.c index 1e3b98ff5c6..4e955c4de47 100644 --- a/vnet/vnet/lisp-cp/control.c +++ b/vnet/vnet/lisp-cp/control.c @@ -18,49 +18,381 @@ #include #include +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) +{ + if (ip_addr_version (dst) == IP4) + 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)); +} + +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; + + 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; +} + +/** + * 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) +{ + ip_lookup_main_t * lm; + + lm = ip_addr_version (dst) == IP4 ? + &lcm->im4->lookup_main : &lcm->im6->lookup_main; + + return ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm); +} + +/** + * 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; + + ASSERT(result != 0); + + 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; + + ip_address_set (result, addr, ipver); + return 1; +} + +static int +dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_add) +{ + uword * table_id, * intf; + vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai; + + table_id = hash_get(lcm->table_id_by_vni, vni); + + if (!table_id) + { + clib_warning ("vni %d not associated to a vrf!", vni); + return VNET_API_ERROR_INVALID_VALUE; + } + + intf = hash_get(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->table_id = table_id[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); + } + } + else + { + if (intf == 0) + { + clib_warning("interface for vni %d doesn't exist!", vni); + return VNET_API_ERROR_INVALID_VALUE; + } + + ai->is_add = 0; + ai->vni = vni; + ai->table_id = table_id[0]; + vnet_lisp_gpe_add_del_iface (ai, 0); + hash_unset(lcm->dp_intf_by_vni, vni); + } + + return 0; +} + static void -add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index); +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)); + + 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]); + + /* delete dp fwd entry */ + u32 sw_if_index; + a->is_add = 0; + a->dlocator = fe->dst_loc; + a->slocator = fe->src_loc; + 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); + + /* delete entry in fwd table */ + hash_unset(lcm->fwd_entry_by_mapping_index, dst_map_index); + pool_put(lcm->fwd_entry_pool, fe); +} + +/** + * Finds first remote locator with best (lowest) priority that has a local + * peer locator with an underlying route to it. + * + */ +static u32 +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, 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; + uword * checked = 0; + + 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) + return 0; + + while (!done) + { + 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); + l = pool_elt_at_index(lcm->locator_pool, li); + + /* we don't support non-IP locators for now */ + if (gid_address_type(&l->address) != GID_ADDR_IP_PREFIX) + continue; + + if (l->priority < minp && l->priority >= limitp) + { + minp = l->priority; + rmt = l; + check_index = i; + } + } + /* check if a local locator with a route to remote locator exists */ + if (rmt != 0) + { + 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 */ + if (sl->sw_if_index == esi) + { + 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)); + ip_address_copy(lcl_loc, lcl); + done = 2; + } + } + + /* skip this remote locator in next searches */ + limitp = minp; + hash_set(checked, check_index, 1); + } + else + done = 1; + } + hash_free(checked); + return (done == 2) ? 1 : 0; +} static void -del_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) +{ + mapping_t * src_map, * dst_map; + u32 sw_if_index; + uword * feip = 0, * tidp; + fwd_entry_t* fe; + vnet_lisp_gpe_add_del_fwd_entry_args_t _a, * a = &_a; -static u8 -compare_locators (lisp_cp_main_t *lcm, u32 * old_ls_indexes, - locator_t * new_locators); + memset (a, 0, sizeof(*a)); + + /* remove entry if it already exists */ + feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index); + if (feip) + dp_del_fwd_entry (lcm, src_map_index, dst_map_index); + + 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]; + + /* insert data plane forwarding entry */ + a->is_add = 1; + + /* find best locator pair that 1) verifies LISP policy 2) are connected */ + if (0 == get_locator_pair (lcm, src_map, dst_map, &a->slocator, &a->dlocator)) + { + /* negative entry */ + a->is_negative = 1; + a->action = dst_map->action; + } + + /* 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; + + vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index); -/* Stores mapping in map-cache. It does NOT program data plane forwarding for - * remote/learned mappings. */ + /* add tunnel to fwd entry table XXX check return value from DP insertion */ + pool_get (lcm->fwd_entry_pool, fe); + fe->dst_loc = a->dlocator; + fe->src_loc = a->slocator; + gid_address_copy (&fe->deid, &a->deid); + hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index, + fe - lcm->fwd_entry_pool); +} + +/** + * Add/remove mapping to/from map-cache. Overwriting not allowed. + */ int -vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a, - u32 * map_index_result) +vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a, + 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; - mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->deid); + 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->deid)) + &a->eid)) { clib_warning ("eid %U found in the eid-table", format_gid_address, - &a->deid); + &a->eid); return VNET_API_ERROR_VALUE_EXIST; } pool_get(lcm->mapping_pool, m); - gid_address_copy (&m->eid, &a->deid); + gid_address_copy (&m->eid, &a->eid); 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; - gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->deid, map_index, + gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, map_index, 1); if (pool_is_free_index(lcm->locator_set_pool, a->locator_set_index)) @@ -88,7 +420,7 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a, if (mi == GID_LOOKUP_MISS) { clib_warning("eid %U not found in the eid-table", format_gid_address, - &a->deid); + &a->eid); return VNET_API_ERROR_INVALID_VALUE; } @@ -116,13 +448,9 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a, } vec_del1(lcm->local_mappings_indexes, k); } - else - { - /* remove tunnel ??? */ - } /* remove mapping from dictionary */ - gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->deid, 0, 0); + gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, 0, 0); gid_address_free (&m->eid); pool_put_index (lcm->mapping_pool, mi); } @@ -130,14 +458,16 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a, return 0; } -/* Stores mapping in map-cache and programs data plane for local mappings. */ +/** + * Add/update/delete mapping to/in/from map-cache. + */ int vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a, u32 * map_index_result) { - uword * table_id, * refc; - u32 rv, vni; - vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai; + uword * table_id; + u32 vni; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); if (vnet_lisp_enable_disable_status () == 0) @@ -146,13 +476,7 @@ vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a, return VNET_API_ERROR_LISP_DISABLED; } - 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; - + vni = gid_address_vni(&a->eid); table_id = hash_get(lcm->table_id_by_vni, vni); if (!table_id) @@ -161,45 +485,8 @@ vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a, return VNET_API_ERROR_INVALID_VALUE; } - refc = hash_get(lcm->dp_if_refcount_by_vni, vni); - - /* enable/disable data-plane interface */ - if (a->is_add) - { - /* create interface or update refcount */ - if (!refc) - { - ai->is_add = 1; - 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 - { - refc[0]++; - } - } - else - { - /* since this is a remove for an existing eid, the iface should exist */ - ASSERT(refc != 0); - refc[0]--; - - /* remove iface if needed */ - if (refc[0] == 0) - { - ai->is_add = 0; - 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); - } - } - - return rv; + /* store/remove mapping from map-cache */ + return vnet_lisp_map_cache_add_del (a, map_index_result); } static clib_error_t * @@ -211,6 +498,7 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input, u8 is_add = 1; gid_address_t eid; ip_prefix_t * prefp = &gid_address_ippref(&eid); + u8 * mac = gid_address_mac(&eid); gid_address_t * eids = 0; clib_error_t * error = 0; u8 * locator_set_name = 0; @@ -235,6 +523,12 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input, gid_address_vni (&eid) = vni; else if (unformat (line_input, "eid %U", unformat_ip_prefix, prefp)) { + gid_address_type (&eid) = GID_ADDR_IP_PREFIX; + vec_add1(eids, eid); + } + else if (unformat (line_input, "eid %U", unformat_mac_address, mac)) + { + gid_address_type (&eid) = GID_ADDR_MAC; vec_add1(eids, eid); } else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name)) @@ -256,8 +550,7 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input, } /* XXX treat batch configuration */ - gid_address_type (&eid) = GID_ADDR_IP_PREFIX; - a->deid = eid; + a->eid = eid; a->is_add = is_add; a->locator_set_index = locator_set_index; a->local = 1; @@ -265,14 +558,14 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input, rv = vnet_lisp_add_del_local_mapping (a, &map_index); if (0 != rv) { - error = clib_error_return(0, "failed to %s eid-table!", + 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->deid); + gid_address_free (&a->eid); return error; } @@ -308,12 +601,15 @@ vnet_lisp_eid_table_map (u32 vni, u32 vrf, u8 is_add) { if (table_id || vnip) { - clib_warning ("vni %d or vrf %d already used in any vrf/vni " + clib_warning ("vni %d or vrf %d already used in vrf/vni " "mapping!", vni, vrf); return -1; } hash_set (lcm->table_id_by_vni, vni, vrf); hash_set (lcm->vni_by_table_id, vrf, vni); + + /* create dp iface */ + dp_add_del_iface (lcm, vni, 1); } else { @@ -325,6 +621,9 @@ vnet_lisp_eid_table_map (u32 vni, u32 vrf, u8 is_add) } hash_unset (lcm->table_id_by_vni, vni); hash_unset (lcm->vni_by_table_id, vrf); + + /* remove dp iface */ + dp_add_del_iface (lcm, vni, 0); } return 0; } @@ -348,140 +647,69 @@ lisp_eid_table_map_command_fn (vlib_main_t * vm, is_add = 0; else if (unformat (line_input, "vni %d", &vni)) ; - else if (unformat (line_input, "vrf %d", &vrf)) - ; - else - { - return unformat_parse_error (line_input); - } - } - vnet_lisp_eid_table_map (vni, vrf, is_add); - return 0; -} - -VLIB_CLI_COMMAND (lisp_eid_table_map_command) = { - .path = "lisp eid-table map", - .short_help = "lisp eid-table map [del] vni vrf ", - .function = lisp_eid_table_map_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) + else if (unformat (line_input, "vrf %d", &vrf)) + ; + else { - clib_warning ("eid %U marked for removal, but not found in " - "map-cache!", unformat_gid_address, deid); - return VNET_API_ERROR_INVALID_VALUE; + return unformat_parse_error (line_input); } + } + vnet_lisp_eid_table_map (vni, vrf, is_add); + return 0; +} + +VLIB_CLI_COMMAND (lisp_eid_table_map_command) = { + .path = "lisp eid-table map", + .short_help = "lisp eid-table map [del] vni vrf ", + .function = lisp_eid_table_map_command_fn, +}; - /* 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; +/* 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) +{ + u32 i, old_li; + locator_t * old_loc, * new_loc; - /* delete mapping associated to fwd entry */ - vnet_lisp_add_del_mapping (dm_args, 0); + if (vec_len (old_ls_indexes) != vec_len(new_locators)) + return 1; - refc = hash_get (lcm->dp_if_refcount_by_vni, vni); - ASSERT(refc != 0); - refc[0]--; + 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); - /* 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); - } + new_loc = vec_elt_at_index(new_locators, i); + + if (locator_cmp (old_loc, new_loc)) + return 1; } - return rv; + return 0; } /** - * Adds/removes/updates static remote mapping. + * Adds/removes/updates mapping. Does not program forwarding. * - * This function also modifies forwarding entries if needed. - * - * @param deid destination EID - * @param seid source EID + * @param eid end-host identifier * @param rlocs vector of remote locators * @param action action for negative map-reply * @param is_add add mapping if non-zero, delete otherwise - * @param del_all if set, delete all remote mappings + * @param res_map_index the map-index that was created/updated/removed. It is + * set to ~0 if no action is taken. * @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, - u8 del_all) +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) { - 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; + 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, src_map_index; - locator_t loc; - ip_address_t * dl; - int rc = -1; + u32 mi, ls_index = 0, dst_map_index; + mapping_t * old_map; if (vnet_lisp_enable_disable_status() == 0) { @@ -489,117 +717,94 @@ vnet_lisp_add_del_remote_mapping (gid_address_t * deid, gid_address_t * seid, return VNET_API_ERROR_LISP_DISABLED; } - if (del_all) - return vnet_lisp_clear_all_remote_mappings (); + if (res_map_index) + res_map_index[0] = ~0; - memset (sm_args, 0, sizeof (sm_args[0])); - memset (dm_args, 0, sizeof (dm_args[0])); - memset (ls, 0, sizeof (ls[0])); + memset (m_args, 0, sizeof (m_args[0])); + memset (ls_args, 0, sizeof (ls_args[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); + 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; - mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, deid); - /* new mapping */ - if ((u32)~0 == mi) + if (is_add) { - ls->is_add = 1; - ls->index = ~0; + /* 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; - /* process a negative mapping */ - if (0 == vec_len (rlocs)) - return lisp_add_del_negative_static_mapping (deid, ls, - action, is_add); + /* update mapping attributes */ + old_map->action = action; + old_map->authoritative = authoritative; + old_map->ttl = ttl; - if ((u32)~0 == src_map_index) - { - clib_warning ("seid %U not found!", format_gid_address, seid); - goto done; + 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; + } } - - if (!is_add) + /* new mapping */ + else { - clib_warning ("deid %U marked for removal but not " - "found!", format_gid_address, deid); - goto done; - } + ls_args->is_add = 1; + ls_args->index = ~0; - vnet_lisp_add_del_locator_set (ls, &ls_index); + vnet_lisp_add_del_locator_set (ls_args, &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 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 fwd tunnel */ - add_fwd_entry (lcm, src_map_index, dst_map_index); + if (res_map_index) + res_map_index[0] = dst_map_index; + } } else { - /* delete mapping */ - if (!is_add) + if (old_map == 0 || gid_address_cmp (&old_map->eid, eid) != 0) { - /* 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); + clib_warning("cannot delete mapping for eid %U", format_gid_address, + eid); + return -1; } - /* 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); + m_args->is_add = 0; + gid_address_copy (&m_args->eid, eid); + m_args->locator_set_index = old_map->locator_set_index; - /* update mapping attributes */ - old_map->action = action; + /* delete mapping associated from map-cache */ + vnet_lisp_map_cache_add_del (m_args, 0); - 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); - } - } + ls_args->is_add = 0; + ls_args->index = old_map->locator_set_index; + /* delete locator set */ + vnet_lisp_add_del_locator_set (ls_args, 0); + + /* return old mapping index */ + if (res_map_index) + res_map_index[0] = mi; } + /* success */ - rc = 0; -done: - vec_free (ls->locators); - return rc; + return 0; } int -vnet_lisp_clear_all_remote_mappings (void) +vnet_lisp_clear_all_remote_adjacencies (void) { int rv = 0; u32 mi, * map_indices = 0, * map_indexp; @@ -617,14 +822,14 @@ vnet_lisp_clear_all_remote_mappings (void) mapping_t * map = pool_elt_at_index (lcm->mapping_pool, map_indexp[0]); if (!map->local) { - del_fwd_entry (lcm, 0, map_indexp[0]); + dp_del_fwd_entry (lcm, 0, map_indexp[0]); dm_args->is_add = 0; - gid_address_copy (&dm_args->deid, &map->eid); + 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_add_del_mapping (dm_args, 0); + vnet_lisp_map_cache_add_del (dm_args, 0); ls->is_add = 0; ls->local = 0; @@ -642,6 +847,67 @@ cleanup: return rv; } +/** + * Adds adjacency or removes forwarding entry associated to remote mapping. + * Note that adjacencies are not stored, they only result in forwarding entries + * being created. + */ +int +lisp_add_del_adjacency (lisp_cp_main_t * lcm, gid_address_t * local_eid, + gid_address_t * remote_eid, u8 is_add) +{ + u32 local_mi, remote_mi = ~0; + + if (vnet_lisp_enable_disable_status () == 0) + { + clib_warning ("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } + + 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); + + return -1; + } + + if (is_add) + { + /* TODO 1) check if src/dst 2) once we have src/dst working, use it in + * delete*/ + + /* 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); + + + if (GID_LOOKUP_MISS == local_mi) + { + clib_warning("Local eid %U not found. Cannot add adjacency!", + format_gid_address, local_eid); + + return -1; + } + + /* update forwarding */ + dp_add_fwd_entry (lcm, local_mi, remote_mi); + } + else + dp_del_fwd_entry (lcm, 0, remote_mi); + + return 0; +} + +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); +} + /** * Handler for add/del remote mapping CLI. * @@ -658,25 +924,23 @@ lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm, clib_error_t * error = 0; unformat_input_t _line_input, * line_input = &_line_input; u8 is_add = 1, del_all = 0; - ip_address_t rloc, * rlocs = 0; - ip_prefix_t * deid_ippref, * seid_ippref; - gid_address_t seid, deid; - u8 deid_set = 0, seid_set = 0; + locator_t rloc, * rlocs = 0, * curr_rloc = 0; + ip_prefix_t * eid_ippref; + gid_address_t eid; + u8 * dmac = gid_address_mac (&eid); + u8 eid_set = 0; u8 * s = 0; - u32 vni, action = ~0; + u32 vni, action = ~0, p, w; + int rv; /* 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); + memset(&eid, 0, sizeof(eid)); + memset(&rloc, 0, sizeof(rloc)); - gid_address_type (&deid) = GID_ADDR_IP_PREFIX; - gid_address_type (&seid) = GID_ADDR_IP_PREFIX; + eid_ippref = &gid_address_ippref(&eid); while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { @@ -686,23 +950,38 @@ lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm, is_add = 0; else if (unformat (line_input, "add")) ; - else if (unformat (line_input, "deid %U", - unformat_ip_prefix, deid_ippref)) + else if (unformat (line_input, "eid %U", + unformat_ip_prefix, eid_ippref)) { - deid_set = 1; + gid_address_type (&eid) = GID_ADDR_IP_PREFIX; + eid_set = 1; + } + else if (unformat (line_input, "eid %U", + unformat_mac_address, dmac)) + { + gid_address_type (&eid) = GID_ADDR_MAC; + eid_set = 1; } else if (unformat (line_input, "vni %u", &vni)) { - gid_address_vni (&seid) = vni; - gid_address_vni (&deid) = vni; + gid_address_vni (&eid) = vni; } - else if (unformat (line_input, "seid %U", - unformat_ip_prefix, seid_ippref)) + else if (unformat (line_input, "p %d w %d", &p, &w)) { - seid_set = 1; + 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, + &rloc.address)) + { + vec_add1 (rlocs, rloc); + curr_rloc = &rlocs[vec_len (rlocs) - 1]; } - 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")) @@ -726,41 +1005,179 @@ lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm, } } - if (!del_all) + if (!eid_set) + { + clib_warning ("missing eid!"); + goto done; + } + + if (!del_all) + { + + + if (is_add && (~0 == action) + && 0 == vec_len (rlocs)) + { + clib_warning ("no action set for negative map-reply!"); + goto done; + } + } + else + { + vnet_lisp_clear_all_remote_adjacencies (); + goto done; + } + + /* 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 (); + rv = lisp_add_del_adjacency (lcm, 0, &eid, /* is_add */ 0); + if (rv) + { + goto done; + } + } + + /* add as static remote mapping, i.e., not authoritative and infinite + * ttl */ + 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"); + +done: + vec_free (rlocs); + 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 [del-all] vni " + "eid [action ] rloc [rloc ... ]", + .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) +{ + 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; + gid_address_t seid, deid; + u8 * dmac = gid_address_mac (&deid); + u8 * smac = gid_address_mac (&seid); + u8 deid_set = 0, seid_set = 0; + u8 * s = 0; + u32 vni, action = ~0; + int rv; + + /* 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)); + memset(&rloc, 0, sizeof(rloc)); + + 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; + 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; + } + 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; + } + 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; + } + } + + if (!deid_set) { - if (!deid_set) - { - clib_warning ("missing deid!"); - goto done; - } + clib_warning ("missing deid!"); + goto done; + } - /* if seid not set, make sure the ip version is the same as that of the - * deid. This ensures the seid to be configured will be either 0/0 or - * ::/0 */ + if (GID_ADDR_IP_PREFIX == gid_address_type (&deid)) + { + /* if seid not set, make sure the ip version is the same as that + * 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); if (is_add && - (ip_prefix_version (deid_ippref) != ip_prefix_version(seid_ippref))) + (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; - } + 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, del_all); + memset(a, 0, sizeof(a[0])); + gid_address_copy (&a->seid, &deid); + gid_address_copy (&a->deid, &seid); + + a->is_add = is_add; + rv = vnet_lisp_add_del_adjacency (a); + if (rv) - clib_warning ("failed to %s remote mapping!", - is_add ? "add" : "delete"); + clib_warning("failed to %s adjacency!", is_add ? "add" : "delete"); done: unformat_free (line_input); @@ -769,14 +1186,15 @@ done: 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 " +VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = { + .path = "lisp adjacency", + .short_help = "lisp adjacency add|del vni " "deid seid [action ] rloc [rloc ... ]", - .function = lisp_add_del_remote_mapping_command_fn, + .function = lisp_add_del_adjacency_command_fn, }; + static clib_error_t * lisp_show_map_resolvers_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -891,14 +1309,61 @@ VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = { .function = lisp_pitr_set_locator_set_command_fn, }; +static clib_error_t * +lisp_show_pitr_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 (); + mapping_t * m; + locator_set_t * ls; + u8 * tmp_str = 0; + + vlib_cli_output (vm, "%=20s%=16s", + "pitr", lcm->lisp_pitr ? "locator-set" : ""); + + 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"); + } + } + vec_add1(tmp_str, 0); + + vlib_cli_output (vm, "%=20s%=16s", + "enable", tmp_str); + + vec_free(tmp_str); + + return 0; +} + +VLIB_CLI_COMMAND (lisp_show_pitr_command) = { + .path = "show lisp pitr", + .short_help = "Show pitr", + .function = lisp_show_pitr_command_fn, +}; 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 *); - gid_address_t * gid = va_arg (*args, gid_address_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; u8 first_line = 1; u8 * loc; @@ -908,7 +1373,8 @@ format_eid_entry (u8 * s, va_list * args) if (vec_len (ls->locator_indices) == 0) { - s = format (s, "%-35U%-20s", format_gid_address, gid, type); + s = format (s, "%-35U%-30s%-20u%-u", format_gid_address, gid, + type, ttl, aut); } else { @@ -924,8 +1390,8 @@ format_eid_entry (u8 * s, va_list * args) if (first_line) { - s = format (s, "%-35U%-20s%-v\n", format_gid_address, - gid, type, loc); + s = format (s, "%-35U%-20s%-30v%-20u%-u\n", format_gid_address, + gid, type, loc, ttl, aut); first_line = 0; } else @@ -942,15 +1408,68 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm, { 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; - vlib_cli_output (vm, "%-35s%-20s%-s", "EID", "type", "locators"); - pool_foreach (mapit, lcm->mapping_pool, - ({ - locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool, - mapit->locator_set_index); - vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main, - lcm, &mapit->eid, ls); - })); + memset (&eid, 0, sizeof(eid)); + + /* 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, "eid %U", unformat_gid_address, &eid)) + print_all = 0; + else if (unformat (line_input, "local")) + filter = 1; + else if (unformat(line_input, "remote")) + filter = 2; + else + 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"); + + if (print_all) + { + pool_foreach (mapit, lcm->mapping_pool, + ({ + 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))) + { + continue; + } + vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main, + lcm, mapit, ls); + })); + } + else + { + mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &eid); + 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); + + if (filter && !((1 == filter && ls->local) || + (2 == filter && !ls->local))) + { + return 0; + } + + vlib_cli_output (vm, "%U,", format_eid_entry, lcm->vnet_main, + lcm, mapit, ls); + } return 0; } @@ -1002,9 +1521,8 @@ clean_locator_to_locator_set (lisp_cp_main_t * lcm, u32 lsi) } } -static inline -uword *get_locator_set_index(vnet_lisp_add_del_locator_set_args_t * a, - uword * p) +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(); @@ -1024,9 +1542,9 @@ uword *get_locator_set_index(vnet_lisp_add_del_locator_set_args_t * a, return p; } -static inline -int is_locator_in_locator_set(lisp_cp_main_t * lcm, locator_set_t * ls, - locator_t * loc) +static inline int +is_locator_in_locator_set (lisp_cp_main_t * lcm, locator_set_t * ls, + locator_t * loc) { locator_t * itloc; u32 * locit; @@ -1037,8 +1555,8 @@ int is_locator_in_locator_set(lisp_cp_main_t * lcm, locator_set_t * ls, vec_foreach(locit, ls->locator_indices) { itloc = pool_elt_at_index(lcm->locator_pool, locit[0]); - if (itloc->sw_if_index == loc->sw_if_index || - !gid_address_cmp(&itloc->address, &loc->address)) + 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; @@ -1048,9 +1566,9 @@ int is_locator_in_locator_set(lisp_cp_main_t * lcm, locator_set_t * ls, return 0; } -static inline -void remove_locator_from_locator_set(locator_set_t * ls, u32 * locit, - u32 ls_index, u32 loc_id) +static inline void +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; @@ -1291,16 +1809,14 @@ vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a, } clib_error_t * -vnet_lisp_enable_disable (u8 is_enabled) +vnet_lisp_enable_disable (u8 is_enable) { - vnet_lisp_gpe_add_del_iface_args_t _ai, * ai= &_ai; - uword * table_id, * refc; - u32 i; + u32 vni, table_id; 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; + a->is_en = is_enable; error = vnet_lisp_gpe_enable_disable (a); if (error) { @@ -1308,54 +1824,30 @@ vnet_lisp_enable_disable (u8 is_enabled) a->is_en ? "enable" : "disable"); } - if (is_enabled) + if (is_enable) { /* 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]++; - } - } + hash_foreach(vni, table_id, lcm->table_id_by_vni, ({ + dp_add_del_iface(lcm, vni, 1); + })); } 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); + /* clear interface table */ + hash_free(lcm->dp_intf_by_vni); + hash_free(lcm->fwd_entry_by_mapping_index); + pool_free(lcm->fwd_entry_pool); } /* update global flag */ - lcm->is_enabled = is_enabled; + lcm->is_enabled = is_enable; return 0; } 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; u8 is_enabled = 0; @@ -1600,7 +2092,14 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, ({ u8 * msg = 0; int next_line = 0; - msg = format (msg, "%=16v", lsit->name); + if (lsit->local) + { + msg = format (msg, "%=16v", lsit->name); + } + else + { + msg = format (msg, "%=16s", "remote"); + } vec_foreach (locit, lsit->locator_indices) { if (next_line) @@ -1613,7 +2112,7 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, loc->weight); else msg = format (msg, "%16U%16d%16d\n", format_ip_address, - gid_address_ip(&loc->address), loc->priority, + &gid_address_ip(&loc->address), loc->priority, loc->weight); next_line = 1; } @@ -1672,11 +2171,11 @@ vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a) 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; - u8 is_add = 1; + u8 is_add = 1, addr_set = 0; ip_address_t ip_addr; clib_error_t * error = 0; int rv = 0; @@ -1693,13 +2192,20 @@ lisp_add_del_map_resolver_command_fn (vlib_main_t * vm, else if (unformat (line_input, "del")) is_add = 0; else if (unformat (line_input, "%U", unformat_ip_address, &ip_addr)) - ; + addr_set = 1; else { error = unformat_parse_error(line_input); goto done; } } + + if (!addr_set) + { + error = clib_error_return(0, "Map-resolver address must be set!"); + goto done; + } + a->is_add = is_add; a->address = ip_addr; rv = vnet_lisp_add_del_map_resolver (a); @@ -1725,12 +2231,11 @@ 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 (vnet_lisp_enable_disable_status () == 0) + { + clib_warning("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } if (a->is_add) { @@ -1752,9 +2257,9 @@ vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a) } 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) +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; @@ -1835,168 +2340,45 @@ VLIB_CLI_COMMAND (lisp_show_map_request_command) = { _(DROP, "drop") \ _(MAP_REQUESTS_SENT, "map-request sent") -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 -#undef _ - LISP_CP_LOOKUP_N_ERROR, -} lisp_cp_lookup_error_t; - -typedef enum -{ - LISP_CP_LOOKUP_NEXT_DROP, - LISP_CP_LOOKUP_NEXT_IP4_LOOKUP, - LISP_CP_LOOKUP_NEXT_IP6_LOOKUP, - LISP_CP_LOOKUP_N_NEXT, -} lisp_cp_lookup_next_t; - -typedef struct -{ - gid_address_t dst_eid; - ip_address_t map_resolver_ip; -} lisp_cp_lookup_trace_t; - -u8 * -format_lisp_cp_lookup_trace (u8 * s, va_list * args) -{ - 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 *); - - 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); - 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) -{ - if (ip_addr_version (dst) == IP4) - 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)); -} - -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; - - 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; -} - -/** - * 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) -{ - ip_lookup_main_t * lm; - - lm = ip_addr_version (dst) == IP4 ? - &lcm->im4->lookup_main : &lcm->im6->lookup_main; - - return ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm); -} - -/** - * 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; - - ASSERT(result != 0); +static char * lisp_cp_lookup_error_strings[] = { +#define _(sym,string) string, + foreach_lisp_cp_lookup_error +#undef _ +}; - ipver = ip_addr_version(dst); +typedef enum +{ +#define _(sym,str) LISP_CP_LOOKUP_ERROR_##sym, + foreach_lisp_cp_lookup_error +#undef _ + LISP_CP_LOOKUP_N_ERROR, +} lisp_cp_lookup_error_t; - lm = (ipver == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main; - si = ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm); +typedef enum +{ + LISP_CP_LOOKUP_NEXT_DROP, + LISP_CP_LOOKUP_NEXT_IP4_LOOKUP, + LISP_CP_LOOKUP_NEXT_IP6_LOOKUP, + LISP_CP_LOOKUP_N_NEXT, +} lisp_cp_lookup_next_t; - if ((u32) ~0 == si) - return 0; +typedef struct +{ + gid_address_t dst_eid; + ip_address_t map_resolver_ip; +} lisp_cp_lookup_trace_t; - /* find the first ip address */ - addr = ip_interface_get_first_address (lm, si, ipver); - if (0 == addr) - return 0; +u8 * +format_lisp_cp_lookup_trace (u8 * s, va_list * args) +{ + 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 *); - ip_address_set (result, addr, ipver); - return 1; + 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); + return s; } int @@ -2052,6 +2434,7 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) addr = ip_interface_address_get_address (&lcm->im4->lookup_main, ia); ip_address_set (rloc, addr, IP4); ip_prefix_len (ippref) = 32; + ip_prefix_normalize (ippref); vec_add1 (rlocs, gid[0]); })); @@ -2062,6 +2445,7 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) addr = ip_interface_address_get_address (&lcm->im6->lookup_main, ia); ip_address_set (rloc, addr, IP6); ip_prefix_len (ippref) = 128; + ip_prefix_normalize (ippref); vec_add1 (rlocs, gid[0]); })); } @@ -2171,8 +2555,8 @@ send_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm, if (!b) return; - /* set fib index and lookup node */ - vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0; + /* set fib index to default and lookup node */ + vnet_buffer(b)->sw_if_index[VLIB_TX] = 0; next_index = (ip_addr_version(&mr_ip) == IP4) ? ip4_lookup_node.index : ip6_lookup_node.index; @@ -2188,7 +2572,6 @@ send_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm, pool_get(lcm->pending_map_requests_pool, pmr); gid_address_copy (&pmr->src, seid); gid_address_copy (&pmr->dst, deid); - pmr->src_mapping_index = map_index; hash_set(lcm->pending_map_requests_by_nonce, nonce, pmr - lcm->pending_map_requests_pool); } @@ -2319,7 +2702,7 @@ lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node, &src); if (~0 != si) { - add_fwd_entry (lcm, si, di); + dp_add_fwd_entry (lcm, si, di); } } } @@ -2376,8 +2759,8 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_node) = { }; /* lisp_cp_input statistics */ -#define foreach_lisp_cp_input_error \ -_(DROP, "drop") \ +#define foreach_lisp_cp_input_error \ +_(DROP, "drop") \ _(MAP_REPLIES_RECEIVED, "map-replies received") static char * lisp_cp_input_error_strings[] = { @@ -2417,213 +2800,19 @@ format_lisp_cp_input_trace (u8 * s, va_list * args) return s; } -static void -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)); - - 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]); - - /* delete dp fwd entry */ - u32 sw_if_index; - a->is_add = 0; - a->dlocator = fe->dst_loc; - a->slocator = fe->src_loc; - 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); - - /* delete entry in fwd table */ - hash_unset(lcm->fwd_entry_by_mapping_index, dst_map_index); - pool_put(lcm->fwd_entry_pool, fe); -} - -/** - * Finds first remote locator with best (lowest) priority that has a local - * peer locator with an underlying route to it. - * - */ -static u32 -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, 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; - uword * checked = 0; - - 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) - return 0; - - while (!done) - { - /* 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); - l = pool_elt_at_index(lcm->locator_pool, li); - - /* we don't support non-IP locators for now */ - if (gid_address_type(&l->address) != GID_ADDR_IP_PREFIX) - continue; - - if (l->priority < minp && l->priority >= limitp) - { - minp = l->priority; - rmt = l; - check_index = i; - } - } - /* check if a local locator with a route to remote locator exists */ - if (rmt != 0) - { - 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 */ - if (sl->sw_if_index == esi) - { - 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)); - ip_address_copy(lcl_loc, lcl); - done = 2; - } - } - - /* skip this remote locator in next searches */ - limitp = minp; - hash_set(checked, check_index, 1); - } - else - done = 1; - } - hash_free(checked); - return (done == 2) ? 1 : 0; -} - -static void -add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index) -{ - mapping_t * src_map, * dst_map; - u32 sw_if_index; - 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)); - - /* remove entry if it already exists */ - feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index); - if (feip) - del_fwd_entry (lcm, src_map_index, dst_map_index); - - 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]; - - /* insert data plane forwarding entry */ - a->is_add = 1; - - /* find best locator pair that 1) verifies LISP policy 2) are connected */ - if (0 == get_locator_pair (lcm, src_map, dst_map, &a->slocator, &a->dlocator)) - { - /* negative entry */ - a->is_negative = 1; - a->action = dst_map->action; - } - - /* 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; - - vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index); - - /* add tunnel to fwd entry table XXX check return value from DP insertion */ - pool_get (lcm->fwd_entry_pool, fe); - fe->dst_loc = a->dlocator; - fe->src_loc = a->slocator; - gid_address_copy (&fe->deid, &a->deid); - hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index, - fe - lcm->fwd_entry_pool); -} - -/* 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) -{ - u32 i, old_li; - locator_t * old_loc, * new_loc; - - if (vec_len (old_ls_indexes) != vec_len(new_locators)) - return 1; - - 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); - - new_loc = vec_elt_at_index(new_locators, i); - - if (locator_cmp (old_loc, new_loc)) - return 1; - } - return 0; -} - 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; + u32 len = 0, i, ttl, dst_map_index = 0; void * h; - vnet_lisp_add_del_locator_set_args_t _ls_arg, * ls_arg = &_ls_arg; - vnet_lisp_add_del_mapping_args_t _m_args, * m_args = &_m_args; pending_map_request_t * pmr; locator_t probed; map_reply_hdr_t * mrep_hdr; u64 nonce; - u32 dst_map_index, mi; + gid_address_t deid; uword * pmr_index; + u8 authoritative, action; + locator_t * locators = 0, * loc; mrep_hdr = vlib_buffer_get_current (b); @@ -2641,71 +2830,33 @@ process_map_reply (lisp_cp_main_t * lcm, vlib_buffer_t * b) for (i = 0; i < MREP_REC_COUNT(mrep_hdr); i++) { - memset (ls_arg, 0, sizeof(*ls_arg)); - memset (m_args, 0, sizeof(*m_args)); h = vlib_buffer_get_current (b); - m_args->ttl = clib_net_to_host_u32 (MAP_REC_TTL(h)); - m_args->action = MAP_REC_ACTION(h); - m_args->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, &m_args->deid, &ls_arg->locators, - &probed); + len = lisp_msg_parse_mapping_record (b, &deid, &locators, &probed); if (len == ~0) { clib_warning ("Failed to parse mapping record!"); - vec_foreach (loc, ls_arg->locators) + vec_foreach (loc, locators) { locator_free (loc); } - vec_free(ls_arg->locators); + vec_free(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 (old_map != 0 && !gid_address_cmp (&old_map->eid, &m_args->deid)) - { - locator_set_t * old_ls; - - /* update mapping attributes */ - old_map->action = m_args->action; - old_map->authoritative = m_args->authoritative; - old_map->ttl = m_args->ttl; - - old_ls = pool_elt_at_index(lcm->locator_set_pool, - old_map->locator_set_index); - /* if the two locators are not equal, update them and forwarding - * otherwise there's nothing to be done */ - if (compare_locators (lcm, old_ls->locator_indices, ls_arg->locators)) - { - /* set locator-set index to overwrite */ - ls_arg->is_add = 1; - ls_arg->index = old_map->locator_set_index; - vnet_lisp_add_del_locator_set (ls_arg, 0); - add_fwd_entry (lcm, pmr->src_mapping_index, mi); - } - } - /* new mapping */ - else - { - /* add locator-set */ - ls_arg->is_add = 1; - ls_arg->index = ~0; - vnet_lisp_add_del_locator_set (ls_arg, &ls_index); + /* insert/update mappings cache */ + vnet_lisp_add_del_mapping (&deid, locators, action, authoritative, ttl, 1, + &dst_map_index); - /* add mapping */ - m_args->is_add = 1; - m_args->locator_set_index = ls_index; - vnet_lisp_add_del_mapping (m_args, &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); - /* add forwarding tunnel */ - add_fwd_entry (lcm, pmr->src_mapping_index, dst_map_index); - } - vec_free(ls_arg->locators); + vec_free(locators); } /* remove pending map request entry */ @@ -2853,6 +3004,7 @@ lisp_cp_init (vlib_main_t *vm) lcm->vlib_main = vm; lcm->vnet_main = vnet_get_main(); lcm->mreq_itr_rlocs = ~0; + lcm->lisp_pitr = 0; gid_dictionary_init (&lcm->mapping_index_by_gid);