#include <vnet/ip/ip.h>
#include <vnet/ip/ip_neighbor.h>
#include <vnet/ip/ip_types_api.h>
+#include <vnet/fib/fib_api.h>
#include <vnet/unix/tuntap.h>
#include <vnet/mpls/mpls.h>
#include <vnet/dhcp/dhcp_proxy.h>
#include <vlibmemory/api.h>
#include <vnet/lisp-cp/lisp_types.h>
#include <vnet/qos/qos_types.h>
-#include <vpp/oam/oam.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/ethernet/ethernet_types_api.h>
#include <vpp/api/vpe_msg_enum.h>
#include <vpp/api/types.h>
+#include <vlibapi/api_types_inlines.h>
#include <vnet/bonding/node.h>
FINISH;
}
-static void *vl_api_sw_interface_set_rx_placement_t_print
+__clib_unused
+ static void *vl_api_sw_interface_set_rx_placement_t_print
(vl_api_sw_interface_set_rx_placement_t * mp, void *handle)
{
u8 *s;
FINISH;
}
-static void *vl_api_sw_interface_rx_placement_dump_t_print
+__clib_unused
+ static void *vl_api_sw_interface_rx_placement_dump_t_print
(vl_api_sw_interface_rx_placement_dump_t * mp, void *handle)
{
u8 *s;
u8 *s;
s = format (0, "SCRIPT: bd_ip_mac_add_del ");
- s = format (s, "bd_id %d ", ntohl (mp->bd_id));
+ s = format (s, "bd_id %d ", ntohl (mp->entry.bd_id));
- s = format (s, "%U ", format_vl_api_address, &mp->ip);
- s = format (s, "%U ", format_vl_api_mac_address, &mp->mac);
+ s = format (s, "%U ", format_vl_api_address, &mp->entry.ip);
+ s = format (s, "%U ", format_vl_api_mac_address, &mp->entry.mac);
if (mp->is_add == 0)
s = format (s, "del ");
FINISH;
}
-static void *vl_api_bd_ip_mac_dump_t_print
+__clib_unused
+ static void *vl_api_bd_ip_mac_dump_t_print
(vl_api_bd_ip_mac_dump_t * mp, void *handle)
{
u8 *s;
FINISH;
}
-static void *vl_api_virtio_pci_create_t_print
+__clib_unused
+ static void *vl_api_virtio_pci_create_t_print
(vl_api_virtio_pci_create_t * mp, void *handle)
{
u8 *s;
if (memcmp (mp->mac_address, null_mac, 6))
s = format (s, "mac-address %U ",
format_ethernet_address, mp->mac_address);
- if (mp->tx_ring_sz)
- s = format (s, "tx-ring-size %u ", ntohs (mp->tx_ring_sz));
- if (mp->rx_ring_sz)
- s = format (s, "rx-ring-size %u ", ntohs (mp->rx_ring_sz));
if (mp->features)
s = format (s, "features 0x%llx ", clib_net_to_host_u64 (mp->features));
+ if (mp->gso_enabled)
+ s = format (s, "gso-enabled");
FINISH;
}
-static void *vl_api_virtio_pci_delete_t_print
+__clib_unused
+ static void *vl_api_virtio_pci_delete_t_print
(vl_api_virtio_pci_delete_t * mp, void *handle)
{
u8 *s;
FINISH;
}
-static void *vl_api_sw_interface_virtio_pci_dump_t_print
+__clib_unused
+ static void *vl_api_sw_interface_virtio_pci_dump_t_print
(vl_api_sw_interface_virtio_pci_dump_t * mp, void *handle)
{
u8 *s;
FINISH;
}
-static void *vl_api_sw_interface_bond_dump_t_print
+__clib_unused
+ static void *vl_api_sw_interface_bond_dump_t_print
(vl_api_sw_interface_bond_dump_t * mp, void *handle)
{
u8 *s;
FINISH;
}
-static void *vl_api_sw_interface_slave_dump_t_print
+__clib_unused
+ static void *vl_api_sw_interface_slave_dump_t_print
(vl_api_sw_interface_slave_dump_t * mp, void *handle)
{
u8 *s;
FINISH;
}
-static void *vl_api_ip_add_del_route_t_print
- (vl_api_ip_add_del_route_t * mp, void *handle)
+static void *vl_api_ip_route_add_del_t_print
+ (vl_api_ip_route_add_del_t * mp, void *handle)
{
- u8 *s;
+ u8 *s, p;
- s = format (0, "SCRIPT: ip_add_del_route ");
+ s = format (0, "SCRIPT: ip_route_add_del ");
if (mp->is_add == 0)
s = format (s, "del ");
- if (mp->is_ipv6)
- s = format (s, "%U/%d ", format_ip6_address, mp->dst_address,
- mp->dst_address_length);
- else
- s = format (s, "%U/%d ", format_ip4_address, mp->dst_address,
- mp->dst_address_length);
-
- if (mp->table_id != 0)
- s = format (s, "vrf %d ", ntohl (mp->table_id));
-
- if (mp->is_local)
- s = format (s, "local ");
- else if (mp->is_drop)
- s = format (s, "drop ");
- else if (mp->is_classify)
- s = format (s, "classify %d", ntohl (mp->classify_table_index));
- else if (mp->next_hop_via_label != htonl (MPLS_LABEL_INVALID))
- s = format (s, "via via_label %d ", ntohl (mp->next_hop_via_label));
- else
- {
- if (mp->is_ipv6)
- s = format (s, "via %U ", format_ip6_address, mp->next_hop_address);
- else
- s = format (s, "via %U ", format_ip4_address, mp->next_hop_address);
- if (mp->next_hop_sw_if_index != ~0)
- s = format (s, "sw_if_index %d ", ntohl (mp->next_hop_sw_if_index));
-
- }
-
- if (mp->next_hop_weight != 1)
- s = format (s, "weight %d ", (u32) mp->next_hop_weight);
-
- if (mp->is_multipath)
- s = format (s, "multipath ");
+ s = format (s, "%U", format_vl_api_prefix, &mp->route.prefix);
- if (mp->next_hop_table_id)
- s = format (s, "lookup-in-vrf %d ", ntohl (mp->next_hop_table_id));
-
- if (mp->next_hop_n_out_labels)
- {
- u8 i;
- for (i = 0; i < mp->next_hop_n_out_labels; i++)
- {
- s = format (s, "out-label %d ",
- ntohl (mp->next_hop_out_label_stack[i].label));
- }
- }
+ for (p = 0; p < mp->route.n_paths; p++)
+ s = format (s, " [%U]", format_vl_api_fib_path, &mp->route.paths[p]);
FINISH;
}
static void *vl_api_mpls_route_add_del_t_print
(vl_api_mpls_route_add_del_t * mp, void *handle)
{
- u8 *s;
+ u8 *s, p;
s = format (0, "SCRIPT: mpls_route_add_del ");
else
s = format (s, "del ");
- s = format (s, "%d ", ntohl (mp->mr_label));
+ s = format (s, "table %d ", ntohl (mp->mr_route.mr_table_id));
+ s = format (s, "%d ", ntohl (mp->mr_route.mr_label));
- if (mp->mr_eos)
+ if (mp->mr_route.mr_eos)
s = format (s, "eos ");
else
s = format (s, "non-eos ");
+ if (mp->mr_route.mr_is_multicast)
+ s = format (s, "multicast ");
- if (mp->mr_next_hop_proto == DPO_PROTO_IP4)
- {
- ip4_address_t ip4_null = {.as_u32 = 0, };
- if (memcmp (mp->mr_next_hop, &ip4_null, sizeof (ip4_null)))
- s = format (s, "via %U ", format_ip4_address, mp->mr_next_hop);
- else
- s = format (s, "via lookup-in-ip4-table %d ",
- ntohl (mp->mr_next_hop_table_id));
- }
- else if (mp->mr_next_hop_proto == DPO_PROTO_IP6)
- {
- ip6_address_t ip6_null = { {0}
- };
- if (memcmp (mp->mr_next_hop, &ip6_null, sizeof (ip6_null)))
- s = format (s, "via %U ", format_ip6_address, mp->mr_next_hop);
- else
- s = format (s, "via lookup-in-ip6-table %d ",
- ntohl (mp->mr_next_hop_table_id));
- }
- else if (mp->mr_next_hop_proto == DPO_PROTO_ETHERNET)
- {
- s = format (s, "via l2-input-on ");
- }
- else if (mp->mr_next_hop_proto == DPO_PROTO_MPLS)
- {
- if (mp->mr_next_hop_via_label != htonl (MPLS_LABEL_INVALID))
- s =
- format (s, "via via-label %d ", ntohl (mp->mr_next_hop_via_label));
- else
- s = format (s, "via next-hop-table %d ",
- ntohl (mp->mr_next_hop_table_id));
- }
- if (mp->mr_next_hop_sw_if_index != ~0)
- s = format (s, "sw_if_index %d ", ntohl (mp->mr_next_hop_sw_if_index));
-
- if (mp->mr_next_hop_weight != 1)
- s = format (s, "weight %d ", (u32) mp->mr_next_hop_weight);
-
- if (mp->mr_is_multipath)
- s = format (s, "multipath ");
+ for (p = 0; p < mp->mr_route.mr_n_paths; p++)
+ s =
+ format (s, " [%U]", format_vl_api_fib_path, &mp->mr_route.mr_paths[p]);
- if (mp->mr_is_classify)
- s = format (s, "classify %d", ntohl (mp->mr_classify_table_index));
-
- if (mp->mr_next_hop_n_out_labels)
- {
- u8 i;
- for (i = 0; i < mp->mr_next_hop_n_out_labels; i++)
- {
- s = format (s, "out-label %d ",
- ntohl (mp->mr_next_hop_out_label_stack[i].label));
- }
- }
FINISH;
}
s = format (s, "add ");
else
s = format (s, "del ");
- if (mp->is_ipv6)
+ if (mp->table.is_ip6)
s = format (s, "ip6 ");
- s = format (s, "table %d ", ntohl (mp->table_id));
+ s = format (s, "table %d ", ntohl (mp->table.table_id));
+ s = format (s, "%s ", mp->table.name);
FINISH;
}
s = format (s, "add ");
else
s = format (s, "del ");
- s = format (s, "table %d ", ntohl (mp->mt_table_id));
+ s = format (s, "table %d ", ntohl (mp->mt_table.mt_table_id));
FINISH;
}
static void *vl_api_mpls_tunnel_add_del_t_print
(vl_api_mpls_tunnel_add_del_t * mp, void *handle)
{
- u8 *s;
+ u8 *s, p;
s = format (0, "SCRIPT: mpls_tunnel_add_del ");
if (mp->mt_is_add == 0)
- s = format (s, "del sw_if_index %d ", ntohl (mp->mt_sw_if_index));
-
- mpls_label_t label = ntohl (mp->mt_next_hop_via_label);
- if (label != MPLS_LABEL_INVALID)
- s = format (s, "via-label %d ", label);
- else if (mp->mt_next_hop_proto_is_ip4)
- s = format (s, "via %U ", format_ip4_address, mp->mt_next_hop);
+ s =
+ format (s, "del sw_if_index %d ", ntohl (mp->mt_tunnel.mt_sw_if_index));
else
- s = format (s, "via %U ", format_ip6_address, mp->mt_next_hop);
+ s = format (s, "sw_if_index %d ", ntohl (mp->mt_tunnel.mt_sw_if_index));
- if (mp->mt_next_hop_sw_if_index != ~0)
- s = format (s, "sw_if_index %d ", ntohl (mp->mt_next_hop_sw_if_index));
- else if (mp->mt_next_hop_table_id)
- s = format (s, "next-hop-table %d ", ntohl (mp->mt_next_hop_table_id));
- if (mp->mt_l2_only)
+ if (mp->mt_tunnel.mt_l2_only)
s = format (s, "l2-only ");
+ if (mp->mt_tunnel.mt_is_multicast)
+ s = format (s, "multicast ");
+ if (mp->mt_tunnel.mt_tunnel_index)
+ s = format (s, "tunnel-index ");
- if (mp->mt_next_hop_n_out_labels)
- {
- u8 i;
- for (i = 0; i < mp->mt_next_hop_n_out_labels; i++)
- {
- s = format (s, "out-label %d ",
- ntohl (mp->mt_next_hop_out_label_stack[i].label));
- }
- }
+ for (p = 0; p < mp->mt_tunnel.mt_n_paths; p++)
+ s = format (s, " [%U]", format_vl_api_fib_path,
+ &mp->mt_tunnel.mt_paths[p]);
FINISH;
}
FINISH;
}
-static void *vl_api_oam_add_del_t_print
- (vl_api_oam_add_del_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: oam_add_del ");
-
- if (mp->vrf_id)
- s = format (s, "vrf %d ", ntohl (mp->vrf_id));
-
- s = format (s, "src %U ", format_ip4_address, mp->src_address);
-
- s = format (s, "dst %U ", format_ip4_address, mp->dst_address);
-
- if (mp->is_add == 0)
- s = format (s, "del ");
-
- FINISH;
-}
-
static void *
vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle)
{
FINISH;
}
+static void *vl_api_vxlan_gbp_tunnel_add_del_t_print
+ (vl_api_vxlan_gbp_tunnel_add_del_t * mp, void *handle)
+{
+ u8 *s;
+ s = format (0, "SCRIPT: vxlan_gbp_tunnel_add_del ");
+
+ if (mp->is_add)
+ s = format (s, "add ");
+ else
+ s = format (s, "del ");
+
+ s = format (s, "instance %d ", ntohl (mp->tunnel.instance));
+ s = format (s, "src %U ", format_vl_api_address, &mp->tunnel.src);
+ s = format (s, "dst %U ", format_vl_api_address, &mp->tunnel.dst);
+ s =
+ format (s, "mcast_sw_if_index %d ", ntohl (mp->tunnel.mcast_sw_if_index));
+ s = format (s, "encap_table_id %d ", ntohl (mp->tunnel.encap_table_id));
+ s = format (s, "vni %d ", ntohl (mp->tunnel.vni));
+ s = format (s, "sw_if_index %d ", ntohl (mp->tunnel.sw_if_index));
+
+ FINISH;
+}
+
+static void *vl_api_vxlan_gbp_tunnel_dump_t_print
+ (vl_api_vxlan_gbp_tunnel_dump_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: vxlan_gbp_tunnel_dump ");
+
+ s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+
+ FINISH;
+}
+
+static void *vl_api_sw_interface_set_vxlan_gbp_bypass_t_print
+ (vl_api_sw_interface_set_vxlan_gbp_bypass_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: sw_interface_set_vxlan_gbp_bypass ");
+
+ s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+ s = format (s, "%s ", (mp->is_ipv6 != 0) ? "ipv6" : "ipv4");
+ s = format (s, "%s ", (mp->enable != 0) ? "enable" : "disable");
+
+ FINISH;
+}
+
static void *vl_api_geneve_add_del_tunnel_t_print
(vl_api_geneve_add_del_tunnel_t * mp, void *handle)
{
FINISH;
}
-static void *vl_api_gre_add_del_tunnel_t_print
- (vl_api_gre_add_del_tunnel_t * mp, void *handle)
+static void *vl_api_gre_tunnel_add_del_t_print
+ (vl_api_gre_tunnel_add_del_t * mp, void *handle)
{
u8 *s;
- ip46_address_t src = to_ip46 (mp->is_ipv6, mp->src_address);
- ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->dst_address);
- s = format (0, "SCRIPT: gre_add_del_tunnel ");
+ s = format (0, "SCRIPT: gre_tunnel_add_del ");
- s = format (s, "dst %U ", format_ip46_address, &dst, IP46_TYPE_ANY);
- s = format (s, "src %U ", format_ip46_address, &src, IP46_TYPE_ANY);
+ s = format (s, "dst %U ", format_vl_api_address, &mp->tunnel.dst);
+ s = format (s, "src %U ", format_vl_api_address, &mp->tunnel.src);
- s = format (s, "instance %d ", ntohl (mp->instance));
+ s = format (s, "instance %d ", ntohl (mp->tunnel.instance));
- if (mp->tunnel_type == GRE_TUNNEL_TYPE_TEB)
+ if (mp->tunnel.type == GRE_API_TUNNEL_TYPE_TEB)
s = format (s, "teb ");
- if (mp->tunnel_type == GRE_TUNNEL_TYPE_ERSPAN)
- s = format (s, "erspan %d ", ntohs (mp->session_id));
+ if (mp->tunnel.type == GRE_API_TUNNEL_TYPE_ERSPAN)
+ s = format (s, "erspan %d ", ntohs (mp->tunnel.session_id));
- if (mp->outer_fib_id)
- s = format (s, "outer-fib-id %d ", ntohl (mp->outer_fib_id));
+ if (mp->tunnel.outer_fib_id)
+ s = format (s, "outer-fib-id %d ", ntohl (mp->tunnel.outer_fib_id));
if (mp->is_add == 0)
s = format (s, "del ");
FINISH;
}
-static void *vl_api_show_threads_t_print
+__clib_unused
+ static void *vl_api_show_threads_t_print
(vl_api_show_threads_t * mp, void *handle)
{
u8 *s;
u8 *s;
s = format (0, "SCRIPT: mpls_tunnel_dump ");
-
s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
FINISH;
}
-static void *vl_api_mpls_fib_dump_t_print
- (vl_api_mpls_fib_dump_t * mp, void *handle)
+static void *vl_api_mpls_table_dump_t_print
+ (vl_api_mpls_table_dump_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: mpls_fib_decap_dump ");
+ s = format (0, "SCRIPT: mpls_table_decap_dump ");
FINISH;
}
-static void *vl_api_ip_fib_dump_t_print
- (vl_api_ip_fib_dump_t * mp, void *handle)
+static void *vl_api_mpls_route_dump_t_print
+ (vl_api_mpls_route_dump_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: ip_fib_dump ");
+ s = format (0, "SCRIPT: mpls_route_decap_dump ");
FINISH;
}
-static void *vl_api_ip6_fib_dump_t_print
- (vl_api_ip6_fib_dump_t * mp, void *handle)
+static void *vl_api_ip_table_dump_t_print
+ (vl_api_ip_table_dump_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: ip6_fib_dump ");
+ s = format (0, "SCRIPT: ip_table_dump ");
+
+ FINISH;
+}
+
+static void *vl_api_ip_route_dump_t_print
+ (vl_api_ip_route_dump_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: ip_route_dump ");
FINISH;
}
FINISH;
}
-static void *vl_api_ipsec_gre_add_del_tunnel_t_print
- (vl_api_ipsec_gre_add_del_tunnel_t * mp, void *handle)
+static void *vl_api_ipsec_tunnel_if_add_del_t_print
+ (vl_api_ipsec_tunnel_if_add_del_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel ");
-
- s = format (s, "dst %U ", format_ip4_address,
- (ip4_address_t *) & (mp->dst_address));
+ s = format (0, "SCRIPT: ipsec_tunnel_if_add_del ");
- s = format (s, "src %U ", format_ip4_address,
- (ip4_address_t *) & (mp->src_address));
+ if (mp->esn)
+ s = format (s, "esn");
+ if (mp->anti_replay)
+ s = format (s, "anti-replay");
+ if (mp->udp_encap)
+ s = format (s, "udp-encap");
- s = format (s, "local_sa %d ", ntohl (mp->local_sa_id));
+ s = format (s, "local-ip %U ", format_vl_api_address, &mp->remote_ip);
- s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id));
+ s = format (s, "remote-ip %U ", format_vl_api_address, &mp->local_ip);
+ s = format (s, "tx-table-id %d ", ntohl (mp->tx_table_id));
- if (mp->is_add == 0)
- s = format (s, "del ");
-
- FINISH;
-}
+ s = format (s, "local-spi %d ", ntohl (mp->local_spi));
-static void *vl_api_ipsec_gre_tunnel_dump_t_print
- (vl_api_ipsec_gre_tunnel_dump_t * mp, void *handle)
-{
- u8 *s;
+ s = format (s, "remote-spi %d ", ntohl (mp->remote_spi));
- s = format (0, "SCRIPT: ipsec_gre_tunnel_dump ");
+ s = format (s, "local-crypto-key-len %d ", mp->local_crypto_key_len);
+ s = format (s, "local-crypto-key %U ", format_hex_bytes,
+ mp->local_crypto_key, mp->local_crypto_key_len, 0);
+ s = format (s, "remote-crypto-key-len %d ", mp->remote_crypto_key_len);
+ s = format (s, "remote-crypto-key %U ", format_hex_bytes,
+ mp->remote_crypto_key, mp->remote_crypto_key_len, 0);
+ s = format (s, "local-integ-key-len %d ", mp->local_integ_key_len);
+ s = format (s, "local-integ-key %U ", format_hex_bytes,
+ mp->local_integ_key, mp->local_integ_key_len, 0);
+ s = format (s, "remote-integ-key-len %d ", mp->remote_integ_key_len);
+ s = format (s, "remote-integ-key %U ", format_hex_bytes,
+ mp->remote_integ_key, mp->remote_integ_key_len, 0);
- if (mp->sw_if_index != ~0)
- s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+ if (mp->is_add == 0)
+ s = format (s, "del ");
FINISH;
}
s = format (0, "SCRIPT: punt ");
- if (mp->punt.ipv != (u8) ~ 0)
- s = format (s, "ip %d ", mp->punt.ipv);
+ switch (clib_net_to_host_u32 (mp->punt.type))
+ {
+ case PUNT_API_TYPE_L4:
+ s = format (s, "%U", format_vl_api_address_family, mp->punt.punt.l4.af);
- s = format (s, "protocol %d ", mp->punt.l4_protocol);
+ s = format (s, "protocol %d ", mp->punt.punt.l4.protocol);
- if (mp->punt.l4_port != (u16) ~ 0)
- s = format (s, "port %d ", ntohs (mp->punt.l4_port));
+ if (mp->punt.punt.l4.port != (u16) ~ 0)
+ s = format (s, "port %d ", ntohs (mp->punt.punt.l4.port));
+ break;
+ }
if (!mp->is_add)
s = format (s, "del ");
static void *vl_api_app_namespace_add_del_t_print
(vl_api_app_namespace_add_del_t * mp, void *handle)
{
- u8 *s, *ns_id = 0;
+ u8 *s;
u8 len = clib_min (mp->namespace_id_len,
ARRAY_LEN (mp->namespace_id) - 1);
mp->namespace_id[len] = 0;
FINISH;
}
-static void *vl_api_ip_container_proxy_add_del_t_print
+__clib_unused
+ static void *vl_api_ip_container_proxy_add_del_t_print
(vl_api_ip_container_proxy_add_del_t * mp, void *handle)
{
u8 *s;
_(TAP_CREATE_V2, tap_create_v2) \
_(TAP_DELETE_V2, tap_delete_v2) \
_(SW_INTERFACE_TAP_V2_DUMP, sw_interface_tap_v2_dump) \
-_(IP_ADD_DEL_ROUTE, ip_add_del_route) \
_(IP_TABLE_ADD_DEL, ip_table_add_del) \
_(MPLS_ROUTE_ADD_DEL, mpls_route_add_del) \
_(MPLS_TABLE_ADD_DEL, mpls_table_add_del) \
+_(IP_ROUTE_ADD_DEL, ip_route_add_del) \
_(PROXY_ARP_ADD_DEL, proxy_arp_add_del) \
_(PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable) \
_(MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del) \
_(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del) \
_(CREATE_VLAN_SUBIF, create_vlan_subif) \
_(CREATE_SUBIF, create_subif) \
-_(OAM_ADD_DEL, oam_add_del) \
_(RESET_FIB, reset_fib) \
_(DHCP_PROXY_CONFIG, dhcp_proxy_config) \
_(DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss) \
_(VXLAN_OFFLOAD_RX, vxlan_offload_rx) \
_(GENEVE_ADD_DEL_TUNNEL, geneve_add_del_tunnel) \
_(GENEVE_TUNNEL_DUMP, geneve_tunnel_dump) \
-_(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel) \
+_(GRE_TUNNEL_ADD_DEL, gre_tunnel_add_del) \
_(GRE_TUNNEL_DUMP, gre_tunnel_dump) \
_(L2_FIB_CLEAR_TABLE, l2_fib_clear_table) \
_(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter) \
_(L2_FIB_TABLE_DUMP, l2_fib_table_dump) \
_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel) \
_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump) \
+_(VXLAN_GBP_TUNNEL_ADD_DEL, vxlan_gbp_tunnel_add_del) \
+_(VXLAN_GBP_TUNNEL_DUMP, vxlan_gbp_tunnel_dump) \
+_(SW_INTERFACE_SET_VXLAN_GBP_BYPASS, sw_interface_set_vxlan_gbp_bypass) \
_(INTERFACE_NAME_RENUMBER, interface_name_renumber) \
_(IP_PROBE_NEIGHBOR, ip_probe_neighbor) \
_(IP_SCAN_NEIGHBOR_ENABLE_DISABLE, ip_scan_neighbor_enable_disable) \
_(AF_PACKET_DELETE, af_packet_delete) \
_(AF_PACKET_DUMP, af_packet_dump) \
_(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats) \
-_(MPLS_FIB_DUMP, mpls_fib_dump) \
+_(MPLS_TABLE_DUMP, mpls_table_dump) \
+_(MPLS_ROUTE_DUMP, mpls_route_dump) \
_(MPLS_TUNNEL_DUMP, mpls_tunnel_dump) \
_(CLASSIFY_TABLE_IDS,classify_table_ids) \
_(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface) \
_(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state) \
_(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable) \
_(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable) \
-_(IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel) \
-_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump) \
+_(IPSEC_TUNNEL_IF_ADD_DEL, ipsec_tunnel_if_add_del) \
_(DELETE_SUBIF, delete_subif) \
_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite) \
_(SET_PUNT, set_punt) \
_(GET_FIRST_MSG_ID, get_first_msg_id) \
_(IOAM_ENABLE, ioam_enable) \
_(IOAM_DISABLE, ioam_disable) \
-_(IP_FIB_DUMP, ip_fib_dump) \
-_(IP6_FIB_DUMP, ip6_fib_dump) \
+_(IP_TABLE_DUMP, ip_table_dump) \
+_(IP_ROUTE_DUMP, ip_route_dump) \
_(FEATURE_ENABLE_DISABLE, feature_enable_disable) \
_(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del) \
_(HW_INTERFACE_SET_MTU, hw_interface_set_mtu) \
Code Review / vpp.git / blobdiff