X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_punt_drop.c;h=e36980ce9ed78f2d6539d62d254d77e9c01a5480;hb=609e1210c6339376dd6cdd0f79195b436d5614d2;hp=3600d7cb9d3cddb2f5aabb601f14d9e856b84307;hpb=8269d3dbe70adaae60806d5d84e35f25d23193c5;p=vpp.git diff --git a/src/vnet/ip/ip4_punt_drop.c b/src/vnet/ip/ip4_punt_drop.c index 3600d7cb9d3..e36980ce9ed 100644 --- a/src/vnet/ip/ip4_punt_drop.c +++ b/src/vnet/ip/ip4_punt_drop.c @@ -414,10 +414,10 @@ ip4_punt_redirect_cmd (vlib_main_t * vm, vlib_cli_command_t * cmd) { unformat_input_t _line_input, *line_input = &_line_input; + ip46_address_t nh = ip46_address_initializer; clib_error_t *error = 0; u32 rx_sw_if_index = 0; u32 tx_sw_if_index = 0; - ip46_address_t nh; vnet_main_t *vnm; u8 is_add; @@ -445,7 +445,7 @@ ip4_punt_redirect_cmd (vlib_main_t * vm, ; else if (unformat (line_input, "via %U", unformat_vnet_sw_interface, vnm, &tx_sw_if_index)) - memset (&nh, 0, sizeof (nh)); + clib_memset (&nh, 0, sizeof (nh)); else { error = unformat_parse_error (line_input); @@ -521,6 +521,42 @@ format_ip_punt_redirect (u8 * s, va_list * args) return (s); } +ip_punt_redirect_detail_t * +ip4_punt_redirect_entries (u32 sw_if_index) +{ + ip_punt_redirect_rx_t *pr; + ip_punt_redirect_detail_t *prs = 0; + u32 rx_sw_if_index; + + vec_foreach_index (rx_sw_if_index, + ip4_punt_redirect_cfg.redirect_by_rx_sw_if_index) + { + if (sw_if_index == ~0 || sw_if_index == rx_sw_if_index) + { + pr = + &ip4_punt_redirect_cfg.redirect_by_rx_sw_if_index[rx_sw_if_index]; + if (~0 != pr->tx_sw_if_index) + { + ip_punt_redirect_detail_t detail = {.rx_sw_if_index = + rx_sw_if_index, + .punt_redirect = *pr + }; + vec_add1 (prs, detail); + } + } + } + if (~0 != ip4_punt_redirect_cfg.any_rx_sw_if_index.tx_sw_if_index) + { + pr = &ip4_punt_redirect_cfg.any_rx_sw_if_index; + ip_punt_redirect_detail_t detail = {.rx_sw_if_index = ~0, + .punt_redirect = *pr + }; + vec_add1 (prs, detail); + } + + return prs; +} + static clib_error_t * ip4_punt_redirect_show_cmd (vlib_main_t * vm, unformat_input_t * main_input,