X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip-neighbor%2Fip_neighbor.c;h=6ba191abaf6bcc893841922b035d12113d13328d;hb=bb912f2e25b5205f0705c4b8a5bd325aed078754;hp=12ce0d6a2710b1f9a4643982484c03134cb17209;hpb=dc617b8df442f3e25197ec64ffd58d11411b0470;p=vpp.git diff --git a/src/vnet/ip-neighbor/ip_neighbor.c b/src/vnet/ip-neighbor/ip_neighbor.c index 12ce0d6a271..6ba191abaf6 100644 --- a/src/vnet/ip-neighbor/ip_neighbor.c +++ b/src/vnet/ip-neighbor/ip_neighbor.c @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -386,7 +387,7 @@ ip_neighbor_mk_incomplete_walk (adj_index_t ai, void *ctx) } static void -ip_neighbor_free (ip_neighbor_t * ipn) +ip_neighbor_destroy (ip_neighbor_t * ipn) { ip_address_family_t af; @@ -395,6 +396,9 @@ ip_neighbor_free (ip_neighbor_t * ipn) IP_NEIGHBOR_DBG ("free: %U", format_ip_neighbor, ip_neighbor_get_index (ipn)); + ip_neighbor_publish (ip_neighbor_get_index (ipn), + IP_NEIGHBOR_EVENT_REMOVED); + adj_nbr_walk_nh (ipn->ipn_key->ipnk_sw_if_index, ip_address_family_to_fib_proto (af), &ip_addr_46 (&ipn->ipn_key->ipnk_ip), @@ -426,7 +430,7 @@ ip_neighbor_force_reuse (ip_address_family_t af) return (false); elt = clib_llist_prev (ip_neighbor_elt_pool, ipne_anchor, head); - ip_neighbor_free (ip_neighbor_get (elt->ipne_index)); + ip_neighbor_destroy (ip_neighbor_get (elt->ipne_index)); return (true); } @@ -556,7 +560,7 @@ ip_neighbor_add (const ip_address_t * ip, check_customers: /* Customer(s) requesting event for this address? */ - ip_neighbor_publish (ip_neighbor_get_index (ipn)); + ip_neighbor_publish (ip_neighbor_get_index (ipn), IP_NEIGHBOR_EVENT_ADDED); if (stats_index) *stats_index = adj_nbr_find (fproto, @@ -588,7 +592,7 @@ ip_neighbor_del (const ip_address_t * ip, u32 sw_if_index) if (NULL == ipn) return (VNET_API_ERROR_NO_SUCH_ENTRY); - ip_neighbor_free (ipn); + ip_neighbor_destroy (ipn); return (0); } @@ -623,7 +627,8 @@ ip_neighbor_del_all (ip_address_family_t af, u32 sw_if_index) ip_neighbor_walk (af, sw_if_index, ip_neighbor_del_all_walk_cb, &ctx); - vec_foreach (ipni, ctx.ipn_del) ip_neighbor_free (ip_neighbor_get (*ipni)); + vec_foreach (ipni, + ctx.ipn_del) ip_neighbor_destroy (ip_neighbor_get (*ipni)); vec_free (ctx.ipn_del); } @@ -687,13 +692,18 @@ ip_neighbor_update (vnet_main_t * vnm, adj_index_t ai) ip_neighbor_probe (adj); } break; + case IP_LOOKUP_NEXT_REWRITE: + /* Update of an existing rewrite adjacency happens e.g. when the + * interface's MAC address changes */ + if (NULL != ipn) + ip_neighbor_mk_complete (ai, ipn); + break; case IP_LOOKUP_NEXT_GLEAN: case IP_LOOKUP_NEXT_BCAST: case IP_LOOKUP_NEXT_MCAST: case IP_LOOKUP_NEXT_DROP: case IP_LOOKUP_NEXT_PUNT: case IP_LOOKUP_NEXT_LOCAL: - case IP_LOOKUP_NEXT_REWRITE: case IP_LOOKUP_NEXT_MCAST_MIDCHAIN: case IP_LOOKUP_NEXT_MIDCHAIN: case IP_LOOKUP_NEXT_ICMP_ERROR: @@ -836,14 +846,14 @@ ip_neighbor_entries (u32 sw_if_index, ip_address_family_t af) ip_neighbor_t *ipn; /* *INDENT-OFF* */ - pool_foreach (ipn, ip_neighbor_pool, - ({ + pool_foreach (ipn, ip_neighbor_pool) + { if ((sw_if_index == ~0 || ipn->ipn_key->ipnk_sw_if_index == sw_if_index) && (N_AF == af || ip_neighbor_get_af(ipn) == af)) vec_add1 (ipnis, ip_neighbor_get_index(ipn)); - })); + } /* *INDENT-ON* */ @@ -1007,22 +1017,19 @@ ip_neighbor_register (ip_address_family_t af, const ip_neighbor_vft_t * vft) } void -ip_neighbor_probe_dst (const ip_adjacency_t * adj, const ip46_address_t * dst) +ip_neighbor_probe_dst (u32 sw_if_index, + ip_address_family_t af, const ip46_address_t * dst) { - if (!vnet_sw_interface_is_admin_up (vnet_get_main (), - adj->rewrite_header.sw_if_index)) + if (!vnet_sw_interface_is_admin_up (vnet_get_main (), sw_if_index)) return; - switch (adj->ia_nh_proto) + switch (af) { - case FIB_PROTOCOL_IP6: - ip6_neighbor_probe_dst (adj, &dst->ip6); + case AF_IP6: + ip6_neighbor_probe_dst (sw_if_index, &dst->ip6); break; - case FIB_PROTOCOL_IP4: - ip4_neighbor_probe_dst (adj, &dst->ip4); - break; - case FIB_PROTOCOL_MPLS: - ASSERT (0); + case AF_IP4: + ip4_neighbor_probe_dst (sw_if_index, &dst->ip4); break; } } @@ -1030,7 +1037,9 @@ ip_neighbor_probe_dst (const ip_adjacency_t * adj, const ip46_address_t * dst) void ip_neighbor_probe (const ip_adjacency_t * adj) { - ip_neighbor_probe_dst (adj, &adj->sub_type.nbr.next_hop); + ip_neighbor_probe_dst (adj->rewrite_header.sw_if_index, + ip_address_family_from_fib_proto (adj->ia_nh_proto), + &adj->sub_type.nbr.next_hop); } void @@ -1138,35 +1147,6 @@ ip6_neighbor_proxy_del (u32 sw_if_index, const ip6_address_t * addr) return -1; } -static void -ip_neighbor_ethernet_change_mac (ethernet_main_t * em, - u32 sw_if_index, uword opaque) -{ - ip_neighbor_t *ipn; - adj_index_t ai; - - IP_NEIGHBOR_DBG ("mac-change: %U", - format_vnet_sw_if_index_name, vnet_get_main (), - sw_if_index); - - /* *INDENT-OFF* */ - pool_foreach (ipn, ip_neighbor_pool, - ({ - if (ipn->ipn_key->ipnk_sw_if_index == sw_if_index) - adj_nbr_walk_nh (ipn->ipn_key->ipnk_sw_if_index, - ip_address_family_to_fib_proto(ip_neighbor_get_af(ipn)), - &ip_addr_46(&ipn->ipn_key->ipnk_ip), - ip_neighbor_mk_complete_walk, - ipn); - })); - /* *INDENT-ON* */ - - ai = adj_glean_get (FIB_PROTOCOL_IP4, sw_if_index); - - if (ADJ_INDEX_INVALID != ai) - adj_glean_update_rewrite (ai); -} - void ip_neighbor_populate (ip_address_family_t af, u32 sw_if_index) { @@ -1178,12 +1158,12 @@ ip_neighbor_populate (ip_address_family_t af, u32 sw_if_index) sw_if_index, format_ip_address_family, af); /* *INDENT-OFF* */ - pool_foreach (ipn, ip_neighbor_pool, - ({ + pool_foreach (ipn, ip_neighbor_pool) + { if (ip_neighbor_get_af(ipn) == af && ipn->ipn_key->ipnk_sw_if_index == sw_if_index) vec_add1 (ipnis, ipn - ip_neighbor_pool); - })); + } /* *INDENT-ON* */ vec_foreach (ipni, ipnis) @@ -1211,20 +1191,20 @@ ip_neighbor_flush (ip_address_family_t af, u32 sw_if_index) sw_if_index, format_ip_address_family, af); /* *INDENT-OFF* */ - pool_foreach (ipn, ip_neighbor_pool, - ({ + pool_foreach (ipn, ip_neighbor_pool) + { if (ip_neighbor_get_af(ipn) == af && ipn->ipn_key->ipnk_sw_if_index == sw_if_index && ip_neighbor_is_dynamic (ipn)) vec_add1 (ipnis, ipn - ip_neighbor_pool); - })); + } /* *INDENT-ON* */ - vec_foreach (ipni, ipnis) ip_neighbor_free (ip_neighbor_get (*ipni)); + vec_foreach (ipni, ipnis) ip_neighbor_destroy (ip_neighbor_get (*ipni)); vec_free (ipnis); } -static walk_rc_t +walk_rc_t ip_neighbor_mark_one (index_t ipni, void *ctx) { ip_neighbor_t *ipn; @@ -1273,7 +1253,7 @@ ip_neighbor_sweep (ip_address_family_t af) vec_foreach (ipni, ctx.ipnsc_stale) { - ip_neighbor_free (ip_neighbor_get (*ipni)); + ip_neighbor_destroy (ip_neighbor_get (*ipni)); } vec_free (ctx.ipnsc_stale); } @@ -1407,7 +1387,7 @@ ip_neighbor_add_del_interface_address_v4 (ip4_main_t * im, ip_neighbor_walk (AF_IP4, sw_if_index, ip_neighbor_walk_covered, &ctx); vec_foreach (ipni, ctx.ipnis) - ip_neighbor_free (ip_neighbor_get (*ipni)); + ip_neighbor_destroy (ip_neighbor_get (*ipni)); vec_free (ctx.ipnis); } @@ -1449,7 +1429,7 @@ ip_neighbor_add_del_interface_address_v6 (ip6_main_t * im, ip_neighbor_walk (AF_IP6, sw_if_index, ip_neighbor_walk_covered, &ctx); vec_foreach (ipni, ctx.ipnis) - ip_neighbor_free (ip_neighbor_get (*ipni)); + ip_neighbor_destroy (ip_neighbor_get (*ipni)); vec_free (ctx.ipnis); } @@ -1539,14 +1519,8 @@ ip_neighbour_age_out (index_t ipni, f64 now, f64 * wait) } else { - adj_index_t ai; - - ai = adj_glean_get (ip_address_family_to_fib_proto (af), - ip_neighbor_get_sw_if_index (ipn)); - - if (ADJ_INDEX_INVALID != ai) - ip_neighbor_probe_dst (adj_get (ai), - &ip_addr_46 (&ipn->ipn_key->ipnk_ip)); + ip_neighbor_probe_dst (ip_neighbor_get_sw_if_index (ipn), + af, &ip_addr_46 (&ipn->ipn_key->ipnk_ip)); ipn->ipn_n_probes++; *wait = 1; @@ -1623,7 +1597,7 @@ ip_neighbor_age_loop (vlib_main_t * vm, else if (IP_NEIGHBOR_AGE_DEAD == res) { /* the oldest neighbor is dead, pop it, then restart the walk * again from the back */ - ip_neighbor_free (ip_neighbor_get(elt->ipne_index)); + ip_neighbor_destroy (ip_neighbor_get(elt->ipne_index)); goto restart; } @@ -1724,12 +1698,65 @@ ip_neighbor_config_show (vlib_main_t * vm, return (NULL); } +static clib_error_t * +ip_neighbor_config_set (vlib_main_t *vm, unformat_input_t *input, + vlib_cli_command_t *cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + clib_error_t *error = NULL; + ip_address_family_t af; + u32 limit, age; + bool recycle; + + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + if (!unformat (line_input, "%U", unformat_ip_address_family, &af)) + { + error = unformat_parse_error (line_input); + goto done; + } + + limit = ip_neighbor_db[af].ipndb_limit; + age = ip_neighbor_db[af].ipndb_age; + recycle = ip_neighbor_db[af].ipndb_recycle; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "limit %u", &limit)) + ; + else if (unformat (line_input, "age %u", &age)) + ; + else if (unformat (line_input, "recycle")) + recycle = true; + else if (unformat (line_input, "norecycle")) + recycle = false; + else + { + error = unformat_parse_error (line_input); + goto done; + } + } + + ip_neighbor_config (af, limit, age, recycle); + +done: + unformat_free (line_input); + return error; +} + /* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_ip_neighbor_cfg_cmd_node, static) = { .path = "show ip neighbor-config", .function = ip_neighbor_config_show, .short_help = "show ip neighbor-config", }; +VLIB_CLI_COMMAND (set_ip_neighbor_cfg_cmd_node, static) = { + .path = "set ip neighbor-config", + .function = ip_neighbor_config_set, + .short_help = "set ip neighbor-config ip4|ip6 [limit ] [age ] " + "[recycle|norecycle]", +}; /* *INDENT-ON* */ static clib_error_t * @@ -1759,14 +1786,6 @@ ip_neighbor_init (vlib_main_t * vm) }; vec_add1 (ip6_main.table_bind_callbacks, cb); } - { - ethernet_address_change_ctx_t ctx = { - .function = ip_neighbor_ethernet_change_mac, - .function_opaque = 0, - }; - vec_add1 (ethernet_main.address_change_callbacks, ctx); - } - ipn_logger = vlib_log_register_class ("ip", "neighbor"); ip_address_family_t af;