*/
#include <vat/vat.h>
+#include <vpp/api/types.h>
#include <vppinfra/socket.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <vnet/ip/ip.h>
+#include <vnet/ip/ip_neighbor.h>
#include <vnet/l2/l2_input.h>
#include <vnet/l2tp/l2tp.h>
#include <vnet/vxlan/vxlan.h>
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/ikev2.h>
#include <inttypes.h>
-#include <vnet/map/map.h>
#include <vnet/cop/cop.h>
#include <vnet/ip/ip6_hop_by_hop.h>
#include <vnet/ip/ip_source_and_port_range_check.h>
#include <vnet/mfib/mfib_types.h>
#include <vnet/dhcp/dhcp_proxy.h>
#include <vnet/bonding/node.h>
+#include <vnet/qos/qos_types.h>
#include "vat/json_format.h"
+#include <vnet/ip/ip_types_api.h>
+#include <vnet/ethernet/ethernet_types_api.h>
#include <inttypes.h>
#include <sys/stat.h>
#if VPP_API_TEST_BUILTIN == 0
#include <netdb.h>
+/* *INDENT-OFF* */
+const mac_address_t ZERO_MAC_ADDRESS = {
+ .bytes = {
+ 0, 0, 0, 0, 0, 0,
+ },
+};
+/* *INDENT-ON* */
+
u32
vl (void *p)
{
return 1;
}
+static uword
+api_unformat_hw_if_index (unformat_input_t * input, va_list * args)
+{
+ return 0;
+}
+
/* Parse an IP4 address %d.%d.%d.%d. */
uword
unformat_ip4_address (unformat_input_t * input, va_list * args)
vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *);
vnet_main_t *vnm = vnet_get_main ();
u32 *result = va_arg (*args, u32 *);
- u32 sw_if_index;
- if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
- return 0;
+ return unformat (input, "%U", unformat_vnet_sw_interface, vnm, result);
+}
- *result = sw_if_index;
- return 1;
+static uword
+api_unformat_hw_if_index (unformat_input_t * input, va_list * args)
+{
+ vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *);
+ vnet_main_t *vnm = vnet_get_main ();
+ u32 *result = va_arg (*args, u32 *);
+
+ return unformat (input, "%U", unformat_vnet_hw_interface, vnm, result);
}
+
#endif /* VPP_API_TEST_BUILTIN */
static uword
vam->result_ready = 1;
}
+static void vl_api_show_threads_reply_t_handler
+ (vl_api_show_threads_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ int i, count = 0;
+
+ if (retval >= 0)
+ count = ntohl (mp->count);
+
+ for (i = 0; i < count; i++)
+ print (vam->ofp,
+ "\n%-2d %-11s %-11s %-5d %-6d %-4d %-6d",
+ ntohl (mp->thread_data[i].id), mp->thread_data[i].name,
+ mp->thread_data[i].type, ntohl (mp->thread_data[i].pid),
+ ntohl (mp->thread_data[i].cpu_id), ntohl (mp->thread_data[i].core),
+ ntohl (mp->thread_data[i].cpu_socket));
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void vl_api_show_threads_reply_t_handler_json
+ (vl_api_show_threads_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ vl_api_thread_data_t *td;
+ i32 retval = ntohl (mp->retval);
+ int i, count = 0;
+
+ if (retval >= 0)
+ count = ntohl (mp->count);
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", retval);
+ vat_json_object_add_uint (&node, "count", count);
+
+ for (i = 0; i < count; i++)
+ {
+ td = &mp->thread_data[i];
+ vat_json_object_add_uint (&node, "id", ntohl (td->id));
+ vat_json_object_add_string_copy (&node, "name", td->name);
+ vat_json_object_add_string_copy (&node, "type", td->type);
+ vat_json_object_add_uint (&node, "pid", ntohl (td->pid));
+ vat_json_object_add_int (&node, "cpu_id", ntohl (td->cpu_id));
+ vat_json_object_add_int (&node, "core", ntohl (td->id));
+ vat_json_object_add_int (&node, "cpu_socket", ntohl (td->cpu_socket));
+ }
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static int
+api_show_threads (vat_main_t * vam)
+{
+ vl_api_show_threads_t *mp;
+ int ret;
+
+ print (vam->ofp,
+ "\n%-2s %-11s %-11s %-5s %-6s %-4s %-6s",
+ "ID", "Name", "Type", "LWP", "cpu_id", "Core", "Socket");
+
+ M (SHOW_THREADS, mp);
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
static void
vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp)
{
vl_api_l2_macs_event_t_handler (vl_api_l2_macs_event_t * mp)
{
u32 n_macs = ntohl (mp->n_macs);
- errmsg ("L2MAC event recived with pid %d cl-idx %d for %d macs: \n",
+ errmsg ("L2MAC event received with pid %d cl-idx %d for %d macs: \n",
ntohl (mp->pid), mp->client_index, n_macs);
int i;
for (i = 0; i < n_macs; i++)
u32 n_sw_ifs = ntohl (mp->n_sw_ifs);
int i;
- print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s",
- " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
+ print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-6s %-3s",
+ " ID", "LRN", "FWD", "FLD", "BVI", "UU-FWD", "#IF");
- print (vam->ofp, "%3d %3d %3d %3d %3d %3d",
+ print (vam->ofp, "%3d %3d %3d %3d %3d %6d %3d",
ntohl (mp->bd_id), mp->learn, mp->forward,
- mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
+ mp->flood, ntohl (mp->bvi_sw_if_index),
+ ntohl (mp->uu_fwd_sw_if_index), n_sw_ifs);
if (n_sw_ifs)
{
else
{
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
+ vam->regenerate_interface_table = 1;
}
static void vl_api_mpls_tunnel_add_del_reply_t_handler_json
vam->result_ready = 1;
}
+static void vl_api_vxlan_offload_rx_reply_t_handler
+ (vl_api_vxlan_offload_rx_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
+ }
+}
+
+static void vl_api_vxlan_offload_rx_reply_t_handler_json
+ (vl_api_vxlan_offload_rx_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
+
static void vl_api_geneve_add_del_tunnel_reply_t_handler
(vl_api_geneve_add_del_tunnel_reply_t * mp)
{
vam->result_ready = 1;
}
-static clib_error_t *
-receive_fd_msg (int socket_fd, int *my_fd)
-{
- char msgbuf[16];
- char ctl[CMSG_SPACE (sizeof (int)) + CMSG_SPACE (sizeof (struct ucred))];
- struct msghdr mh = { 0 };
- struct iovec iov[1];
- ssize_t size;
- struct ucred *cr = 0;
- struct cmsghdr *cmsg;
- pid_t pid __attribute__ ((unused));
- uid_t uid __attribute__ ((unused));
- gid_t gid __attribute__ ((unused));
-
- iov[0].iov_base = msgbuf;
- iov[0].iov_len = 5;
- mh.msg_iov = iov;
- mh.msg_iovlen = 1;
- mh.msg_control = ctl;
- mh.msg_controllen = sizeof (ctl);
-
- memset (ctl, 0, sizeof (ctl));
-
- /* receive the incoming message */
- size = recvmsg (socket_fd, &mh, 0);
- if (size != 5)
- {
- return (size == 0) ? clib_error_return (0, "disconnected") :
- clib_error_return_unix (0, "recvmsg: malformed message (fd %d)",
- socket_fd);
- }
-
- cmsg = CMSG_FIRSTHDR (&mh);
- while (cmsg)
- {
- if (cmsg->cmsg_level == SOL_SOCKET)
- {
- if (cmsg->cmsg_type == SCM_CREDENTIALS)
- {
- cr = (struct ucred *) CMSG_DATA (cmsg);
- uid = cr->uid;
- gid = cr->gid;
- pid = cr->pid;
- }
- else if (cmsg->cmsg_type == SCM_RIGHTS)
- {
- clib_memcpy (my_fd, CMSG_DATA (cmsg), sizeof (int));
- }
- }
- cmsg = CMSG_NXTHDR (&mh, cmsg);
- }
- return 0;
-}
-
-static void vl_api_memfd_segment_create_reply_t_handler
- (vl_api_memfd_segment_create_reply_t * mp)
-{
- /* Dont bother in the builtin version */
-#if VPP_API_TEST_BUILTIN == 0
- vat_main_t *vam = &vat_main;
- api_main_t *am = &api_main;
- socket_client_main_t *scm = vam->socket_client_main;
- int my_fd = -1;
- clib_error_t *error;
- ssvm_private_t memfd;
- i32 retval = ntohl (mp->retval);
-
- if (retval == 0)
- {
- error = receive_fd_msg (scm->socket_fd, &my_fd);
- if (error)
- {
- retval = -99;
- goto out;
- }
-
- memset (&memfd, 0, sizeof (memfd));
- memfd.fd = my_fd;
-
- vam->client_index_invalid = 1;
-
- /* Note: this closes memfd.fd */
- retval = ssvm_slave_init_memfd (&memfd);
- if (retval)
- clib_warning ("WARNING: segment map returned %d", retval);
-
- /* Pivot to the memory client segment that vpp just created */
-
- am->vlib_rp = (void *) (memfd.requested_va + MMAP_PAGESIZE);
-
- am->shmem_hdr = (void *) am->vlib_rp->user_ctx;
-
- vl_client_install_client_message_handlers ();
-
- vl_client_connect_to_vlib_no_map ("pvt",
- "vpp_api_test(p)",
- 32 /* input_queue_length */ );
- vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
-
- vl_socket_client_enable_disable (0 /* disable socket */ );
- }
-
-out:
- if (vam->async_mode)
- {
- vam->async_errors += (retval < 0);
- }
- else
- {
- vam->retval = retval;
- vam->result_ready = 1;
- }
-#endif
-}
-
-static void vl_api_memfd_segment_create_reply_t_handler_json
- (vl_api_memfd_segment_create_reply_t * mp)
-{
- clib_warning ("no");
-}
-
static void vl_api_dns_resolve_name_reply_t_handler
(vl_api_dns_resolve_name_reply_t * mp)
{
clib_net_to_host_u32 (mp->sw_if_index));
}
-static void vl_api_map_domain_details_t_handler_json
- (vl_api_map_domain_details_t * mp)
-{
- vat_json_node_t *node = NULL;
- vat_main_t *vam = &vat_main;
- struct in6_addr ip6;
- struct in_addr ip4;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
-
- node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object (node);
-
- vat_json_object_add_uint (node, "domain_index",
- clib_net_to_host_u32 (mp->domain_index));
- clib_memcpy (&ip6, mp->ip6_prefix, sizeof (ip6));
- vat_json_object_add_ip6 (node, "ip6_prefix", ip6);
- clib_memcpy (&ip4, mp->ip4_prefix, sizeof (ip4));
- vat_json_object_add_ip4 (node, "ip4_prefix", ip4);
- clib_memcpy (&ip6, mp->ip6_src, sizeof (ip6));
- vat_json_object_add_ip6 (node, "ip6_src", ip6);
- vat_json_object_add_int (node, "ip6_prefix_len", mp->ip6_prefix_len);
- vat_json_object_add_int (node, "ip4_prefix_len", mp->ip4_prefix_len);
- vat_json_object_add_int (node, "ip6_src_len", mp->ip6_src_len);
- vat_json_object_add_int (node, "ea_bits_len", mp->ea_bits_len);
- vat_json_object_add_int (node, "psid_offset", mp->psid_offset);
- vat_json_object_add_int (node, "psid_length", mp->psid_length);
- vat_json_object_add_uint (node, "flags", mp->flags);
- vat_json_object_add_uint (node, "mtu", clib_net_to_host_u16 (mp->mtu));
- vat_json_object_add_int (node, "is_translation", mp->is_translation);
-}
-
-static void vl_api_map_domain_details_t_handler
- (vl_api_map_domain_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
-
- if (mp->is_translation)
- {
- print (vam->ofp,
- "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u",
- format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
- format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
- format_ip6_address, mp->ip6_src, mp->ip6_src_len,
- clib_net_to_host_u32 (mp->domain_index));
- }
- else
- {
- print (vam->ofp,
- "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u",
- format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
- format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
- format_ip6_address, mp->ip6_src,
- clib_net_to_host_u32 (mp->domain_index));
- }
- print (vam->ofp, " ea-len %d psid-offset %d psid-len %d mtu %d %s",
- mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu,
- mp->is_translation ? "map-t" : "");
-}
-
-static void vl_api_map_rule_details_t_handler_json
- (vl_api_map_rule_details_t * mp)
-{
- struct in6_addr ip6;
- vat_json_node_t *node = NULL;
- vat_main_t *vam = &vat_main;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
-
- node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object (node);
-
- vat_json_object_add_uint (node, "psid", clib_net_to_host_u16 (mp->psid));
- clib_memcpy (&ip6, mp->ip6_dst, sizeof (ip6));
- vat_json_object_add_ip6 (node, "ip6_dst", ip6);
-}
-
-static void
-vl_api_map_rule_details_t_handler (vl_api_map_rule_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- print (vam->ofp, " %d (psid) %U (ip6-dst)",
- clib_net_to_host_u16 (mp->psid), format_ip6_address, mp->ip6_dst);
-}
-
static void
vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp)
{
errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
"router_addr %U host_mac %U",
- ntohl (mp->pid), mp->is_ipv6 ? "ipv6" : "ipv4", mp->hostname,
- format_ip4_address, &mp->host_address,
- format_ip4_address, &mp->router_address,
- format_ethernet_address, mp->host_mac);
+ ntohl (mp->pid), mp->lease.is_ipv6 ? "ipv6" : "ipv4",
+ mp->lease.hostname,
+ format_ip4_address, &mp->lease.host_address,
+ format_ip4_address, &mp->lease.router_address,
+ format_ethernet_address, mp->lease.host_mac);
}
static void vl_api_dhcp_compl_event_t_handler_json
{
hash_free (vam->graph_node_index_by_name);
- for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ for (i = 0; i < vec_len (vam->graph_nodes[0]); i++)
{
- node = vam->graph_nodes[i];
+ node = vam->graph_nodes[0][i];
vec_free (node->name);
vec_free (node->next_nodes);
vec_free (node);
}
+ vec_free (vam->graph_nodes[0]);
vec_free (vam->graph_nodes);
}
vam->graph_nodes = vlib_node_unserialize (pvt_copy);
vec_free (pvt_copy);
- for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ for (i = 0; i < vec_len (vam->graph_nodes[0]); i++)
{
- node = vam->graph_nodes[i];
+ node = vam->graph_nodes[0][i];
hash_set_mem (vam->graph_node_index_by_name, node->name, i);
}
}
_(sw_interface_set_flags_reply) \
_(sw_interface_add_del_address_reply) \
_(sw_interface_set_rx_mode_reply) \
+_(sw_interface_set_rx_placement_reply) \
_(sw_interface_set_table_reply) \
_(sw_interface_set_mpls_enable_reply) \
_(sw_interface_set_vpath_reply) \
_(sw_interface_ip6nd_ra_config_reply) \
_(set_arp_neighbor_limit_reply) \
_(l2_patch_add_del_reply) \
+_(sr_mpls_policy_add_reply) \
+_(sr_mpls_policy_mod_reply) \
+_(sr_mpls_policy_del_reply) \
_(sr_policy_add_reply) \
_(sr_policy_mod_reply) \
_(sr_policy_del_reply) \
_(l2_interface_vlan_tag_rewrite_reply) \
_(modify_vhost_user_if_reply) \
_(delete_vhost_user_if_reply) \
+_(ip_probe_neighbor_reply) \
+_(ip_scan_neighbor_enable_disable_reply) \
_(want_ip4_arp_events_reply) \
_(want_ip6_nd_events_reply) \
_(want_l2_macs_events_reply) \
_(ikev2_initiate_rekey_child_sa_reply) \
_(delete_loopback_reply) \
_(bd_ip_mac_add_del_reply) \
-_(map_del_domain_reply) \
-_(map_add_del_rule_reply) \
_(want_interface_events_reply) \
_(want_stats_reply) \
_(cop_interface_enable_disable_reply) \
_(punt_reply) \
_(feature_enable_disable_reply) \
_(sw_interface_tag_add_del_reply) \
-_(sw_interface_set_mtu_reply) \
+_(hw_interface_set_mtu_reply) \
_(p2p_ethernet_add_reply) \
_(p2p_ethernet_del_reply) \
_(lldp_config_reply) \
_(dns_name_server_add_del_reply) \
_(session_rule_add_del_reply) \
_(ip_container_proxy_add_del_reply) \
-_(output_acl_set_interface_reply)
+_(output_acl_set_interface_reply) \
+_(qos_record_enable_disable_reply)
#define _(n) \
static void vl_api_##n##_t_handler \
_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \
sw_interface_add_del_address_reply) \
_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \
+_(SW_INTERFACE_SET_RX_PLACEMENT_REPLY, sw_interface_set_rx_placement_reply) \
+_(SW_INTERFACE_RX_PLACEMENT_DETAILS, sw_interface_rx_placement_details) \
_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \
_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \
_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \
sw_interface_ip6nd_ra_config_reply) \
_(SET_ARP_NEIGHBOR_LIMIT_REPLY, set_arp_neighbor_limit_reply) \
_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply) \
+_(SR_MPLS_POLICY_ADD_REPLY, sr_mpls_policy_add_reply) \
+_(SR_MPLS_POLICY_MOD_REPLY, sr_mpls_policy_mod_reply) \
+_(SR_MPLS_POLICY_DEL_REPLY, sr_mpls_policy_del_reply) \
_(SR_POLICY_ADD_REPLY, sr_policy_add_reply) \
_(SR_POLICY_MOD_REPLY, sr_policy_mod_reply) \
_(SR_POLICY_DEL_REPLY, sr_policy_del_reply) \
_(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply) \
_(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details) \
_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \
+_(VXLAN_OFFLOAD_RX_REPLY, vxlan_offload_rx_reply) \
_(GENEVE_ADD_DEL_TUNNEL_REPLY, geneve_add_del_tunnel_reply) \
_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \
_(GENEVE_TUNNEL_DETAILS, geneve_tunnel_details) \
_(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply) \
_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \
_(SHOW_VERSION_REPLY, show_version_reply) \
+_(SHOW_THREADS_REPLY, show_threads_reply) \
_(L2_FIB_TABLE_DETAILS, l2_fib_table_details) \
-_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \
+_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \
_(VXLAN_GPE_TUNNEL_DETAILS, vxlan_gpe_tunnel_details) \
_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \
+_(IP_PROBE_NEIGHBOR_REPLY, ip_probe_neighbor_reply) \
+_(IP_SCAN_NEIGHBOR_ENABLE_DISABLE_REPLY, ip_scan_neighbor_enable_disable_reply) \
_(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply) \
_(IP4_ARP_EVENT, ip4_arp_event) \
_(WANT_IP6_ND_EVENTS_REPLY, want_ip6_nd_events_reply) \
_(IKEV2_INITIATE_REKEY_CHILD_SA_REPLY, ikev2_initiate_rekey_child_sa_reply) \
_(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \
_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \
+_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \
_(DHCP_COMPL_EVENT, dhcp_compl_event) \
-_(MAP_ADD_DOMAIN_REPLY, map_add_domain_reply) \
-_(MAP_DEL_DOMAIN_REPLY, map_del_domain_reply) \
-_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply) \
-_(MAP_DOMAIN_DETAILS, map_domain_details) \
-_(MAP_RULE_DETAILS, map_rule_details) \
_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \
_(WANT_STATS_REPLY, want_stats_reply) \
_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \
show_one_map_register_fallback_threshold_reply) \
_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \
_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \
+_(AF_PACKET_DETAILS, af_packet_details) \
_(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \
_(POLICER_DETAILS, policer_details) \
_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \
_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \
_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \
_(L2_XCONNECT_DETAILS, l2_xconnect_details) \
-_(SW_INTERFACE_SET_MTU_REPLY, sw_interface_set_mtu_reply) \
+_(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \
_(IP_NEIGHBOR_DETAILS, ip_neighbor_details) \
_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \
_(P2P_ETHERNET_ADD_REPLY, p2p_ethernet_add_reply) \
_(SESSION_RULES_DETAILS, session_rules_details) \
_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \
_(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \
+_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply)
#define foreach_standalone_reply_msg \
_(SW_INTERFACE_EVENT, sw_interface_event) \
_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters) \
_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters) \
_(VNET_IP4_NBR_COUNTERS, vnet_ip4_nbr_counters) \
-_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters) \
-_(MEMFD_SEGMENT_CREATE_REPLY, memfd_segment_create_reply) \
+_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters)
typedef struct
{
u32 value;
} name_sort_t;
-
#define STR_VTR_OP_CASE(op) \
case L2_VTR_ ## op: \
return "" # op;
u32 user_instance = 0;
int ret;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
}
static int
-api_sw_interface_clear_stats (vat_main_t * vam)
+api_sw_interface_set_rx_placement (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_clear_stats_t *mp;
+ vl_api_sw_interface_set_rx_placement_t *mp;
u32 sw_if_index;
u8 sw_if_index_set = 0;
int ret;
+ u8 is_main = 0;
+ u32 queue_id, thread_index;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ if (unformat (i, "queue %d", &queue_id))
+ ;
+ else if (unformat (i, "main"))
+ is_main = 1;
+ else if (unformat (i, "worker %d", &thread_index))
+ ;
+ else
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
sw_if_index_set = 1;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
break;
}
- /* Construct the API message */
- M (SW_INTERFACE_CLEAR_STATS, mp);
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
- if (sw_if_index_set == 1)
- mp->sw_if_index = ntohl (sw_if_index);
- else
- mp->sw_if_index = ~0;
+ if (is_main)
+ thread_index = 0;
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_RX_PLACEMENT, mp);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->worker_id = ntohl (thread_index);
+ mp->queue_id = ntohl (queue_id);
+ mp->is_main = is_main;
/* send it... */
S (mp);
-
/* Wait for a reply, return the good/bad news... */
W (ret);
return ret;
}
+static void vl_api_sw_interface_rx_placement_details_t_handler
+ (vl_api_sw_interface_rx_placement_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ u32 worker_id = ntohl (mp->worker_id);
+
+ print (vam->ofp,
+ "\n%-11d %-11s %-6d %-5d %-9s",
+ ntohl (mp->sw_if_index), (worker_id == 0) ? "main" : "worker",
+ worker_id, ntohl (mp->queue_id),
+ (mp->mode ==
+ 1) ? "polling" : ((mp->mode == 2) ? "interrupt" : "adaptive"));
+}
+
+static void vl_api_sw_interface_rx_placement_details_t_handler_json
+ (vl_api_sw_interface_rx_placement_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "worker_id", ntohl (mp->worker_id));
+ vat_json_object_add_uint (node, "queue_id", ntohl (mp->queue_id));
+ vat_json_object_add_uint (node, "mode", mp->mode);
+}
+
static int
-api_sw_interface_add_del_address (vat_main_t * vam)
+api_sw_interface_rx_placement_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_add_del_address_t *mp;
+ vl_api_sw_interface_rx_placement_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 is_add = 1, del_all = 0;
- u32 address_length = 0;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
- int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set++;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set++;
+ else
+ break;
+ }
+
+ print (vam->ofp,
+ "\n%-11s %-11s %-6s %-5s %-4s",
+ "sw_if_index", "main/worker", "thread", "queue", "mode");
+
+ /* Dump Interface rx placement */
+ M (SW_INTERFACE_RX_PLACEMENT_DUMP, mp);
+
+ if (sw_if_index_set)
+ mp->sw_if_index = htonl (sw_if_index);
+ else
+ mp->sw_if_index = ~0;
+
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ W (ret);
+ return ret;
+}
+
+static int
+api_sw_interface_clear_stats (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_clear_stats_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ int ret;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
+
+ /* Construct the API message */
+ M (SW_INTERFACE_CLEAR_STATS, mp);
+
+ if (sw_if_index_set == 1)
+ mp->sw_if_index = ntohl (sw_if_index);
+ else
+ mp->sw_if_index = ~0;
+
+ /* send it... */
+ S (mp);
+
+ /* Wait for a reply, return the good/bad news... */
+ W (ret);
+ return ret;
+}
+
+static int
+api_sw_interface_add_del_address (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_add_del_address_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 is_add = 1, del_all = 0;
+ u32 address_length = 0;
+ u8 v4_address_set = 0;
+ u8 v6_address_set = 0;
+ ip4_address_t v4address;
+ ip6_address_t v6address;
+ int ret;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
unformat_input_t *i = vam->input;
vl_api_sw_interface_set_l2_bridge_t *mp;
+ vl_api_l2_port_type_t port_type;
u32 rx_sw_if_index;
u8 rx_sw_if_index_set = 0;
u32 bd_id;
u8 bd_id_set = 0;
- u8 bvi = 0;
u32 shg = 0;
u8 enable = 1;
int ret;
+ port_type = L2_API_PORT_TYPE_NORMAL;
+
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
else if (unformat (i, "shg %d", &shg))
;
else if (unformat (i, "bvi"))
- bvi = 1;
+ port_type = L2_API_PORT_TYPE_BVI;
+ else if (unformat (i, "uu-fwd"))
+ port_type = L2_API_PORT_TYPE_UU_FWD;
else if (unformat (i, "enable"))
enable = 1;
else if (unformat (i, "disable"))
mp->rx_sw_if_index = ntohl (rx_sw_if_index);
mp->bd_id = ntohl (bd_id);
mp->shg = (u8) shg;
- mp->bvi = bvi;
+ mp->port_type = ntohl (port_type);
mp->enable = enable;
S (mp);
u8 mac_set = 0;
u32 bd_id;
u8 bd_id_set = 0;
- u32 sw_if_index = ~0;
+ u32 sw_if_index = 0;
u8 sw_if_index_set = 0;
u8 is_add = 1;
u8 static_mac = 0;
clib_memcpy (mp->mac, mac, 6);
mp->bd_id = ntohl (bd_id);
mp->is_add = is_add;
+ mp->sw_if_index = ntohl (sw_if_index);
if (is_add)
{
- mp->sw_if_index = ntohl (sw_if_index);
mp->static_mac = static_mac;
mp->filter_mac = filter_mac;
mp->bvi_mac = bvi_mac;
u32 bd_id;
u8 bd_id_set = 0;
u8 is_set = 1;
- u32 flags = 0;
+ bd_flags_t flags = 0;
int ret;
/* Parse args required to build the message */
if (unformat (i, "bd_id %d", &bd_id))
bd_id_set = 1;
else if (unformat (i, "learn"))
- flags |= L2_LEARN;
+ flags |= BRIDGE_API_FLAG_LEARN;
else if (unformat (i, "forward"))
- flags |= L2_FWD;
+ flags |= BRIDGE_API_FLAG_FWD;
else if (unformat (i, "flood"))
- flags |= L2_FLOOD;
+ flags |= BRIDGE_API_FLAG_FLOOD;
else if (unformat (i, "uu-flood"))
- flags |= L2_UU_FLOOD;
+ flags |= BRIDGE_API_FLAG_UU_FLOOD;
else if (unformat (i, "arp-term"))
- flags |= L2_ARP_TERM;
+ flags |= BRIDGE_API_FLAG_ARP_TERM;
else if (unformat (i, "off"))
is_set = 0;
else if (unformat (i, "disable"))
M (BRIDGE_FLAGS, mp);
mp->bd_id = ntohl (bd_id);
- mp->feature_bitmap = ntohl (flags);
+ mp->flags = ntohl (flags);
mp->is_set = is_set;
S (mp);
static int
api_bd_ip_mac_add_del (vat_main_t * vam)
{
+ vl_api_address_t ip = VL_API_ZERO_ADDRESS;
+ vl_api_mac_address_t mac = VL_API_ZERO_MAC_ADDRESS;
unformat_input_t *i = vam->input;
vl_api_bd_ip_mac_add_del_t *mp;
+ ip46_type_t type;
u32 bd_id;
u8 is_ipv6 = 0;
u8 is_add = 1;
u8 bd_id_set = 0;
u8 ip_set = 0;
u8 mac_set = 0;
- ip4_address_t v4addr;
- ip6_address_t v6addr;
u8 macaddr[6];
int ret;
{
bd_id_set++;
}
- else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
- {
- ip_set++;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
+ else if (unformat (i, "%U", unformat_vl_api_address, &ip))
{
ip_set++;
- is_ipv6++;
}
- else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
+ else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac))
{
mac_set++;
}
M (BD_IP_MAC_ADD_DEL, mp);
mp->bd_id = ntohl (bd_id);
- mp->is_ipv6 = is_ipv6;
mp->is_add = is_add;
- if (is_ipv6)
- clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
+
+ clib_memcpy (&mp->ip, &ip, sizeof (ip));
+ clib_memcpy (&mp->mac, &mac, sizeof (mac));
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static void vl_api_bd_ip_mac_details_t_handler
+ (vl_api_bd_ip_mac_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ u8 *ip = 0;
+
+ if (!mp->is_ipv6)
+ ip =
+ format (0, "%U", format_ip4_address, (ip4_address_t *) mp->ip_address);
+ else
+ ip =
+ format (0, "%U", format_ip6_address, (ip6_address_t *) mp->ip_address);
+
+ print (vam->ofp,
+ "\n%-5d %-7s %-20U %-30s",
+ ntohl (mp->bd_id), mp->is_ipv6 ? "ip6" : "ip4",
+ format_ethernet_address, mp->mac_address, ip);
+
+ vec_free (ip);
+}
+
+static void vl_api_bd_ip_mac_details_t_handler_json
+ (vl_api_bd_ip_mac_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+ vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6);
+ vat_json_object_add_string_copy (node, "mac_address",
+ format (0, "%U", format_ethernet_address,
+ &mp->mac_address));
+ u8 *ip = 0;
+
+ if (!mp->is_ipv6)
+ ip =
+ format (0, "%U", format_ip4_address, (ip4_address_t *) mp->ip_address);
+ else
+ ip =
+ format (0, "%U", format_ip6_address, (ip6_address_t *) mp->ip_address);
+ vat_json_object_add_string_copy (node, "ip_address", ip);
+ vec_free (ip);
+}
+
+static int
+api_bd_ip_mac_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_bd_ip_mac_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
+ u32 bd_id;
+ u8 bd_id_set = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bd_id %d", &bd_id))
+ {
+ bd_id_set++;
+ }
+ else
+ break;
+ }
+
+ print (vam->ofp,
+ "\n%-5s %-7s %-20s %-30s",
+ "bd_id", "is_ipv6", "mac_address", "ip_address");
+
+ /* Dump Bridge Domain Ip to Mac entries */
+ M (BD_IP_MAC_DUMP, mp);
+
+ if (bd_id_set)
+ mp->bd_id = htonl (bd_id);
else
- clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
- clib_memcpy (mp->mac_address, macaddr, 6);
+ mp->bd_id = ~0;
+
S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
W (ret);
return ret;
}
int ip6_address_set = 0;
int ret;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
u8 sw_if_index_set = 0;
int ret;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
int ret;
u32 rx_ring_sz = 0, tx_ring_sz = 0;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge));
if (host_ip4_prefix_len)
clib_memcpy (mp->host_ip4_addr, &host_ip4_addr, 4);
- if (host_ip4_prefix_len)
+ if (host_ip6_prefix_len)
clib_memcpy (mp->host_ip6_addr, &host_ip6_addr, 16);
if (host_ip4_gw_set)
clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4);
u8 lb;
u8 mode_is_set = 0;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
lb = BOND_LB_L2;
/* Parse args required to build the message */
u32 classify_table_index = ~0;
u8 is_classify = 0;
u8 resolve_host = 0, resolve_attached = 0;
- mpls_label_t *next_hop_out_label_stack = NULL;
+ vl_api_fib_mpls_label_t *next_hop_out_label_stack = NULL;
mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ clib_memset (&v4_next_hop_address, 0, sizeof (ip4_address_t));
+ clib_memset (&v6_next_hop_address, 0, sizeof (ip6_address_t));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
{
next_hop_set = 1;
}
+ else
+ if (unformat
+ (i, "via %U", api_unformat_sw_if_index, vam, &sw_if_index))
+ {
+ next_hop_set = 1;
+ }
+ else if (unformat (i, "via sw_if_index %d", &sw_if_index))
+ {
+ next_hop_set = 1;
+ }
else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
;
else if (unformat (i, "weight %d", &next_hop_weight))
else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
;
else if (unformat (i, "out-label %d", &next_hop_out_label))
- vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
- else if (unformat (i, "via-label %d", &next_hop_via_label))
+ {
+ vl_api_fib_mpls_label_t fib_label = {
+ .label = ntohl (next_hop_out_label),
+ .ttl = 64,
+ .exp = 0,
+ };
+ vec_add1 (next_hop_out_label_stack, fib_label);
+ }
+ else if (unformat (i, "via via-label %d", &next_hop_via_label))
;
else if (unformat (i, "random"))
random_add_del = 1;
for (j = 0; j < count; j++)
{
/* Construct the API message */
- M2 (IP_ADD_DEL_ROUTE, mp,
- sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
+ M2 (IP_ADD_DEL_ROUTE, mp, sizeof (vl_api_fib_mpls_label_t) *
+ vec_len (next_hop_out_label_stack));
mp->next_hop_sw_if_index = ntohl (sw_if_index);
mp->table_id = ntohl (vrf_id);
mp->is_resolve_host = resolve_host;
mp->is_resolve_attached = resolve_attached;
mp->next_hop_weight = next_hop_weight;
+ mp->next_hop_preference = 0;
mp->dst_address_length = dst_address_length;
mp->next_hop_table_id = ntohl (next_hop_table_id);
mp->classify_table_index = ntohl (classify_table_index);
{
memcpy (mp->next_hop_out_label_stack,
next_hop_out_label_stack,
- vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
+ (vec_len (next_hop_out_label_stack) *
+ sizeof (vl_api_fib_mpls_label_t)));
vec_free (next_hop_out_label_stack);
}
}
else if (unformat (i, "%U", unformat_ip4_address, &v4_grp_address))
{
- memset (&v4_src_address, 0, sizeof (v4_src_address));
+ clib_memset (&v4_src_address, 0, sizeof (v4_src_address));
grp_address_length = 32;
address_set = 1;
is_ipv6 = 0;
}
else if (unformat (i, "%U", unformat_ip6_address, &v6_grp_address))
{
- memset (&v6_src_address, 0, sizeof (v6_src_address));
+ clib_memset (&v6_src_address, 0, sizeof (v6_src_address));
grp_address_length = 128;
address_set = 1;
is_ipv6 = 1;
u32 classify_table_index = ~0;
u8 is_classify = 0;
u8 resolve_host = 0, resolve_attached = 0;
+ u8 is_interface_rx = 0;
mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
- mpls_label_t *next_hop_out_label_stack = NULL;
+ vl_api_fib_mpls_label_t *next_hop_out_label_stack = NULL;
mpls_label_t local_label = MPLS_LABEL_INVALID;
u8 is_eos = 0;
- dpo_proto_t next_hop_proto = DPO_PROTO_IP4;
+ dpo_proto_t next_hop_proto = DPO_PROTO_MPLS;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
is_multipath = 1;
else if (unformat (i, "count %d", &count))
;
- else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id))
+ else if (unformat (i, "via lookup-in-ip4-table %d", &next_hop_table_id))
{
next_hop_set = 1;
next_hop_proto = DPO_PROTO_IP4;
}
- else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id))
+ else if (unformat (i, "via lookup-in-ip6-table %d", &next_hop_table_id))
{
next_hop_set = 1;
next_hop_proto = DPO_PROTO_IP6;
}
- else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
- ;
- else if (unformat (i, "via-label %d", &next_hop_via_label))
- ;
+ else
+ if (unformat
+ (i, "via l2-input-on %U", api_unformat_sw_if_index, vam,
+ &sw_if_index))
+ {
+ next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_ETHERNET;
+ is_interface_rx = 1;
+ }
+ else if (unformat (i, "via l2-input-on sw_if_index %d", &sw_if_index))
+ {
+ next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_ETHERNET;
+ is_interface_rx = 1;
+ }
+ else if (unformat (i, "via next-hop-table %d", &next_hop_table_id))
+ next_hop_set = 1;
+ else if (unformat (i, "via via-label %d", &next_hop_via_label))
+ next_hop_set = 1;
else if (unformat (i, "out-label %d", &next_hop_out_label))
- vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
+ {
+ vl_api_fib_mpls_label_t fib_label = {
+ .label = ntohl (next_hop_out_label),
+ .ttl = 64,
+ .exp = 0,
+ };
+ vec_add1 (next_hop_out_label_stack, fib_label);
+ }
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
for (j = 0; j < count; j++)
{
/* Construct the API message */
- M2 (MPLS_ROUTE_ADD_DEL, mp,
- sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
+ M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_mpls_label_t) *
+ vec_len (next_hop_out_label_stack));
mp->mr_next_hop_sw_if_index = ntohl (sw_if_index);
mp->mr_table_id = ntohl (table_id);
mp->mr_is_multipath = is_multipath;
mp->mr_is_resolve_host = resolve_host;
mp->mr_is_resolve_attached = resolve_attached;
+ mp->mr_is_interface_rx = is_interface_rx;
mp->mr_next_hop_weight = next_hop_weight;
+ mp->mr_next_hop_preference = 0;
mp->mr_next_hop_table_id = ntohl (next_hop_table_id);
mp->mr_classify_table_index = ntohl (classify_table_index);
mp->mr_next_hop_via_label = ntohl (next_hop_via_label);
{
memcpy (mp->mr_next_hop_out_label_stack,
next_hop_out_label_stack,
- vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
+ vec_len (next_hop_out_label_stack) *
+ sizeof (vl_api_fib_mpls_label_t));
vec_free (next_hop_out_label_stack);
}
if (!address_set)
{
- errmsg ("IP addres not set");
+ errmsg ("IP address not set");
return -99;
}
return ret;
}
+static int
+api_sr_mpls_policy_add (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sr_mpls_policy_add_t *mp;
+ u32 bsid = 0;
+ u32 weight = 1;
+ u8 type = 0;
+ u8 n_segments = 0;
+ u32 sid;
+ u32 *segments = NULL;
+ int ret;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bsid %d", &bsid))
+ ;
+ else if (unformat (i, "weight %d", &weight))
+ ;
+ else if (unformat (i, "spray"))
+ type = 1;
+ else if (unformat (i, "next %d", &sid))
+ {
+ n_segments += 1;
+ vec_add1 (segments, htonl (sid));
+ }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (bsid == 0)
+ {
+ errmsg ("bsid not set");
+ return -99;
+ }
+
+ if (n_segments == 0)
+ {
+ errmsg ("no sid in segment stack");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments);
+
+ mp->bsid = htonl (bsid);
+ mp->weight = htonl (weight);
+ mp->type = type;
+ mp->n_segments = n_segments;
+ memcpy (mp->segments, segments, sizeof (u32) * n_segments);
+ vec_free (segments);
+
+ /* send it... */
+ S (mp);
+
+ /* Wait for a reply... */
+ W (ret);
+ return ret;
+}
+
+static int
+api_sr_mpls_policy_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sr_mpls_policy_del_t *mp;
+ u32 bsid = 0;
+ int ret;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "bsid %d", &bsid))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (bsid == 0)
+ {
+ errmsg ("bsid not set");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (SR_MPLS_POLICY_DEL, mp);
+
+ mp->bsid = htonl (bsid);
+
+ /* send it... */
+ S (mp);
+
+ /* Wait for a reply... */
+ W (ret);
+ return ret;
+}
+
static int
api_bier_table_add_del (vat_main_t * vam)
{
M (PROXY_ARP_ADD_DEL, mp);
- mp->vrf_id = ntohl (vrf_id);
+ mp->proxy.vrf_id = ntohl (vrf_id);
mp->is_add = is_add;
- clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address));
- clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address));
+ clib_memcpy (mp->proxy.low_address, &lo, sizeof (mp->proxy.low_address));
+ clib_memcpy (mp->proxy.hi_address, &hi, sizeof (mp->proxy.hi_address));
S (mp);
W (ret);
.as_u32 = 0,
};
ip6_address_t v6_next_hop_address = { {0} };
- mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID, *labels = NULL;
+ vl_api_fib_mpls_label_t *next_hop_out_label_stack = NULL;
+ mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "add"))
is_add = 1;
+ else
+ if (unformat
+ (i, "del %U", api_unformat_sw_if_index, vam, &sw_if_index))
+ is_add = 0;
else if (unformat (i, "del sw_if_index %d", &sw_if_index))
is_add = 0;
- else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index))
- ;
else if (unformat (i, "via %U",
unformat_ip4_address, &v4_next_hop_address))
{
{
next_hop_proto_is_ip4 = 0;
}
+ else if (unformat (i, "via-label %d", &next_hop_via_label))
+ ;
+ else
+ if (unformat
+ (i, "%U", api_unformat_sw_if_index, vam, &next_hop_sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index))
+ ;
else if (unformat (i, "l2-only"))
l2_only = 1;
else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
;
else if (unformat (i, "out-label %d", &next_hop_out_label))
- vec_add1 (labels, ntohl (next_hop_out_label));
+ {
+ vl_api_fib_mpls_label_t fib_label = {
+ .label = ntohl (next_hop_out_label),
+ .ttl = 64,
+ .exp = 0,
+ };
+ vec_add1 (next_hop_out_label_stack, fib_label);
+ }
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (mpls_label_t) * vec_len (labels));
+ M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_mpls_label_t) *
+ vec_len (next_hop_out_label_stack));
mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index);
mp->mt_sw_if_index = ntohl (sw_if_index);
mp->mt_l2_only = l2_only;
mp->mt_next_hop_table_id = ntohl (next_hop_table_id);
mp->mt_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
+ mp->mt_next_hop_via_label = ntohl (next_hop_via_label);
+ mp->mt_next_hop_weight = 1;
+ mp->mt_next_hop_preference = 0;
- mp->mt_next_hop_n_out_labels = vec_len (labels);
+ mp->mt_next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
if (0 != mp->mt_next_hop_n_out_labels)
{
- clib_memcpy (mp->mt_next_hop_out_label_stack, labels,
- sizeof (mpls_label_t) * mp->mt_next_hop_n_out_labels);
- vec_free (labels);
+ clib_memcpy (mp->mt_next_hop_out_label_stack,
+ next_hop_out_label_stack,
+ (vec_len (next_hop_out_label_stack) *
+ sizeof (vl_api_fib_mpls_label_t)));
+ vec_free (next_hop_out_label_stack);
}
if (next_hop_proto_is_ip4)
ip6_address_t v6address;
int ret;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
}
else
{
- /* mp->is_ipv6 = 0; via memset in M macro above */
+ /* mp->is_ipv6 = 0; via clib_memset in M macro above */
clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
}
/* Construct the API message */
M (DHCP_CLIENT_CONFIG, mp);
- mp->sw_if_index = htonl (sw_if_index);
- clib_memcpy (mp->hostname, hostname, vec_len (hostname));
- vec_free (hostname);
mp->is_add = is_add;
- mp->want_dhcp_event = disable_event ? 0 : 1;
- mp->pid = htonl (getpid ());
+ mp->client.sw_if_index = htonl (sw_if_index);
+ clib_memcpy (mp->client.hostname, hostname, vec_len (hostname));
+ vec_free (hostname);
+ mp->client.want_dhcp_event = disable_event ? 0 : 1;
+ mp->client.pid = htonl (getpid ());
/* send it... */
S (mp);
u8 behavior = ~0;
u32 sw_if_index;
u32 fib_table = ~(u32) 0;
- ip6_address_t next_hop;
+ ip6_address_t nh_addr6;
+ ip4_address_t nh_addr4;
+ clib_memset (&nh_addr6, 0, sizeof (ip6_address_t));
+ clib_memset (&nh_addr4, 0, sizeof (ip4_address_t));
bool nexthop_set = 0;
if (unformat (i, "del"))
is_del = 1;
else if (unformat (i, "address %U", unformat_ip6_address, &localsid));
- else if (unformat (i, "next-hop %U", unformat_ip6_address, &next_hop))
+ else if (unformat (i, "next-hop %U", unformat_ip4_address, &nh_addr4))
+ nexthop_set = 1;
+ else if (unformat (i, "next-hop %U", unformat_ip6_address, &nh_addr6))
nexthop_set = 1;
else if (unformat (i, "behavior %u", &behavior));
else if (unformat (i, "sw_if_index %u", &sw_if_index));
M (SR_LOCALSID_ADD_DEL, mp);
- clib_memcpy (mp->localsid_addr, &localsid, sizeof (mp->localsid_addr));
+ clib_memcpy (mp->localsid.addr, &localsid, sizeof (mp->localsid));
if (nexthop_set)
- clib_memcpy (mp->nh_addr, &next_hop, sizeof (mp->nh_addr));
+ {
+ clib_memcpy (mp->nh_addr6, &nh_addr6, sizeof (mp->nh_addr6));
+ clib_memcpy (mp->nh_addr4, &nh_addr4, sizeof (mp->nh_addr4));
+ }
mp->behavior = behavior;
mp->sw_if_index = ntohl (sw_if_index);
mp->fib_table = ntohl (fib_table);
tcp = (tcp_header_t *) mask;
-#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
+#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a));
foreach_tcp_proto_field;
#undef _
udp = (udp_header_t *) mask;
-#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
+#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a));
foreach_udp_proto_field;
#undef _
ip = (ip4_header_t *) mask;
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a));
foreach_ip4_proto_field;
#undef _
ip = (ip6_header_t *) mask;
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a));
foreach_ip6_proto_field;
#undef _
vec_validate (mask, len - 1);
if (dst)
- memset (mask, 0xff, 6);
+ clib_memset (mask, 0xff, 6);
if (src)
- memset (mask + 6, 0xff, 6);
+ clib_memset (mask + 6, 0xff, 6);
if (tag2 || dot1ad)
{
mp->miss_next_index = ntohl (miss_next_index);
mp->current_data_flag = ntohl (current_data_flag);
mp->current_data_offset = ntohl (current_data_offset);
+ mp->mask_len = ntohl (vec_len (mask));
clib_memcpy (mp->mask, mask, vec_len (mask));
vec_free (mask);
*matchp = match;
return 1;
}
+
+uword
+unformat_qos_source (unformat_input_t * input, va_list * args)
+{
+ int *qs = va_arg (*args, int *);
+
+ if (unformat (input, "ip"))
+ *qs = QOS_SOURCE_IP;
+ else if (unformat (input, "mpls"))
+ *qs = QOS_SOURCE_MPLS;
+ else if (unformat (input, "ext"))
+ *qs = QOS_SOURCE_EXT;
+ else if (unformat (input, "vlan"))
+ *qs = QOS_SOURCE_VLAN;
+ else
+ return 0;
+
+ return 1;
+}
#endif
uword
mp->advance = ntohl (advance);
mp->action = action;
mp->metadata = ntohl (metadata);
+ mp->match_len = ntohl (vec_len (match));
clib_memcpy (mp->match, match, vec_len (match));
vec_free (match);
vl_api_control_ping_t *mp_ping;
int ret;
- print (vam->ofp,
- "\n%-16s %-12s %-5s %-12s %-12s %-14s %-30s %-20s %-20s %-30s",
- "dev_name", "sw_if_index", "id", "rx_ring_sz", "tx_ring_sz",
- "host_mac_addr", "host_namespace", "host_bridge", "host_ip4_addr",
- "host_ip6_addr");
+ print (vam->ofp,
+ "\n%-16s %-12s %-5s %-12s %-12s %-14s %-30s %-20s %-20s %-30s",
+ "dev_name", "sw_if_index", "id", "rx_ring_sz", "tx_ring_sz",
+ "host_mac_addr", "host_namespace", "host_bridge", "host_ip4_addr",
+ "host_ip6_addr");
+
+ /* Get list of tap interfaces */
+ M (SW_INTERFACE_TAP_V2_DUMP, mp);
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ W (ret);
+ return ret;
+}
+
+static int
+api_vxlan_offload_rx (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ vl_api_vxlan_offload_rx_t *mp;
+ u32 hw_if_index = ~0, rx_if_index = ~0;
+ u8 is_add = 1;
+ int ret;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ is_add = 0;
+ else if (unformat (line_input, "hw %U", api_unformat_hw_if_index, vam,
+ &hw_if_index))
+ ;
+ else if (unformat (line_input, "hw hw_if_index %u", &hw_if_index))
+ ;
+ else if (unformat (line_input, "rx %U", api_unformat_sw_if_index, vam,
+ &rx_if_index))
+ ;
+ else if (unformat (line_input, "rx sw_if_index %u", &rx_if_index))
+ ;
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, line_input);
+ return -99;
+ }
+ }
+
+ if (hw_if_index == ~0)
+ {
+ errmsg ("no hw interface");
+ return -99;
+ }
- /* Get list of tap interfaces */
- M (SW_INTERFACE_TAP_V2_DUMP, mp);
- S (mp);
+ if (rx_if_index == ~0)
+ {
+ errmsg ("no rx tunnel");
+ return -99;
+ }
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
+ M (VXLAN_OFFLOAD_RX, mp);
+ mp->hw_if_index = ntohl (hw_if_index);
+ mp->sw_if_index = ntohl (rx_if_index);
+ mp->enable = is_add;
+
+ S (mp);
W (ret);
return ret;
}
int ret;
/* Can't "universally zero init" (={0}) due to GCC bug 53119 */
- memset (&src, 0, sizeof src);
- memset (&dst, 0, sizeof dst);
+ clib_memset (&src, 0, sizeof src);
+ clib_memset (&dst, 0, sizeof dst);
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
int ret;
/* Can't "universally zero init" (={0}) due to GCC bug 53119 */
- memset (&src, 0, sizeof src);
- memset (&dst, 0, sizeof dst);
+ clib_memset (&src, 0, sizeof src);
+ clib_memset (&dst, 0, sizeof dst);
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
u32 instance = ~0;
int ret;
- memset (&src4, 0, sizeof src4);
- memset (&dst4, 0, sizeof dst4);
- memset (&src6, 0, sizeof src6);
- memset (&dst6, 0, sizeof dst6);
+ clib_memset (&src4, 0, sizeof src4);
+ clib_memset (&dst4, 0, sizeof dst4);
+ clib_memset (&src6, 0, sizeof src6);
+ clib_memset (&dst6, 0, sizeof dst6);
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
u32 custom_dev_instance = ~0;
u8 hwaddr[6];
u8 use_custom_mac = 0;
+ u8 disable_mrg_rxbuf = 0;
+ u8 disable_indirect_desc = 0;
u8 *tag = 0;
int ret;
/* Shut up coverity */
- memset (hwaddr, 0, sizeof (hwaddr));
+ clib_memset (hwaddr, 0, sizeof (hwaddr));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
use_custom_mac = 1;
else if (unformat (i, "server"))
is_server = 1;
+ else if (unformat (i, "disable_mrg_rxbuf"))
+ disable_mrg_rxbuf = 1;
+ else if (unformat (i, "disable_indirect_desc"))
+ disable_indirect_desc = 1;
else if (unformat (i, "tag %s", &tag))
;
else
M (CREATE_VHOST_USER_IF, mp);
mp->is_server = is_server;
+ mp->disable_mrg_rxbuf = disable_mrg_rxbuf;
+ mp->disable_indirect_desc = disable_indirect_desc;
clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
vec_free (file_name);
if (custom_dev_instance != ~0)
mp->renumber = 1;
mp->custom_dev_instance = ntohl (custom_dev_instance);
}
+
mp->use_custom_mac = use_custom_mac;
clib_memcpy (mp->mac_address, hwaddr, 6);
if (tag)
int ret;
/* Can't "universally zero init" (={0}) due to GCC bug 53119 */
- memset (&local4, 0, sizeof local4);
- memset (&remote4, 0, sizeof remote4);
- memset (&local6, 0, sizeof local6);
- memset (&remote6, 0, sizeof remote6);
+ clib_memset (&local4, 0, sizeof local4);
+ clib_memset (&remote4, 0, sizeof remote4);
+ clib_memset (&local6, 0, sizeof local6);
+ clib_memset (&remote6, 0, sizeof remote6);
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
return ret;
}
+static int
+api_ip_probe_neighbor (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ip_probe_neighbor_t *mp;
+ u8 int_set = 0;
+ u8 adr_set = 0;
+ u8 is_ipv6 = 0;
+ u8 dst_adr[16];
+ u32 sw_if_index;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ int_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ int_set = 1;
+ else if (unformat (i, "address %U", unformat_ip4_address, dst_adr))
+ adr_set = 1;
+ else if (unformat (i, "address %U", unformat_ip6_address, dst_adr))
+ {
+ adr_set = 1;
+ is_ipv6 = 1;
+ }
+ else
+ break;
+ }
+
+ if (int_set == 0)
+ {
+ errmsg ("missing interface");
+ return -99;
+ }
+
+ if (adr_set == 0)
+ {
+ errmsg ("missing addresses");
+ return -99;
+ }
+
+ M (IP_PROBE_NEIGHBOR, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_ipv6 = is_ipv6;
+ clib_memcpy (mp->dst_address, dst_adr, sizeof (dst_adr));
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static int
+api_ip_scan_neighbor_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ip_scan_neighbor_enable_disable_t *mp;
+ u8 mode = IP_SCAN_V46_NEIGHBORS;
+ u32 interval = 0, time = 0, update = 0, delay = 0, stale = 0;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "ip4"))
+ mode = IP_SCAN_V4_NEIGHBORS;
+ else if (unformat (i, "ip6"))
+ mode = IP_SCAN_V6_NEIGHBORS;
+ if (unformat (i, "both"))
+ mode = IP_SCAN_V46_NEIGHBORS;
+ else if (unformat (i, "disable"))
+ mode = IP_SCAN_DISABLED;
+ else if (unformat (i, "interval %d", &interval))
+ ;
+ else if (unformat (i, "max-time %d", &time))
+ ;
+ else if (unformat (i, "max-update %d", &update))
+ ;
+ else if (unformat (i, "delay %d", &delay))
+ ;
+ else if (unformat (i, "stale %d", &stale))
+ ;
+ else
+ break;
+ }
+
+ if (interval > 255)
+ {
+ errmsg ("interval cannot exceed 255 minutes.");
+ return -99;
+ }
+ if (time > 255)
+ {
+ errmsg ("max-time cannot exceed 255 usec.");
+ return -99;
+ }
+ if (update > 255)
+ {
+ errmsg ("max-update cannot exceed 255.");
+ return -99;
+ }
+ if (delay > 255)
+ {
+ errmsg ("delay cannot exceed 255 msec.");
+ return -99;
+ }
+ if (stale > 255)
+ {
+ errmsg ("stale cannot exceed 255 minutes.");
+ return -99;
+ }
+
+ M (IP_SCAN_NEIGHBOR_ENABLE_DISABLE, mp);
+ mp->mode = mode;
+ mp->scan_interval = interval;
+ mp->max_proc_time = time;
+ mp->max_update = update;
+ mp->scan_int_delay = delay;
+ mp->stale_threshold = stale;
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
static int
api_want_ip4_arp_events (vat_main_t * vam)
{
if (unformat
(i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
{
- if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
- crypto_alg >= IPSEC_CRYPTO_N_ALG)
+ if (crypto_alg >= IPSEC_CRYPTO_N_ALG)
{
clib_warning ("unsupported crypto-alg: '%U'",
format_ipsec_crypto_alg, crypto_alg);
if (unformat
(i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
{
- if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
- integ_alg >= IPSEC_INTEG_N_ALG)
+ if (integ_alg >= IPSEC_INTEG_N_ALG)
{
clib_warning ("unsupported integ-alg: '%U'",
format_ipsec_integ_alg, integ_alg);
u8 is_add = 1;
u8 esn = 0;
u8 anti_replay = 0;
+ u8 renumber = 0;
+ u32 instance = ~0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
if (unformat
(i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
{
- if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
- crypto_alg >= IPSEC_CRYPTO_N_ALG)
+ if (crypto_alg >= IPSEC_CRYPTO_N_ALG)
{
errmsg ("unsupported crypto-alg: '%U'\n",
format_ipsec_crypto_alg, crypto_alg);
if (unformat
(i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
{
- if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
- integ_alg >= IPSEC_INTEG_N_ALG)
+ if (integ_alg >= IPSEC_INTEG_N_ALG)
{
errmsg ("unsupported integ-alg: '%U'\n",
format_ipsec_integ_alg, integ_alg);
return -99;
}
}
+ else if (unformat (i, "instance %u", &instance))
+ renumber = 1;
else
{
errmsg ("parse error '%U'\n", format_unformat_error, i);
clib_memcpy (mp->remote_integ_key, rik, mp->remote_integ_key_len);
}
+ if (renumber)
+ {
+ mp->renumber = renumber;
+ mp->show_instance = ntohl (instance);
+ }
+
S (mp);
W (ret);
return ret;
unformat_input_t *i = vam->input;
vl_api_ikev2_initiate_del_ike_sa_t *mp;
int ret;
- u64 ispi;
-
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%lx", &ispi))
- ;
- else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M (IKEV2_INITIATE_DEL_IKE_SA, mp);
-
- mp->ispi = ispi;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_ikev2_initiate_del_child_sa (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_ikev2_initiate_del_child_sa_t *mp;
- int ret;
- u32 ispi;
-
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%x", &ispi))
- ;
- else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M (IKEV2_INITIATE_DEL_CHILD_SA, mp);
-
- mp->ispi = ispi;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_ikev2_initiate_rekey_child_sa (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_ikev2_initiate_rekey_child_sa_t *mp;
- int ret;
- u32 ispi;
-
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%x", &ispi))
- ;
- else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M (IKEV2_INITIATE_REKEY_CHILD_SA, mp);
-
- mp->ispi = ispi;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-/*
- * MAP
- */
-static int
-api_map_add_domain (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_map_add_domain_t *mp;
-
- ip4_address_t ip4_prefix;
- ip6_address_t ip6_prefix;
- ip6_address_t ip6_src;
- u32 num_m_args = 0;
- u32 ip6_prefix_len = 0, ip4_prefix_len = 0, ea_bits_len = 0, psid_offset =
- 0, psid_length = 0;
- u8 is_translation = 0;
- u32 mtu = 0;
- u32 ip6_src_len = 128;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
- &ip4_prefix, &ip4_prefix_len))
- num_m_args++;
- else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
- &ip6_prefix, &ip6_prefix_len))
- num_m_args++;
- else
- if (unformat
- (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
- &ip6_src_len))
- num_m_args++;
- else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
- num_m_args++;
- else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
- num_m_args++;
- else if (unformat (i, "psid-offset %d", &psid_offset))
- num_m_args++;
- else if (unformat (i, "psid-len %d", &psid_length))
- num_m_args++;
- else if (unformat (i, "mtu %d", &mtu))
- num_m_args++;
- else if (unformat (i, "map-t"))
- is_translation = 1;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (num_m_args < 3)
- {
- errmsg ("mandatory argument(s) missing");
- return -99;
- }
-
- /* Construct the API message */
- M (MAP_ADD_DOMAIN, mp);
-
- clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix));
- mp->ip4_prefix_len = ip4_prefix_len;
-
- clib_memcpy (mp->ip6_prefix, &ip6_prefix, sizeof (ip6_prefix));
- mp->ip6_prefix_len = ip6_prefix_len;
-
- clib_memcpy (mp->ip6_src, &ip6_src, sizeof (ip6_src));
- mp->ip6_src_prefix_len = ip6_src_len;
-
- mp->ea_bits_len = ea_bits_len;
- mp->psid_offset = psid_offset;
- mp->psid_length = psid_length;
- mp->is_translation = is_translation;
- mp->mtu = htons (mtu);
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
-}
-
-static int
-api_map_del_domain (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_map_del_domain_t *mp;
-
- u32 num_m_args = 0;
- u32 index;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (num_m_args != 1)
- {
- errmsg ("mandatory argument(s) missing");
- return -99;
- }
-
- /* Construct the API message */
- M (MAP_DEL_DOMAIN, mp);
-
- mp->index = ntohl (index);
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
-}
-
-static int
-api_map_add_del_rule (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_map_add_del_rule_t *mp;
- u8 is_add = 1;
- ip6_address_t ip6_dst;
- u32 num_m_args = 0, index, psid = 0;
- int ret;
+ u64 ispi;
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else if (unformat (i, "psid %d", &psid))
- num_m_args++;
- else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst))
- num_m_args++;
- else if (unformat (i, "del"))
- {
- is_add = 0;
- }
+ if (unformat (i, "%lx", &ispi))
+ ;
else
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ errmsg ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- /* Construct the API message */
- M (MAP_ADD_DEL_RULE, mp);
+ M (IKEV2_INITIATE_DEL_IKE_SA, mp);
- mp->index = ntohl (index);
- mp->is_add = is_add;
- clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst));
- mp->psid = ntohs (psid);
+ mp->ispi = ispi;
- /* send it... */
S (mp);
-
- /* Wait for a reply, return good/bad news */
W (ret);
return ret;
}
static int
-api_map_domain_dump (vat_main_t * vam)
+api_ikev2_initiate_del_child_sa (vat_main_t * vam)
{
- vl_api_map_domain_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_initiate_del_child_sa_t *mp;
int ret;
+ u32 ispi;
- /* Construct the API message */
- M (MAP_DOMAIN_DUMP, mp);
- /* send it... */
- S (mp);
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%x", &ispi))
+ ;
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
+ M (IKEV2_INITIATE_DEL_CHILD_SA, mp);
+
+ mp->ispi = ispi;
+ S (mp);
W (ret);
return ret;
}
static int
-api_map_rule_dump (vat_main_t * vam)
+api_ikev2_initiate_rekey_child_sa (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_map_rule_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- u32 domain_index = ~0;
+ vl_api_ikev2_initiate_rekey_child_sa_t *mp;
int ret;
+ u32 ispi;
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "index %u", &domain_index))
+ if (unformat (i, "%x", &ispi))
;
else
- break;
- }
-
- if (domain_index == ~0)
- {
- clib_warning ("parse error: domain index expected");
- return -99;
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- /* Construct the API message */
- M (MAP_RULE_DUMP, mp);
+ M (IKEV2_INITIATE_REKEY_CHILD_SA, mp);
- mp->domain_index = htonl (domain_index);
+ mp->ispi = ispi;
- /* send it... */
S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
W (ret);
return ret;
}
-static void vl_api_map_add_domain_reply_t_handler
- (vl_api_map_add_domain_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl (mp->retval);
-
- if (vam->async_mode)
- {
- vam->async_errors += (retval < 0);
- }
- else
- {
- vam->retval = retval;
- vam->result_ready = 1;
- }
-}
-
-static void vl_api_map_add_domain_reply_t_handler_json
- (vl_api_map_add_domain_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
-
- vat_json_init_object (&node);
- vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "index", ntohl (mp->index));
-
- vat_json_print (vam->ofp, &node);
- vat_json_free (&node);
-
- vam->retval = ntohl (mp->retval);
- vam->result_ready = 1;
-}
-
static int
api_get_first_msg_id (vat_main_t * vam)
{
{
lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
- memset (a, 0, sizeof (a[0]));
+ clib_memset (a, 0, sizeof (a[0]));
if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
{
vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
int ret;
- memset (&rloc, 0, sizeof (rloc));
+ clib_memset (&rloc, 0, sizeof (rloc));
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
ip_address_t ip;
int ret;
- memset (&ip, 0, sizeof (ip));
+ clib_memset (&ip, 0, sizeof (ip));
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0;
int ret;
- memset (&rloc, 0, sizeof (rloc));
+ clib_memset (&rloc, 0, sizeof (rloc));
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
}
else
{
- memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
+ clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
}
vec_free (locator_set_name);
struct in6_addr ip6;
u32 table_id = 0, nh_sw_if_index = ~0;
- memset (&ip4, 0, sizeof (ip4));
- memset (&ip6, 0, sizeof (ip6));
+ clib_memset (&ip4, 0, sizeof (ip4));
+ clib_memset (&ip6, 0, sizeof (ip6));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
u8 random_hw_addr = 1;
int ret;
- memset (hw_addr, 0, sizeof (hw_addr));
+ clib_memset (hw_addr, 0, sizeof (hw_addr));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
return ret;
}
+static void vl_api_af_packet_details_t_handler
+ (vl_api_af_packet_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ print (vam->ofp, "%-16s %d",
+ mp->host_if_name, clib_net_to_host_u32 (mp->sw_if_index));
+}
+
+static void vl_api_af_packet_details_t_handler_json
+ (vl_api_af_packet_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_string_copy (node, "dev_name", mp->host_if_name);
+}
+
+static int
+api_af_packet_dump (vat_main_t * vam)
+{
+ vl_api_af_packet_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
+
+ print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index");
+ /* Get list of tap interfaces */
+ M (AF_PACKET_DUMP, mp);
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ W (ret);
+ return ret;
+}
+
static int
api_policer_add_del (vat_main_t * vam)
{
u8 is_master = 0;
int ret;
- memset (hw_addr, 0, sizeof (hw_addr));
+ clib_memset (hw_addr, 0, sizeof (hw_addr));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
{
vl_api_mpls_tunnel_dump_t *mp;
vl_api_control_ping_t *mp_ping;
- i32 index = -1;
+ u32 sw_if_index = ~0;
int ret;
/* Parse args required to build the message */
while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT)
{
- if (!unformat (vam->input, "tunnel_index %d", &index))
- {
- index = -1;
- break;
- }
+ if (unformat (vam->input, "sw_if_index %d", &sw_if_index))
+ ;
}
- print (vam->ofp, " tunnel_index %d", index);
+ print (vam->ofp, " sw_if_index %d", sw_if_index);
M (MPLS_TUNNEL_DUMP, mp);
- mp->tunnel_index = htonl (index);
+ mp->sw_if_index = htonl (sw_if_index);
S (mp);
/* Use a control ping for synchronization */
int i;
print (vam->ofp,
- "table-id %d, prefix %U/%d",
+ "table-id %d, prefix %U/%d stats-index %d",
ntohl (mp->table_id), format_ip4_address, mp->address,
- mp->address_length);
+ mp->address_length, ntohl (mp->stats_index));
fp = mp->path;
for (i = 0; i < count; i++)
{
if (fp->afi == IP46_TYPE_IP6)
print (vam->ofp,
" weight %d, sw_if_index %d, is_local %d, is_drop %d, "
- "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U, "
+ "next_hop_table %d",
ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
- format_ip6_address, fp->next_hop);
+ format_ip6_address, fp->next_hop, ntohl (fp->table_id));
else if (fp->afi == IP46_TYPE_IP4)
print (vam->ofp,
" weight %d, sw_if_index %d, is_local %d, is_drop %d, "
- "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U, "
+ "next_hop_table %d",
ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
- format_ip4_address, fp->next_hop);
+ format_ip4_address, fp->next_hop, ntohl (fp->table_id));
fp++;
}
}
int i;
print (vam->ofp,
- "table-id %d, prefix %U/%d",
+ "table-id %d, prefix %U/%d stats-index %d",
ntohl (mp->table_id), format_ip6_address, mp->address,
- mp->address_length);
+ mp->address_length, ntohl (mp->stats_index));
fp = mp->path;
for (i = 0; i < count; i++)
{
int ret;
/* Shut up coverity */
- memset (dmac, 0, sizeof (dmac));
- memset (smac, 0, sizeof (smac));
+ clib_memset (dmac, 0, sizeof (dmac));
+ clib_memset (smac, 0, sizeof (smac));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
}
static int
-api_sw_interface_set_mtu (vat_main_t * vam)
+api_hw_interface_set_mtu (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_mtu_t *mp;
+ vl_api_hw_interface_set_mtu_t *mp;
u32 sw_if_index = ~0;
u32 mtu = 0;
int ret;
}
/* Construct the API message */
- M (SW_INTERFACE_SET_MTU, mp);
+ M (HW_INTERFACE_SET_MTU, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->mtu = ntohs ((u16) mtu);
u8 mac_set = 0;
int ret;
- memset (remote_mac, 0, sizeof (remote_mac));
+ clib_memset (remote_mac, 0, sizeof (remote_mac));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index))
u8 mac_set = 0;
int ret;
- memset (remote_mac, 0, sizeof (remote_mac));
+ clib_memset (remote_mac, 0, sizeof (remote_mac));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index))
ip6_address_t ip6_addr;
int ret;
- memset (&ip4_addr, 0, sizeof (ip4_addr));
- memset (&ip6_addr, 0, sizeof (ip6_addr));
+ clib_memset (&ip4_addr, 0, sizeof (ip4_addr));
+ clib_memset (&ip6_addr, 0, sizeof (ip6_addr));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
return ret;
}
-static int
-api_memfd_segment_create (vat_main_t * vam)
-{
-#if VPP_API_TEST_BUILTIN == 0
- unformat_input_t *i = vam->input;
- vl_api_memfd_segment_create_t *mp;
- u64 size = 64 << 20;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "size %U", unformat_memory_size, &size))
- ;
- else
- break;
- }
-
- M (MEMFD_SEGMENT_CREATE, mp);
- mp->requested_size = size;
- S (mp);
- W (ret);
- return ret;
-
-#else
- errmsg ("memfd_segment_create (builtin) not supported");
- return -99;
-#endif
-}
-
static int
api_sock_init_shm (vat_main_t * vam)
{
break;
}
- /* Try customized config to see if it works */
- vec_validate (config, 3);
+ /*
+ * Canned custom ring allocator config.
+ * Should probably parse all of this
+ */
+ vec_validate (config, 6);
config[0].type = VL_API_VLIB_RING;
- config[0].count = 256;
config[0].size = 256;
- config[1].type = VL_API_CLIENT_RING;
- config[1].count = 256;
+ config[0].count = 32;
+
+ config[1].type = VL_API_VLIB_RING;
config[1].size = 1024;
- config[2].type = VL_API_CLIENT_RING;
- config[2].count = 8;
+ config[1].count = 16;
+
+ config[2].type = VL_API_VLIB_RING;
config[2].size = 4096;
- config[3].type = VL_API_QUEUE;
- config[3].count = 256;
- config[3].size = sizeof (uword);
+ config[2].count = 2;
+
+ config[3].type = VL_API_CLIENT_RING;
+ config[3].size = 256;
+ config[3].count = 32;
+
+ config[4].type = VL_API_CLIENT_RING;
+ config[4].size = 1024;
+ config[4].count = 16;
+
+ config[5].type = VL_API_CLIENT_RING;
+ config[5].size = 4096;
+ config[5].count = 2;
+
+ config[6].type = VL_API_QUEUE;
+ config[6].count = 128;
+ config[6].size = sizeof (uword);
+
rv = vl_socket_client_init_shm (config);
if (!rv)
vam->client_index_invalid = 1;
return ret;
}
+static int
+api_qos_record_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_qos_record_enable_disable_t *mp;
+ u32 sw_if_index, qs = 0xff;
+ u8 sw_if_index_set = 0;
+ u8 enable = 1;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U", unformat_qos_source, &qs))
+ ;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
+ if (qs == 0xff)
+ {
+ errmsg ("input location must be specified");
+ return -99;
+ }
+
+ M (QOS_RECORD_ENABLE_DISABLE, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->input_source = qs;
+ mp->enable = enable;
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+
static int
q_or_quit (vat_main_t * vam)
{
return 0;
}
+static int
+statseg (vat_main_t * vam)
+{
+ ssvm_private_t *ssvmp = &vam->stat_segment;
+ ssvm_shared_header_t *shared_header = ssvmp->sh;
+ vlib_counter_t **counters;
+ u64 thread0_index1_packets;
+ u64 thread0_index1_bytes;
+ f64 vector_rate, input_rate;
+ uword *p;
+
+ uword *counter_vector_by_name;
+ if (vam->stat_segment_lockp == 0)
+ {
+ errmsg ("Stat segment not mapped...");
+ return -99;
+ }
+
+ /* look up "/if/rx for sw_if_index 1 as a test */
+
+ clib_spinlock_lock (vam->stat_segment_lockp);
+
+ counter_vector_by_name = (uword *) shared_header->opaque[1];
+
+ p = hash_get_mem (counter_vector_by_name, "/if/rx");
+ if (p == 0)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("/if/tx not found?");
+ return -99;
+ }
+
+ /* Fish per-thread vector of combined counters from shared memory */
+ counters = (vlib_counter_t **) p[0];
+
+ if (vec_len (counters[0]) < 2)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("/if/tx vector length %d", vec_len (counters[0]));
+ return -99;
+ }
+
+ /* Read thread 0 sw_if_index 1 counter */
+ thread0_index1_packets = counters[0][1].packets;
+ thread0_index1_bytes = counters[0][1].bytes;
+
+ p = hash_get_mem (counter_vector_by_name, "vector_rate");
+ if (p == 0)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("vector_rate not found?");
+ return -99;
+ }
+
+ vector_rate = *(f64 *) (p[0]);
+ p = hash_get_mem (counter_vector_by_name, "input_rate");
+ if (p == 0)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("input_rate not found?");
+ return -99;
+ }
+ input_rate = *(f64 *) (p[0]);
+
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+
+ print (vam->ofp, "vector_rate %.2f input_rate %.2f",
+ vector_rate, input_rate);
+ print (vam->ofp, "thread 0 sw_if_index 1 rx pkts %lld, bytes %lld",
+ thread0_index1_packets, thread0_index1_bytes);
+
+ return 0;
+}
+
static int
cmd_cmp (void *a1, void *a2)
{
return 0;
}
- for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ for (i = 0; i < vec_len (vam->graph_nodes[0]); i++)
{
- node = vam->graph_nodes[i];
+ node = vam->graph_nodes[0][i];
print (vam->ofp, "[%d] %s", i, node->name);
for (j = 0; j < vec_len (node->next_nodes); j++)
{
if (node->next_nodes[j] != ~0)
{
- next_node = vam->graph_nodes[node->next_nodes[j]];
+ next_node = vam->graph_nodes[0][node->next_nodes[j]];
print (vam->ofp, " [%d] %s", j, next_node->name);
}
}
print (vam->ofp, "%s not found...", node_to_find);
goto out;
}
- node = vam->graph_nodes[p[0]];
+ node = vam->graph_nodes[0][p[0]];
print (vam->ofp, "[%d] %s", p[0], node->name);
for (j = 0; j < vec_len (node->next_nodes); j++)
{
if (node->next_nodes[j] != ~0)
{
- next_node = vam->graph_nodes[node->next_nodes[j]];
+ next_node = vam->graph_nodes[0][node->next_nodes[j]];
print (vam->ofp, " [%d] %s", j, next_node->name);
}
}
vam->current_file = s;
do_one_file (vam);
- clib_memcpy (&vam->input, &save_input, sizeof (vam->input));
+ clib_memcpy (&vam->input, &save_input, sizeof (save_input));
clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf));
vam->ifp = save_ifp;
vam->input_line_number = save_line_number;
"<intfc> | sw_if_index <id> <ip4-address> | <ip6-address> [del] [del-all] ") \
_(sw_interface_set_rx_mode, \
"<intfc> | sw_if_index <id> [queue <id>] <polling | interrupt | adaptive>") \
+_(sw_interface_set_rx_placement, \
+ "<intfc> | sw_if_index <id> [queue <id>] [worker <id> | main]") \
+_(sw_interface_rx_placement_dump, \
+ "[<intfc> | sw_if_index <id>]") \
_(sw_interface_set_table, \
"<intfc> | sw_if_index <id> vrf <table-id> [ipv6]") \
_(sw_interface_set_mpls_enable, \
_(sw_interface_slave_dump, \
"<vpp-if-name> | sw_if_index <id>") \
_(ip_table_add_del, \
- "table-id <n> [ipv6]\n") \
+ "table <n> [ipv6] [add | del]\n") \
_(ip_add_del_route, \
- "<addr>/<mask> via <addr> [table-id <n>]\n" \
- "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n" \
- "[weight <n>] [drop] [local] [classify <n>] [del]\n" \
- "[multipath] [count <n>]") \
+ "<addr>/<mask> via <<addr>|<intfc>|sw_if_index <id>|via-label <n>>\n" \
+ "[table-id <n>] [<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"\
+ "[weight <n>] [drop] [local] [classify <n>] [out-label <n>]\n" \
+ "[multipath] [count <n>] [del]") \
_(ip_mroute_add_del, \
"<src> <grp>/<mask> [table-id <n>]\n" \
"[<intfc> | sw_if_index <id>] [local] [del]") \
_(mpls_table_add_del, \
- "table-id <n>\n") \
+ "table <n> [add | del]\n") \
_(mpls_route_add_del, \
- "<label> <eos> via <addr> [table-id <n>]\n" \
- "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n" \
- "[weight <n>] [drop] [local] [classify <n>] [del]\n" \
- "[multipath] [count <n>]") \
+ "<label> <eos> via <addr | next-hop-table <n> | via-label <n> |\n" \
+ "lookup-ip4-table <n> | lookup-in-ip6-table <n> |\n" \
+ "l2-input-on <intfc> | l2-input-on sw_if_index <id>>\n" \
+ "[<intfc> | sw_if_index <id>] [resolve-attempts <n>] [weight <n>]\n" \
+ "[drop] [local] [classify <n>] [out-label <n>] [multipath]\n" \
+ "[count <n>] [del]") \
_(mpls_ip_bind_unbind, \
"<label> <addr/len>") \
_(mpls_tunnel_add_del, \
- " via <addr> [table-id <n>]\n" \
- "sw_if_index <id>] [l2] [del]") \
+ "[add | del <intfc | sw_if_index <id>>] via <addr | via-label <n>>\n" \
+ "[<intfc> | sw_if_index <id> | next-hop-table <id>]\n" \
+ "[l2-only] [out-label <n>]") \
+_(sr_mpls_policy_add, \
+ "bsid <id> [weight <n>] [spray] next <sid> [next <sid>]") \
+_(sr_mpls_policy_del, \
+ "bsid <id>") \
_(bier_table_add_del, \
"<label> <sub-domain> <set> <bsl> [del]") \
_(bier_route_add_del, \
_(l2tpv3_set_lookup_key, \
"lookup_v6_src | lookup_v6_dst | lookup_session_id") \
_(sw_if_l2tpv3_tunnel_dump, "") \
+_(vxlan_offload_rx, \
+ "hw { <interface name> | hw_if_index <nn>} " \
+ "rx { <vxlan tunnel name> | sw_if_index <nn> } [del]") \
_(vxlan_add_del_tunnel, \
"src <ip-addr> { dst <ip-addr> | group <mcast-ip-addr>\n" \
"{ <intfc> | mcast_sw_if_index <nn> } [instance <id>]}\n" \
"[translate-2-[1|2]] [push_dot1q 0] tag1 <nn> tag2 <nn>") \
_(create_vhost_user_if, \
"socket <filename> [server] [renumber <dev_instance>] " \
+ "[disable_mrg_rxbuf] [disable_indirect_desc] " \
"[mac <mac_address>]") \
_(modify_vhost_user_if, \
"<intfc> | sw_if_index <nn> socket <filename>\n" \
_(delete_vhost_user_if, "<intfc> | sw_if_index <nn>") \
_(sw_interface_vhost_user_dump, "") \
_(show_version, "") \
+_(show_threads, "") \
_(vxlan_gpe_add_del_tunnel, \
"local <addr> remote <addr> | group <mcast-ip-addr>\n" \
"{ <intfc> | mcast_sw_if_index <nn> } }\n" \
_(input_acl_set_interface, \
"<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n" \
" [l2-table <nn>] [del]") \
+_(ip_probe_neighbor, "(<intc> | sw_if_index <nn>) address <ip4|ip6-addr>") \
+_(ip_scan_neighbor_enable_disable, "[ip4|ip6|both|disable] [interval <n-min>]\n" \
+ " [max-time <n-usec>] [max-update <n>] [delay <n-msec>] [stale <n-min>]") \
_(want_ip4_arp_events, "address <ip4-address> [del]") \
_(want_ip6_nd_events, "address <ip6-address> [del]") \
_(want_l2_macs_events, "[disable] [learn-limit <n>] [scan-delay <n>] [max-entries <n>]") \
_(ipsec_tunnel_if_add_del, "local_spi <n> remote_spi <n>\n" \
" crypto_alg <alg> local_crypto_key <hex> remote_crypto_key <hex>\n" \
" integ_alg <alg> local_integ_key <hex> remote_integ_key <hex>\n" \
- " local_ip <addr> remote_ip <addr> [esn] [anti_replay] [del]\n") \
+ " local_ip <addr> remote_ip <addr> [esn] [anti_replay] [del]\n" \
+ " [instance <n>]") \
_(ipsec_sa_dump, "[sa_id <n>]") \
_(ipsec_tunnel_if_set_key, "<intfc> <local|remote> <crypto|integ>\n" \
" <alg> <hex>\n") \
_(ikev2_initiate_rekey_child_sa, "<ispi>") \
_(delete_loopback,"sw_if_index <nn>") \
_(bd_ip_mac_add_del, "bd_id <bridge-domain-id> <ip4/6-addr> <mac-addr> [del]") \
-_(map_add_domain, \
- "ip4-pfx <ip4pfx> ip6-pfx <ip6pfx> " \
- "ip6-src <ip6addr> " \
- "ea-bits-len <n> psid-offset <n> psid-len <n>") \
-_(map_del_domain, "index <n>") \
-_(map_add_del_rule, \
- "index <n> psid <n> dst <ip6addr> [del]") \
-_(map_domain_dump, "") \
-_(map_rule_dump, "index <map-domain>") \
+_(bd_ip_mac_dump, "[bd_id] <id>") \
_(want_interface_events, "enable|disable") \
_(want_stats,"enable|disable") \
_(get_first_msg_id, "client <name>") \
_(one_add_del_l2_arp_entry, "[del] mac <mac> bd <bd> ip4 <ip4>") \
_(one_l2_arp_bd_get, "") \
_(one_l2_arp_entries_get, "bd <bridge-domain>") \
-_(one_stats_enable_disable, "enable|disalbe") \
+_(one_stats_enable_disable, "enable|disable") \
_(show_one_stats_enable_disable, "") \
_(one_eid_table_vni_dump, "") \
_(one_eid_table_map_dump, "l2|l3") \
_(show_lisp_map_request_mode, "") \
_(af_packet_create, "name <host interface name> [hw_addr <mac>]") \
_(af_packet_delete, "name <host interface name>") \
+_(af_packet_dump, "") \
_(policer_add_del, "name <policer name> <params> [del]") \
_(policer_dump, "[name <policer name>]") \
_(policer_classify_set_interface, \
_(sw_interface_tag_add_del, "<intfc> | sw_if_index <nn> tag <text>" \
"[disable]") \
_(l2_xconnect_dump, "") \
-_(sw_interface_set_mtu, "<intfc> | sw_if_index <nn> mtu <nn>") \
+_(hw_interface_set_mtu, "<intfc> | hw_if_index <nn> mtu <nn>") \
_(ip_neighbor_dump, "[ip6] <intfc> | sw_if_index <nn>") \
_(sw_interface_get_table, "<intfc> | sw_if_index <id> [ipv6]") \
_(p2p_ethernet_add, "<intfc> | sw_if_index <nn> remote_mac <mac-address> sub_id <id>") \
_(sw_interface_set_lldp, "<intfc> | sw_if_index <nn> [port-desc <description>]\n" \
" [mgmt-ip4 <ip4>] [mgmt-ip6 <ip6>] [mgmt-oid <object id>] [disable]") \
_(tcp_configure_src_addresses, "<ip4|6>first-<ip4|6>last [vrf <id>]") \
-_(memfd_segment_create,"size <nnn>") \
_(sock_init_shm, "size <nnn>") \
_(app_namespace_add_del, "[add] id <ns-id> secret <nn> sw_if_index <nn>")\
_(dns_enable_disable, "[enable][disable]") \
_(output_acl_set_interface, \
"<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n" \
" [l2-table <nn>] [del]") \
+_(qos_record_enable_disable, "<record-source> <intfc> | sw_if_index <id> [disable]")
/* List of command functions, CLI names map directly to functions */
#define foreach_cli_function \
_(search_node_table, "usage: search_node_table <name>...") \
_(set, "usage: set <variable-name> <value>") \
_(script, "usage: script <file-name>") \
+_(statseg, "usage: statseg"); \
_(unset, "usage: unset <variable-name>")
+
#define _(N,n) \
static void vl_api_##n##_t_handler_uni \
(vl_api_##n##_t * mp) \