X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_api.c;h=431a777442f80b19eba726706ab43c5f041ba66c;hb=0bdd319b3b5d7d4037605f9baba8889d30bd1717;hp=92393cb507902584aef03738b82ac6974e340eee;hpb=8637634d4dbc3e8cc90f78307d2069524b8f8f5e;p=vpp.git diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c index 92393cb5079..431a777442f 100644 --- a/src/vnet/ip/ip_api.c +++ b/src/vnet/ip/ip_api.c @@ -159,7 +159,7 @@ vl_api_ip_neighbor_dump_t_handler (vl_api_ip_neighbor_dump_t * mp) vec_foreach (n, ns) { send_ip_neighbor_details - (sw_if_index, mp->is_ipv6, + (n->key.sw_if_index, mp->is_ipv6, ((n->flags & IP6_NEIGHBOR_FLAG_STATIC) ? 1 : 0), (u8 *) n->link_layer_address, (u8 *) & (n->key.ip6_address.as_u8), @@ -176,7 +176,7 @@ vl_api_ip_neighbor_dump_t_handler (vl_api_ip_neighbor_dump_t * mp) /* *INDENT-OFF* */ vec_foreach (n, ns) { - send_ip_neighbor_details (sw_if_index, mp->is_ipv6, + send_ip_neighbor_details (n->sw_if_index, mp->is_ipv6, ((n->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC) ? 1 : 0), (u8*) n->ethernet_address, (u8*) & (n->ip4_address.as_u8), @@ -247,7 +247,7 @@ vl_api_ip_fib_dump_t_handler (vl_api_ip_fib_dump_t * mp) ip4_main_t *im = &ip4_main; fib_table_t *fib_table; fib_node_index_t *lfeip; - fib_prefix_t pfx; + const fib_prefix_t *pfx; u32 fib_index; fib_route_path_encode_t *api_rpaths; vl_api_ip_fib_dump_walk_ctx_t ctx = { @@ -272,12 +272,12 @@ vl_api_ip_fib_dump_t_handler (vl_api_ip_fib_dump_t * mp) vec_foreach (lfeip, ctx.feis) { - fib_entry_get_prefix (*lfeip, &pfx); + pfx = fib_entry_get_prefix (*lfeip); fib_index = fib_entry_get_fib_index (*lfeip); - fib_table = fib_table_get (fib_index, pfx.fp_proto); + fib_table = fib_table_get (fib_index, pfx->fp_proto); api_rpaths = NULL; fib_entry_encode (*lfeip, &api_rpaths); - send_ip_fib_details (am, reg, fib_table, &pfx, api_rpaths, mp->context); + send_ip_fib_details (am, reg, fib_table, pfx, api_rpaths, mp->context); vec_free (api_rpaths); } @@ -351,7 +351,7 @@ api_ip6_fib_table_get_all (vl_api_registration_t * reg, .entries = NULL, }; fib_route_path_encode_t *api_rpaths; - fib_prefix_t pfx; + const fib_prefix_t *pfx; BV (clib_bihash_foreach_key_value_pair) ((BVT (clib_bihash) *) & im6->ip6_table[IP6_FIB_TABLE_NON_FWDING]. @@ -361,10 +361,10 @@ api_ip6_fib_table_get_all (vl_api_registration_t * reg, vec_foreach (fib_entry_index, ctx.entries) { - fib_entry_get_prefix (*fib_entry_index, &pfx); + pfx = fib_entry_get_prefix (*fib_entry_index); api_rpaths = NULL; fib_entry_encode (*fib_entry_index, &api_rpaths); - send_ip6_fib_details (am, reg, fib_table, &pfx, api_rpaths, mp->context); + send_ip6_fib_details (am, reg, fib_table, pfx, api_rpaths, mp->context); vec_free (api_rpaths); } @@ -653,48 +653,31 @@ static void vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t * mp, vlib_main_t * vm) { + ip46_address_t ip = ip46_address_initializer; vl_api_ip_neighbor_add_del_reply_t *rmp; - vnet_main_t *vnm = vnet_get_main (); + ip_neighbor_flags_t flags; int rv = 0; VALIDATE_SW_IF_INDEX (mp); stats_dslock_with_hint (1 /* release hint */ , 7 /* tag */ ); - /* - * there's no validation here of the ND/ARP entry being added. - * The expectation is that the FIB will ensure that nothing bad - * will come of adding bogus entries. - */ + flags = IP_NEIGHBOR_FLAG_NODE; + if (mp->is_static) + flags |= IP_NEIGHBOR_FLAG_STATIC; + if (mp->is_no_adj_fib) + flags |= IP_NEIGHBOR_FLAG_NO_ADJ_FIB; + if (mp->is_ipv6) - { - if (mp->is_add) - rv = vnet_set_ip6_ethernet_neighbor - (vm, ntohl (mp->sw_if_index), - (ip6_address_t *) (mp->dst_address), - mp->mac_address, sizeof (mp->mac_address), mp->is_static, - mp->is_no_adj_fib); - else - rv = vnet_unset_ip6_ethernet_neighbor - (vm, ntohl (mp->sw_if_index), - (ip6_address_t *) (mp->dst_address), - mp->mac_address, sizeof (mp->mac_address)); - } + clib_memcpy (&ip.ip6, mp->dst_address, 16); else - { - ethernet_arp_ip4_over_ethernet_address_t a; - - clib_memcpy (&a.ethernet, mp->mac_address, 6); - clib_memcpy (&a.ip4, mp->dst_address, 4); + clib_memcpy (&ip.ip4, mp->dst_address, 4); - if (mp->is_add) - rv = vnet_arp_set_ip4_over_ethernet (vnm, ntohl (mp->sw_if_index), - &a, mp->is_static, - mp->is_no_adj_fib); - else - rv = - vnet_arp_unset_ip4_over_ethernet (vnm, ntohl (mp->sw_if_index), &a); - } + if (mp->is_add) + rv = ip_neighbor_add (&ip, mp->is_ipv6, mp->mac_address, + ntohl (mp->sw_if_index), flags); + else + rv = ip_neighbor_del (&ip, mp->is_ipv6, ntohl (mp->sw_if_index)); stats_dsunlock (); @@ -839,26 +822,6 @@ add_del_route_t_handler (u8 is_multipath, path.frp_flags = path_flags; - if (is_multipath) - { - stats_dslock_with_hint (1 /* release hint */ , 10 /* tag */ ); - - - vec_add1 (paths, path); - - if (is_add) - fib_table_entry_path_add2 (fib_index, - prefix, - FIB_SOURCE_API, entry_flags, paths); - else - fib_table_entry_path_remove2 (fib_index, - prefix, FIB_SOURCE_API, paths); - - vec_free (paths); - stats_dsunlock (); - return 0; - } - stats_dslock_with_hint (1 /* release hint */ , 2 /* tag */ ); if (is_drop || is_local || is_classify || is_unreach || is_prohibit) @@ -914,6 +877,20 @@ add_del_route_t_handler (u8 is_multipath, fib_table_entry_special_remove (fib_index, prefix, FIB_SOURCE_API); } } + else if (is_multipath) + { + vec_add1 (paths, path); + + if (is_add) + fib_table_entry_path_add2 (fib_index, + prefix, + FIB_SOURCE_API, entry_flags, paths); + else + fib_table_entry_path_remove2 (fib_index, + prefix, FIB_SOURCE_API, paths); + + vec_free (paths); + } else { if (is_add) @@ -1690,7 +1667,7 @@ vl_api_ip6nd_proxy_dump_t_handler (vl_api_ip6nd_proxy_dump_t * mp) .indices = NULL, }; fib_node_index_t *feip; - fib_prefix_t pfx; + const fib_prefix_t *pfx; vl_api_registration_t *reg; reg = vl_api_client_index_to_registration (mp->client_index); @@ -1711,11 +1688,11 @@ vl_api_ip6nd_proxy_dump_t_handler (vl_api_ip6nd_proxy_dump_t * mp) vec_foreach (feip, ctx.indices) { - fib_entry_get_prefix (*feip, &pfx); + pfx = fib_entry_get_prefix (*feip); send_ip6nd_proxy_details (reg, mp->context, - &pfx.fp_addr, + &pfx->fp_addr, fib_entry_get_resolving_interface (*feip)); } @@ -2463,7 +2440,8 @@ wc_arp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) vl_api_send_msg (vl_reg, (u8 *) event); } })); - /* *INDENT-ON* */ + /* *INDENT-ON* */ + vec_free (ra_events[i].prefixes); } } vlib_process_put_event_data (vm, event_data);