#include <vnet/vnet.h>
#include <vnet/ip/ip.h>
#include <vnet/ip/ip_neighbor.h>
+#include <vnet/ip/ip_types_api.h>
#include <vnet/unix/tuntap.h>
#include <vnet/mpls/mpls.h>
#include <vnet/dhcp/dhcp_proxy.h>
#include <vpp/oam/oam.h>
#include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/ethernet_types_api.h>
#include <vnet/l2/l2_vtr.h>
#include <vpp/api/vpe_msg_enum.h>
FINISH;
}
-static void *vl_api_tap_connect_t_print
- (vl_api_tap_connect_t * mp, void *handle)
-{
- u8 *s;
- u8 null_mac[6];
-
- clib_memset (null_mac, 0, sizeof (null_mac));
-
- s = format (0, "SCRIPT: tap_connect ");
- s = format (s, "tapname %s ", mp->tap_name);
- if (mp->use_random_mac)
- s = format (s, "random-mac ");
- if (mp->tag[0])
- s = format (s, "tag %s ", mp->tag);
- if (memcmp (mp->mac_address, null_mac, 6))
- s = format (s, "mac %U ", format_ethernet_address, mp->mac_address);
- if (mp->ip4_address_set)
- s = format (s, "address %U/%d ", format_ip4_address, mp->ip4_address,
- mp->ip4_mask_width);
- if (mp->ip6_address_set)
- s = format (s, "address %U/%d ", format_ip6_address, mp->ip6_address,
- mp->ip6_mask_width);
- FINISH;
-}
-
-static void *vl_api_tap_modify_t_print
- (vl_api_tap_modify_t * mp, void *handle)
-{
- u8 *s;
- u8 null_mac[6];
-
- clib_memset (null_mac, 0, sizeof (null_mac));
-
- s = format (0, "SCRIPT: tap_modify ");
- s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
- s = format (s, "tapname %s ", mp->tap_name);
- if (mp->use_random_mac)
- s = format (s, "random-mac ");
-
- if (memcmp (mp->mac_address, null_mac, 6))
- s = format (s, "mac %U ", format_ethernet_address, mp->mac_address);
-
- FINISH;
-}
-
-static void *vl_api_tap_delete_t_print
- (vl_api_tap_delete_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: tap_delete ");
- s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
-
- FINISH;
-}
-
-static void *vl_api_sw_interface_tap_dump_t_print
- (vl_api_sw_interface_tap_dump_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: sw_interface_tap_dump ");
-
- FINISH;
-}
-
static void *vl_api_tap_create_v2_t_print
(vl_api_tap_create_v2_t * mp, void *handle)
{
s = format (0, "SCRIPT: proxy_arp_add_del ");
s = format (s, "%U - %U ",
- format_ip4_address, mp->proxy.low_address,
- format_ip4_address, mp->proxy.hi_address);
+ format_vl_api_ip4_address, mp->proxy.low,
+ format_vl_api_ip4_address, mp->proxy.hi);
- if (mp->proxy.vrf_id)
- s = format (s, "vrf %d ", ntohl (mp->proxy.vrf_id));
+ s = format (s, "table %d ", ntohl (mp->proxy.table_id));
if (mp->is_add == 0)
s = format (s, "del ");
(vl_api_ip_neighbor_add_del_t * mp, void *handle)
{
u8 *s;
- u8 null_mac[6];
-
- clib_memset (null_mac, 0, sizeof (null_mac));
s = format (0, "SCRIPT: ip_neighbor_add_del ");
- s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+ s = format (s, "sw_if_index %d ", ntohl (mp->neighbor.sw_if_index));
- if (mp->is_static)
+ if (IP_API_NEIGHBOR_FLAG_STATIC & ntohl (mp->neighbor.flags))
s = format (s, "is_static ");
- if (mp->is_no_adj_fib)
+ if (IP_API_NEIGHBOR_FLAG_NO_FIB_ENTRY & ntohl (mp->neighbor.flags))
s = format (s, "is_no_fib_entry ");
- if (memcmp (mp->mac_address, null_mac, 6))
- s = format (s, "mac %U ", format_ethernet_address, mp->mac_address);
+ s = format (s, "mac %U ", format_vl_api_mac_address,
+ &mp->neighbor.mac_address);
- if (mp->is_ipv6)
- s =
- format (s, "dst %U ", format_ip6_address,
- (ip6_address_t *) mp->dst_address);
- else
- s =
- format (s, "dst %U ", format_ip4_address,
- (ip4_address_t *) mp->dst_address);
+ s = format (s, "dst %U ", format_vl_api_address, &mp->neighbor.ip_address);
if (mp->is_add == 0)
s = format (s, "del ");
FINISH;
}
+
static void *vl_api_create_vlan_subif_t_print
(vl_api_create_vlan_subif_t * mp, void *handle)
{
s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
- s = format (s, "%U/%d ", format_ip6_address, mp->address,
- mp->address_length);
+ s = format (s, "%U ", format_vl_api_prefix, &mp->prefix);
s = format (s, "val_life %d ", ntohl (mp->val_lifetime));
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)
{
s = format (0, "SCRIPT: ip_probe_neighbor ");
s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
- if (mp->is_ipv6)
- s = format (s, "address %U ", format_ip6_address, &mp->dst_address);
- else
- s = format (s, "address %U ", format_ip4_address, &mp->dst_address);
+ s = format (s, "address %U ", format_vl_api_address, &mp->dst);
FINISH;
}
s = format (0, "SCRIPT: want_ip4_arp_events ");
s = format (s, "pid %d address %U ", ntohl (mp->pid),
- format_ip4_address, &mp->address);
+ format_ip4_address, mp->ip);
if (mp->enable_disable == 0)
s = format (s, "del ");
s = format (0, "SCRIPT: want_ip6_nd_events ");
s = format (s, "pid %d address %U ", ntohl (mp->pid),
- format_ip6_address, mp->address);
+ format_vl_api_ip6_address, mp->ip);
if (mp->enable_disable == 0)
s = format (s, "del ");
int i;
s = format (0, "SCRIPT: ip_source_and_port_range_check_add_del ");
- if (mp->is_ipv6)
- s = format (s, "%U/%d ", format_ip6_address, mp->address,
- mp->mask_length);
- else
- s = format (s, "%U/%d ", format_ip4_address, mp->address,
- mp->mask_length);
+ s = format (s, "%U ", format_vl_api_prefix, &mp->prefix);
for (i = 0; i < mp->number_of_ranges; i++)
{
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_gre_tunnel_add_del_t_print
+ (vl_api_ipsec_gre_tunnel_add_del_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: ipsec_gre_add_del_tunnel ");
+ s = format (0, "SCRIPT: ipsec_gre_tunnel_add_del ");
- s = format (s, "dst %U ", format_ip4_address,
- (ip4_address_t *) & (mp->dst_address));
+ s = format (s, "dst %U ", format_vl_api_ip4_address, mp->tunnel.dst);
- s = format (s, "src %U ", format_ip4_address,
- (ip4_address_t *) & (mp->src_address));
+ s = format (s, "src %U ", format_vl_api_ip4_address, mp->tunnel.src);
- s = format (s, "local_sa %d ", ntohl (mp->local_sa_id));
+ s = format (s, "local_sa %d ", ntohl (mp->tunnel.local_sa_id));
- s = format (s, "remote_sa %d ", ntohl (mp->remote_sa_id));
+ s = format (s, "remote_sa %d ", ntohl (mp->tunnel.remote_sa_id));
if (mp->is_add == 0)
s = format (s, "del ");
{
u8 *s;
s = format (0, "SCRIPT: ip_container_proxy_add_del ");
- if (mp->is_ip4)
- s = format (s, "is_add %d address %U/%d sw_if_index %d",
- mp->is_add, format_ip4_address,
- (ip4_address_t *) mp->ip, mp->plen, mp->sw_if_index);
- else
- s = format (s, "is_add %d address %U/%d sw_if_index %d",
- mp->is_add, format_ip6_address,
- (ip6_address_t *) mp->ip, mp->plen, mp->sw_if_index);
+ s = format (s, "is_add %d prefix %U sw_if_index %d",
+ mp->is_add, format_vl_api_prefix, mp->sw_if_index);
+
FINISH;
}
s = format (0, "SCRIPT: qos_record_enable_disable ");
s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
- s =
- format (s, "input_source %U ", format_qos_source,
- ntohl (mp->input_source));
+ s = format (s, "input_source %U ", format_qos_source,
+ ntohl (mp->input_source));
if (!mp->enable)
s = format (s, "disable ");
_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath) \
_(SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass) \
_(SW_INTERFACE_SET_GENEVE_BYPASS, sw_interface_set_geneve_bypass) \
-_(TAP_CONNECT, tap_connect) \
-_(TAP_MODIFY, tap_modify) \
-_(TAP_DELETE, tap_delete) \
-_(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump) \
_(BOND_CREATE, bond_create) \
_(BOND_DELETE, bond_delete) \
_(BOND_ENSLAVE, bond_enslave) \
_(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) \
_(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_ADD_DEL, ipsec_gre_tunnel_add_del) \
_(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump) \
_(DELETE_SUBIF, delete_subif) \
_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite) \