X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_format.c;h=631120b96ac950e66db3091cc645e5c32d0c0700;hb=717de096c4d715eab6b783aaa28f26a9114925da;hp=e58369a1126bc8e1629571fc7732d834c3e45bb4;hpb=d3c008d108aa2187d1a2afe2833b4de25ca2c2ab;p=vpp.git diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c index e58369a1126..631120b96ac 100644 --- a/src/vnet/interface_format.c +++ b/src/vnet/interface_format.c @@ -176,6 +176,21 @@ format_vnet_sw_if_index_name (u8 * s, va_list * args) return format (s, "%U", format_vnet_sw_interface_name, vnm, si); } +u8 * +format_vnet_hw_if_index_name (u8 * s, va_list * args) +{ + vnet_main_t *vnm = va_arg (*args, vnet_main_t *); + u32 hw_if_index = va_arg (*args, u32); + vnet_hw_interface_t *hi; + + hi = vnet_get_hw_interface (vnm, hw_if_index); + + if (hi == 0) + return format (s, "DELETED"); + + return format (s, "%v", hi->name); +} + u8 * format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im, vnet_sw_interface_t * si) @@ -276,6 +291,16 @@ format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im, return s; } +static u8 * +format_vnet_sw_interface_mtu (u8 * s, va_list * args) +{ + vnet_sw_interface_t *si = va_arg (*args, vnet_sw_interface_t *); + + return format (s, "%d/%d/%d/%d", si->mtu[VNET_MTU_L3], + si->mtu[VNET_MTU_IP4], + si->mtu[VNET_MTU_IP6], si->mtu[VNET_MTU_MPLS]); +} + u8 * format_vnet_sw_interface (u8 * s, va_list * args) { @@ -284,12 +309,14 @@ format_vnet_sw_interface (u8 * s, va_list * args) vnet_interface_main_t *im = &vnm->interface_main; if (!si) - return format (s, "%=32s%=5s%=16s%=16s%=16s", - "Name", "Idx", "State", "Counter", "Count"); + return format (s, "%=32s%=5s%=10s%=21s%=16s%=16s", + "Name", "Idx", "State", "MTU (L3/IP4/IP6/MPLS)", "Counter", + "Count"); - s = format (s, "%-32U%=5d%=16U", + s = format (s, "%-32U%=5d%=10U%=21U", format_vnet_sw_interface_name, vnm, si, si->sw_if_index, - format_vnet_sw_interface_flags, si->flags); + format_vnet_sw_interface_flags, si->flags, + format_vnet_sw_interface_mtu, si); s = format_vnet_sw_interface_cntrs (s, im, si);