X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Flisp-cp%2Fcontrol.c;h=ca71bf885cf71a4c05918147925bd3f69894465b;hb=53fffa1;hp=aeea72c90a1340b838c9e7c6e3d000b79202e27b;hpb=8d7a0b9b920dfacc856145df96097060b6cde588;p=vpp.git diff --git a/src/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c index aeea72c90a1..ca71bf885cf 100644 --- a/src/vnet/lisp-cp/control.c +++ b/src/vnet/lisp-cp/control.c @@ -149,7 +149,7 @@ ip_address_to_fib_prefix (const ip_address_t * addr, fib_prefix_t * prefix) { prefix->fp_len = 32; prefix->fp_proto = FIB_PROTOCOL_IP4; - memset (&prefix->fp_addr.pad, 0, sizeof (prefix->fp_addr.pad)); + clib_memset (&prefix->fp_addr.pad, 0, sizeof (prefix->fp_addr.pad)); memcpy (&prefix->fp_addr.ip4, &addr->ip, sizeof (prefix->fp_addr.ip4)); } else @@ -221,7 +221,8 @@ ip_fib_get_first_egress_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst, } static int -dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_l2, u8 is_add) +dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_l2, u8 is_add, + u8 with_default_route) { uword *dp_table; @@ -251,7 +252,8 @@ dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_l2, u8 is_add) if (is_l2) lisp_gpe_tenant_l2_iface_add_or_lock (vni, dp_table[0]); else - lisp_gpe_tenant_l3_iface_add_or_lock (vni, dp_table[0]); + lisp_gpe_tenant_l3_iface_add_or_lock (vni, dp_table[0], + with_default_route); } else { @@ -270,7 +272,7 @@ dp_del_fwd_entry (lisp_cp_main_t * lcm, 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)); + clib_memset (a, 0, sizeof (*a)); feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index); if (!feip) @@ -375,7 +377,7 @@ get_locator_pairs (lisp_cp_main_t * lcm, mapping_t * lcl_map, lcl_addr)) continue; - memset (&pair, 0, sizeof (pair)); + clib_memset (&pair, 0, sizeof (pair)); ip_address_copy (&pair.rmt_loc, &gid_address_ip (&rmt->address)); ip_address_copy (&pair.lcl_loc, lcl_addr); @@ -444,7 +446,7 @@ dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index) u8 type, is_src_dst = 0; int rv; - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); /* remove entry if it already exists */ feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index); @@ -454,8 +456,16 @@ dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index) /* * Determine local mapping and eid */ - if (lcm->lisp_pitr) - lcl_map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index); + if (lcm->flags & LISP_FLAG_PITR_MODE) + { + if (lcm->pitr_map_index != ~0) + lcl_map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index); + else + { + clib_warning ("no PITR mapping configured!"); + return; + } + } else lcl_map = pool_elt_at_index (lcm->mapping_pool, src_map_index); lcl_eid = &lcl_map->eid; @@ -564,7 +574,7 @@ dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index) if (!rmts_stored_idxp) { pool_get (lcm->lcl_to_rmt_adjacencies, rmts); - memset (rmts, 0, sizeof (*rmts)); + clib_memset (rmts, 0, sizeof (*rmts)); rmts_idx = rmts - lcm->lcl_to_rmt_adjacencies; hash_set (lcm->lcl_to_rmt_adjs_by_lcl_idx, src_map_index, rmts_idx); } @@ -596,7 +606,7 @@ dp_add_fwd_entry_from_mt (u32 si, u32 di) { fwd_entry_mt_arg_t a; - memset (&a, 0, sizeof (a)); + clib_memset (&a, 0, sizeof (a)); a.si = si; a.di = di; @@ -689,7 +699,7 @@ vnet_lisp_add_del_map_server (ip_address_t * addr, u8 is_add) return -1; } - memset (ms, 0, sizeof (*ms)); + clib_memset (ms, 0, sizeof (*ms)); ip_address_copy (&ms->address, addr); vec_add1 (lcm->map_servers, ms[0]); @@ -1101,7 +1111,8 @@ vnet_lisp_eid_table_map (u32 vni, u32 dp_id, u8 is_l2, u8 is_add) hash_set (vni_by_dp_table[0], dp_id, vni); /* create dp iface */ - dp_add_del_iface (lcm, vni, is_l2, 1); + dp_add_del_iface (lcm, vni, is_l2, 1 /* is_add */ , + 1 /* with_default_route */ ); } else { @@ -1112,7 +1123,7 @@ vnet_lisp_eid_table_map (u32 vni, u32 dp_id, u8 is_l2, u8 is_add) return -1; } /* remove dp iface */ - dp_add_del_iface (lcm, vni, is_l2, 0); + dp_add_del_iface (lcm, vni, is_l2, 0 /* is_add */ , 0 /* unused */ ); hash_unset (dp_table_by_vni[0], vni); hash_unset (vni_by_dp_table[0], dp_id); @@ -1202,7 +1213,7 @@ remove_overlapping_sub_prefixes (lisp_cp_main_t * lcm, gid_address_t * eid, gid_address_t *e; remove_mapping_args_t a; - memset (&a, 0, sizeof (a)); + clib_memset (&a, 0, sizeof (a)); /* do this only in src/dst mode ... */ if (MR_MODE_SRC_DST != lcm->map_request_mode) @@ -1223,7 +1234,7 @@ remove_overlapping_sub_prefixes (lisp_cp_main_t * lcm, gid_address_t * eid, { vnet_lisp_add_del_adjacency_args_t _adj_args, *adj_args = &_adj_args; - memset (adj_args, 0, sizeof (adj_args[0])); + clib_memset (adj_args, 0, sizeof (adj_args[0])); gid_address_copy (&adj_args->reid, e); adj_args->is_add = 0; if (vnet_lisp_add_del_adjacency (adj_args)) @@ -1286,13 +1297,13 @@ vnet_lisp_add_mapping (vnet_lisp_add_del_mapping_args_t * a, if (is_updated) is_updated[0] = 0; - memset (ls_args, 0, sizeof (ls_args[0])); + clib_memset (ls_args, 0, sizeof (ls_args[0])); ls_args->locators = rlocs; mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->eid); old_map = ((u32) ~ 0 != mi) ? pool_elt_at_index (lcm->mapping_pool, mi) : 0; - /* check if none of the locators match localy configured address */ + /* check if none of the locators match locally configured address */ vec_foreach (loc, rlocs) { ip_prefix_t *p = &gid_address_ippref (&loc->address); @@ -1369,7 +1380,7 @@ vnet_lisp_add_mapping (vnet_lisp_add_del_mapping_args_t * a, /** * Removes a mapping. Does not program forwarding. * - * @param eid end-host indetifier + * @param eid end-host identifier * @param res_map_index index of the removed mapping * @return return code */ @@ -1382,8 +1393,8 @@ vnet_lisp_del_mapping (gid_address_t * eid, u32 * res_map_index) mapping_t *old_map; u32 mi; - memset (ls_args, 0, sizeof (ls_args[0])); - memset (m_args, 0, sizeof (m_args[0])); + clib_memset (ls_args, 0, sizeof (ls_args[0])); + clib_memset (m_args, 0, sizeof (m_args[0])); if (res_map_index) res_map_index[0] = ~0; @@ -1499,8 +1510,18 @@ vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a) { /* check if source eid has an associated mapping. If pitr mode is on, * just use the pitr's mapping */ - if (lcm->lisp_pitr) - local_mi = lcm->pitr_map_index; + if (lcm->flags & LISP_FLAG_PITR_MODE) + { + if (lcm->pitr_map_index != ~0) + { + local_mi = lcm->pitr_map_index; + } + else + { + /* PITR mode is on, but no mapping is configured */ + return -1; + } + } else { if (gid_address_type (&a->reid) == GID_ADDR_NSH) @@ -1583,7 +1604,7 @@ vnet_lisp_nsh_set_locator_set (u8 * locator_set_name, u8 is_add) locator_set_index = p[0]; pool_get (lcm->mapping_pool, m); - memset (m, 0, sizeof *m); + clib_memset (m, 0, sizeof *m); m->locator_set_index = locator_set_index; m->local = 1; m->nsh_set = 1; @@ -1635,17 +1656,12 @@ vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add) m->local = 1; m->pitr_set = 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; + lcm->pitr_map_index = ~0; } return 0; } @@ -1693,12 +1709,12 @@ vnet_lisp_use_petr (ip_address_t * ip, u8 is_add) return VNET_API_ERROR_LISP_DISABLED; } - memset (ls_args, 0, sizeof (*ls_args)); + clib_memset (ls_args, 0, sizeof (*ls_args)); if (is_add) { /* Create dummy petr locator-set */ - memset (&loc, 0, sizeof (loc)); + clib_memset (&loc, 0, sizeof (loc)); gid_address_from_ip (&loc.address, ip); loc.priority = 1; loc.state = loc.weight = 1; @@ -1731,6 +1747,7 @@ vnet_lisp_use_petr (ip_address_t * ip, u8 is_add) /* Disable use-petr */ lcm->flags &= ~LISP_FLAG_USE_PETR; + lcm->petr_map_index = ~0; } return 0; } @@ -1823,39 +1840,70 @@ is_locator_in_locator_set (lisp_cp_main_t * lcm, locator_set_t * ls, } static void -update_adjacencies_by_map_index (lisp_cp_main_t * lcm, u8 is_local, +update_adjacencies_by_map_index (lisp_cp_main_t * lcm, u32 mapping_index, u8 remove_only) { fwd_entry_t *fwd; mapping_t *map; + uword *fei = 0, *rmts_idxp = 0; + u32 **rmts = 0, *remote_idxp = 0, *rmts_copy = 0; vnet_lisp_add_del_adjacency_args_t _a, *a = &_a; + clib_memset (a, 0, sizeof (*a)); map = pool_elt_at_index (lcm->mapping_pool, mapping_index); - /* *INDENT-OFF* */ - pool_foreach(fwd, lcm->fwd_entry_pool, - ({ - if ((is_local && 0 == gid_address_cmp (&map->eid, &fwd->leid)) || - (!is_local && 0 == gid_address_cmp (&map->eid, &fwd->reid))) - { - a->is_add = 0; - gid_address_copy (&a->leid, &fwd->leid); - gid_address_copy (&a->reid, &fwd->reid); + if (map->local) + { + rmts_idxp = hash_get (lcm->lcl_to_rmt_adjs_by_lcl_idx, mapping_index); + if (rmts_idxp) + { + rmts = + pool_elt_at_index (lcm->lcl_to_rmt_adjacencies, rmts_idxp[0]); + rmts_copy = vec_dup (rmts[0]); - vnet_lisp_add_del_adjacency (a); + vec_foreach (remote_idxp, rmts_copy) + { + fei = hash_get (lcm->fwd_entry_by_mapping_index, remote_idxp[0]); + if (!fei) + continue; - if (!remove_only) - { - a->is_add = 1; - vnet_lisp_add_del_adjacency (a); - } - } - })); - /* *INDENT-ON* */ + fwd = pool_elt_at_index (lcm->fwd_entry_pool, fei[0]); + a->is_add = 0; + gid_address_copy (&a->leid, &fwd->leid); + gid_address_copy (&a->reid, &fwd->reid); + vnet_lisp_add_del_adjacency (a); + + if (!remove_only) + { + a->is_add = 1; + vnet_lisp_add_del_adjacency (a); + } + } + vec_free (rmts_copy); + } + } + else + { + fei = hash_get (lcm->fwd_entry_by_mapping_index, mapping_index); + if (!fei) + return; + + fwd = pool_elt_at_index (lcm->fwd_entry_pool, fei[0]); + a->is_add = 0; + gid_address_copy (&a->leid, &fwd->leid); + gid_address_copy (&a->reid, &fwd->reid); + vnet_lisp_add_del_adjacency (a); + + if (!remove_only) + { + a->is_add = 1; + vnet_lisp_add_del_adjacency (a); + } + } } static void -update_fwd_entries_by_locator_set (lisp_cp_main_t * lcm, u8 is_local, +update_fwd_entries_by_locator_set (lisp_cp_main_t * lcm, u32 ls_index, u8 remove_only) { u32 i, *map_indexp; @@ -1869,8 +1917,7 @@ update_fwd_entries_by_locator_set (lisp_cp_main_t * lcm, u8 is_local, for (i = 0; i < vec_len (eid_indexes[0]); i++) { map_indexp = vec_elt_at_index (eid_indexes[0], i); - update_adjacencies_by_map_index (lcm, is_local, map_indexp[0], - remove_only); + update_adjacencies_by_map_index (lcm, map_indexp[0], remove_only); } } @@ -1981,7 +2028,7 @@ vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a, if (removed) { /* update fwd entries using this locator in DP */ - update_fwd_entries_by_locator_set (lcm, loc->local, ls_index, + update_fwd_entries_by_locator_set (lcm, ls_index, vec_len (ls->locator_indices) == 0); } @@ -2042,7 +2089,7 @@ vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a, else { pool_get (lcm->locator_set_pool, ls); - memset (ls, 0, sizeof (*ls)); + clib_memset (ls, 0, sizeof (*ls)); ls_index = ls - lcm->locator_set_pool; if (a->local) @@ -2152,10 +2199,66 @@ vnet_lisp_map_register_enable_disable (u8 is_enable) return 0; } +static void +lisp_cp_register_dst_port (vlib_main_t * vm) +{ + udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp, + lisp_cp_input_node.index, 1 /* is_ip4 */ ); + udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp6, + lisp_cp_input_node.index, 0 /* is_ip4 */ ); +} + +static void +lisp_cp_unregister_dst_port (vlib_main_t * vm) +{ + udp_unregister_dst_port (vm, UDP_DST_PORT_lisp_cp, 0 /* is_ip4 */ ); + udp_unregister_dst_port (vm, UDP_DST_PORT_lisp_cp6, 1 /* is_ip4 */ ); +} + +/** + * lisp_cp_enable_l2_l3_ifaces + * + * Enable all l2 and l3 ifaces + */ +static void +lisp_cp_enable_l2_l3_ifaces (lisp_cp_main_t * lcm, u8 with_default_route) +{ + u32 vni, dp_table; + + /* *INDENT-OFF* */ + hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({ + dp_add_del_iface(lcm, vni, /* is_l2 */ 0, /* is_add */1, + with_default_route); + })); + hash_foreach(vni, dp_table, lcm->bd_id_by_vni, ({ + dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1, + with_default_route); + })); + /* *INDENT-ON* */ +} + +static void +lisp_cp_disable_l2_l3_ifaces (lisp_cp_main_t * lcm) +{ + u32 **rmts; + + /* clear interface table */ + hash_free (lcm->fwd_entry_by_mapping_index); + pool_free (lcm->fwd_entry_pool); + /* Clear state tracking rmt-lcl fwd entries */ + /* *INDENT-OFF* */ + pool_foreach(rmts, lcm->lcl_to_rmt_adjacencies, + { + vec_free(rmts[0]); + }); + /* *INDENT-ON* */ + hash_free (lcm->lcl_to_rmt_adjs_by_lcl_idx); + pool_free (lcm->lcl_to_rmt_adjacencies); +} + clib_error_t * vnet_lisp_enable_disable (u8 is_enable) { - u32 vni, dp_table, **rmts; 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; @@ -2168,33 +2271,45 @@ vnet_lisp_enable_disable (u8 is_enable) a->is_en ? "enable" : "disable"); } - if (is_enable) + /* decide what to do based on mode */ + + if (lcm->flags & LISP_FLAG_XTR_MODE) { - /* enable all l2 and l3 ifaces */ + if (is_enable) + { + lisp_cp_register_dst_port (lcm->vlib_main); + lisp_cp_enable_l2_l3_ifaces (lcm, 1 /* with_default_route */ ); + } + else + { + lisp_cp_unregister_dst_port (lcm->vlib_main); + lisp_cp_disable_l2_l3_ifaces (lcm); + } + } - /* *INDENT-OFF* */ - hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({ - dp_add_del_iface(lcm, vni, 0, 1); - })); - hash_foreach(vni, dp_table, lcm->bd_id_by_vni, ({ - dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1); - })); - /* *INDENT-ON* */ + if (lcm->flags & LISP_FLAG_PETR_MODE) + { + /* if in xTR mode, the LISP ports were already (un)registered above */ + if (!(lcm->flags & LISP_FLAG_XTR_MODE)) + { + if (is_enable) + lisp_cp_register_dst_port (lcm->vlib_main); + else + lisp_cp_unregister_dst_port (lcm->vlib_main); + } } - else + + if (lcm->flags & LISP_FLAG_PITR_MODE) { - /* clear interface table */ - hash_free (lcm->fwd_entry_by_mapping_index); - pool_free (lcm->fwd_entry_pool); - /* Clear state tracking rmt-lcl fwd entries */ - /* *INDENT-OFF* */ - pool_foreach(rmts, lcm->lcl_to_rmt_adjacencies, - { - vec_free(rmts[0]); - }); - /* *INDENT-ON* */ - hash_free (lcm->lcl_to_rmt_adjs_by_lcl_idx); - pool_free (lcm->lcl_to_rmt_adjacencies); + if (is_enable) + { + /* install interfaces, but no default routes */ + lisp_cp_enable_l2_l3_ifaces (lcm, 0 /* with_default_route */ ); + } + else + { + lisp_cp_disable_l2_l3_ifaces (lcm); + } } /* update global flag */ @@ -2233,7 +2348,7 @@ vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a) return -1; } - memset (mr, 0, sizeof (*mr)); + clib_memset (mr, 0, sizeof (*mr)); ip_address_copy (&mr->address, &a->address); vec_add1 (lcm->map_resolvers, *mr); @@ -2396,7 +2511,7 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) ip_prefix_t *ippref = &gid_address_ippref (gid); ip_address_t *rloc = &ip_prefix_addr (ippref); - memset (gid, 0, sizeof (gid[0])); + clib_memset (gid, 0, sizeof (gid[0])); gid_address_type (gid) = GID_ADDR_IP_PREFIX; for (i = 0; i < vec_len (loc_set->locator_indices); i++) { @@ -2496,7 +2611,7 @@ build_encapsulated_map_request (lisp_cp_main_t * lcm, && GID_ADDR_SRC_DST != gid_address_type (deid)) { gid_address_t sd; - memset (&sd, 0, sizeof (sd)); + clib_memset (&sd, 0, sizeof (sd)); build_src_dst (&sd, seid, deid); lisp_msg_put_mreq (lcm, b, seid, &sd, rlocs, is_smr_invoked, 0 /* rloc probe */ , nonce_res); @@ -2895,7 +3010,7 @@ send_map_register (lisp_cp_main_t * lcm, u8 want_map_notif) map_registers_sent++; pool_get (lcm->pending_map_registers_pool, pmr); - memset (pmr, 0, sizeof (*pmr)); + clib_memset (pmr, 0, sizeof (*pmr)); pmr->time_to_expire = PENDING_MREG_EXPIRATION_TIME; hash_set (lcm->map_register_messages_by_nonce, nonce, pmr - lcm->pending_map_registers_pool); @@ -2950,8 +3065,10 @@ _send_encapsulated_map_request (lisp_cp_main_t * lcm, return 0; } + u8 pitr_mode = lcm->flags & LISP_FLAG_PITR_MODE; + /* get locator-set for seid */ - if (!lcm->lisp_pitr && gid_address_type (deid) != GID_ADDR_NSH) + if (!pitr_mode && gid_address_type (deid) != GID_ADDR_NSH) { map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid); if (map_index == ~0) @@ -2974,10 +3091,18 @@ _send_encapsulated_map_request (lisp_cp_main_t * lcm, } else { - if (lcm->lisp_pitr) + if (pitr_mode) { - map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index); - ls_index = map->locator_set_index; + if (lcm->pitr_map_index != ~0) + { + map = + pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index); + ls_index = map->locator_set_index; + } + else + { + return -1; + } } else { @@ -3053,7 +3178,7 @@ _send_encapsulated_map_request (lisp_cp_main_t * lcm, { /* add map-request to pending requests table */ pool_get (lcm->pending_map_requests_pool, pmr); - memset (pmr, 0, sizeof (*pmr)); + clib_memset (pmr, 0, sizeof (*pmr)); gid_address_copy (&pmr->src, seid); gid_address_copy (&pmr->dst, deid); clib_fifo_add1 (pmr->nonces, nonce); @@ -3149,8 +3274,8 @@ get_src_and_dst_eids_from_buffer (lisp_cp_main_t * lcm, vlib_buffer_t * b, u32 vni = 0; icmp6_neighbor_discovery_ethernet_link_layer_address_option_t *opt; - memset (src, 0, sizeof (*src)); - memset (dst, 0, sizeof (*dst)); + clib_memset (src, 0, sizeof (*src)); + clib_memset (dst, 0, sizeof (*dst)); gid_address_type (dst) = GID_ADDR_NO_ADDRESS; gid_address_type (src) = GID_ADDR_NO_ADDRESS; @@ -3184,11 +3309,18 @@ get_src_and_dst_eids_from_buffer (lisp_cp_main_t * lcm, vlib_buffer_t * b, if (clib_net_to_host_u16 (eh->type) == ETHERNET_TYPE_ARP) { ah = (ethernet_arp_header_t *) (((u8 *) eh) + sizeof (*eh)); + gid_address_type (dst) = GID_ADDR_ARP; + if (clib_net_to_host_u16 (ah->opcode) != ETHERNET_ARP_OPCODE_request) - return; + { + clib_memset (&gid_address_arp_ndp_ip (dst), 0, + sizeof (ip_address_t)); + ip_addr_version (&gid_address_arp_ndp_ip (dst)) = IP4; + gid_address_arp_ndp_bd (dst) = ~0; + return; + } - gid_address_type (dst) = GID_ADDR_ARP; gid_address_arp_bd (dst) = lisp_get_bd_from_buffer_eth (b); clib_memcpy (&gid_address_arp_ip4 (dst), &ah->ip4_over_ethernet[1].ip4, 4); @@ -3206,13 +3338,23 @@ get_src_and_dst_eids_from_buffer (lisp_cp_main_t * lcm, vlib_buffer_t * b, ndh = ip6_next_header (ip); if (ndh->icmp.type == ICMP6_neighbor_solicitation) { + gid_address_type (dst) = GID_ADDR_NDP; + + /* check that source link layer address option is present */ opt = (void *) (ndh + 1); if ((opt->header.type != ICMP6_NEIGHBOR_DISCOVERY_OPTION_source_link_layer_address) || (opt->header.n_data_u64s != 1)) - return; /* source link layer address option not present */ + { + clib_memset (&gid_address_arp_ndp_ip (dst), 0, + sizeof (ip_address_t)); + ip_addr_version (&gid_address_arp_ndp_ip (dst)) = + IP6; + gid_address_arp_ndp_bd (dst) = ~0; + gid_address_type (src) = GID_ADDR_NO_ADDRESS; + return; + } - gid_address_type (dst) = GID_ADDR_NDP; gid_address_ndp_bd (dst) = lisp_get_bd_from_buffer_eth (b); ip_address_set (&gid_address_arp_ndp_ip (dst), @@ -3367,7 +3509,7 @@ lisp_cp_lookup_inline (vlib_main_t * vm, goto enqueue; } - /* if we have remote mapping for destination already in map-chache + /* if we have remote mapping for destination already in map-cache add forwarding tunnel directly. If not send a map-request */ di = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid, &dst, &src); @@ -3414,7 +3556,7 @@ lisp_cp_lookup_inline (vlib_main_t * vm, lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr)); - memset (tr, 0, sizeof (*tr)); + clib_memset (tr, 0, sizeof (*tr)); gid_address_copy (&tr->dst_eid, &dst); ip_address_copy (&tr->map_resolver_ip, &lcm->active_map_resolver); @@ -3585,7 +3727,7 @@ remove_expired_mapping (lisp_cp_main_t * lcm, u32 mi) { mapping_t *m; vnet_lisp_add_del_adjacency_args_t _adj_args, *adj_args = &_adj_args; - memset (adj_args, 0, sizeof (adj_args[0])); + clib_memset (adj_args, 0, sizeof (adj_args[0])); m = pool_elt_at_index (lcm->mapping_pool, mi); @@ -3636,7 +3778,7 @@ process_expired_mapping (lisp_cp_main_t * lcm, u32 mi) fe = pool_elt_at_index (lcm->fwd_entry_pool, fei[0]); - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); a->rmt_eid = fe->reid; if (fe->is_src_dst) a->lcl_eid = fe->leid; @@ -3655,7 +3797,7 @@ process_expired_mapping (lisp_cp_main_t * lcm, u32 mi) { /* mapping is in use, re-fetch */ map_request_args_t mr_args; - memset (&mr_args, 0, sizeof (mr_args)); + clib_memset (&mr_args, 0, sizeof (mr_args)); mr_args.seid = fe->leid; mr_args.deid = fe->reid; @@ -3719,7 +3861,7 @@ process_map_reply (map_records_arg_t * a) vec_foreach (m, a->mappings) { vnet_lisp_add_del_mapping_args_t _m_args, *m_args = &_m_args; - memset (m_args, 0, sizeof (m_args[0])); + clib_memset (m_args, 0, sizeof (m_args[0])); gid_address_copy (&m_args->eid, &m->eid); m_args->action = m->action; m_args->authoritative = m->authoritative; @@ -3736,7 +3878,7 @@ process_map_reply (map_records_arg_t * a) { /* try to program forwarding only if mapping saved or updated */ vnet_lisp_add_del_adjacency_args_t _adj_args, *adj_args = &_adj_args; - memset (adj_args, 0, sizeof (adj_args[0])); + clib_memset (adj_args, 0, sizeof (adj_args[0])); gid_address_copy (&adj_args->leid, &pmr->src); gid_address_copy (&adj_args->reid, &m->eid); @@ -3747,7 +3889,8 @@ process_map_reply (map_records_arg_t * a) } if ((u32) ~ 0 != m->ttl) - mapping_start_expiration_timer (lcm, dst_map_index, MAPPING_TIMEOUT); + mapping_start_expiration_timer (lcm, dst_map_index, + (m->ttl == 0) ? 0 : MAPPING_TIMEOUT); } /* remove pending map request entry */ @@ -3786,7 +3929,7 @@ is_auth_data_valid (map_notify_hdr_t * h, u32 msg_len, clib_memcpy (auth_data, MNOTIFY_DATA (h), auth_data_len); /* clear auth data */ - memset (MNOTIFY_DATA (h), 0, auth_data_len); + clib_memset (MNOTIFY_DATA (h), 0, auth_data_len); /* get hash of the message */ unsigned char *code = HMAC (get_encrypt_fcn (key_id), key, vec_len (key), @@ -3879,7 +4022,7 @@ parse_map_records (vlib_buffer_t * b, map_records_arg_t * a, u8 count) mapping_t m; locator_t *loc; - memset (&m, 0, sizeof (m)); + clib_memset (&m, 0, sizeof (m)); /* parse record eid */ for (i = 0; i < count; i++) @@ -3934,10 +4077,10 @@ parse_map_notify (vlib_buffer_t * b) map_records_arg_t *a; a = map_record_args_get (); - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); mnotif_hdr = vlib_buffer_get_current (b); vlib_buffer_pull (b, sizeof (*mnotif_hdr)); - memset (&deid, 0, sizeof (deid)); + clib_memset (&deid, 0, sizeof (deid)); a->nonce = MNOTIFY_NONCE (mnotif_hdr); key_id = clib_net_to_host_u16 (MNOTIFY_KEY_ID (mnotif_hdr)); @@ -4020,11 +4163,11 @@ send_map_reply (lisp_cp_main_t * lcm, u32 mi, ip_address_t * dst, vec_add1 (records, m[0]); add_locators (lcm, &records[0], m->locator_set_index, probed_loc); - memset (&src, 0, sizeof (src)); + clib_memset (&src, 0, sizeof (src)); if (!ip_fib_get_first_egress_ip_for_dst (lcm, dst, &src)) { - clib_warning ("can't find inteface address for %U", format_ip_address, + clib_warning ("can't find interface address for %U", format_ip_address, dst); return -1; } @@ -4101,7 +4244,7 @@ process_map_request (vlib_main_t * vm, vlib_node_runtime_t * node, /* parse eid records and send SMR-invoked map-requests */ for (i = 0; i < MREQ_REC_COUNT (mreq_hdr); i++) { - memset (&dst, 0, sizeof (dst)); + clib_memset (&dst, 0, sizeof (dst)); len = lisp_msg_parse_eid_rec (b, &dst); if (len == ~0) { @@ -4123,7 +4266,7 @@ process_map_request (vlib_main_t * vm, vlib_node_runtime_t * node, goto done; } rloc_probe_recv++; - memset (&m, 0, sizeof (m)); + clib_memset (&m, 0, sizeof (m)); u32 mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &dst); // TODO: select best locator; for now use the first one @@ -4159,7 +4302,7 @@ parse_map_reply (vlib_buffer_t * b) map_records_arg_t *a; a = map_record_args_get (); - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); locator_t *locators; @@ -4175,7 +4318,7 @@ parse_map_reply (vlib_buffer_t * b) for (i = 0; i < MREP_REC_COUNT (mrep_hdr); i++) { - memset (&m, 0, sizeof (m)); + clib_memset (&m, 0, sizeof (m)); locators = 0; h = vlib_buffer_get_current (b); @@ -4327,10 +4470,12 @@ 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; lcm->flags = 0; - memset (&lcm->active_map_resolver, 0, sizeof (lcm->active_map_resolver)); - memset (&lcm->active_map_server, 0, sizeof (lcm->active_map_server)); + lcm->pitr_map_index = ~0; + lcm->petr_map_index = ~0; + clib_memset (&lcm->active_map_resolver, 0, + sizeof (lcm->active_map_resolver)); + clib_memset (&lcm->active_map_server, 0, sizeof (lcm->active_map_server)); gid_dictionary_init (&lcm->mapping_index_by_gid); lcm->do_map_resolver_election = 1; @@ -4344,11 +4489,6 @@ lisp_cp_init (vlib_main_t * vm) hash_set (lcm->table_id_by_vni, 0, 0); hash_set (lcm->vni_by_table_id, 0, 0); - udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp, - lisp_cp_input_node.index, 1 /* is_ip4 */ ); - udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp6, - lisp_cp_input_node.index, 0 /* is_ip4 */ ); - u64 now = clib_cpu_time_now (); timing_wheel_init (&lcm->wheel, now, vm->clib_time.clocks_per_second); lcm->nsh_map_index = ~0; @@ -4356,6 +4496,7 @@ lisp_cp_init (vlib_main_t * vm) lcm->max_expired_map_registers = MAX_EXPIRED_MAP_REGISTERS_DEFAULT; lcm->expired_map_registers = 0; lcm->transport_protocol = LISP_TRANSPORT_PROTOCOL_UDP; + lcm->flags |= LISP_FLAG_XTR_MODE; return 0; } @@ -4370,8 +4511,8 @@ lisp_stats_api_fill (lisp_cp_main_t * lcm, lisp_gpe_main_t * lgm, const lisp_gpe_tunnel_t *lgt; fwd_entry_t *fe; - memset (stat, 0, sizeof (*stat)); - memset (&fwd_key, 0, sizeof (fwd_key)); + clib_memset (stat, 0, sizeof (*stat)); + clib_memset (&fwd_key, 0, sizeof (fwd_key)); fe = pool_elt_at_index (lcm->fwd_entry_pool, key->fwd_entry_index); ASSERT (fe != 0); @@ -4745,6 +4886,124 @@ vnet_lisp_get_transport_protocol (void) return lcm->transport_protocol; } +int +vnet_lisp_enable_disable_xtr_mode (u8 is_enabled) +{ + lisp_cp_main_t *lcm = vnet_lisp_cp_get_main (); + u8 pitr_mode = lcm->flags & LISP_FLAG_PITR_MODE; + u8 xtr_mode = lcm->flags & LISP_FLAG_XTR_MODE; + u8 petr_mode = lcm->flags & LISP_FLAG_PETR_MODE; + + if (pitr_mode && is_enabled) + return VNET_API_ERROR_INVALID_ARGUMENT; + + if (is_enabled && xtr_mode) + return 0; + if (!is_enabled && !xtr_mode) + return 0; + + if (is_enabled) + { + if (!petr_mode) + { + lisp_cp_register_dst_port (lcm->vlib_main); + } + lisp_cp_enable_l2_l3_ifaces (lcm, 1 /* with_default_route */ ); + lcm->flags |= LISP_FLAG_XTR_MODE; + } + else + { + if (!petr_mode) + { + lisp_cp_unregister_dst_port (lcm->vlib_main); + } + lisp_cp_disable_l2_l3_ifaces (lcm); + lcm->flags &= ~LISP_FLAG_XTR_MODE; + } + return 0; +} + +int +vnet_lisp_enable_disable_pitr_mode (u8 is_enabled) +{ + lisp_cp_main_t *lcm = vnet_lisp_cp_get_main (); + u8 xtr_mode = lcm->flags & LISP_FLAG_XTR_MODE; + u8 pitr_mode = lcm->flags & LISP_FLAG_PITR_MODE; + + if (xtr_mode && is_enabled) + return VNET_API_ERROR_INVALID_VALUE; + + if (is_enabled && pitr_mode) + return 0; + if (!is_enabled && !pitr_mode) + return 0; + + if (is_enabled) + { + /* create iface, no default route */ + lisp_cp_enable_l2_l3_ifaces (lcm, 0 /* with_default_route */ ); + lcm->flags |= LISP_FLAG_PITR_MODE; + } + else + { + lisp_cp_disable_l2_l3_ifaces (lcm); + lcm->flags &= ~LISP_FLAG_PITR_MODE; + } + return 0; +} + +int +vnet_lisp_enable_disable_petr_mode (u8 is_enabled) +{ + lisp_cp_main_t *lcm = vnet_lisp_cp_get_main (); + u8 xtr_mode = lcm->flags & LISP_FLAG_XTR_MODE; + u8 petr_mode = lcm->flags & LISP_FLAG_PETR_MODE; + + if (is_enabled && petr_mode) + return 0; + if (!is_enabled && !petr_mode) + return 0; + + if (is_enabled) + { + if (!xtr_mode) + { + lisp_cp_register_dst_port (lcm->vlib_main); + } + lcm->flags |= LISP_FLAG_PETR_MODE; + } + else + { + if (!xtr_mode) + { + lisp_cp_unregister_dst_port (lcm->vlib_main); + } + lcm->flags &= ~LISP_FLAG_PETR_MODE; + } + return 0; +} + +u8 +vnet_lisp_get_xtr_mode (void) +{ + lisp_cp_main_t *lcm = vnet_lisp_cp_get_main (); + return (lcm->flags & LISP_FLAG_XTR_MODE); +} + +u8 +vnet_lisp_get_pitr_mode (void) +{ + lisp_cp_main_t *lcm = vnet_lisp_cp_get_main (); + return (lcm->flags & LISP_FLAG_PITR_MODE); +} + +u8 +vnet_lisp_get_petr_mode (void) +{ + lisp_cp_main_t *lcm = vnet_lisp_cp_get_main (); + return (lcm->flags & LISP_FLAG_PETR_MODE); +} + VLIB_INIT_FUNCTION (lisp_cp_init); /*