X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Flookup.c;h=a0cb28b890652a0e58c2b2346854418f58395ab3;hb=31d6c738c20d3baa619dbbb08af6125fab32bc08;hp=43a90a1b5582556932d384fa20185fec475ae4d6;hpb=eacc8c5943e44d19b5a65a68db3ad5adf9e37495;p=vpp.git diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c index 43a90a1b558..a0cb28b8906 100644 --- a/src/vnet/ip/lookup.c +++ b/src/vnet/ip/lookup.c @@ -13,7 +13,7 @@ * limitations under the License. */ /* - * ip/ip_lookup.c: ip4/6 adjacency and lookup table managment + * ip/ip_lookup.c: ip4/6 adjacency and lookup table management * * Copyright (c) 2008 Eliot Dresselhaus * @@ -50,12 +50,10 @@ #include #include #include -#include -#include /** * @file - * @brief IPv4 and IPv6 adjacency and lookup table managment. + * @brief IPv4 and IPv6 adjacency and lookup table management. * */ @@ -258,27 +256,10 @@ format_ip_flow_hash_config (u8 * s, va_list * args) u8 * format_ip_adjacency_packet_data (u8 * s, va_list * args) { - u32 adj_index = va_arg (*args, u32); u8 *packet_data = va_arg (*args, u8 *); u32 n_packet_data_bytes = va_arg (*args, u32); - ip_adjacency_t *adj; - if (!adj_is_valid (adj_index)) - return format (s, ""); - - adj = adj_get (adj_index); - - switch (adj->lookup_next_index) - { - case IP_LOOKUP_NEXT_REWRITE: - case IP_LOOKUP_NEXT_MCAST: - s = - format (s, "%U", format_hex_bytes, packet_data, n_packet_data_bytes); - break; - - default: - break; - } + s = format (s, "%U", format_hex_bytes, packet_data, n_packet_data_bytes); return s; } @@ -659,7 +640,6 @@ VLIB_CLI_COMMAND (ip4_table_command, static) = { .path = "ip table", .short_help = "ip table [add|del] ", .function = vnet_ip4_table_cmd, - .is_mp_safe = 1, }; /* *INDENT-ON* */ @@ -675,7 +655,6 @@ VLIB_CLI_COMMAND (ip6_table_command, static) = { .path = "ip6 table", .short_help = "ip6 table [add|del] ", .function = vnet_ip6_table_cmd, - .is_mp_safe = 1, }; static clib_error_t * @@ -904,9 +883,6 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, { vec_add1 (rpaths, rpath); } - else if (unformat (line_input, "%U", - unformat_mfib_itf_flags, &rpath.frp_mitf_flags)) - ; else if (unformat (line_input, "%U", unformat_mfib_entry_flags, &eflags)) ; @@ -1019,7 +995,7 @@ done: } /*? - * This command is used to add or delete IPv4 or IPv6 multicastroutes. All + * This command is used to add or delete IPv4 or IPv6 multicast routes. All * IP Addresses ('/', * '' and '') * can be IPv4 or IPv6, but all must be of the same form in a single @@ -1049,210 +1025,6 @@ VLIB_CLI_COMMAND (ip_mroute_command, static) = }; /* *INDENT-ON* */ -/* - * The next two routines address a longstanding script hemorrhoid. - * Probing a v4 or v6 neighbor needs to appear to be synchronous, - * or dependent route-adds will simply fail. - */ -static clib_error_t * -ip6_probe_neighbor_wait (vlib_main_t * vm, ip6_address_t * a, u32 sw_if_index, - int retry_count) -{ - vnet_main_t *vnm = vnet_get_main (); - clib_error_t *e; - int i; - int resolved = 0; - uword event_type; - uword *event_data = 0; - - ASSERT (vlib_in_process_context (vm)); - - if (retry_count > 0) - vnet_register_ip6_neighbor_resolution_event - (vnm, a, vlib_get_current_process (vm)->node_runtime.node_index, - 1 /* event */ , 0 /* data */ ); - - for (i = 0; i < retry_count; i++) - { - /* The interface may be down, etc. */ - e = ip6_probe_neighbor (vm, a, sw_if_index, 0); - - if (e) - return e; - - vlib_process_wait_for_event_or_clock (vm, 1.0); - event_type = vlib_process_get_events (vm, &event_data); - switch (event_type) - { - case 1: /* resolved... */ - vlib_cli_output (vm, "Resolved %U", format_ip6_address, a); - resolved = 1; - goto done; - - case ~0: /* timeout */ - break; - - default: - clib_warning ("unknown event_type %d", event_type); - } - vec_reset_length (event_data); - } - -done: - - if (!resolved) - return clib_error_return (0, "Resolution failed for %U", - format_ip6_address, a); - return 0; -} - -static clib_error_t * -ip4_probe_neighbor_wait (vlib_main_t * vm, ip4_address_t * a, u32 sw_if_index, - int retry_count) -{ - vnet_main_t *vnm = vnet_get_main (); - clib_error_t *e; - int i; - int resolved = 0; - uword event_type; - uword *event_data = 0; - - ASSERT (vlib_in_process_context (vm)); - - if (retry_count > 0) - vnet_register_ip4_arp_resolution_event - (vnm, a, vlib_get_current_process (vm)->node_runtime.node_index, - 1 /* event */ , 0 /* data */ ); - - for (i = 0; i < retry_count; i++) - { - /* The interface may be down, etc. */ - e = ip4_probe_neighbor (vm, a, sw_if_index, 0); - - if (e) - return e; - - vlib_process_wait_for_event_or_clock (vm, 1.0); - event_type = vlib_process_get_events (vm, &event_data); - switch (event_type) - { - case 1: /* resolved... */ - vlib_cli_output (vm, "Resolved %U", format_ip4_address, a); - resolved = 1; - goto done; - - case ~0: /* timeout */ - break; - - default: - clib_warning ("unknown event_type %d", event_type); - } - vec_reset_length (event_data); - } - -done: - - vec_reset_length (event_data); - - if (!resolved) - return clib_error_return (0, "Resolution failed for %U", - format_ip4_address, a); - return 0; -} - -static clib_error_t * -probe_neighbor_address (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) -{ - vnet_main_t *vnm = vnet_get_main (); - unformat_input_t _line_input, *line_input = &_line_input; - ip4_address_t a4; - ip6_address_t a6; - clib_error_t *error = 0; - u32 sw_if_index = ~0; - int retry_count = 3; - int is_ip4 = 1; - int address_set = 0; - - /* Get a line of input. */ - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat_user (line_input, unformat_vnet_sw_interface, vnm, - &sw_if_index)) - ; - else if (unformat (line_input, "retry %d", &retry_count)) - ; - - else if (unformat (line_input, "%U", unformat_ip4_address, &a4)) - address_set++; - else if (unformat (line_input, "%U", unformat_ip6_address, &a6)) - { - address_set++; - is_ip4 = 0; - } - else - { - error = clib_error_return (0, "unknown input '%U'", - format_unformat_error, line_input); - goto done; - } - } - - if (sw_if_index == ~0) - { - error = clib_error_return (0, "Interface required, not set."); - goto done; - } - if (address_set == 0) - { - error = clib_error_return (0, "ip address required, not set."); - goto done; - } - if (address_set > 1) - { - error = clib_error_return (0, "Multiple ip addresses not supported."); - goto done; - } - - if (is_ip4) - error = ip4_probe_neighbor_wait (vm, &a4, sw_if_index, retry_count); - else - error = ip6_probe_neighbor_wait (vm, &a6, sw_if_index, retry_count); - -done: - unformat_free (line_input); - - return error; -} - -/*? - * The 'ip probe-neighbor' command ARPs for IPv4 addresses or - * attempts IPv6 neighbor discovery depending on the supplied IP address - * format. - * - * @note This command will not immediately affect the indicated FIB; it - * is not suitable for use in establishing a FIB entry prior to adding - * recursive FIB entries. As in: don't use it in a script to probe a - * gateway prior to adding a default route. It won't work. Instead, - * configure a static ARP cache entry [see 'set ip arp'], or - * a static IPv6 neighbor [see 'set ip6 neighbor']. - * - * @cliexpar - * Example of probe for an IPv4 address: - * @cliexcmd{ip probe-neighbor GigabitEthernet2/0/0 172.16.1.2} -?*/ -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (ip_probe_neighbor_command, static) = { - .path = "ip probe-neighbor", - .function = probe_neighbor_address, - .short_help = "ip probe-neighbor | [retry nn]", - .is_mp_safe = 1, -}; -/* *INDENT-ON* */ - clib_error_t * vnet_ip_container_proxy_add_del (vnet_ip_container_proxy_args_t * args) {