ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vnet: fix format of deleted sw interfaces

Browse Source 
As similar 535364e904 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
This commit is contained in:
Vladislav Grishenko
2022-08-04 20:36:45 +05:00
committed by Damjan Marion
parent 7ad751ba53
commit fb9d1ac843
16 changed files with 49 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/dpdk/device/format.c
View File

@@ -608,10 +608,9 @@ format_dpdk_tx_trace (u8 * s, va_list * va)
dpdk_main_t *dm = &dpdk_main;
dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
u32 indent = format_get_indent (s);
vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
s = format (s, "%U tx queue %d",
format_vnet_sw_interface_name, vnm, sw, t->queue_index);
s = format (s, "%U tx queue %d", format_vnet_sw_if_index_name, vnm,
xd->sw_if_index, t->queue_index);
s = format (s, "\n%Ubuffer 0x%x: %U", format_white_space, indent,
t->buffer_index, format_vnet_buffer_no_chain, &t->buffer);
@@ -638,10 +637,9 @@ format_dpdk_rx_trace (u8 * s, va_list * va)
dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
format_function_t *f;
u32 indent = format_get_indent (s);
vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
s = format (s, "%U rx queue %d",
format_vnet_sw_interface_name, vnm, sw, t->queue_index);
s = format (s, "%U rx queue %d", format_vnet_sw_if_index_name, vnm,
xd->sw_if_index, t->queue_index);
s = format (s, "\n%Ubuffer 0x%x: %U", format_white_space, indent,
t->buffer_index, format_vnet_buffer_no_chain, &t->buffer);

10
src/plugins/l2tp/l2tp.c
View File

@@ -53,12 +53,10 @@ format_l2t_session (u8 * s, va_list * args)
vlib_counter_t v;
s = format (s, "[%d] %U (our) %U (client) %U (sw_if_index %d)\n",
session - lm->sessions,
format_ip6_address, &session->our_address,
format_ip6_address, &session->client_address,
format_vnet_sw_interface_name, lm->vnet_main,
vnet_get_sw_interface (lm->vnet_main, session->sw_if_index),
session->sw_if_index);
session - lm->sessions, format_ip6_address,
&session->our_address, format_ip6_address,
&session->client_address, format_vnet_sw_if_index_name,
lm->vnet_main, session->sw_if_index, session->sw_if_index);
s = format (s, " local cookies %016llx %016llx remote cookie %016llx\n",
clib_net_to_host_u64 (session->local_cookie[0]),

26
src/plugins/lb/cli.c
View File

@@ -447,24 +447,22 @@ lb_set_interface_nat_command_fn (vlib_main_t * vm,
{
if (lb_nat4_interface_add_del (*sw_if_index, is_del))
{
error = clib_error_return(
0, "%s %U failed", is_del ? "del" : "add",
format_vnet_sw_interface_name, vnm,
vnet_get_sw_interface (vnm, *sw_if_index));
goto done;
}
}
error = clib_error_return (
0, "%s %U failed", is_del ? "del" : "add",
format_vnet_sw_if_index_name, vnm, *sw_if_index);
goto done;
}
}
else
{
if (lb_nat6_interface_add_del (*sw_if_index, is_del))
{
error = clib_error_return(
0, "%s %U failed", is_del ? "del" : "add",
format_vnet_sw_interface_name, vnm,
vnet_get_sw_interface (vnm, *sw_if_index));
goto done;
}
}
error = clib_error_return (
0, "%s %U failed", is_del ? "del" : "add",
format_vnet_sw_if_index_name, vnm, *sw_if_index);
goto done;
}
}
}
done:

4
src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c
View File

@@ -224,9 +224,7 @@ format_lisp_gpe_sub_interface (u8 * s, va_list * ap)
lisp_gpe_sub_interface_t *l3s = va_arg (*ap, lisp_gpe_sub_interface_t *);
vnet_main_t *vnm = vnet_get_main ();
s = format (s, "%-16U",
format_vnet_sw_interface_name,
vnm, vnet_get_sw_interface (vnm, l3s->sw_if_index));
s = format (s, "%-16U", format_vnet_sw_if_index_name, vnm, l3s->sw_if_index);
s = format (s, "%=8d", l3s->key->vni);
s = format (s, "%=15d", l3s->sw_if_index);
s = format (s, "%U", format_ip_address, &l3s->key->local_rloc);

9
src/vnet/dpo/dvr_dpo.c
View File

@@ -206,12 +206,9 @@ format_dvr_dpo (u8* s, va_list *ap)
vnet_main_t * vnm = vnet_get_main();
dvr_dpo_t *dd = dvr_dpo_get(index);
return (format(s, "%U-dvr-%U-dpo %U",
format_dpo_proto, dd->dd_proto,
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm, dd->dd_sw_if_index),
format_dvr_reinject, dd->dd_reinject));
return format (s, "%U-dvr-%U-dpo %U", format_dpo_proto, dd->dd_proto,
format_vnet_sw_if_index_name, vnm, dd->dd_sw_if_index,
format_dvr_reinject, dd->dd_reinject);
}
static void

