#include <vnet/srmpls/sr_mpls.h>
#include <vnet/gre/gre.h>
#include <vnet/vxlan-gpe/vxlan_gpe.h>
-#include <vnet/geneve/geneve.h>
#include <vnet/classify/policer_classify.h>
#include <vnet/policer/xlate.h>
#include <vnet/policer/policer.h>
FINISH;
}
-static void *vl_api_sw_interface_set_geneve_bypass_t_print
- (vl_api_sw_interface_set_geneve_bypass_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: sw_interface_set_geneve_bypass ");
-
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
-
- if (mp->is_ipv6)
- s = format (s, "ip6 ");
-
- if (mp->enable)
- s = format (s, "enable ");
- else
- s = format (s, "disable ");
-
- FINISH;
-}
-
static void *vl_api_sw_interface_set_l2_xconnect_t_print
(vl_api_sw_interface_set_l2_xconnect_t * mp, void *handle)
{
s = format (s, "rx-ring-size %u ", (mp->rx_ring_sz));
if (mp->host_mtu_set)
s = format (s, "host-mtu-size %u ", (mp->host_mtu_size));
- if ((mp->tap_flags) & 0x1)
+ if ((mp->tap_flags) & TAP_API_FLAG_GSO)
s = format (s, "gso-enabled ");
- if ((mp->tap_flags) & 0x2)
+ if ((mp->tap_flags) & TAP_API_FLAG_CSUM_OFFLOAD)
s = format (s, "csum-offload-enabled ");
- if ((mp->tap_flags) & 0x4)
+ if ((mp->tap_flags) & TAP_API_FLAG_PERSIST)
s = format (s, "persist ");
- if ((mp->tap_flags) & 0x8)
+ if ((mp->tap_flags) & TAP_API_FLAG_ATTACH)
s = format (s, "attach ");
- if ((mp->tap_flags) & 0x16)
+ if ((mp->tap_flags) & TAP_API_FLAG_TUN)
s = format (s, "tun ");
- if ((mp->tap_flags) & 0x32)
+ if ((mp->tap_flags) & TAP_API_FLAG_GRO_COALESCE)
s = format (s, "gro-coalesce-enabled ");
+ if ((mp->tap_flags) & TAP_API_FLAG_PACKED)
+ s = format (s, "packed ");
+ if ((mp->tap_flags) & TAP_API_FLAG_IN_ORDER)
+ s = format (s, "in-order ");
FINISH;
}
FINISH;
}
+__clib_unused
+ static void *vl_api_virtio_pci_create_v2_t_print
+ (vl_api_virtio_pci_create_v2_t * mp, void *handle)
+{
+ u8 *s;
+ u8 null_mac[6];
+
+ clib_memset (null_mac, 0, sizeof (null_mac));
+
+ s = format (0, "SCRIPT: virtio_pci_create_v2 ");
+ s = format (s, "pci_addr %U ", format_vlib_pci_addr, (mp->pci_addr));
+ if (memcmp (mp->mac_address, null_mac, 6))
+ s = format (s, "mac-address %U ",
+ format_ethernet_address, mp->mac_address);
+ if (mp->features)
+ s = format (s, "features 0x%llx ", clib_net_to_host_u64 (mp->features));
+ if (mp->virtio_flags & VIRTIO_API_FLAG_GSO)
+ s = format (s, "gso-enabled ");
+ if (mp->virtio_flags & VIRTIO_API_FLAG_CSUM_OFFLOAD)
+ s = format (s, "checksum_offload_enabled ");
+ if ((mp->virtio_flags) & VIRTIO_API_FLAG_GRO_COALESCE)
+ s = format (s, "gro-coalesce-enabled ");
+ if ((mp->virtio_flags) & VIRTIO_API_FLAG_PACKED)
+ s = format (s, "packed ");
+ if ((mp->virtio_flags) & VIRTIO_API_FLAG_IN_ORDER)
+ s = format (s, "in-order ");
+ FINISH;
+}
+
__clib_unused
static void *vl_api_virtio_pci_delete_t_print
(vl_api_virtio_pci_delete_t * mp, void *handle)
FINISH;
}
+static void *vl_api_bond_create2_t_print
+ (vl_api_bond_create2_t * mp, void *handle)
+{
+ u8 *s;
+ u8 null_mac[6];
+
+ clib_memset (null_mac, 0, sizeof (null_mac));
+
+ s = format (0, "SCRIPT: bond_create2 ");
+ if (memcmp (mp->mac_address, null_mac, 6))
+ s = format (s, "mac-address %U ",
+ format_ethernet_address, mp->mac_address);
+ if (mp->mode)
+ s = format (s, "mode %U ", format_bond_mode, ntohl (mp->mode));
+ if (mp->lb)
+ s = format (s, "lb %U ", format_bond_load_balance, ntohl (mp->lb));
+ if (mp->numa_only)
+ s = format (s, "numa-only ");
+ if (mp->enable_gso)
+ s = format (s, "gso ");
+ if (mp->id != ~0)
+ s = format (s, "id %u ", (mp->id));
+ FINISH;
+}
+
static void *vl_api_bond_delete_t_print
(vl_api_bond_delete_t * mp, void *handle)
{
FINISH;
}
-static void *vl_api_bond_enslave_t_print
- (vl_api_bond_enslave_t * mp, void *handle)
+static void *vl_api_bond_add_member_t_print
+ (vl_api_bond_add_member_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: bond_enslave ");
+ s = format (0, "SCRIPT: bond_add_member ");
s = format (s, "bond_sw_if_index %u ", (mp->bond_sw_if_index));
s = format (s, "sw_if_index %u ", (mp->sw_if_index));
if (mp->is_passive)
FINISH;
}
-static void *vl_api_bond_detach_slave_t_print
- (vl_api_bond_detach_slave_t * mp, void *handle)
+static void *vl_api_bond_detach_member_t_print
+ (vl_api_bond_detach_member_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: bond_detach_slave ");
+ s = format (0, "SCRIPT: bond_detach_member ");
s = format (s, "sw_if_index %d ", (mp->sw_if_index));
FINISH;
}
-static void *vl_api_sw_interface_bond_dump_t_print
- (vl_api_sw_interface_bond_dump_t * mp, void *handle)
+static void *vl_api_sw_bond_interface_dump_t_print
+ (vl_api_sw_bond_interface_dump_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: sw_interface_bond_dump ");
+ s = format (0, "SCRIPT: sw_bond_interface_dump ");
+ if (mp->sw_if_index != ~0)
+ s = format (s, "sw_if_index %d ", (mp->sw_if_index));
FINISH;
}
-static void *vl_api_sw_interface_slave_dump_t_print
- (vl_api_sw_interface_slave_dump_t * mp, void *handle)
+static void *vl_api_sw_member_interface_dump_t_print
+ (vl_api_sw_member_interface_dump_t * mp, void *handle)
{
u8 *s;
- s = format (0, "SCRIPT: sw_interface_slave_dump ");
+ s = format (0, "SCRIPT: sw_member_interface_dump ");
s = format (s, "sw_if_index %d ", (mp->sw_if_index));
FINISH;
FINISH;
}
-static void *vl_api_geneve_add_del_tunnel_t_print
- (vl_api_geneve_add_del_tunnel_t * mp, void *handle)
-{
- u8 *s;
- s = format (0, "SCRIPT: geneve_add_del_tunnel ");
-
- ip46_address_t local;
- ip46_address_t remote;
- ip_address_decode (&mp->remote_address, &remote);
- ip_address_decode (&mp->local_address, &local);
-
- u8 is_grp = ip46_address_is_multicast (&remote);
- char *remote_name = is_grp ? "group" : "dst";
-
- s = format (s, "src %U ", format_ip46_address, &local, IP46_TYPE_ANY);
- s = format (s, "%s %U ", remote_name, format_ip46_address,
- &remote, IP46_TYPE_ANY);
-
- if (is_grp)
- s = format (s, "mcast_sw_if_index %d ", (mp->mcast_sw_if_index));
-
- if (mp->encap_vrf_id)
- s = format (s, "encap-vrf-id %d ", (mp->encap_vrf_id));
-
- s = format (s, "decap-next %d ", (mp->decap_next_index));
-
- s = format (s, "vni %d ", (mp->vni));
-
- if (mp->is_add == 0)
- s = format (s, "del ");
-
- FINISH;
-}
-
-static void *vl_api_geneve_tunnel_dump_t_print
- (vl_api_geneve_tunnel_dump_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: geneve_tunnel_dump ");
-
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
-
- FINISH;
-}
-
static void *vl_api_gre_tunnel_add_del_t_print
(vl_api_gre_tunnel_add_del_t * mp, void *handle)
{
u8 *s;
s = format (0, "SCRIPT: sw_interface_vhost_user_dump ");
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+ if (mp->sw_if_index != ~0)
+ s = format (s, "sw_if_index %d ", (mp->sw_if_index));
FINISH;
}
FINISH;
}
+static void *vl_api_pg_interface_enable_disable_coalesce_t_print
+ (vl_api_pg_interface_enable_disable_coalesce_t * mp, void *handle)
+{
+ u8 *s;
+
+ s = format (0, "SCRIPT: pg_interface_enable_disable_coalesce ");
+ s = format (s, "sw_if_index %d ", (mp->sw_if_index));
+ if (!mp->coalesce_enabled)
+ s = format (s, "disable");
+ else
+ s = format (s, "enable");
+ FINISH;
+}
+
+
static void *vl_api_ip_source_and_port_range_check_add_del_t_print
(vl_api_ip_source_and_port_range_check_add_del_t * mp, void *handle)
{
"PROTECT",
};
-static const char *proto_strs[] = {
- "ESP",
- "AH",
-};
-
static const char *algo_strs[] = {
"NONE",
"AES_CBC_128",
ep = (vl_api_ipsec_sad_entry_t *) & mp->entry;
- s = format (0, "SCRIPT: ipsec_sad_entry_add_del is_add ", mp->is_add);
+ s = format (0, "SCRIPT: ipsec_sad_entry_add_del is_add %d ", mp->is_add);
tmp = (ep->protocol);
- if (tmp < ARRAY_LEN (proto_strs))
- protocol_str = proto_strs[tmp];
+ if (tmp == IPSEC_API_PROTO_ESP)
+ protocol_str = "ESP";
+ else if (tmp == IPSEC_API_PROTO_AH)
+ protocol_str = "AH";
tmp = (ep->crypto_algorithm);
if (tmp < ARRAY_LEN (algo_strs))
FINISH;
}
-static void *vl_api_sw_interface_set_lldp_t_print
- (vl_api_sw_interface_set_lldp_t * mp, void *handle)
-{
- u8 *s;
- u8 null_data[256];
-
- clib_memset (null_data, 0, sizeof (null_data));
-
- s = format (0, "SCRIPT: sw_interface_set_lldp ");
- s = format (s, "sw_if_index %d ", (mp->sw_if_index));
-
- if (memcmp (&mp->port_desc, null_data, sizeof (mp->port_desc)))
- s = format (s, "port_desc %s ", mp->port_desc);
-
- if (memcmp (mp->mgmt_ip4, null_data, sizeof (mp->mgmt_ip4)))
- s = format (s, "mgmt_ip4 %U ", format_ip4_address, mp->mgmt_ip4);
-
- if (memcmp (mp->mgmt_ip6, null_data, sizeof (mp->mgmt_ip6)))
- s = format (s, "mgmt_ip6 %U ", format_ip6_address, mp->mgmt_ip6);
-
- if (memcmp (mp->mgmt_oid, null_data, sizeof (mp->mgmt_oid)))
- s = format (s, "mgmt_oid %s ", mp->mgmt_oid);
-
- if (mp->enable == 0)
- s = format (s, "disable ");
-
- FINISH;
-}
-
-static void *vl_api_lldp_config_t_print
- (vl_api_lldp_config_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: lldp_config ");
- s = format (s, "system_name %s ", mp->system_name);
- s = format (s, "tx_hold %d ", (mp->tx_hold));
- s = format (s, "tx_interval %d ", (mp->tx_interval));
- FINISH;
-}
-
static void *vl_api_session_rule_add_del_t_print
(vl_api_session_rule_add_del_t * mp, void *handle)
{
_(SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable) \
_(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) \
_(BOND_CREATE, bond_create) \
+_(BOND_CREATE2, bond_create2) \
_(BOND_DELETE, bond_delete) \
-_(BOND_ENSLAVE, bond_enslave) \
-_(BOND_DETACH_SLAVE, bond_detach_slave) \
+_(BOND_ADD_MEMBER, bond_add_member) \
+_(BOND_DETACH_MEMBER, bond_detach_member) \
_(SW_INTERFACE_SET_BOND_WEIGHT, sw_interface_set_bond_weight) \
-_(SW_INTERFACE_SLAVE_DUMP, sw_interface_slave_dump) \
-_(SW_INTERFACE_BOND_DUMP, sw_interface_bond_dump) \
+_(SW_MEMBER_INTERFACE_DUMP, sw_member_interface_dump) \
+_(SW_BOND_INTERFACE_DUMP, sw_bond_interface_dump) \
_(SW_INTERFACE_RX_PLACEMENT_DUMP, sw_interface_rx_placement_dump) \
_(TAP_CREATE_V2, tap_create_v2) \
_(TAP_DELETE_V2, tap_delete_v2) \
_(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel) \
_(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump) \
_(VXLAN_OFFLOAD_RX, vxlan_offload_rx) \
-_(GENEVE_ADD_DEL_TUNNEL, geneve_add_del_tunnel) \
-_(GENEVE_TUNNEL_DUMP, geneve_tunnel_dump) \
_(GRE_TUNNEL_ADD_DEL, gre_tunnel_add_del) \
_(GRE_TUNNEL_DUMP, gre_tunnel_dump) \
_(L2_FIB_CLEAR_TABLE, l2_fib_clear_table) \
_(PG_CREATE_INTERFACE,pg_create_interface) \
_(PG_CAPTURE, pg_capture) \
_(PG_ENABLE_DISABLE, pg_enable_disable) \
+_(PG_INTERFACE_ENABLE_DISABLE_COALESCE, pg_interface_enable_disable_coalesce) \
_(POLICER_ADD_DEL, policer_add_del) \
_(POLICER_DUMP, policer_dump) \
_(POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface) \
_(P2P_ETHERNET_DEL, p2p_ethernet_del) \
_(TCP_CONFIGURE_SRC_ADDRESSES, tcp_configure_src_addresses) \
_(APP_NAMESPACE_ADD_DEL, app_namespace_add_del) \
-_(LLDP_CONFIG, lldp_config) \
-_(SW_INTERFACE_SET_LLDP, sw_interface_set_lldp) \
_(SESSION_RULE_ADD_DEL, session_rule_add_del) \
_(OUTPUT_ACL_SET_INTERFACE, output_acl_set_interface) \
_(QOS_RECORD_ENABLE_DISABLE, qos_record_enable_disable) \
Code Review / vpp.git / blobdiff