diff options
Diffstat (limited to 'src/vnet/dpo')
| -rw-r--r-- | src/vnet/dpo/dvr_dpo.c | 9 | ||||
| -rw-r--r-- | src/vnet/dpo/interface_rx_dpo.c | 7 | ||||
| -rw-r--r-- | src/vnet/dpo/interface_tx_dpo.c | 5 | ||||
| -rw-r--r-- | src/vnet/dpo/l3_proxy_dpo.c | 5 | ||||
| -rw-r--r-- | src/vnet/dpo/receive_dpo.c | 7 |
5 files changed, 11 insertions, 22 deletions
diff --git a/src/vnet/dpo/dvr_dpo.c b/src/vnet/dpo/dvr_dpo.c index 5db9c803145..2b66467837c 100644 --- a/src/vnet/dpo/dvr_dpo.c +++ b/src/vnet/dpo/dvr_dpo.c @@ -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 diff --git a/src/vnet/dpo/interface_rx_dpo.c b/src/vnet/dpo/interface_rx_dpo.c index d3615d0ce76..5a519d344c1 100644 --- a/src/vnet/dpo/interface_rx_dpo.c +++ b/src/vnet/dpo/interface_rx_dpo.c @@ -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 diff --git a/src/vnet/dpo/interface_tx_dpo.c b/src/vnet/dpo/interface_tx_dpo.c index 870579884a0..73f4e906268 100644 --- a/src/vnet/dpo/interface_tx_dpo.c +++ b/src/vnet/dpo/interface_tx_dpo.c @@ -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 diff --git a/src/vnet/dpo/l3_proxy_dpo.c b/src/vnet/dpo/l3_proxy_dpo.c index 41156301a0e..f89554d775f 100644 --- a/src/vnet/dpo/l3_proxy_dpo.c +++ b/src/vnet/dpo/l3_proxy_dpo.c @@ -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 { diff --git a/src/vnet/dpo/receive_dpo.c b/src/vnet/dpo/receive_dpo.c index 0a97e1d373b..413c3ae5b47 100644 --- a/src/vnet/dpo/receive_dpo.c +++ b/src/vnet/dpo/receive_dpo.c @@ -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 { |