diff options
Diffstat (limited to 'vpp/vpp-api/custom_dump.c')
| -rw-r--r-- | vpp/vpp-api/custom_dump.c | 80 |
1 files changed, 7 insertions, 73 deletions
diff --git a/vpp/vpp-api/custom_dump.c b/vpp/vpp-api/custom_dump.c index 887c9fc7459..cce6bb83853 100644 --- a/vpp/vpp-api/custom_dump.c +++ b/vpp/vpp-api/custom_dump.c @@ -477,8 +477,8 @@ static void *vl_api_ip_add_del_route_t_print s = format (s, "via %U ", format_ip4_address, mp->next_hop_address); } - if (mp->vrf_id != 0) - s = format (s, "vrf %d ", ntohl (mp->vrf_id)); + if (mp->table_id != 0) + s = format (s, "vrf %d ", ntohl (mp->table_id)); if (mp->create_vrf_if_needed) s = format (s, "create-vrf "); @@ -498,8 +498,8 @@ static void *vl_api_ip_add_del_route_t_print if (mp->is_multipath) s = format (s, "multipath "); - if (mp->lookup_in_vrf) - s = format (s, "lookup-in-vrf %d ", ntohl (mp->lookup_in_vrf)); + if (mp->next_hop_table_id) + s = format (s, "lookup-in-vrf %d ", ntohl (mp->next_hop_table_id)); FINISH; } @@ -537,30 +537,6 @@ static void *vl_api_proxy_arp_intfc_enable_disable_t_print FINISH; } -static void *vl_api_mpls_add_del_decap_t_print - (vl_api_mpls_add_del_decap_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: mpls_add_del_decap "); - - s = format (s, "rx_vrf_id %d ", ntohl (mp->rx_vrf_id)); - - s = format (s, "tx_vrf_id %d ", ntohl (mp->tx_vrf_id)); - - s = format (s, "label %d ", ntohl (mp->label)); - - s = format (s, "next-index %d ", ntohl (mp->next_index)); - - if (mp->s_bit == 0) - s = format (s, "s-bit-clear "); - - if (mp->is_add == 0) - s = format (s, "del "); - - FINISH; -} - static void *vl_api_mpls_add_del_encap_t_print (vl_api_mpls_add_del_encap_t * mp, void *handle) { @@ -582,33 +558,6 @@ static void *vl_api_mpls_add_del_encap_t_print FINISH; } -static void *vl_api_mpls_gre_add_del_tunnel_t_print - (vl_api_mpls_gre_add_del_tunnel_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: mpls_gre_add_del_tunnel "); - - s = format (s, "src %U ", format_ip4_address, mp->src_address); - - s = format (s, "dst %U ", format_ip4_address, mp->dst_address); - - s = format (s, "adj %U/%d ", format_ip4_address, - (ip4_address_t *) mp->intfc_address, mp->intfc_address_length); - - s = format (s, "inner-vrf_id %d ", ntohl (mp->inner_vrf_id)); - - s = format (s, "outer-vrf_id %d ", ntohl (mp->outer_vrf_id)); - - if (mp->is_add == 0) - s = format (s, "del "); - - if (mp->l2_only) - s = format (s, "l2-only "); - - FINISH; -} - static void *vl_api_mpls_ethernet_add_del_tunnel_t_print (vl_api_mpls_ethernet_add_del_tunnel_t * mp, void *handle) { @@ -2060,18 +2009,6 @@ static void *vl_api_sw_interface_clear_stats_t_print FINISH; } -static void *vl_api_mpls_gre_tunnel_dump_t_print - (vl_api_mpls_gre_tunnel_dump_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: mpls_gre_tunnel_dump "); - - s = format (s, "tunnel_index %d ", ntohl (mp->tunnel_index)); - - FINISH; -} - static void *vl_api_mpls_eth_tunnel_dump_t_print (vl_api_mpls_eth_tunnel_dump_t * mp, void *handle) { @@ -2094,8 +2031,8 @@ static void *vl_api_mpls_fib_encap_dump_t_print FINISH; } -static void *vl_api_mpls_fib_decap_dump_t_print - (vl_api_mpls_fib_decap_dump_t * mp, void *handle) +static void *vl_api_mpls_fib_dump_t_print + (vl_api_mpls_fib_dump_t * mp, void *handle) { u8 *s; @@ -2871,9 +2808,7 @@ _(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump) \ _(IP_ADD_DEL_ROUTE, ip_add_del_route) \ _(PROXY_ARP_ADD_DEL, proxy_arp_add_del) \ _(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable) \ -_(MPLS_ADD_DEL_DECAP, mpls_add_del_decap) \ _(MPLS_ADD_DEL_ENCAP, mpls_add_del_encap) \ -_(MPLS_GRE_ADD_DEL_TUNNEL, mpls_gre_add_del_tunnel) \ _(MPLS_ETHERNET_ADD_DEL_TUNNEL, mpls_ethernet_add_del_tunnel) \ _(MPLS_ETHERNET_ADD_DEL_TUNNEL_2, mpls_ethernet_add_del_tunnel_2) \ _(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered) \ @@ -2951,10 +2886,9 @@ _(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable) \ _(AF_PACKET_CREATE, af_packet_create) \ _(AF_PACKET_DELETE, af_packet_delete) \ _(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats) \ -_(MPLS_GRE_TUNNEL_DUMP, mpls_gre_tunnel_dump) \ _(MPLS_ETH_TUNNEL_DUMP, mpls_eth_tunnel_dump) \ _(MPLS_FIB_ENCAP_DUMP, mpls_fib_encap_dump) \ -_(MPLS_FIB_DECAP_DUMP, mpls_fib_decap_dump) \ +_(MPLS_FIB_DUMP, mpls_fib_dump) \ _(CLASSIFY_TABLE_IDS,classify_table_ids) \ _(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface) \ _(CLASSIFY_TABLE_INFO,classify_table_info) \ |