*/
#include <vat/vat.h>
+#include <vlib/pci/pci.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/ip-neighbor/ip_neighbor.h>
#include <vnet/ip/ip_types_api.h>
#include <vnet/l2/l2_input.h>
#include <vnet/l2tp/l2tp.h>
#include <vnet/policer/policer.h>
#include <vnet/policer/police.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 <vnet/ethernet/ethernet_types_api.h>
#define __plugin_msg_base 0
#include <vlibapi/vat_helper_macros.h>
+#include <vnet/format_fns.h>
+
+void vl_api_set_elog_main (elog_main_t * m);
+int vl_api_set_elog_trace_api_messages (int enable);
+
#if VPP_API_TEST_BUILTIN == 0
#include <netdb.h>
if (vam->ifp != stdin)
fformat (vam->ofp, "%s(%d): \n", vam->current_file,
vam->input_line_number);
- fformat (vam->ofp, (char *) s);
+ else
+ fformat (vam->ofp, "%s\n", (char *) s);
fflush (vam->ofp);
}
#endif
return 0;
}
+/* Parse an IP46 address. */
+uword
+unformat_ip46_address (unformat_input_t * input, va_list * args)
+{
+ ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+ ip46_type_t type = va_arg (*args, ip46_type_t);
+ if ((type != IP46_TYPE_IP6) &&
+ unformat (input, "%U", unformat_ip4_address, &ip46->ip4))
+ {
+ ip46_address_mask_ip4 (ip46);
+ return 1;
+ }
+ else if ((type != IP46_TYPE_IP4) &&
+ unformat (input, "%U", unformat_ip6_address, &ip46->ip6))
+ {
+ return 1;
+ }
+ return 0;
+}
+
/* Parse an IP6 address. */
uword
unformat_ip6_address (unformat_input_t * input, va_list * args)
static void
increment_address (vl_api_address_t * a)
{
- if (a->af == ADDRESS_IP4)
+ if (clib_net_to_host_u32 (a->af) == ADDRESS_IP4)
increment_v4_address (&a->un.ip4);
- else if (a->af == ADDRESS_IP6)
+ else if (clib_net_to_host_u32 (a->af) == ADDRESS_IP6)
increment_v6_address (&a->un.ip6);
}
}
}
+void
+ip_set (ip46_address_t * dst, void *src, u8 is_ip4)
+{
+ if (is_ip4)
+ dst->ip4.as_u32 = ((ip4_address_t *) src)->as_u32;
+ else
+ clib_memcpy_fast (&dst->ip6, (ip6_address_t *) src,
+ sizeof (ip6_address_t));
+}
+
static void
increment_mac_address (u8 * mac)
{
sub->sw_if_index = ntohl (mp->sw_if_index);
sub->sub_id = ntohl (mp->sub_id);
- sub->sub_dot1ad = mp->sub_dot1ad;
+ sub->raw_flags = ntohl (mp->sub_if_flags & SUB_IF_API_FLAG_MASK_VNET);
+
sub->sub_number_of_tags = mp->sub_number_of_tags;
sub->sub_outer_vlan_id = ntohs (mp->sub_outer_vlan_id);
sub->sub_inner_vlan_id = ntohs (mp->sub_inner_vlan_id);
- sub->sub_exact_match = mp->sub_exact_match;
- sub->sub_default = mp->sub_default;
- sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
- sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
/* vlan tag rewrite */
sub->vtr_op = ntohl (mp->vtr_op);
vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
vat_json_object_add_uint (node, "sup_sw_if_index",
ntohl (mp->sup_sw_if_index));
- vat_json_object_add_uint (node, "l2_address_length",
- ntohl (mp->l2_address_length));
vat_json_object_add_bytes (node, "l2_address", mp->l2_address,
sizeof (mp->l2_address));
vat_json_object_add_string_copy (node, "interface_name",
mp->interface_name);
- vat_json_object_add_uint (node, "admin_up_down", mp->admin_up_down);
- vat_json_object_add_uint (node, "link_up_down", mp->link_up_down);
+ vat_json_object_add_string_copy (node, "interface_dev_type",
+ mp->interface_dev_type);
+ vat_json_object_add_uint (node, "flags", mp->flags);
vat_json_object_add_uint (node, "link_duplex", mp->link_duplex);
vat_json_object_add_uint (node, "link_speed", mp->link_speed);
vat_json_object_add_uint (node, "mtu", ntohs (mp->link_mtu));
vat_json_object_add_uint (node, "sub_id", ntohl (mp->sub_id));
- vat_json_object_add_uint (node, "sub_dot1ad", mp->sub_dot1ad);
vat_json_object_add_uint (node, "sub_number_of_tags",
mp->sub_number_of_tags);
vat_json_object_add_uint (node, "sub_outer_vlan_id",
ntohs (mp->sub_outer_vlan_id));
vat_json_object_add_uint (node, "sub_inner_vlan_id",
ntohs (mp->sub_inner_vlan_id));
- vat_json_object_add_uint (node, "sub_exact_match", mp->sub_exact_match);
- vat_json_object_add_uint (node, "sub_default", mp->sub_default);
- vat_json_object_add_uint (node, "sub_outer_vlan_id_any",
- mp->sub_outer_vlan_id_any);
- vat_json_object_add_uint (node, "sub_inner_vlan_id_any",
- mp->sub_inner_vlan_id_any);
+ vat_json_object_add_uint (node, "sub_if_flags", ntohl (mp->sub_if_flags));
vat_json_object_add_uint (node, "vtr_op", ntohl (mp->vtr_op));
vat_json_object_add_uint (node, "vtr_push_dot1q",
ntohl (mp->vtr_push_dot1q));
vat_json_object_add_uint (node, "vtr_tag1", ntohl (mp->vtr_tag1));
vat_json_object_add_uint (node, "vtr_tag2", ntohl (mp->vtr_tag2));
- if (mp->sub_dot1ah)
+ if (ntohl (mp->sub_if_flags) & SUB_IF_API_FLAG_DOT1AH)
{
vat_json_object_add_string_copy (node, "pbb_vtr_dmac",
format (0, "%U",
if (vam->interface_event_display)
errmsg ("interface flags: sw_if_index %d %s %s",
ntohl (mp->sw_if_index),
- mp->admin_up_down ? "admin-up" : "admin-down",
- mp->link_up_down ? "link-up" : "link-down");
+ ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_ADMIN_UP) ?
+ "admin-up" : "admin-down",
+ ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_LINK_UP) ?
+ "link-up" : "link-down");
}
#endif
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
- api_main_t *am = &api_main;
void *oldheap;
u8 *reply;
vat_json_object_add_uint (&node, "reply_in_shmem",
ntohl (mp->reply_in_shmem));
/* Toss the shared-memory original... */
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+ oldheap = vl_msg_push_heap ();
reply = uword_to_pointer (mp->reply_in_shmem, u8 *);
vec_free (reply);
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
+ vl_msg_pop_heap (oldheap);
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
- u32 length = vl_api_string_len (&mp->reply);
vec_reset_length (vam->cmd_reply);
vam->retval = retval;
if (retval == 0)
- {
- vec_validate (vam->cmd_reply, length);
- clib_memcpy ((char *) (vam->cmd_reply),
- vl_api_from_api_string (&mp->reply), length);
- vam->cmd_reply[length] = 0;
- }
+ vam->cmd_reply = vl_api_from_api_to_new_vec (&mp->reply);
vam->result_ready = 1;
}
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
+ u8 *reply = 0; /* reply vector */
+ reply = vl_api_from_api_to_new_vec (&mp->reply);
vec_reset_length (vam->cmd_reply);
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_string_copy (&node, "reply",
- vl_api_from_api_string (&mp->reply));
+ vat_json_object_add_string_copy (&node, "reply", reply);
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
+ vec_free (reply);
vam->retval = ntohl (mp->retval);
vam->result_ready = 1;
if (retval >= 0)
{
- u8 *s = 0;
- char *p = (char *) &mp->program;
-
- s = vl_api_from_api_to_vec ((vl_api_string_t *) p);
- errmsg (" program: %v\n", s);
- vec_free (s);
-
- p +=
- vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
- s = vl_api_from_api_to_vec ((vl_api_string_t *) p);
- errmsg (" version: %v\n", s);
- vec_free (s);
-
- p +=
- vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
- s = vl_api_from_api_to_vec ((vl_api_string_t *) p);
- errmsg (" build date: %v\n", s);
- vec_free (s);
-
- p +=
- vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
- s = vl_api_from_api_to_vec ((vl_api_string_t *) p);
- errmsg ("build directory: %v\n", s);
- vec_free (s);
+ errmsg (" program: %s", mp->program);
+ errmsg (" version: %s", mp->version);
+ errmsg (" build date: %s", mp->build_date);
+ errmsg ("build directory: %s", mp->build_directory);
}
vam->retval = retval;
vam->result_ready = 1;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- char *p = (char *) &mp->program;
- vat_json_object_add_string_copy (&node, "program",
- vl_api_from_api_string ((vl_api_string_t *)
- p));
- p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32);
- vat_json_object_add_string_copy (&node, "version",
- vl_api_from_api_string ((vl_api_string_t *)
- p));
- p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32);
- vat_json_object_add_string_copy (&node, "build_date",
- vl_api_from_api_string ((vl_api_string_t *)
- p));
- p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32);
+ vat_json_object_add_string_copy (&node, "program", mp->program);
+ vat_json_object_add_string_copy (&node, "version", mp->version);
+ vat_json_object_add_string_copy (&node, "build_date", mp->build_date);
vat_json_object_add_string_copy (&node, "build_directory",
- vl_api_from_api_string ((vl_api_string_t *)
- p));
+ mp->build_directory);
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
return ret;
}
-static void
-vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp)
-{
- u32 sw_if_index = ntohl (mp->sw_if_index);
- errmsg ("arp %s event: pid %d address %U new mac %U sw_if_index %d\n",
- mp->mac_ip ? "mac/ip binding" : "address resolution",
- ntohl (mp->pid), format_ip4_address, mp->ip,
- format_vl_api_mac_address, &mp->mac, sw_if_index);
-}
-
-static void
-vl_api_ip4_arp_event_t_handler_json (vl_api_ip4_arp_event_t * mp)
-{
- /* JSON output not supported */
-}
-
-static void
-vl_api_ip6_nd_event_t_handler (vl_api_ip6_nd_event_t * mp)
-{
- u32 sw_if_index = ntohl (mp->sw_if_index);
- errmsg ("ip6 nd %s event: pid %d address %U new mac %U sw_if_index %d\n",
- mp->mac_ip ? "mac/ip binding" : "address resolution",
- ntohl (mp->pid), format_vl_api_ip6_address, mp->ip,
- format_vl_api_mac_address, mp->mac, sw_if_index);
-}
-
-static void
-vl_api_ip6_nd_event_t_handler_json (vl_api_ip6_nd_event_t * mp)
-{
- /* JSON output not supported */
-}
-
static void
vl_api_l2_macs_event_t_handler (vl_api_l2_macs_event_t * mp)
{
vam->result_ready = 1;
}
+static int
+api_sw_interface_set_bond_weight (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_bond_weight_t *mp;
+ u32 sw_if_index = ~0;
+ u32 weight = 0;
+ u8 weight_enter = 0;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "weight %u", &weight))
+ weight_enter = 1;
+ else
+ break;
+ }
+
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
+ if (weight_enter == 0)
+ {
+ errmsg ("missing valid weight");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_BOND_WEIGHT, mp);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->weight = ntohl (weight);
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
static void vl_api_sw_interface_bond_details_t_handler
(vl_api_sw_interface_bond_details_t * mp)
{
print (vam->ofp,
"%-16s %-12d %-12U %-13U %-14u %-14u",
mp->interface_name, ntohl (mp->sw_if_index),
- format_bond_mode, mp->mode, format_bond_load_balance, mp->lb,
- ntohl (mp->active_slaves), ntohl (mp->slaves));
+ format_bond_mode, ntohl (mp->mode), format_bond_load_balance,
+ ntohl (mp->lb), ntohl (mp->active_slaves), ntohl (mp->slaves));
}
static void vl_api_sw_interface_bond_details_t_handler_json
vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
vat_json_object_add_string_copy (node, "interface_name",
mp->interface_name);
- vat_json_object_add_uint (node, "mode", mp->mode);
- vat_json_object_add_uint (node, "load_balance", mp->lb);
+ vat_json_object_add_uint (node, "mode", ntohl (mp->mode));
+ vat_json_object_add_uint (node, "load_balance", ntohl (mp->lb));
vat_json_object_add_uint (node, "active_slaves", ntohl (mp->active_slaves));
vat_json_object_add_uint (node, "slaves", ntohl (mp->slaves));
}
vat_main_t *vam = &vat_main;
print (vam->ofp,
- "%-25s %-12d %-12d %d", mp->interface_name,
- ntohl (mp->sw_if_index), mp->is_passive, mp->is_long_timeout);
+ "%-25s %-12d %-7d %-12d %-10d %-10d", mp->interface_name,
+ ntohl (mp->sw_if_index), mp->is_passive, mp->is_long_timeout,
+ ntohl (mp->weight), mp->is_local_numa);
}
static void vl_api_sw_interface_slave_details_t_handler_json
mp->interface_name);
vat_json_object_add_uint (node, "passive", mp->is_passive);
vat_json_object_add_uint (node, "long_timeout", mp->is_long_timeout);
+ vat_json_object_add_uint (node, "weight", ntohl (mp->weight));
+ vat_json_object_add_uint (node, "is_local_numa", mp->is_local_numa);
}
static int
}
print (vam->ofp,
- "\n%-25s %-12s %-12s %s",
- "slave interface name", "sw_if_index", "passive", "long_timeout");
+ "\n%-25s %-12s %-7s %-12s %-10s %-10s",
+ "slave interface name", "sw_if_index", "passive", "long_timeout",
+ "weight", "local numa");
/* Get list of bond interfaces */
M (SW_INTERFACE_SLAVE_DUMP, mp);
vam->result_ready = 1;
}
-static void vl_api_dns_resolve_name_reply_t_handler
- (vl_api_dns_resolve_name_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;
-
- if (retval == 0)
- {
- if (mp->ip4_set)
- clib_warning ("ip4 address %U", format_ip4_address,
- (ip4_address_t *) mp->ip4_address);
- if (mp->ip6_set)
- clib_warning ("ip6 address %U", format_ip6_address,
- (ip6_address_t *) mp->ip6_address);
- }
- else
- clib_warning ("retval %d", retval);
- }
-}
-
-static void vl_api_dns_resolve_name_reply_t_handler_json
- (vl_api_dns_resolve_name_reply_t * mp)
-{
- clib_warning ("not implemented");
-}
-
-static void vl_api_dns_resolve_ip_reply_t_handler
- (vl_api_dns_resolve_ip_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;
-
- if (retval == 0)
- {
- clib_warning ("canonical name %s", mp->name);
- }
- else
- clib_warning ("retval %d", retval);
- }
-}
-
-static void vl_api_dns_resolve_ip_reply_t_handler_json
- (vl_api_dns_resolve_ip_reply_t * mp)
-{
- clib_warning ("not implemented");
-}
-
-
static void vl_api_ip_address_details_t_handler
(vl_api_ip_address_details_t * mp)
{
clib_net_to_host_u32 (mp->sw_if_index));
}
-static void
-vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp)
-{
- u8 *s, i;
-
- s = format (0, "DHCP compl event: pid %d %s hostname %s host_addr %U "
- "host_mac %U router_addr %U",
- ntohl (mp->pid), mp->lease.is_ipv6 ? "ipv6" : "ipv4",
- mp->lease.hostname,
- format_ip4_address, mp->lease.host_address,
- format_ethernet_address, mp->lease.host_mac,
- format_ip4_address, mp->lease.router_address);
-
- for (i = 0; i < mp->lease.count; i++)
- s =
- format (s, " domain_server_addr %U", format_ip4_address,
- mp->lease.domain_server[i].address);
-
- errmsg ((char *) s);
- vec_free (s);
-}
-
-static void vl_api_dhcp_compl_event_t_handler_json
- (vl_api_dhcp_compl_event_t * mp)
-{
- /* JSON output not supported */
-}
-
static void vl_api_get_first_msg_id_reply_t_handler
(vl_api_get_first_msg_id_reply_t * mp)
{
(vl_api_get_node_graph_reply_t * mp)
{
vat_main_t *vam = &vat_main;
- api_main_t *am = &api_main;
i32 retval = ntohl (mp->retval);
u8 *pvt_copy, *reply;
void *oldheap;
pvt_copy = vec_dup (reply);
/* Toss the shared-memory original... */
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+ oldheap = vl_msg_push_heap ();
vec_free (reply);
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
+ vl_msg_pop_heap (oldheap);
if (vam->graph_nodes)
{
(vl_api_get_node_graph_reply_t * mp)
{
vat_main_t *vam = &vat_main;
- api_main_t *am = &api_main;
void *oldheap;
vat_json_node_t node;
u8 *reply;
reply = uword_to_pointer (mp->reply_in_shmem, u8 *);
/* Toss the shared-memory original... */
- pthread_mutex_lock (&am->vlib_rp->mutex);
- oldheap = svm_push_data_heap (am->vlib_rp);
+ oldheap = vl_msg_push_heap ();
vec_free (reply);
- svm_pop_heap (oldheap);
- pthread_mutex_unlock (&am->vlib_rp->mutex);
+ vl_msg_pop_heap (oldheap);
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
_(sw_interface_set_geneve_bypass_reply) \
_(sw_interface_set_vxlan_gpe_bypass_reply) \
_(sw_interface_set_l2_bridge_reply) \
+_(sw_interface_set_bond_weight_reply) \
_(bridge_domain_add_del_reply) \
_(sw_interface_set_l2_xconnect_reply) \
_(l2fib_add_del_reply) \
_(l2fib_flush_bd_reply) \
_(ip_route_add_del_reply) \
_(ip_table_add_del_reply) \
+_(ip_table_replace_begin_reply) \
+_(ip_table_flush_reply) \
+_(ip_table_replace_end_reply) \
_(ip_mroute_add_del_reply) \
_(mpls_route_add_del_reply) \
_(mpls_table_add_del_reply) \
_(mpls_ip_bind_unbind_reply) \
_(bier_route_add_del_reply) \
_(bier_table_add_del_reply) \
-_(proxy_arp_add_del_reply) \
-_(proxy_arp_intfc_enable_disable_reply) \
_(sw_interface_set_unnumbered_reply) \
-_(ip_neighbor_add_del_reply) \
-_(reset_fib_reply) \
-_(dhcp_proxy_config_reply) \
-_(dhcp_proxy_set_vss_reply) \
-_(dhcp_client_config_reply) \
_(set_ip_flow_hash_reply) \
_(sw_interface_ip6_enable_disable_reply) \
-_(ip6nd_proxy_add_del_reply) \
-_(sw_interface_ip6nd_ra_prefix_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) \
_(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) \
_(input_acl_set_interface_reply) \
_(ipsec_spd_add_del_reply) \
_(gpe_add_del_native_fwd_rpath_reply) \
_(af_packet_delete_reply) \
_(policer_classify_set_interface_reply) \
-_(netmap_create_reply) \
-_(netmap_delete_reply) \
_(set_ipfix_exporter_reply) \
_(set_ipfix_classify_stream_reply) \
_(ipfix_classify_table_add_del_reply) \
_(l2_interface_pbb_tag_rewrite_reply) \
_(set_punt_reply) \
_(feature_enable_disable_reply) \
+_(feature_gso_enable_disable_reply) \
_(sw_interface_tag_add_del_reply) \
+_(sw_interface_add_del_mac_address_reply) \
_(hw_interface_set_mtu_reply) \
_(p2p_ethernet_add_reply) \
_(p2p_ethernet_del_reply) \
_(lldp_config_reply) \
_(sw_interface_set_lldp_reply) \
_(tcp_configure_src_addresses_reply) \
-_(dns_enable_disable_reply) \
-_(dns_name_server_add_del_reply) \
_(session_rule_add_del_reply) \
_(ip_container_proxy_add_del_reply) \
_(output_acl_set_interface_reply) \
_(BOND_DELETE_REPLY, bond_delete_reply) \
_(BOND_ENSLAVE_REPLY, bond_enslave_reply) \
_(BOND_DETACH_SLAVE_REPLY, bond_detach_slave_reply) \
+_(SW_INTERFACE_SET_BOND_WEIGHT_REPLY, sw_interface_set_bond_weight_reply) \
_(SW_INTERFACE_BOND_DETAILS, sw_interface_bond_details) \
_(SW_INTERFACE_SLAVE_DETAILS, sw_interface_slave_details) \
_(IP_ROUTE_ADD_DEL_REPLY, ip_route_add_del_reply) \
_(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \
+_(IP_TABLE_REPLACE_BEGIN_REPLY, ip_table_replace_begin_reply) \
+_(IP_TABLE_FLUSH_REPLY, ip_table_flush_reply) \
+_(IP_TABLE_REPLACE_END_REPLY, ip_table_replace_end_reply) \
_(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \
_(MPLS_TABLE_ADD_DEL_REPLY, mpls_table_add_del_reply) \
_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \
_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \
_(BIER_ROUTE_ADD_DEL_REPLY, bier_route_add_del_reply) \
_(BIER_TABLE_ADD_DEL_REPLY, bier_table_add_del_reply) \
-_(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply) \
-_(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY, \
- proxy_arp_intfc_enable_disable_reply) \
_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \
_(SW_INTERFACE_SET_UNNUMBERED_REPLY, \
sw_interface_set_unnumbered_reply) \
-_(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply) \
_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply) \
_(CREATE_SUBIF_REPLY, create_subif_reply) \
-_(RESET_FIB_REPLY, reset_fib_reply) \
-_(DHCP_PROXY_CONFIG_REPLY, dhcp_proxy_config_reply) \
-_(DHCP_PROXY_SET_VSS_REPLY, dhcp_proxy_set_vss_reply) \
-_(DHCP_PROXY_DETAILS, dhcp_proxy_details) \
-_(DHCP_CLIENT_CONFIG_REPLY, dhcp_client_config_reply) \
_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply) \
_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, \
sw_interface_ip6_enable_disable_reply) \
-_(IP6ND_PROXY_ADD_DEL_REPLY, ip6nd_proxy_add_del_reply) \
-_(IP6ND_PROXY_DETAILS, ip6nd_proxy_details) \
-_(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY, \
- sw_interface_ip6nd_ra_prefix_reply) \
-_(SW_INTERFACE_IP6ND_RA_CONFIG_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) \
_(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) \
-_(IP6_ND_EVENT, ip6_nd_event) \
_(WANT_L2_MACS_EVENTS_REPLY, want_l2_macs_events_reply) \
_(L2_MACS_EVENT, l2_macs_event) \
_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply) \
_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \
_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \
_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \
-_(DHCP_COMPL_EVENT, dhcp_compl_event) \
_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \
_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \
_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \
_(POLICER_DETAILS, policer_details) \
_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \
_(POLICER_CLASSIFY_DETAILS, policer_classify_details) \
-_(NETMAP_CREATE_REPLY, netmap_create_reply) \
-_(NETMAP_DELETE_REPLY, netmap_delete_reply) \
_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details) \
_(MPLS_TABLE_DETAILS, mpls_table_details) \
_(MPLS_ROUTE_DETAILS, mpls_route_details) \
_(IP_TABLE_DETAILS, ip_table_details) \
_(IP_ROUTE_DETAILS, ip_route_details) \
_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \
+_(FEATURE_GSO_ENABLE_DISABLE_REPLY, feature_gso_enable_disable_reply) \
_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \
+_(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply) \
_(L2_XCONNECT_DETAILS, l2_xconnect_details) \
_(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) \
_(P2P_ETHERNET_DEL_REPLY, p2p_ethernet_del_reply) \
_(SW_INTERFACE_SET_LLDP_REPLY, sw_interface_set_lldp_reply) \
_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) \
_(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply) \
-_(DNS_ENABLE_DISABLE_REPLY, dns_enable_disable_reply) \
-_(DNS_NAME_SERVER_ADD_DEL_REPLY, dns_name_server_add_del_reply) \
-_(DNS_RESOLVE_NAME_REPLY, dns_resolve_name_reply) \
-_(DNS_RESOLVE_IP_REPLY, dns_resolve_ip_reply) \
_(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \
_(SESSION_RULES_DETAILS, session_rules_details) \
_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \
* must be a vector ending in \n, not a C-string ending
* in \n\0.
*/
- u32 len = vec_len (vam->input->buffer);
- M2 (CLI_INBAND, mp, len);
- vl_api_to_api_string (len - 1, (const char *) vam->input->buffer, &mp->cmd);
+ M2 (CLI_INBAND, mp, vec_len (vam->input->buffer));
+ vl_api_vec_to_api_string (vam->input->buffer, &mp->cmd);
S (mp);
W (ret);
/* Construct the API message */
M (SW_INTERFACE_SET_FLAGS, mp);
mp->sw_if_index = ntohl (sw_if_index);
- mp->admin_up_down = admin_up;
+ mp->flags = ntohl ((admin_up) ? IF_STATUS_API_FLAG_ADMIN_UP : 0);
/* send it... */
S (mp);
/* Construct the API message */
M (SW_INTERFACE_SET_RX_MODE, mp);
mp->sw_if_index = ntohl (sw_if_index);
- mp->mode = mode;
+ mp->mode = (vl_api_rx_mode_t) mode;
mp->queue_id_valid = queue_id_valid;
mp->queue_id = queue_id_valid ? ntohl (queue_id) : ~0;
mp->del_all = del_all;
if (v6_address_set)
{
- mp->is_ipv6 = 1;
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
+ mp->prefix.address.af = ADDRESS_IP6;
+ clib_memcpy (mp->prefix.address.un.ip6, &v6address, sizeof (v6address));
}
else
{
- clib_memcpy (mp->address, &v4address, sizeof (v4address));
+ mp->prefix.address.af = ADDRESS_IP4;
+ clib_memcpy (mp->prefix.address.un.ip4, &v4address, sizeof (v4address));
}
- mp->address_length = address_length;
+ mp->prefix.len = address_length;
/* send it... */
S (mp);
{
unformat_input_t *i = vam->input;
vl_api_tap_create_v2_t *mp;
-#define TAP_FLAG_GSO (1 << 0)
u8 mac_address[6];
u8 random_mac = 1;
u32 id = ~0;
+ u32 num_rx_queues = 0;
u8 *host_if_name = 0;
+ u8 host_if_name_set = 0;
u8 *host_ns = 0;
+ u8 host_ns_set = 0;
u8 host_mac_addr[6];
u8 host_mac_addr_set = 0;
u8 *host_bridge = 0;
+ u8 host_bridge_set = 0;
+ u8 host_ip4_prefix_set = 0;
+ u8 host_ip6_prefix_set = 0;
ip4_address_t host_ip4_addr;
ip4_address_t host_ip4_gw;
u8 host_ip4_gw_set = 0;
ip6_address_t host_ip6_gw;
u8 host_ip6_gw_set = 0;
u32 host_ip6_prefix_len = 0;
- u8 host_mtu_set = 0;
u32 host_mtu_size = 0;
+ u8 host_mtu_set = 0;
u32 tap_flags = 0;
int ret;
u32 rx_ring_sz = 0, tx_ring_sz = 0;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address))
- {
- random_mac = 0;
- }
- else if (unformat (i, "id %u", &id))
+ if (unformat (i, "id %u", &id))
;
+ else
+ if (unformat
+ (i, "hw-addr %U", unformat_ethernet_address, mac_address))
+ random_mac = 0;
else if (unformat (i, "host-if-name %s", &host_if_name))
+ host_if_name_set = 1;
+ else if (unformat (i, "num-rx-queues %u", &num_rx_queues))
;
else if (unformat (i, "host-ns %s", &host_ns))
- ;
+ host_ns_set = 1;
else if (unformat (i, "host-mac-addr %U", unformat_ethernet_address,
host_mac_addr))
host_mac_addr_set = 1;
else if (unformat (i, "host-bridge %s", &host_bridge))
- ;
- else if (unformat (i, "host-ip4-addr %U/%d", unformat_ip4_address,
+ host_bridge_set = 1;
+ else if (unformat (i, "host-ip4-addr %U/%u", unformat_ip4_address,
&host_ip4_addr, &host_ip4_prefix_len))
- ;
- else if (unformat (i, "host-ip6-addr %U/%d", unformat_ip6_address,
+ host_ip4_prefix_set = 1;
+ else if (unformat (i, "host-ip6-addr %U/%u", unformat_ip6_address,
&host_ip6_addr, &host_ip6_prefix_len))
- ;
+ host_ip6_prefix_set = 1;
else if (unformat (i, "host-ip4-gw %U", unformat_ip4_address,
&host_ip4_gw))
host_ip4_gw_set = 1;
else if (unformat (i, "host-ip6-gw %U", unformat_ip6_address,
&host_ip6_gw))
host_ip6_gw_set = 1;
- else if (unformat (i, "rx-ring-size %d", &rx_ring_sz))
+ else if (unformat (i, "rx-ring-size %u", &rx_ring_sz))
;
- else if (unformat (i, "tx-ring-size %d", &tx_ring_sz))
+ else if (unformat (i, "tx-ring-size %u", &tx_ring_sz))
;
- else if (unformat (i, "host-mtu-size %d", &host_mtu_size))
+ else if (unformat (i, "host-mtu-size %u", &host_mtu_size))
host_mtu_set = 1;
else if (unformat (i, "no-gso"))
tap_flags &= ~TAP_FLAG_GSO;
else if (unformat (i, "gso"))
tap_flags |= TAP_FLAG_GSO;
+ else if (unformat (i, "csum-offload"))
+ tap_flags |= TAP_FLAG_CSUM_OFFLOAD;
+ else if (unformat (i, "persist"))
+ tap_flags |= TAP_FLAG_PERSIST;
+ else if (unformat (i, "attach"))
+ tap_flags |= TAP_FLAG_ATTACH;
else
break;
}
/* Construct the API message */
M (TAP_CREATE_V2, mp);
- mp->use_random_mac = random_mac;
-
mp->id = ntohl (id);
- mp->host_namespace_set = host_ns != 0;
- mp->host_bridge_set = host_bridge != 0;
- mp->host_ip4_addr_set = host_ip4_prefix_len != 0;
- mp->host_ip6_addr_set = host_ip6_prefix_len != 0;
- mp->rx_ring_sz = ntohs (rx_ring_sz);
+ mp->use_random_mac = random_mac;
+ mp->num_rx_queues = (u8) num_rx_queues;
mp->tx_ring_sz = ntohs (tx_ring_sz);
+ mp->rx_ring_sz = ntohs (rx_ring_sz);
mp->host_mtu_set = host_mtu_set;
mp->host_mtu_size = ntohl (host_mtu_size);
+ mp->host_mac_addr_set = host_mac_addr_set;
+ mp->host_ip4_prefix_set = host_ip4_prefix_set;
+ mp->host_ip6_prefix_set = host_ip6_prefix_set;
+ mp->host_ip4_gw_set = host_ip4_gw_set;
+ mp->host_ip6_gw_set = host_ip6_gw_set;
mp->tap_flags = ntohl (tap_flags);
+ mp->host_namespace_set = host_ns_set;
+ mp->host_if_name_set = host_if_name_set;
+ mp->host_bridge_set = host_bridge_set;
if (random_mac == 0)
clib_memcpy (mp->mac_address, mac_address, 6);
if (host_mac_addr_set)
clib_memcpy (mp->host_mac_addr, host_mac_addr, 6);
- if (host_if_name)
+ if (host_if_name_set)
clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
- if (host_ns)
+ if (host_ns_set)
clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns));
- if (host_bridge)
+ if (host_bridge_set)
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_ip6_prefix_len)
- clib_memcpy (mp->host_ip6_addr, &host_ip6_addr, 16);
+ if (host_ip4_prefix_set)
+ {
+ clib_memcpy (mp->host_ip4_prefix.address, &host_ip4_addr, 4);
+ mp->host_ip4_prefix.len = (u8) host_ip4_prefix_len;
+ }
+ if (host_ip6_prefix_set)
+ {
+ clib_memcpy (mp->host_ip6_prefix.address, &host_ip6_addr, 16);
+ mp->host_ip6_prefix.len = (u8) host_ip6_prefix_len;
+ }
if (host_ip4_gw_set)
clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4);
if (host_ip6_gw_set)
}
uword
-unformat_pci_addr (unformat_input_t * input, va_list * args)
+unformat_vlib_pci_addr (unformat_input_t * input, va_list * args)
{
- struct pci_addr_t
- {
- u16 domain;
- u8 bus;
- u8 slot:5;
- u8 function:3;
- } *addr;
- addr = va_arg (*args, struct pci_addr_t *);
+ vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *);
u32 x[4];
if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3]))
u8 mac_address[6];
u8 random_mac = 1;
u8 gso_enabled = 0;
+ u8 checksum_offload_enabled = 0;
u32 pci_addr = 0;
u64 features = (u64) ~ (0ULL);
int ret;
{
random_mac = 0;
}
- else if (unformat (i, "pci-addr %U", unformat_pci_addr, &pci_addr))
+ else if (unformat (i, "pci-addr %U", unformat_vlib_pci_addr, &pci_addr))
;
else if (unformat (i, "features 0x%llx", &features))
;
else if (unformat (i, "gso-enabled"))
gso_enabled = 1;
+ else if (unformat (i, "csum-offload-enabled"))
+ checksum_offload_enabled = 1;
else
break;
}
mp->use_random_mac = random_mac;
- mp->pci_addr = htonl (pci_addr);
+ mp->pci_addr.domain = htons (((vlib_pci_addr_t) pci_addr).domain);
+ mp->pci_addr.bus = ((vlib_pci_addr_t) pci_addr).bus;
+ mp->pci_addr.slot = ((vlib_pci_addr_t) pci_addr).slot;
+ mp->pci_addr.function = ((vlib_pci_addr_t) pci_addr).function;
+
mp->features = clib_host_to_net_u64 (features);
mp->gso_enabled = gso_enabled;
+ mp->checksum_offload_enabled = checksum_offload_enabled;
if (random_mac == 0)
clib_memcpy (mp->mac_address, mac_address, 6);
u8 lb;
u8 mode_is_set = 0;
u32 id = ~0;
+ u8 numa_only = 0;
clib_memset (mac_address, 0, sizeof (mac_address));
lb = BOND_LB_L2;
else if (unformat (i, "hw-addr %U", unformat_ethernet_address,
mac_address))
custom_mac = 1;
+ else if (unformat (i, "numa-only"))
+ numa_only = 1;
else if (unformat (i, "id %u", &id))
;
else
mp->use_custom_mac = custom_mac;
- mp->mode = mode;
- mp->lb = lb;
+ mp->mode = htonl (mode);
+ mp->lb = htonl (lb);
mp->id = htonl (id);
+ mp->numa_only = numa_only;
if (custom_mac)
clib_memcpy (mp->mac_address, mac_address, 6);
mp->bsid = htonl (bsid);
mp->weight = htonl (weight);
- mp->type = type;
+ mp->is_spray = type;
mp->n_segments = n_segments;
memcpy (mp->segments, segments, sizeof (u32) * n_segments);
vec_free (segments);
return (ret);
}
-static int
-api_proxy_arp_add_del (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_proxy_arp_add_del_t *mp;
- u32 vrf_id = 0;
- u8 is_add = 1;
- vl_api_ip4_address_t lo, hi;
- u8 range_set = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "%U - %U", unformat_vl_api_ip4_address, &lo,
- unformat_vl_api_ip4_address, &hi))
- range_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (range_set == 0)
- {
- errmsg ("address range not set");
- return -99;
- }
-
- M (PROXY_ARP_ADD_DEL, mp);
-
- mp->proxy.table_id = ntohl (vrf_id);
- mp->is_add = is_add;
- clib_memcpy (mp->proxy.low, &lo, sizeof (lo));
- clib_memcpy (mp->proxy.hi, &hi, sizeof (hi));
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_proxy_arp_intfc_enable_disable_t *mp;
- u32 sw_if_index;
- u8 enable = 1;
- u8 sw_if_index_set = 0;
- 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, "enable"))
- enable = 1;
- 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;
- }
-
- M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable_disable = enable;
-
- S (mp);
- W (ret);
- return ret;
-}
-
static int
api_mpls_tunnel_add_del (vat_main_t * vam)
{
return ret;
}
+
static int
-api_ip_neighbor_add_del (vat_main_t * vam)
+api_create_vlan_subif (vat_main_t * vam)
{
- vl_api_mac_address_t mac_address;
unformat_input_t *i = vam->input;
- vl_api_ip_neighbor_add_del_t *mp;
- vl_api_address_t ip_address;
+ vl_api_create_vlan_subif_t *mp;
u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 is_add = 1;
- u8 mac_set = 0;
- u8 address_set = 0;
- int ret;
- ip_neighbor_flags_t flags;
-
- flags = IP_NEIGHBOR_FLAG_NONE;
- clib_memset (&ip_address, 0, sizeof (ip_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)
- {
- if (unformat (i, "mac %U", unformat_vl_api_mac_address, &mac_address))
- {
- mac_set = 1;
- }
- else if (unformat (i, "del"))
- is_add = 0;
- 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;
- else if (unformat (i, "static"))
- flags |= IP_NEIGHBOR_FLAG_STATIC;
- else if (unformat (i, "no-fib-entry"))
- flags |= IP_NEIGHBOR_FLAG_NO_FIB_ENTRY;
- else if (unformat (i, "dst %U", unformat_vl_api_address, &ip_address))
- address_set = 1;
- 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 (!address_set)
- {
- errmsg ("no address set");
- return -99;
- }
-
- /* Construct the API message */
- M (IP_NEIGHBOR_ADD_DEL, mp);
-
- mp->neighbor.sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->neighbor.flags = htonl (flags);
- if (mac_set)
- clib_memcpy (&mp->neighbor.mac_address, &mac_address,
- sizeof (mac_address));
- if (address_set)
- clib_memcpy (&mp->neighbor.ip_address, &ip_address, sizeof (ip_address));
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
-}
-
-static int
-api_create_vlan_subif (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_create_vlan_subif_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 vlan_id;
- u8 vlan_id_set = 0;
+ u32 vlan_id;
+ u8 vlan_id_set = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
_(outer_vlan_id_any) \
_(inner_vlan_id_any)
+#define foreach_create_subif_flag \
+_(0, "no_tags") \
+_(1, "one_tag") \
+_(2, "two_tags") \
+_(3, "dot1ad") \
+_(4, "exact_match") \
+_(5, "default_sub") \
+_(6, "outer_vlan_id_any") \
+_(7, "inner_vlan_id_any")
+
static int
api_create_subif (vat_main_t * vam)
{
u8 sw_if_index_set = 0;
u32 sub_id;
u8 sub_id_set = 0;
- u32 no_tags = 0;
- u32 one_tag = 0;
- u32 two_tags = 0;
- u32 dot1ad = 0;
- u32 exact_match = 0;
- u32 default_sub = 0;
- u32 outer_vlan_id_any = 0;
- u32 inner_vlan_id_any = 0;
+ u32 __attribute__ ((unused)) no_tags = 0;
+ u32 __attribute__ ((unused)) one_tag = 0;
+ u32 __attribute__ ((unused)) two_tags = 0;
+ u32 __attribute__ ((unused)) dot1ad = 0;
+ u32 __attribute__ ((unused)) exact_match = 0;
+ u32 __attribute__ ((unused)) default_sub = 0;
+ u32 __attribute__ ((unused)) outer_vlan_id_any = 0;
+ u32 __attribute__ ((unused)) inner_vlan_id_any = 0;
u32 tmp;
u16 outer_vlan_id = 0;
u16 inner_vlan_id = 0;
mp->sw_if_index = ntohl (sw_if_index);
mp->sub_id = ntohl (sub_id);
-#define _(a) mp->a = a;
- foreach_create_subif_bit;
+#define _(a,b) mp->sub_if_flags |= (1 << a);
+ foreach_create_subif_flag;
#undef _
mp->outer_vlan_id = ntohs (outer_vlan_id);
}
static int
-api_reset_fib (vat_main_t * vam)
+api_ip_table_replace_begin (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_reset_fib_t *mp;
- u32 vrf_id = 0;
+ vl_api_ip_table_replace_begin_t *mp;
+ u32 table_id = 0;
u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
+ if (unformat (i, "table %d", &table_id))
+ ;
else if (unformat (i, "ipv6"))
is_ipv6 = 1;
else
}
}
- if (vrf_id_set == 0)
- {
- errmsg ("missing vrf id");
- return -99;
- }
-
- M (RESET_FIB, mp);
-
- mp->vrf_id = ntohl (vrf_id);
- mp->is_ipv6 = is_ipv6;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_dhcp_proxy_config (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_dhcp_proxy_config_t *mp;
- u32 rx_vrf_id = 0;
- u32 server_vrf_id = 0;
- u8 is_add = 1;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
- u8 v4_src_address_set = 0;
- u8 v6_src_address_set = 0;
- ip4_address_t v4srcaddress;
- ip6_address_t v6srcaddress;
- int ret;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
- ;
- else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
- ;
- else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
- v4_address_set = 1;
- else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
- v6_address_set = 1;
- else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
- v4_src_address_set = 1;
- else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
- v6_src_address_set = 1;
- else
- break;
- }
-
- if (v4_address_set && v6_address_set)
- {
- errmsg ("both v4 and v6 server addresses set");
- return -99;
- }
- if (!v4_address_set && !v6_address_set)
- {
- errmsg ("no server addresses set");
- return -99;
- }
-
- if (v4_src_address_set && v6_src_address_set)
- {
- errmsg ("both v4 and v6 src addresses set");
- return -99;
- }
- if (!v4_src_address_set && !v6_src_address_set)
- {
- errmsg ("no src addresses set");
- return -99;
- }
-
- if (!(v4_src_address_set && v4_address_set) &&
- !(v6_src_address_set && v6_address_set))
- {
- errmsg ("no matching server and src addresses set");
- return -99;
- }
-
- /* Construct the API message */
- M (DHCP_PROXY_CONFIG, mp);
+ M (IP_TABLE_REPLACE_BEGIN, mp);
- mp->is_add = is_add;
- mp->rx_vrf_id = ntohl (rx_vrf_id);
- mp->server_vrf_id = ntohl (server_vrf_id);
- if (v6_address_set)
- {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
- clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
- }
- else
- {
- clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
- clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
- }
+ mp->table.table_id = ntohl (table_id);
+ mp->table.is_ip6 = is_ipv6;
- /* send it... */
S (mp);
-
- /* Wait for a reply, return good/bad news */
W (ret);
return ret;
}
-#define vl_api_dhcp_proxy_details_t_endian vl_noop_handler
-#define vl_api_dhcp_proxy_details_t_print vl_noop_handler
-
-static void
-vl_api_dhcp_proxy_details_t_handler (vl_api_dhcp_proxy_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- u32 i, count = mp->count;
- vl_api_dhcp_server_t *s;
-
- if (mp->is_ipv6)
- print (vam->ofp,
- "RX Table-ID %d, Source Address %U, VSS Type %d, "
- "VSS ASCII VPN-ID '%s', VSS RFC2685 VPN-ID (oui:id) %d:%d",
- ntohl (mp->rx_vrf_id),
- format_ip6_address, mp->dhcp_src_address,
- mp->vss_type, mp->vss_vpn_ascii_id,
- ntohl (mp->vss_oui), ntohl (mp->vss_fib_id));
- else
- print (vam->ofp,
- "RX Table-ID %d, Source Address %U, VSS Type %d, "
- "VSS ASCII VPN-ID '%s', VSS RFC2685 VPN-ID (oui:id) %d:%d",
- ntohl (mp->rx_vrf_id),
- format_ip4_address, mp->dhcp_src_address,
- mp->vss_type, mp->vss_vpn_ascii_id,
- ntohl (mp->vss_oui), ntohl (mp->vss_fib_id));
-
- for (i = 0; i < count; i++)
- {
- s = &mp->servers[i];
-
- if (mp->is_ipv6)
- print (vam->ofp,
- " Server Table-ID %d, Server Address %U",
- ntohl (s->server_vrf_id), format_ip6_address, s->dhcp_server);
- else
- print (vam->ofp,
- " Server Table-ID %d, Server Address %U",
- ntohl (s->server_vrf_id), format_ip4_address, s->dhcp_server);
- }
-}
-
-static void vl_api_dhcp_proxy_details_t_handler_json
- (vl_api_dhcp_proxy_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
- u32 i, count = mp->count;
- struct in_addr ip4;
- struct in6_addr ip6;
- vl_api_dhcp_server_t *s;
-
- 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, "rx-table-id", ntohl (mp->rx_vrf_id));
- vat_json_object_add_bytes (node, "vss-type", &mp->vss_type,
- sizeof (mp->vss_type));
- vat_json_object_add_string_copy (node, "vss-vpn-ascii-id",
- mp->vss_vpn_ascii_id);
- vat_json_object_add_uint (node, "vss-fib-id", ntohl (mp->vss_fib_id));
- vat_json_object_add_uint (node, "vss-oui", ntohl (mp->vss_oui));
-
- if (mp->is_ipv6)
- {
- clib_memcpy (&ip6, &mp->dhcp_src_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "src_address", ip6);
- }
- else
- {
- clib_memcpy (&ip4, &mp->dhcp_src_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
- }
-
- for (i = 0; i < count; i++)
- {
- s = &mp->servers[i];
-
- vat_json_object_add_uint (node, "server-table-id",
- ntohl (s->server_vrf_id));
-
- if (mp->is_ipv6)
- {
- clib_memcpy (&ip4, &s->dhcp_server, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
- }
- else
- {
- clib_memcpy (&ip6, &s->dhcp_server, sizeof (ip6));
- vat_json_object_add_ip6 (node, "server_address", ip6);
- }
- }
-}
-
static int
-api_dhcp_proxy_dump (vat_main_t * vam)
+api_ip_table_flush (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_control_ping_t *mp_ping;
- vl_api_dhcp_proxy_dump_t *mp;
+ vl_api_ip_table_flush_t *mp;
+ u32 table_id = 0;
u8 is_ipv6 = 0;
- int ret;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "ipv6"))
+ if (unformat (i, "table %d", &table_id))
+ ;
+ else if (unformat (i, "ipv6"))
is_ipv6 = 1;
else
{
}
}
- M (DHCP_PROXY_DUMP, mp);
+ M (IP_TABLE_FLUSH, mp);
- mp->is_ip6 = is_ipv6;
- S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
+ mp->table.table_id = ntohl (table_id);
+ mp->table.is_ip6 = is_ipv6;
+ S (mp);
W (ret);
return ret;
}
static int
-api_dhcp_proxy_set_vss (vat_main_t * vam)
+api_ip_table_replace_end (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_dhcp_proxy_set_vss_t *mp;
+ vl_api_ip_table_replace_end_t *mp;
+ u32 table_id = 0;
u8 is_ipv6 = 0;
- u8 is_add = 1;
- u32 tbl_id = ~0;
- u8 vss_type = VSS_TYPE_DEFAULT;
- u8 *vpn_ascii_id = 0;
- u32 oui = 0;
- u32 fib_id = 0;
- int ret;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "tbl_id %d", &tbl_id))
+ if (unformat (i, "table %d", &table_id))
;
- else if (unformat (i, "vpn_ascii_id %s", &vpn_ascii_id))
- vss_type = VSS_TYPE_ASCII;
- else if (unformat (i, "fib_id %d", &fib_id))
- vss_type = VSS_TYPE_VPN_ID;
- else if (unformat (i, "oui %d", &oui))
- vss_type = VSS_TYPE_VPN_ID;
else if (unformat (i, "ipv6"))
is_ipv6 = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else
- break;
- }
-
- if (tbl_id == ~0)
- {
- errmsg ("missing tbl_id ");
- vec_free (vpn_ascii_id);
- return -99;
- }
-
- if ((vpn_ascii_id) && (vec_len (vpn_ascii_id) > 128))
- {
- errmsg ("vpn_ascii_id cannot be longer than 128 ");
- vec_free (vpn_ascii_id);
- return -99;
- }
-
- M (DHCP_PROXY_SET_VSS, mp);
- mp->tbl_id = ntohl (tbl_id);
- mp->vss_type = vss_type;
- if (vpn_ascii_id)
- {
- clib_memcpy (mp->vpn_ascii_id, vpn_ascii_id, vec_len (vpn_ascii_id));
- mp->vpn_ascii_id[vec_len (vpn_ascii_id)] = 0;
- }
- mp->vpn_index = ntohl (fib_id);
- mp->oui = ntohl (oui);
- mp->is_ipv6 = is_ipv6;
- mp->is_add = is_add;
-
- S (mp);
- W (ret);
-
- vec_free (vpn_ascii_id);
- return ret;
-}
-
-static int
-api_dhcp_client_config (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_dhcp_client_config_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 is_add = 1;
- u8 *hostname = 0;
- u8 disable_event = 0;
- int ret;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "del"))
- is_add = 0;
- 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;
- else if (unformat (i, "hostname %s", &hostname))
- ;
- else if (unformat (i, "disable_event"))
- disable_event = 1;
else
- break;
- }
-
- if (sw_if_index_set == 0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
-
- if (vec_len (hostname) > 63)
- {
- errmsg ("hostname too long");
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- vec_add1 (hostname, 0);
- /* Construct the API message */
- M (DHCP_CLIENT_CONFIG, mp);
+ M (IP_TABLE_REPLACE_END, mp);
- mp->is_add = is_add;
- 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 ());
+ mp->table.table_id = ntohl (table_id);
+ mp->table.is_ip6 = is_ipv6;
- /* send it... */
S (mp);
-
- /* Wait for a reply, return good/bad news */
W (ret);
return ret;
}
}
}
- if (vrf_id_set == 0)
- {
- errmsg ("missing vrf id");
- return -99;
- }
-
- M (SET_IP_FLOW_HASH, mp);
- mp->src = src;
- mp->dst = dst;
- mp->sport = sport;
- mp->dport = dport;
- mp->proto = proto;
- mp->reverse = reverse;
- mp->vrf_id = ntohl (vrf_id);
- mp->is_ipv6 = is_ipv6;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_sw_interface_ip6_enable_disable (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6_enable_disable_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 enable = 0;
- 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, "enable"))
- enable = 1;
- 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;
- }
-
- M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable = enable;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_ip6nd_proxy_add_del (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_ip6nd_proxy_add_del_t *mp;
- u32 sw_if_index = ~0;
- u8 v6_address_set = 0;
- vl_api_ip6_address_t v6address;
- u8 is_del = 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))
- ;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (i, "%U", unformat_vl_api_ip6_address, &v6address))
- v6_address_set = 1;
- if (unformat (i, "del"))
- is_del = 1;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (sw_if_index == ~0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
- if (!v6_address_set)
- {
- errmsg ("no address set");
- return -99;
- }
-
- /* Construct the API message */
- M (IP6ND_PROXY_ADD_DEL, mp);
-
- mp->is_del = is_del;
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->ip, v6address, sizeof (v6address));
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
-}
-
-static int
-api_ip6nd_proxy_dump (vat_main_t * vam)
-{
- vl_api_ip6nd_proxy_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- int ret;
-
- M (IP6ND_PROXY_DUMP, mp);
-
- S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
- W (ret);
- return ret;
-}
-
-static void vl_api_ip6nd_proxy_details_t_handler
- (vl_api_ip6nd_proxy_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
-
- print (vam->ofp, "host %U sw_if_index %d",
- format_vl_api_ip6_address, mp->ip, ntohl (mp->sw_if_index));
-}
-
-static void vl_api_ip6nd_proxy_details_t_handler_json
- (vl_api_ip6nd_proxy_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- struct in6_addr ip6;
- 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));
-
- clib_memcpy (&ip6, mp->ip, sizeof (ip6));
- vat_json_object_add_ip6 (node, "host", ip6);
-}
-
-static int
-api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 v6_address_set = 0;
- vl_api_prefix_t pfx;
- u8 use_default = 0;
- u8 no_advertise = 0;
- u8 off_link = 0;
- u8 no_autoconfig = 0;
- u8 no_onlink = 0;
- u8 is_no = 0;
- u32 val_lifetime = 0;
- u32 pref_lifetime = 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 if (unformat (i, "%U", unformat_vl_api_prefix, &pfx))
- v6_address_set = 1;
- else if (unformat (i, "val_life %d", &val_lifetime))
- ;
- else if (unformat (i, "pref_life %d", &pref_lifetime))
- ;
- else if (unformat (i, "def"))
- use_default = 1;
- else if (unformat (i, "noadv"))
- no_advertise = 1;
- else if (unformat (i, "offl"))
- off_link = 1;
- else if (unformat (i, "noauto"))
- no_autoconfig = 1;
- else if (unformat (i, "nolink"))
- no_onlink = 1;
- else if (unformat (i, "isno"))
- is_no = 1;
- 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 (!v6_address_set)
+ if (vrf_id_set == 0)
{
- errmsg ("no address set");
+ errmsg ("missing vrf id");
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_PREFIX, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (&mp->prefix, &pfx, sizeof (pfx));
- mp->use_default = use_default;
- mp->no_advertise = no_advertise;
- mp->off_link = off_link;
- mp->no_autoconfig = no_autoconfig;
- mp->no_onlink = no_onlink;
- mp->is_no = is_no;
- mp->val_lifetime = ntohl (val_lifetime);
- mp->pref_lifetime = ntohl (pref_lifetime);
+ M (SET_IP_FLOW_HASH, mp);
+ mp->src = src;
+ mp->dst = dst;
+ mp->sport = sport;
+ mp->dport = dport;
+ mp->proto = proto;
+ mp->reverse = reverse;
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_ipv6 = is_ipv6;
- /* send it... */
S (mp);
-
- /* Wait for a reply, return good/bad news */
W (ret);
return ret;
}
static int
-api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
+api_sw_interface_ip6_enable_disable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6nd_ra_config_t *mp;
+ vl_api_sw_interface_ip6_enable_disable_t *mp;
u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 suppress = 0;
- u8 managed = 0;
- u8 other = 0;
- u8 ll_option = 0;
- u8 send_unicast = 0;
- u8 cease = 0;
- u8 is_no = 0;
- u8 default_router = 0;
- u32 max_interval = 0;
- u32 min_interval = 0;
- u32 lifetime = 0;
- u32 initial_count = 0;
- u32 initial_interval = 0;
+ u8 enable = 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 if (unformat (i, "maxint %d", &max_interval))
- ;
- else if (unformat (i, "minint %d", &min_interval))
- ;
- else if (unformat (i, "life %d", &lifetime))
- ;
- else if (unformat (i, "count %d", &initial_count))
- ;
- else if (unformat (i, "interval %d", &initial_interval))
- ;
- else if (unformat (i, "suppress") || unformat (i, "surpress"))
- suppress = 1;
- else if (unformat (i, "managed"))
- managed = 1;
- else if (unformat (i, "other"))
- other = 1;
- else if (unformat (i, "ll"))
- ll_option = 1;
- else if (unformat (i, "send"))
- send_unicast = 1;
- else if (unformat (i, "cease"))
- cease = 1;
- else if (unformat (i, "isno"))
- is_no = 1;
- else if (unformat (i, "def"))
- default_router = 1;
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_CONFIG, mp);
+ M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
- mp->max_interval = ntohl (max_interval);
- mp->min_interval = ntohl (min_interval);
- mp->lifetime = ntohl (lifetime);
- mp->initial_count = ntohl (initial_count);
- mp->initial_interval = ntohl (initial_interval);
- mp->suppress = suppress;
- mp->managed = managed;
- mp->other = other;
- mp->ll_option = ll_option;
- mp->send_unicast = send_unicast;
- mp->cease = cease;
- mp->is_no = is_no;
- mp->default_router = default_router;
+ mp->enable = enable;
- /* send it... */
S (mp);
-
- /* Wait for a reply, return good/bad news */
W (ret);
return ret;
}
-static int
-api_set_arp_neighbor_limit (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_set_arp_neighbor_limit_t *mp;
- u32 arp_nbr_limit;
- u8 limit_set = 0;
- u8 is_ipv6 = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
- limit_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (limit_set == 0)
- {
- errmsg ("missing limit value");
- return -99;
- }
-
- M (SET_ARP_NEIGHBOR_LIMIT, mp);
-
- mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
- mp->is_ipv6 = is_ipv6;
-
- S (mp);
- W (ret);
- return ret;
-}
static int
api_l2_patch_add_del (vat_main_t * vam)
M (SR_LOCALSID_ADD_DEL, mp);
clib_memcpy (mp->localsid.addr, &localsid, sizeof (mp->localsid));
+
if (nexthop_set)
{
clib_memcpy (mp->nh_addr6, &nh_addr6, sizeof (mp->nh_addr6));
M (SET_IPFIX_EXPORTER, mp);
- memcpy (mp->collector_address, collector_address.data,
+ memcpy (mp->collector_address.un.ip4, collector_address.data,
sizeof (collector_address.data));
mp->collector_port = htons ((u16) collector_port);
- memcpy (mp->src_address, src_address.data, sizeof (src_address.data));
+ memcpy (mp->src_address.un.ip4, src_address.data,
+ sizeof (src_address.data));
mp->vrf_id = htonl (vrf_id);
mp->path_mtu = htonl (path_mtu);
mp->template_interval = htonl (template_interval);
M (L2TPV3_CREATE_TUNNEL, mp);
- clib_memcpy (mp->client_address, client_address.as_u8,
- sizeof (mp->client_address));
+ clib_memcpy (mp->client_address.un.ip6, client_address.as_u8,
+ sizeof (ip6_address_t));
- clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address));
+ clib_memcpy (mp->our_address.un.ip6, our_address.as_u8,
+ sizeof (ip6_address_t));
mp->local_session_id = ntohl (local_session_id);
mp->remote_session_id = ntohl (remote_session_id);
mp->local_cookie = clib_host_to_net_u64 (local_cookie);
mp->remote_cookie = clib_host_to_net_u64 (remote_cookie);
mp->l2_sublayer_present = l2_sublayer_present;
- mp->is_ipv6 = 1;
S (mp);
W (ret);
vat_json_init_object (node);
- clib_memcpy (&addr, mp->our_address, sizeof (addr));
+ clib_memcpy (&addr, mp->our_address.un.ip6, sizeof (addr));
vat_json_object_add_ip6 (node, "our_address", addr);
- clib_memcpy (&addr, mp->client_address, sizeof (addr));
+ clib_memcpy (&addr, mp->client_address.un.ip6, sizeof (addr));
vat_json_object_add_ip6 (node, "client_address", addr);
vat_json_node_t *lc = vat_json_object_add (node, "local_cookie");
{
vat_main_t *vam = &vat_main;
- u8 *ip4 = format (0, "%U/%d", format_ip4_address, mp->host_ip4_addr,
- mp->host_ip4_prefix_len);
- u8 *ip6 = format (0, "%U/%d", format_ip6_address, mp->host_ip6_addr,
- mp->host_ip6_prefix_len);
+ u8 *ip4 =
+ format (0, "%U/%d", format_ip4_address, mp->host_ip4_prefix.address,
+ mp->host_ip4_prefix.len);
+ u8 *ip6 =
+ format (0, "%U/%d", format_ip6_address, mp->host_ip6_prefix.address,
+ mp->host_ip6_prefix.len);
print (vam->ofp,
"\n%-16s %-12d %-5d %-12d %-12d %-14U %-30s %-20s %-20s %-30s 0x%-08x",
vat_json_object_add_string_copy (node, "host_bridge", mp->host_bridge);
vat_json_object_add_string_copy (node, "host_ip4_addr",
format (0, "%U/%d", format_ip4_address,
- mp->host_ip4_addr,
- mp->host_ip4_prefix_len));
- vat_json_object_add_string_copy (node, "host_ip6_addr",
+ mp->host_ip4_prefix.address,
+ mp->host_ip4_prefix.len));
+ vat_json_object_add_string_copy (node, "host_ip6_prefix",
format (0, "%U/%d", format_ip6_address,
- mp->host_ip6_addr,
- mp->host_ip6_prefix_len));
+ mp->host_ip6_prefix.address,
+ mp->host_ip6_prefix.len));
}
u32 as_u32;
} pci_addr_t;
pci_addr_t addr;
- addr.as_u32 = ntohl (mp->pci_addr);
+
+ addr.domain = ntohs (mp->pci_addr.domain);
+ addr.bus = mp->pci_addr.bus;
+ addr.slot = mp->pci_addr.slot;
+ addr.function = mp->pci_addr.function;
+
u8 *pci_addr = format (0, "%04x:%02x:%02x.%x", addr.domain, addr.bus,
addr.slot, addr.function);
{
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
+ vlib_pci_addr_t pci_addr;
if (VAT_JSON_ARRAY != vam->json_tree.type)
{
}
node = vat_json_array_add (&vam->json_tree);
+ pci_addr.domain = ntohs (mp->pci_addr.domain);
+ pci_addr.bus = mp->pci_addr.bus;
+ pci_addr.slot = mp->pci_addr.slot;
+ pci_addr.function = mp->pci_addr.function;
+
vat_json_init_object (node);
- vat_json_object_add_uint (node, "pci-addr", ntohl (mp->pci_addr));
+ vat_json_object_add_uint (node, "pci-addr", pci_addr.as_u32);
vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz));
vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz));
if (ipv6_set)
{
- clib_memcpy (mp->local_address, &src.ip6, sizeof (src.ip6));
- clib_memcpy (mp->remote_address, &dst.ip6, sizeof (dst.ip6));
+ clib_memcpy (&mp->local_address.un.ip6, &src.ip6, sizeof (src.ip6));
+ clib_memcpy (&mp->remote_address.un.ip6, &dst.ip6, sizeof (dst.ip6));
}
else
{
- clib_memcpy (mp->local_address, &src.ip4, sizeof (src.ip4));
- clib_memcpy (mp->remote_address, &dst.ip4, sizeof (dst.ip4));
+ clib_memcpy (&mp->local_address.un.ip4, &src.ip4, sizeof (src.ip4));
+ clib_memcpy (&mp->remote_address.un.ip4, &dst.ip4, sizeof (dst.ip4));
}
mp->encap_vrf_id = ntohl (encap_vrf_id);
mp->decap_next_index = ntohl (decap_next_index);
mp->mcast_sw_if_index = ntohl (mcast_sw_if_index);
mp->vni = ntohl (vni);
mp->is_add = is_add;
- mp->is_ipv6 = ipv6_set;
S (mp);
W (ret);
(vl_api_geneve_tunnel_details_t * mp)
{
vat_main_t *vam = &vat_main;
- ip46_address_t src = to_ip46 (mp->is_ipv6, mp->dst_address);
- ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->src_address);
+ ip46_address_t src = {.as_u64[0] = 0,.as_u64[1] = 0 };
+ ip46_address_t dst = {.as_u64[0] = 0,.as_u64[1] = 0 };
+
+ if (mp->src_address.af == ADDRESS_IP6)
+ {
+ clib_memcpy (&src.ip6, &mp->src_address.un.ip6, sizeof (ip6_address_t));
+ clib_memcpy (&dst.ip6, &mp->dst_address.un.ip6, sizeof (ip6_address_t));
+ }
+ else
+ {
+ clib_memcpy (&src.ip4, &mp->src_address.un.ip4, sizeof (ip4_address_t));
+ clib_memcpy (&dst.ip4, &mp->dst_address.un.ip4, sizeof (ip4_address_t));
+ }
print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d",
ntohl (mp->sw_if_index),
{
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
+ bool is_ipv6;
if (VAT_JSON_ARRAY != vam->json_tree.type)
{
vat_json_init_object (node);
vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
- if (mp->is_ipv6)
+ is_ipv6 = mp->src_address.af == ADDRESS_IP6;
+ if (is_ipv6)
{
struct in6_addr ip6;
- clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
+ clib_memcpy (&ip6, &mp->src_address.un.ip6, sizeof (ip6));
vat_json_object_add_ip6 (node, "src_address", ip6);
- clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
+ clib_memcpy (&ip6, &mp->dst_address.un.ip6, sizeof (ip6));
vat_json_object_add_ip6 (node, "dst_address", ip6);
}
else
{
struct in_addr ip4;
- clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
+ clib_memcpy (&ip4, &mp->src_address.un.ip4, sizeof (ip4));
vat_json_object_add_ip4 (node, "src_address", ip4);
- clib_memcpy (&ip4, mp->dst_address, sizeof (ip4));
+ clib_memcpy (&ip4, &mp->dst_address.un.ip4, sizeof (ip4));
vat_json_object_add_ip4 (node, "dst_address", ip4);
}
vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
vat_json_object_add_uint (node, "decap_next_index",
ntohl (mp->decap_next_index));
vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
- vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
vat_json_object_add_uint (node, "mcast_sw_if_index",
ntohl (mp->mcast_sw_if_index));
}
u8 is_add = 1;
u8 src_set = 0;
u8 dst_set = 0;
- u32 outer_fib_id = 0;
+ u32 outer_table_id = 0;
u32 session_id = 0;
u32 instance = ~0;
int ret;
{
dst_set = 1;
}
- else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+ else if (unformat (line_input, "outer-table-id %d", &outer_table_id))
;
else if (unformat (line_input, "teb"))
t_type = GRE_API_TUNNEL_TYPE_TEB;
clib_memcpy (&mp->tunnel.dst, &dst, sizeof (mp->tunnel.dst));
mp->tunnel.instance = htonl (instance);
- mp->tunnel.outer_fib_id = htonl (outer_fib_id);
+ mp->tunnel.outer_table_id = htonl (outer_table_id);
mp->is_add = is_add;
mp->tunnel.session_id = htons ((u16) session_id);
mp->tunnel.type = htonl (t_type);
ntohl (mp->tunnel.instance),
format_vl_api_address, &mp->tunnel.src,
format_vl_api_address, &mp->tunnel.dst,
- mp->tunnel.type, ntohl (mp->tunnel.outer_fib_id),
+ mp->tunnel.type, ntohl (mp->tunnel.outer_table_id),
ntohl (mp->tunnel.session_id));
}
vat_json_object_add_address (node, "src", &mp->tunnel.src);
vat_json_object_add_address (node, "dst", &mp->tunnel.dst);
vat_json_object_add_uint (node, "tunnel_type", mp->tunnel.type);
- vat_json_object_add_uint (node, "outer_fib_id",
- ntohl (mp->tunnel.outer_fib_id));
+ vat_json_object_add_uint (node, "outer_table_id",
+ ntohl (mp->tunnel.outer_table_id));
vat_json_object_add_uint (node, "session_id", mp->tunnel.session_id);
}
u8 disable_mrg_rxbuf = 0;
u8 disable_indirect_desc = 0;
u8 *tag = 0;
+ u8 enable_gso = 0;
int ret;
/* Shut up coverity */
disable_mrg_rxbuf = 1;
else if (unformat (i, "disable_indirect_desc"))
disable_indirect_desc = 1;
+ else if (unformat (i, "gso"))
+ enable_gso = 1;
else if (unformat (i, "tag %s", &tag))
;
else
mp->is_server = is_server;
mp->disable_mrg_rxbuf = disable_mrg_rxbuf;
mp->disable_indirect_desc = disable_indirect_desc;
+ mp->enable_gso = enable_gso;
clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
vec_free (file_name);
if (custom_dev_instance != ~0)
u32 custom_dev_instance = ~0;
u8 sw_if_index_set = 0;
u32 sw_if_index = (u32) ~ 0;
+ u8 enable_gso = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
;
else if (unformat (i, "server"))
is_server = 1;
+ else if (unformat (i, "gso"))
+ enable_gso = 1;
else
break;
}
mp->sw_if_index = ntohl (sw_if_index);
mp->is_server = is_server;
+ mp->enable_gso = enable_gso;
clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
vec_free (file_name);
if (custom_dev_instance != ~0)
(vl_api_sw_interface_vhost_user_details_t * mp)
{
vat_main_t *vam = &vat_main;
+ u64 features;
+
+ features =
+ clib_net_to_host_u32 (mp->features_first_32) | ((u64)
+ clib_net_to_host_u32
+ (mp->features_last_32) <<
+ 32);
print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s",
(char *) mp->interface_name,
ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz),
- clib_net_to_host_u64 (mp->features), mp->is_server,
+ features, mp->is_server,
ntohl (mp->num_regions), (char *) mp->sock_filename);
print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno)));
}
mp->interface_name);
vat_json_object_add_uint (node, "virtio_net_hdr_sz",
ntohl (mp->virtio_net_hdr_sz));
- vat_json_object_add_uint (node, "features",
- clib_net_to_host_u64 (mp->features));
+ vat_json_object_add_uint (node, "features_first_32",
+ clib_net_to_host_u32 (mp->features_first_32));
+ vat_json_object_add_uint (node, "features_last_32",
+ clib_net_to_host_u32 (mp->features_last_32));
vat_json_object_add_uint (node, "is_server", mp->is_server);
vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename);
vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions));
/* Get list of vhost-user interfaces */
M (SW_INTERFACE_VHOST_USER_DUMP, mp);
+ mp->sw_if_index = ntohl (~0);
S (mp);
/* Use a control ping for synchronization */
{
unformat_input_t *line_input = vam->input;
vl_api_vxlan_gpe_add_del_tunnel_t *mp;
- ip4_address_t local4, remote4;
- ip6_address_t local6, remote6;
+ ip46_address_t local, remote;
u8 is_add = 1;
- u8 ipv4_set = 0, ipv6_set = 0;
u8 local_set = 0;
u8 remote_set = 0;
u8 grp_set = 0;
u8 vni_set = 0;
int ret;
- /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
- 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)
{
if (unformat (line_input, "del"))
is_add = 0;
else if (unformat (line_input, "local %U",
- unformat_ip4_address, &local4))
- {
- local_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "remote %U",
- unformat_ip4_address, &remote4))
- {
- remote_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "local %U",
- unformat_ip6_address, &local6))
+ unformat_ip46_address, &local))
{
local_set = 1;
- ipv6_set = 1;
}
else if (unformat (line_input, "remote %U",
- unformat_ip6_address, &remote6))
+ unformat_ip46_address, &remote))
{
remote_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "group %U %U",
- unformat_ip4_address, &remote4,
- api_unformat_sw_if_index, vam, &mcast_sw_if_index))
- {
- grp_set = remote_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "group %U",
- unformat_ip4_address, &remote4))
- {
- grp_set = remote_set = 1;
- ipv4_set = 1;
}
else if (unformat (line_input, "group %U %U",
- unformat_ip6_address, &remote6,
+ unformat_ip46_address, &remote,
api_unformat_sw_if_index, vam, &mcast_sw_if_index))
{
grp_set = remote_set = 1;
- ipv6_set = 1;
}
else if (unformat (line_input, "group %U",
- unformat_ip6_address, &remote6))
+ unformat_ip46_address, &remote))
{
grp_set = remote_set = 1;
- ipv6_set = 1;
}
else
if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
errmsg ("tunnel nonexistent multicast device");
return -99;
}
- if (ipv4_set && ipv6_set)
+ if (ip46_address_is_ip4 (&local) != ip46_address_is_ip4 (&remote))
{
errmsg ("both IPv4 and IPv6 addresses specified");
return -99;
M (VXLAN_GPE_ADD_DEL_TUNNEL, mp);
-
- if (ipv6_set)
- {
- clib_memcpy (&mp->local, &local6, sizeof (local6));
- clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
- }
- else
- {
- clib_memcpy (&mp->local, &local4, sizeof (local4));
- clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
- }
+ ip_address_encode (&local,
+ ip46_address_is_ip4 (&local) ? IP46_TYPE_IP4 :
+ IP46_TYPE_IP6, &mp->local);
+ ip_address_encode (&remote,
+ ip46_address_is_ip4 (&remote) ? IP46_TYPE_IP4 :
+ IP46_TYPE_IP6, &mp->remote);
mp->mcast_sw_if_index = ntohl (mcast_sw_if_index);
mp->encap_vrf_id = ntohl (encap_vrf_id);
mp->protocol = protocol;
mp->vni = ntohl (vni);
mp->is_add = is_add;
- mp->is_ipv6 = ipv6_set;
S (mp);
W (ret);
(vl_api_vxlan_gpe_tunnel_details_t * mp)
{
vat_main_t *vam = &vat_main;
- ip46_address_t local = to_ip46 (mp->is_ipv6, mp->local);
- ip46_address_t remote = to_ip46 (mp->is_ipv6, mp->remote);
+ ip46_address_t local, remote;
+
+ ip_address_decode (&mp->local, &local);
+ ip_address_decode (&mp->remote, &remote);
print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d",
ntohl (mp->sw_if_index),
vat_json_node_t *node = NULL;
struct in_addr ip4;
struct in6_addr ip6;
+ ip46_address_t local, remote;
+
+ ip_address_decode (&mp->local, &local);
+ ip_address_decode (&mp->remote, &remote);
if (VAT_JSON_ARRAY != vam->json_tree.type)
{
vat_json_init_object (node);
vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
- if (mp->is_ipv6)
+ if (ip46_address_is_ip4 (&local))
{
- clib_memcpy (&ip6, &(mp->local[0]), sizeof (ip6));
- vat_json_object_add_ip6 (node, "local", ip6);
- clib_memcpy (&ip6, &(mp->remote[0]), sizeof (ip6));
- vat_json_object_add_ip6 (node, "remote", ip6);
+ clib_memcpy (&ip4, &local.ip4, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "local", ip4);
+ clib_memcpy (&ip4, &remote.ip4, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "remote", ip4);
}
else
{
- clib_memcpy (&ip4, &(mp->local[0]), sizeof (ip4));
- vat_json_object_add_ip4 (node, "local", ip4);
- clib_memcpy (&ip4, &(mp->remote[0]), sizeof (ip4));
- vat_json_object_add_ip4 (node, "remote", ip4);
+ clib_memcpy (&ip6, &local.ip6, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "local", ip6);
+ clib_memcpy (&ip6, &remote.ip6, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "remote", ip6);
}
vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol));
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_bytes (node, "mac", mp->mac, 6);
- vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_object_add_uint (node, "static_mac", mp->static_mac);
- vat_json_object_add_uint (node, "filter_mac", mp->filter_mac);
- vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac);
-}
-
-static int
-api_l2_fib_table_dump (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_l2_fib_table_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- u32 bd_id;
- u8 bd_id_set = 0;
- int ret;
-
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "bd_id %d", &bd_id))
- bd_id_set = 1;
- else
- break;
- }
-
- if (bd_id_set == 0)
- {
- errmsg ("missing bridge domain");
- return -99;
- }
-
- print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI");
-
- /* Get list of l2 fib entries */
- M (L2_FIB_TABLE_DUMP, mp);
-
- mp->bd_id = ntohl (bd_id);
- S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
- W (ret);
- return ret;
-}
-
-
-static int
-api_interface_name_renumber (vat_main_t * vam)
-{
- unformat_input_t *line_input = vam->input;
- vl_api_interface_name_renumber_t *mp;
- u32 sw_if_index = ~0;
- u32 new_show_dev_instance = ~0;
- int ret;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (line_input, "%U", api_unformat_sw_if_index, vam,
- &sw_if_index))
- ;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (line_input, "new_show_dev_instance %d",
- &new_show_dev_instance))
- ;
- else
- break;
- }
-
- if (sw_if_index == ~0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
-
- if (new_show_dev_instance == ~0)
- {
- errmsg ("missing new_show_dev_instance");
- return -99;
- }
-
- M (INTERFACE_NAME_RENUMBER, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->new_show_dev_instance = ntohl (new_show_dev_instance);
-
- S (mp);
- W (ret);
- 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;
- vl_api_address_t dst_adr = { };
- u8 int_set = 0;
- u8 adr_set = 0;
- 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_vl_api_address, &dst_adr))
- adr_set = 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);
- clib_memcpy (&mp->dst, &dst_adr, sizeof (dst_adr));
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
- S (mp);
- W (ret);
- return ret;
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+ vat_json_object_add_bytes (node, "mac", mp->mac, 6);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "static_mac", mp->static_mac);
+ vat_json_object_add_uint (node, "filter_mac", mp->filter_mac);
+ vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac);
}
static int
-api_ip_scan_neighbor_enable_disable (vat_main_t * vam)
+api_l2_fib_table_dump (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;
+ vl_api_l2_fib_table_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ u32 bd_id;
+ u8 bd_id_set = 0;
int ret;
+ /* Parse args required to build the message */
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))
- ;
+ if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
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)
+ if (bd_id_set == 0)
{
- errmsg ("stale cannot exceed 255 minutes.");
+ errmsg ("missing bridge domain");
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;
+ print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI");
+
+ /* Get list of l2 fib entries */
+ M (L2_FIB_TABLE_DUMP, mp);
+ mp->bd_id = ntohl (bd_id);
S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
W (ret);
return ret;
}
+
static int
-api_want_ip4_arp_events (vat_main_t * vam)
+api_interface_name_renumber (vat_main_t * vam)
{
unformat_input_t *line_input = vam->input;
- vl_api_want_ip4_arp_events_t *mp;
- ip4_address_t address;
- int address_set = 0;
- u32 enable_disable = 1;
+ vl_api_interface_name_renumber_t *mp;
+ u32 sw_if_index = ~0;
+ u32 new_show_dev_instance = ~0;
int ret;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "address %U", unformat_ip4_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
+ if (unformat (line_input, "%U", api_unformat_sw_if_index, vam,
+ &sw_if_index))
+ ;
+ else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (line_input, "new_show_dev_instance %d",
+ &new_show_dev_instance))
+ ;
else
break;
}
- if (address_set == 0)
+ if (sw_if_index == ~0)
{
- errmsg ("missing addresses");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (WANT_IP4_ARP_EVENTS, mp);
- mp->enable_disable = enable_disable;
- mp->pid = htonl (getpid ());
- clib_memcpy (mp->ip, &address, sizeof (address));
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_want_ip6_nd_events (vat_main_t * vam)
-{
- unformat_input_t *line_input = vam->input;
- vl_api_want_ip6_nd_events_t *mp;
- vl_api_ip6_address_t address;
- int address_set = 0;
- u32 enable_disable = 1;
- int ret;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat
- (line_input, "address %U", unformat_vl_api_ip6_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
- else
- break;
- }
-
- if (address_set == 0)
+ if (new_show_dev_instance == ~0)
{
- errmsg ("missing addresses");
+ errmsg ("missing new_show_dev_instance");
return -99;
}
- M (WANT_IP6_ND_EVENTS, mp);
- mp->enable_disable = enable_disable;
- mp->pid = htonl (getpid ());
- clib_memcpy (&mp->ip, &address, sizeof (address));
+ M (INTERFACE_NAME_RENUMBER, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->new_show_dev_instance = ntohl (new_show_dev_instance);
S (mp);
W (ret);
if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (&ip)))
{
is_add = 1;
- ip_addr_version (&ip) = IP4;
+ ip_addr_version (&ip) = AF_IP4;
}
else
if (unformat (input, "%U", unformat_ip6_address, &ip_addr_v6 (&ip)))
{
is_add = 1;
- ip_addr_version (&ip) = IP6;
+ ip_addr_version (&ip) = AF_IP6;
}
else
{
mp->is_add = is_add;
if (is_add)
{
- mp->is_ip4 = ip_addr_version (&ip) == IP4 ? 1 : 0;
+ mp->is_ip4 = ip_addr_version (&ip) == AF_IP4 ? 1 : 0;
if (mp->is_ip4)
clib_memcpy (mp->address, &ip, 4);
else
return ret;
}
-static int
-api_netmap_create (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_netmap_create_t *mp;
- u8 *if_name = 0;
- u8 hw_addr[6];
- u8 random_hw_addr = 1;
- u8 is_pipe = 0;
- u8 is_master = 0;
- int ret;
-
- clib_memset (hw_addr, 0, sizeof (hw_addr));
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "name %s", &if_name))
- vec_add1 (if_name, 0);
- else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
- random_hw_addr = 0;
- else if (unformat (i, "pipe"))
- is_pipe = 1;
- else if (unformat (i, "master"))
- is_master = 1;
- else if (unformat (i, "slave"))
- is_master = 0;
- else
- break;
- }
-
- if (!vec_len (if_name))
- {
- errmsg ("interface name must be specified");
- return -99;
- }
-
- if (vec_len (if_name) > 64)
- {
- errmsg ("interface name too long");
- return -99;
- }
-
- M (NETMAP_CREATE, mp);
-
- clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
- clib_memcpy (mp->hw_addr, hw_addr, 6);
- mp->use_random_hw_addr = random_hw_addr;
- mp->is_pipe = is_pipe;
- mp->is_master = is_master;
- vec_free (if_name);
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_netmap_delete (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_netmap_delete_t *mp;
- u8 *if_name = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "name %s", &if_name))
- vec_add1 (if_name, 0);
- else
- break;
- }
-
- if (!vec_len (if_name))
- {
- errmsg ("interface name must be specified");
- return -99;
- }
-
- if (vec_len (if_name) > 64)
- {
- errmsg ("interface name too long");
- return -99;
- }
-
- M (NETMAP_DELETE, mp);
-
- clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
- vec_free (if_name);
-
- S (mp);
- W (ret);
- return ret;
-}
-
static u8 *
format_fib_api_path_nh_proto (u8 * s, va_list * args)
{
vl_api_mpls_route_details_t_handler (vl_api_mpls_route_details_t * mp)
{
vat_main_t *vam = &vat_main;
- int count = ntohl (mp->mr_route.mr_n_paths);
+ int count = (int) clib_net_to_host_u32 (mp->mr_route.mr_n_paths);
vl_api_fib_path_t *fp;
int i;
(vl_api_mpls_route_details_t * mp)
{
vat_main_t *vam = &vat_main;
- int count = ntohl (mp->mr_route.mr_n_paths);
+ int count = (int) clib_host_to_net_u32 (mp->mr_route.mr_n_paths);
vat_json_node_t *node = NULL;
vl_api_fib_path_t *fp;
int i;
return ret;
}
-static void vl_api_ip_neighbor_details_t_handler
- (vl_api_ip_neighbor_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
-
- print (vam->ofp, "%c %U %U",
- (ntohl (mp->neighbor.flags) & IP_NEIGHBOR_FLAG_STATIC) ? 'S' : 'D',
- format_vl_api_mac_address, &mp->neighbor.mac_address,
- format_vl_api_address, &mp->neighbor.ip_address);
-}
-
-static void vl_api_ip_neighbor_details_t_handler_json
- (vl_api_ip_neighbor_details_t * mp)
-{
-
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node;
-
- 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_string_copy
- (node, "flag",
- ((ntohl (mp->neighbor.flags) & IP_NEIGHBOR_FLAG_STATIC) ?
- (u8 *) "static" : (u8 *) "dynamic"));
-
- vat_json_object_add_string_copy (node, "link_layer",
- format (0, "%U", format_vl_api_mac_address,
- &mp->neighbor.mac_address));
- vat_json_object_add_address (node, "ip", &mp->neighbor.ip_address);
-}
-
-static int
-api_ip_neighbor_dump (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_ip_neighbor_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- u8 is_ipv6 = 0;
- u32 sw_if_index = ~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))
- ;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (i, "ip6"))
- is_ipv6 = 1;
- else
- break;
- }
-
- if (sw_if_index == ~0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
-
- M (IP_NEIGHBOR_DUMP, mp);
- mp->is_ipv6 = (u8) is_ipv6;
- mp->sw_if_index = ntohl (sw_if_index);
- S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
- W (ret);
- return ret;
-}
-
#define vl_api_ip_route_details_t_endian vl_noop_handler
#define vl_api_ip_route_details_t_print vl_noop_handler
unformat_input_t *input = vam->input;
vl_api_pg_create_interface_t *mp;
- u32 if_id = ~0;
+ u32 if_id = ~0, gso_size = 0;
+ u8 gso_enabled = 0;
int ret;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "if_id %d", &if_id))
;
+ else if (unformat (input, "gso-enabled"))
+ {
+ gso_enabled = 1;
+ if (unformat (input, "gso-size %u", &gso_size))
+ ;
+ else
+ {
+ errmsg ("missing gso-size");
+ return -99;
+ }
+ }
else
break;
}
M (PG_CREATE_INTERFACE, mp);
mp->context = 0;
mp->interface_id = ntohl (if_id);
+ mp->gso_enabled = gso_enabled;
S (mp);
W (ret);
}
}
- u32 name_len = vec_len (pcap_file);
/* Construct the API message */
M (PG_CAPTURE, mp);
mp->context = 0;
mp->interface_id = ntohl (if_id);
mp->is_enabled = enable;
mp->count = ntohl (count);
- mp->pcap_name_length = ntohl (name_len);
if (pcap_file_set != 0)
{
- clib_memcpy (mp->pcap_file_name, pcap_file, name_len);
+ vl_api_vec_to_api_string (pcap_file, &mp->pcap_file_name);
}
vec_free (pcap_file);
}
}
- u32 name_len = vec_len (stream_name);
/* Construct the API message */
M (PG_ENABLE_DISABLE, mp);
mp->context = 0;
mp->is_enabled = enable;
if (stream_name_set != 0)
{
- mp->stream_name_length = ntohl (name_len);
- clib_memcpy (mp->stream_name, stream_name, name_len);
+ vl_api_vec_to_api_string (stream_name, &mp->stream_name);
}
vec_free (stream_name);
}
if (vec_len (feature_name) > 63)
{
- errmsg ("feature name too long");
+ errmsg ("feature name too long");
+ }
+
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (FEATURE_ENABLE_DISABLE, mp);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable = enable;
+ clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name));
+ clib_memcpy (mp->feature_name, feature_name, vec_len (feature_name));
+ vec_free (arc_name);
+ vec_free (feature_name);
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static int
+api_feature_gso_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_feature_gso_enable_disable_t *mp;
+ u32 sw_if_index = ~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))
+ ;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ break;
}
if (sw_if_index == ~0)
}
/* Construct the API message */
- M (FEATURE_ENABLE_DISABLE, mp);
+ M (FEATURE_GSO_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
- mp->enable = enable;
- clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name));
- clib_memcpy (mp->feature_name, feature_name, vec_len (feature_name));
- vec_free (arc_name);
- vec_free (feature_name);
+ mp->enable_disable = enable;
S (mp);
W (ret);
return ret;
}
+static int
+api_sw_interface_add_del_mac_address (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_mac_address_t mac = { 0 };
+ vl_api_sw_interface_add_del_mac_address_t *mp;
+ u32 sw_if_index = ~0;
+ u8 is_add = 1;
+ u8 mac_set = 0;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac))
+ mac_set++;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ break;
+ }
+
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
+
+ if (!mac_set)
+ {
+ errmsg ("missing MAC address");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (SW_INTERFACE_ADD_DEL_MAC_ADDRESS, mp);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+ clib_memcpy (&mp->addr, &mac, sizeof (mac));
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
static void vl_api_l2_xconnect_details_t_handler
(vl_api_l2_xconnect_details_t * mp)
{
M (LLDP_CONFIG, mp);
mp->tx_hold = htonl (tx_hold);
mp->tx_interval = htonl (tx_interval);
- clib_memcpy (mp->system_name, sys_name, vec_len (sys_name));
+ vl_api_vec_to_api_string (sys_name, &mp->system_name);
vec_free (sys_name);
S (mp);
M (SW_INTERFACE_SET_LLDP, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->enable = enable;
- clib_memcpy (mp->port_desc, port_desc, vec_len (port_desc));
+ vl_api_vec_to_api_string (port_desc, &mp->port_desc);
clib_memcpy (mp->mgmt_oid, mgmt_oid, vec_len (mgmt_oid));
clib_memcpy (mp->mgmt_ip4, &ip4_addr, sizeof (ip4_addr));
clib_memcpy (mp->mgmt_ip6, &ip6_addr, sizeof (ip6_addr));
{
vl_api_tcp_configure_src_addresses_t *mp;
unformat_input_t *i = vam->input;
- ip4_address_t v4first, v4last;
- ip6_address_t v6first, v6last;
+ vl_api_address_t first, last;
u8 range_set = 0;
u32 vrf_id = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "%U - %U",
- unformat_ip4_address, &v4first,
- unformat_ip4_address, &v4last))
+ unformat_vl_api_address, &first,
+ unformat_vl_api_address, &last))
{
if (range_set)
{
}
range_set = 1;
}
- else if (unformat (i, "%U - %U",
- unformat_ip6_address, &v6first,
- unformat_ip6_address, &v6last))
- {
- if (range_set)
- {
- errmsg ("one range per message (range already set)");
- return -99;
- }
- range_set = 2;
- }
else if (unformat (i, "vrf %d", &vrf_id))
;
else
}
M (TCP_CONFIGURE_SRC_ADDRESSES, mp);
+
mp->vrf_id = ntohl (vrf_id);
- /* ipv6? */
- if (range_set == 2)
- {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->first_address, &v6first, sizeof (v6first));
- clib_memcpy (mp->last_address, &v6last, sizeof (v6last));
- }
- else
- {
- mp->is_ipv6 = 0;
- clib_memcpy (mp->first_address, &v4first, sizeof (v4first));
- clib_memcpy (mp->last_address, &v4last, sizeof (v4last));
- }
+ clib_memcpy (&mp->first_address, &first, sizeof (first));
+ clib_memcpy (&mp->last_address, &last, sizeof (last));
+
S (mp);
W (ret);
return ret;
#endif
}
-static int
-api_dns_enable_disable (vat_main_t * vam)
-{
- unformat_input_t *line_input = vam->input;
- vl_api_dns_enable_disable_t *mp;
- u8 enable_disable = 1;
- int ret;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (line_input, "disable"))
- enable_disable = 0;
- if (unformat (line_input, "enable"))
- enable_disable = 1;
- else
- break;
- }
-
- /* Construct the API message */
- M (DNS_ENABLE_DISABLE, mp);
- mp->enable = enable_disable;
-
- /* send it... */
- S (mp);
- /* Wait for the reply */
- W (ret);
- return ret;
-}
-
-static int
-api_dns_resolve_name (vat_main_t * vam)
-{
- unformat_input_t *line_input = vam->input;
- vl_api_dns_resolve_name_t *mp;
- u8 *name = 0;
- int ret;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (line_input, "%s", &name))
- ;
- else
- break;
- }
-
- if (vec_len (name) > 127)
- {
- errmsg ("name too long");
- return -99;
- }
-
- /* Construct the API message */
- M (DNS_RESOLVE_NAME, mp);
- memcpy (mp->name, name, vec_len (name));
- vec_free (name);
-
- /* send it... */
- S (mp);
- /* Wait for the reply */
- W (ret);
- return ret;
-}
-
-static int
-api_dns_resolve_ip (vat_main_t * vam)
-{
- unformat_input_t *line_input = vam->input;
- vl_api_dns_resolve_ip_t *mp;
- int is_ip6 = -1;
- ip4_address_t addr4;
- ip6_address_t addr6;
- int ret;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (line_input, "%U", unformat_ip6_address, &addr6))
- is_ip6 = 1;
- else if (unformat (line_input, "%U", unformat_ip4_address, &addr4))
- is_ip6 = 0;
- else
- break;
- }
-
- if (is_ip6 == -1)
- {
- errmsg ("missing address");
- return -99;
- }
-
- /* Construct the API message */
- M (DNS_RESOLVE_IP, mp);
- mp->is_ip6 = is_ip6;
- if (is_ip6)
- memcpy (mp->address, &addr6, sizeof (addr6));
- else
- memcpy (mp->address, &addr4, sizeof (addr4));
-
- /* send it... */
- S (mp);
- /* Wait for the reply */
- W (ret);
- return ret;
-}
-
-static int
-api_dns_name_server_add_del (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_dns_name_server_add_del_t *mp;
- u8 is_add = 1;
- ip6_address_t ip6_server;
- ip4_address_t ip4_server;
- int ip6_set = 0;
- int ip4_set = 0;
- int ret = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", unformat_ip6_address, &ip6_server))
- ip6_set = 1;
- else if (unformat (i, "%U", unformat_ip4_address, &ip4_server))
- ip4_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (ip4_set && ip6_set)
- {
- errmsg ("Only one server address allowed per message");
- return -99;
- }
- if ((ip4_set + ip6_set) == 0)
- {
- errmsg ("Server address required");
- return -99;
- }
-
- /* Construct the API message */
- M (DNS_NAME_SERVER_ADD_DEL, mp);
-
- if (ip6_set)
- {
- memcpy (mp->server_address, &ip6_server, sizeof (ip6_address_t));
- mp->is_ip6 = 1;
- }
- else
- {
- memcpy (mp->server_address, &ip4_server, sizeof (ip4_address_t));
- mp->is_ip6 = 0;
- }
-
- mp->is_add = is_add;
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
-}
-
static void
vl_api_session_rules_details_t_handler (vl_api_session_rules_details_t * mp)
{
M (QOS_RECORD_ENABLE_DISABLE, mp);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->input_source = qs;
+ mp->record.sw_if_index = ntohl (sw_if_index);
+ mp->record.input_source = qs;
mp->enable = enable;
S (mp);
return 0;
}
+static int
+elog_save (vat_main_t * vam)
+{
+#if VPP_API_TEST_BUILTIN == 0
+ elog_main_t *em = &vam->elog_main;
+ unformat_input_t *i = vam->input;
+ char *file, *chroot_file;
+ clib_error_t *error;
+
+ if (!unformat (i, "%s", &file))
+ {
+ errmsg ("expected file name, got `%U'", format_unformat_error, i);
+ return 0;
+ }
+
+ /* It's fairly hard to get "../oopsie" through unformat; just in case */
+ if (strstr (file, "..") || index (file, '/'))
+ {
+ errmsg ("illegal characters in filename '%s'", file);
+ return 0;
+ }
+
+ chroot_file = (char *) format (0, "/tmp/%s%c", file, 0);
+
+ vec_free (file);
+
+ errmsg ("Saving %wd of %wd events to %s",
+ elog_n_events_in_buffer (em),
+ elog_buffer_capacity (em), chroot_file);
+
+ error = elog_write_file (em, chroot_file, 1 /* flush ring */ );
+ vec_free (chroot_file);
+
+ if (error)
+ clib_error_report (error);
+#else
+ errmsg ("Use the vpp event loger...");
+#endif
+
+ return 0;
+}
+
+static int
+elog_setup (vat_main_t * vam)
+{
+#if VPP_API_TEST_BUILTIN == 0
+ elog_main_t *em = &vam->elog_main;
+ unformat_input_t *i = vam->input;
+ u32 nevents = 128 << 10;
+
+ (void) unformat (i, "nevents %d", &nevents);
+
+ elog_init (em, nevents);
+ vl_api_set_elog_main (em);
+ vl_api_set_elog_trace_api_messages (1);
+ errmsg ("Event logger initialized with %u events", nevents);
+#else
+ errmsg ("Use the vpp event loger...");
+#endif
+ return 0;
+}
+
+static int
+elog_enable (vat_main_t * vam)
+{
+#if VPP_API_TEST_BUILTIN == 0
+ elog_main_t *em = &vam->elog_main;
+
+ elog_enable_disable (em, 1 /* enable */ );
+ vl_api_set_elog_trace_api_messages (1);
+ errmsg ("Event logger enabled...");
+#else
+ errmsg ("Use the vpp event loger...");
+#endif
+ return 0;
+}
+
+static int
+elog_disable (vat_main_t * vam)
+{
+#if VPP_API_TEST_BUILTIN == 0
+ elog_main_t *em = &vam->elog_main;
+
+ elog_enable_disable (em, 0 /* enable */ );
+ vl_api_set_elog_trace_api_messages (1);
+ errmsg ("Event logger disabled...");
+#else
+ errmsg ("Use the vpp event loger...");
+#endif
+ return 0;
+}
+
static int
statseg (vat_main_t * vam)
{
static int
dump_msg_api_table (vat_main_t * vam)
{
- api_main_t *am = &api_main;
+ api_main_t *am = vlibapi_get_main ();
name_sort_t *nses = 0, *ns;
hash_pair_t *hp;
int i;
_(bridge_flags, \
"bd_id <bridge-domain-id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \
_(tap_create_v2, \
- "id <num> [hw-addr <mac-addr>] [host-ns <name>] [rx-ring-size <num> [tx-ring-size <num>] [host-mtu-size <mtu>] [gso | no-gso]") \
+ "id <num> [hw-addr <mac-addr>] [host-if-name <name>] [host-ns <name>] [num-rx-queues <num>] [rx-ring-size <num>] [tx-ring-size <num>] [host-bridge <name>] [host-mac-addr <mac-addr>] [host-ip4-addr <ip4addr/mask>] [host-ip6-addr <ip6addr/mask>] [host-mtu-size <mtu>] [gso | no-gso | csum-offload] [persist] [attach]") \
_(tap_delete_v2, \
"<vpp-if-name> | sw_if_index <id>") \
_(sw_interface_tap_v2_dump, "") \
_(virtio_pci_create, \
- "pci-addr <pci-address> [use_random_mac | hw-addr <mac-addr>] [features <hex-value>] [gso-enabled]") \
+ "pci-addr <pci-address> [use_random_mac | hw-addr <mac-addr>] [features <hex-value>] [gso-enabled | csum-offload-enabled]") \
_(virtio_pci_delete, \
"<vpp-if-name> | sw_if_index <id>") \
_(sw_interface_virtio_pci_dump, "") \
_(bond_create, \
"[hw-addr <mac-addr>] {round-robin | active-backup | " \
"broadcast | {lacp | xor} [load-balance { l2 | l23 | l34 }]} " \
- "[id <if-id>]") \
+ "[id <if-id>]") \
_(bond_delete, \
"<vpp-if-name> | sw_if_index <id>") \
_(bond_enslave, \
- "sw_if_index <n> bond <sw_if_index> [is_passive] [is_long_timeout]") \
+ "sw_if_index <n> bond <sw_if_index> [is_passive] [is_long_timeout]") \
_(bond_detach_slave, \
"sw_if_index <n>") \
+ _(sw_interface_set_bond_weight, "<intfc> | sw_if_index <nn> weight <value>") \
_(sw_interface_bond_dump, "") \
_(sw_interface_slave_dump, \
"<vpp-if-name> | sw_if_index <id>") \
"<bit-position> <sub-domain> <set> <bsl> via <addr> [table-id <n>]\n" \
"[<intfc> | sw_if_index <id>]" \
"[weight <n>] [del] [multipath]") \
-_(proxy_arp_add_del, \
- "<lo-ip4-addr> - <hi-ip4-addr> [vrf <n>] [del]") \
-_(proxy_arp_intfc_enable_disable, \
- "<intfc> | sw_if_index <id> enable | disable") \
_(sw_interface_set_unnumbered, \
"<intfc> | sw_if_index <id> unnum_if_index <id> [del]") \
-_(ip_neighbor_add_del, \
- "(<intfc> | sw_if_index <id>) dst <ip46-address> " \
- "[mac <mac-addr>] [vrf <vrf-id>] [is_static] [del]") \
_(create_vlan_subif, "<intfc> | sw_if_index <id> vlan <n>") \
_(create_subif, "<intfc> | sw_if_index <id> sub_id <n>\n" \
"[outer_vlan_id <n>][inner_vlan_id <n>]\n" \
"[no_tags][one_tag][two_tags][dot1ad][exact_match][default_sub]\n" \
"[outer_vlan_id_any][inner_vlan_id_any]") \
-_(reset_fib, "vrf <n> [ipv6]") \
-_(dhcp_proxy_config, \
- "svr <v46-address> src <v46-address>\n" \
- "rx_vrf_id <nn> server_vrf_id <nn> [del]") \
-_(dhcp_proxy_set_vss, \
- "tbl_id <n> [fib_id <n> oui <n> | vpn_ascii_id <text>] [ipv6] [del]") \
-_(dhcp_proxy_dump, "ip6") \
-_(dhcp_client_config, \
- "<intfc> | sw_if_index <id> [hostname <name>] [disable_event] [del]") \
+_(ip_table_replace_begin, "table <n> [ipv6]") \
+_(ip_table_flush, "table <n> [ipv6]") \
+_(ip_table_replace_end, "table <n> [ipv6]") \
_(set_ip_flow_hash, \
"vrf <n> [src] [dst] [sport] [dport] [proto] [reverse] [ipv6]") \
_(sw_interface_ip6_enable_disable, \
"<intfc> | sw_if_index <id> enable | disable") \
-_(ip6nd_proxy_add_del, \
- "<intfc> | sw_if_index <id> <ip6-address>") \
-_(ip6nd_proxy_dump, "") \
-_(sw_interface_ip6nd_ra_prefix, \
- "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>\n" \
- "val_life <n> pref_life <n> [def] [noadv] [offl] [noauto]\n" \
- "[nolink] [isno]") \
-_(sw_interface_ip6nd_ra_config, \
- "<intfc> | sw_if_index <id> [maxint <n>] [minint <n>]\n" \
- "[life <n>] [count <n>] [interval <n>] [suppress]\n" \
- "[managed] [other] [ll] [send] [cease] [isno] [def]") \
-_(set_arp_neighbor_limit, "arp_nbr_limit <n> [ipv6]") \
_(l2_patch_add_del, \
"rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
"enable | disable") \
"[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] " \
+ "[disable_mrg_rxbuf] [disable_indirect_desc] [gso] " \
"[mac <mac_address>]") \
_(modify_vhost_user_if, \
"<intfc> | sw_if_index <nn> socket <filename>\n" \
- "[server] [renumber <dev_instance>]") \
+ "[server] [renumber <dev_instance>] [gso]") \
_(delete_vhost_user_if, "<intfc> | sw_if_index <nn>") \
_(sw_interface_vhost_user_dump, "") \
_(show_version, "") \
_(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>]") \
_(ip_address_dump, "(ipv4 | ipv6) (<intfc> | sw_if_index <id>)") \
_(ip_dump, "ipv4 | ipv6") \
"<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n" \
" [l2-table <nn>] [del]") \
_(policer_classify_dump, "type [ip4|ip6|l2]") \
-_(netmap_create, "name <interface name> [hw-addr <mac>] [pipe] " \
- "[master|slave]") \
-_(netmap_delete, "name <interface name>") \
_(mpls_tunnel_dump, "tunnel_index <tunnel-id>") \
_(mpls_table_dump, "") \
_(mpls_route_dump, "table-id <ID>") \
_(sw_interface_span_enable_disable, "[l2] [src <intfc> | src_sw_if_index <id>] [disable | [[dst <intfc> | dst_sw_if_index <id>] [both|rx|tx]]]") \
_(sw_interface_span_dump, "[l2]") \
_(get_next_index, "node-name <node-name> next-node-name <node-name>") \
-_(pg_create_interface, "if_id <nn>") \
+_(pg_create_interface, "if_id <nn> [gso-enabled gso-size <size>]") \
_(pg_capture, "if_id <nnn> pcap <file_name> count <nnn> [disable]") \
_(pg_enable_disable, "[stream <id>] disable") \
_(ip_source_and_port_range_check_add_del, \
_(ip_mroute_dump, "table-id [ip4|ip6]") \
_(feature_enable_disable, "arc_name <arc_name> " \
"feature_name <feature_name> <intfc> | sw_if_index <nn> [disable]") \
+_(feature_gso_enable_disable, "<intfc> | sw_if_index <nn> " \
+ "[enable | disable] ") \
_(sw_interface_tag_add_del, "<intfc> | sw_if_index <nn> tag <text>" \
"[disable]") \
+_(sw_interface_add_del_mac_address, "<intfc> | sw_if_index <nn> " \
+ "mac <mac-address> [del]") \
_(l2_xconnect_dump, "") \
_(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>") \
_(p2p_ethernet_del, "<intfc> | sw_if_index <nn> remote_mac <mac-address>") \
_(tcp_configure_src_addresses, "<ip4|6>first-<ip4|6>last [vrf <id>]") \
_(sock_init_shm, "size <nnn>") \
_(app_namespace_add_del, "[add] id <ns-id> secret <nn> sw_if_index <nn>")\
-_(dns_enable_disable, "[enable][disable]") \
-_(dns_name_server_add_del, "<ip-address> [del]") \
-_(dns_resolve_name, "<hostname>") \
-_(dns_resolve_ip, "<ip4|ip6>") \
-_(dns_name_server_add_del, "<ip-address> [del]") \
-_(dns_resolve_name, "<hostname>") \
_(session_rule_add_del, "[add|del] proto <tcp/udp> <lcl-ip>/<plen> " \
"<lcl-port> <rmt-ip>/<plen> <rmt-port> action <nn>") \
_(session_rules_dump, "") \
_(dump_macro_table, "usage: dump_macro_table ") \
_(dump_node_table, "usage: dump_node_table") \
_(dump_msg_api_table, "usage: dump_msg_api_table") \
+_(elog_setup, "usage: elog_setup [nevents, default 128K]") \
+_(elog_disable, "usage: elog_disable") \
+_(elog_enable, "usage: elog_enable") \
+_(elog_save, "usage: elog_save <filename>") \
_(get_msg_id, "usage: get_msg_id name_and_crc") \
_(echo, "usage: echo <message>") \
_(exec, "usage: exec <vpe-debug-CLI-command>") \
Code Review / vpp.git / blobdiff