diff options
| author |   Vladislav Grishenko <themiron@yandex-team.ru> | 2022-08-04 20:36:45 +0500 |
|---|---|---|
| committer |   Damjan Marion <dmarion@0xa5.net> | 2024-03-05 18:48:28 +0000 |
| commit | fb9d1ac843884aca79873577b53f6254e7933478 (patch) | |
| tree | 7848ba7c81826ceafd886cfbbfd76fa9c1bcf562 /src/vnet/ip | |
| parent | 7ad751ba53a792cc6beaade1eb61d0bd9dc87ea5 (diff) | |
vnet: fix format of deleted sw interfaces
As similar 535364e90459566b603661c3dbe360c72f59ad71 is
merged, printing possibly deleted interfaces by index
only in all the rest cases.
Type: improvement
Signed-off-by: Vladislav Grishenko <themiron@yandex-team.ru>
Change-Id: I4fa58b382c0279ff893523ba0188fdb9b09e10af
Diffstat (limited to 'src/vnet/ip')
| -rw-r--r-- | src/vnet/ip/ip6_link.c | 9 | ||||
| -rw-r--r-- | src/vnet/ip/ip6_ll_table.c | 5 | ||||
| -rw-r--r-- | src/vnet/ip/ip6_ll_types.c | 6 | ||||
| -rw-r--r-- | src/vnet/ip/ip_punt_drop.c | 5 |
4 files changed, 10 insertions, 15 deletions
diff --git a/src/vnet/ip/ip6_link.c b/src/vnet/ip/ip6_link.c index afa9d8e3ea9..544a7c33505 100644 --- a/src/vnet/ip/ip6_link.c +++ b/src/vnet/ip/ip6_link.c @@ -594,11 +594,10 @@ format_ip6_link (u8 * s, va_list * arg) if (!ip6_link_is_enabled_i (il)) return (s); - s = format (s, "%U is admin %s\n", - format_vnet_sw_interface_name, vnm, - vnet_get_sw_interface (vnm, il->il_sw_if_index), - (vnet_sw_interface_is_admin_up (vnm, il->il_sw_if_index) ? - "up" : "down")); + s = format ( + s, "%U is admin %s\n", format_vnet_sw_if_index_name, vnm, + il->il_sw_if_index, + (vnet_sw_interface_is_admin_up (vnm, il->il_sw_if_index) ? "up" : "down")); u32 ai; u32 *link_scope = 0, *global_scope = 0; diff --git a/src/vnet/ip/ip6_ll_table.c b/src/vnet/ip/ip6_ll_table.c index 3dc251707bb..331f3f34dcc 100644 --- a/src/vnet/ip/ip6_ll_table.c +++ b/src/vnet/ip/ip6_ll_table.c @@ -52,9 +52,8 @@ ip6_ll_fib_create (u32 sw_if_index) vnet_main_t *vnm = vnet_get_main (); u8 *desc; - desc = format (NULL, "IP6-link-local:%U", - format_vnet_sw_interface_name, - vnm, vnet_get_sw_interface (vnm, sw_if_index)); + desc = format (NULL, "IP6-link-local:%U", format_vnet_sw_if_index_name, vnm, + sw_if_index); ip6_ll_table.ilt_fibs[sw_if_index] = ip6_fib_table_create_and_lock (FIB_SOURCE_IP6_ND, diff --git a/src/vnet/ip/ip6_ll_types.c b/src/vnet/ip/ip6_ll_types.c index a7ac164b05a..b074b6e991c 100644 --- a/src/vnet/ip/ip6_ll_types.c +++ b/src/vnet/ip/ip6_ll_types.c @@ -23,10 +23,8 @@ format_ip6_ll_prefix (u8 * s, va_list * args) ip6_ll_prefix_t *ilp = va_arg (*args, ip6_ll_prefix_t *); vnet_main_t *vnm = vnet_get_main (); - s = format (s, "(%U, %U)", - format_ip6_address, &ilp->ilp_addr, - format_vnet_sw_interface_name, - vnm, vnet_get_sw_interface (vnm, ilp->ilp_sw_if_index)); + s = format (s, "(%U, %U)", format_ip6_address, &ilp->ilp_addr, + format_vnet_sw_if_index_name, vnm, ilp->ilp_sw_if_index); return (s); } diff --git a/src/vnet/ip/ip_punt_drop.c b/src/vnet/ip/ip_punt_drop.c index bf01adadb10..dc113f51386 100644 --- a/src/vnet/ip/ip_punt_drop.c +++ b/src/vnet/ip/ip_punt_drop.c @@ -143,9 +143,8 @@ format_ip_punt_redirect (u8 * s, va_list * args) rx = ip_punt_redirect_get (rxs[rx_sw_if_index]); - s = format (s, " rx %U via:\n", - format_vnet_sw_interface_name, vnm, - vnet_get_sw_interface (vnm, rx_sw_if_index)); + s = format (s, " rx %U via:\n", format_vnet_sw_if_index_name, vnm, + rx_sw_if_index); s = format (s, " %U", format_fib_path_list, rx->pl, 2); s = format (s, " forwarding\n", format_dpo_id, &rx->dpo, 0); s = format (s, " %U\n", format_dpo_id, &rx->dpo, 0); |