7
src/vnet/dpo/interface_rx_dpo.c
View File

@@ -160,11 +160,8 @@ format_interface_rx_dpo (u8* s, va_list *ap)
vnet_main_t * vnm = vnet_get_main();
interface_rx_dpo_t *ido = interface_rx_dpo_get(index);
return (format(s, "%U-rx-dpo: %U",
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm, ido->ido_sw_if_index),
format_dpo_proto, ido->ido_proto));
return format (s, "%U-rx-dpo: %U", format_vnet_sw_if_index_name, vnm,
ido->ido_sw_if_index, format_dpo_proto, ido->ido_proto);
}
static void

5
src/vnet/dpo/interface_tx_dpo.c
View File

@@ -50,10 +50,7 @@ format_interface_tx_dpo (u8* s, va_list *ap)
CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
vnet_main_t * vnm = vnet_get_main();
return (format(s, "%U-tx-dpo:",
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm, index)));
return format (s, "%U-tx-dpo:", format_vnet_sw_if_index_name, vnm, index);
}
static void

5
src/vnet/dpo/l3_proxy_dpo.c
View File

@@ -116,9 +116,8 @@ format_l3_proxy_dpo (u8 *s, va_list *ap)
if (~0 != l3p->l3p_sw_if_index)
{
return (format(s, "dpo-l3_proxy: %U",
format_vnet_sw_interface_name, vnm,
vnet_get_sw_interface(vnm, l3p->l3p_sw_if_index)));
return (format (s, "dpo-l3_proxy: %U", format_vnet_sw_if_index_name, vnm,
l3p->l3p_sw_if_index));
}
else
{

7
src/vnet/dpo/receive_dpo.c
View File

@@ -122,10 +122,9 @@ format_receive_dpo (u8 *s, va_list *ap)
if (~0 != rd->rd_sw_if_index)
{
return (format(s, "dpo-receive: %U on %U",
format_ip46_address, &rd->rd_addr, IP46_TYPE_ANY,
format_vnet_sw_interface_name, vnm,
vnet_get_sw_interface(vnm, rd->rd_sw_if_index)));
return (format (s, "dpo-receive: %U on %U", format_ip46_address,
&rd->rd_addr, IP46_TYPE_ANY,
format_vnet_sw_if_index_name, vnm, rd->rd_sw_if_index));
}
else
{

14
src/vnet/fib/fib_path.c
View File

@@ -530,11 +530,8 @@ format_fib_path (u8 * s, va_list * args)
else
{
s = format (s, " %U",
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(
vnm,
path->attached.fp_interface));
format_vnet_sw_if_index_name,
vnm, path->attached.fp_interface);
}
break;
case FIB_PATH_TYPE_RECURSIVE:
@@ -585,11 +582,8 @@ format_fib_path (u8 * s, va_list * args)
break;
case FIB_PATH_TYPE_DVR:
s = format (s, " %U",
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(
vnm,
path->dvr.fp_interface));
format_vnet_sw_if_index_name,
vnm, path->dvr.fp_interface);
break;
case FIB_PATH_TYPE_DEAG:
s = format (s, " %sfib-index:%d",

9
src/vnet/ip/ip6_link.c
View File

@@ -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;

5
src/vnet/ip/ip6_ll_table.c
View File

@@ -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,

6
src/vnet/ip/ip6_ll_types.c
View File

@@ -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);
}

5
src/vnet/ip/ip_punt_drop.c
View File

@@ -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);

3
src/vnet/l2/l2_fib.c
View File

@@ -95,8 +95,7 @@ format_vnet_sw_if_index_name_with_NA (u8 * s, va_list * args)
if (!swif)
return format (s, "Stale");
return format (s, "%U", format_vnet_sw_interface_name, vnm,
vnet_get_sw_interface_or_null (vnm, sw_if_index));
return format (s, "%U", format_vnet_sw_if_index_name, vnm, sw_if_index);
}
typedef struct l2fib_dump_walk_ctx_t_

6
src/vnet/mfib/mfib_itf.c
View File

@@ -206,10 +206,8 @@ format_mfib_itf (u8 * s, va_list * args)
if (~0 != mfib_itf->mfi_sw_if_index)
{
return (format(s, " %U: %U",
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm,
mfib_itf->mfi_sw_if_index),
format_vnet_sw_if_index_name,
vnm, mfib_itf->mfi_sw_if_index,
format_mfib_itf_flags, mfib_itf->mfi_flags));
}
else