*/
#include <vat/vat.h>
+#include <vpp/api/types.h>
#include <vppinfra/socket.h>
-#include <svm/memfd.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <vnet/ip/ip.h>
+#include <vnet/ip/ip_neighbor.h>
+#include <vnet/ip/ip_types_api.h>
#include <vnet/l2/l2_input.h>
#include <vnet/l2tp/l2tp.h>
#include <vnet/vxlan/vxlan.h>
#include <vpp/api/vpe_msg_enum.h>
#include <vnet/l2/l2_classify.h>
#include <vnet/l2/l2_vtr.h>
-#include <vnet/classify/input_acl.h>
+#include <vnet/classify/in_out_acl.h>
#include <vnet/classify/policer_classify.h>
#include <vnet/classify/flow_classify.h>
#include <vnet/mpls/mpls.h>
#include <vnet/ipsec/ipsec.h>
-#include <vnet/ipsec/ikev2.h>
#include <inttypes.h>
-#include <vnet/map/map.h>
#include <vnet/cop/cop.h>
#include <vnet/ip/ip6_hop_by_hop.h>
#include <vnet/ip/ip_source_and_port_range_check.h>
#include <vnet/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>
+#include <vnet/ip/ip_types_api.h>
#include "vat/json_format.h"
+#include <vnet/ip/ip_types_api.h>
+#include <vnet/ethernet/ethernet_types_api.h>
#include <inttypes.h>
#include <sys/stat.h>
int
vat_socket_connect (vat_main_t * vam)
{
- return vl_socket_client_connect
- (&vam->socket_client_main, (char *) vam->socket_name,
- "vpp_api_test(s)", 0 /* default socket rx, tx buffer */ );
+ int rv;
+ vam->socket_client_main = &socket_client_main;
+ if ((rv = vl_socket_client_connect ((char *) vam->socket_name,
+ "vpp_api_test",
+ 0 /* default socket rx, tx buffer */ )))
+ return rv;
+ /* vpp expects the client index in network order */
+ vam->my_client_index = htonl (socket_client_main.client_index);
+ return 0;
}
#else /* vpp built-in case, we don't do sockets... */
int
return 0;
}
-void
-vl_socket_client_read_reply (socket_client_main_t * scm)
+int
+vl_socket_client_read (int wait)
+{
+ return -1;
+};
+
+int
+vl_socket_client_write ()
{
+ return -1;
};
+
+void *
+vl_socket_client_msg_alloc (int nbytes)
+{
+ return 0;
+}
#endif
return 1;
}
+static uword
+api_unformat_hw_if_index (unformat_input_t * input, va_list * args)
+{
+ return 0;
+}
+
/* Parse an IP4 address %d.%d.%d.%d. */
uword
unformat_ip4_address (unformat_input_t * input, va_list * args)
return 1;
}
-uword
-unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
-{
- u32 *r = va_arg (*args, u32 *);
-
- if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
- foreach_ipsec_crypto_alg
-#undef _
- else
- return 0;
- return 1;
-}
-
u8 *
format_ipsec_crypto_alg (u8 * s, va_list * args)
{
return format (s, "%s", t);
}
-uword
-unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
-{
- u32 *r = va_arg (*args, u32 *);
-
- if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
- foreach_ipsec_integ_alg
-#undef _
- else
- return 0;
- return 1;
-}
-
u8 *
format_ipsec_integ_alg (u8 * s, va_list * args)
{
return format (s, "%s", t);
}
+#else /* VPP_API_TEST_BUILTIN == 1 */
+static uword
+api_unformat_sw_if_index (unformat_input_t * input, va_list * args)
+{
+ vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *);
+ vnet_main_t *vnm = vnet_get_main ();
+ u32 *result = va_arg (*args, u32 *);
+
+ return unformat (input, "%U", unformat_vnet_sw_interface, vnm, result);
+}
+
+static uword
+api_unformat_hw_if_index (unformat_input_t * input, va_list * args)
+{
+ vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *);
+ vnet_main_t *vnm = vnet_get_main ();
+ u32 *result = va_arg (*args, u32 *);
+
+ return unformat (input, "%U", unformat_vnet_hw_interface, vnm, result);
+}
+
+#endif /* VPP_API_TEST_BUILTIN */
+
uword
-unformat_ikev2_auth_method (unformat_input_t * input, va_list * args)
+unformat_ipsec_api_crypto_alg (unformat_input_t * input, va_list * args)
{
u32 *r = va_arg (*args, u32 *);
if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_AUTH_METHOD_##f;
- foreach_ikev2_auth_method
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_API_CRYPTO_ALG_##f;
+ foreach_ipsec_crypto_alg
#undef _
else
return 0;
}
uword
-unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
+unformat_ipsec_api_integ_alg (unformat_input_t * input, va_list * args)
{
u32 *r = va_arg (*args, u32 *);
if (0);
-#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_ID_TYPE_##f;
- foreach_ikev2_id_type
+#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_API_INTEG_ALG_##f;
+ foreach_ipsec_integ_alg
#undef _
else
return 0;
return 1;
}
-#else /* VPP_API_TEST_BUILTIN == 1 */
-static uword
-api_unformat_sw_if_index (unformat_input_t * input, va_list * args)
-{
- vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *);
- vnet_main_t *vnm = vnet_get_main ();
- u32 *result = va_arg (*args, u32 *);
- u32 sw_if_index;
-
- if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
- return 0;
-
- *result = sw_if_index;
- return 1;
-}
-#endif /* VPP_API_TEST_BUILTIN */
static uword
unformat_policer_rate_type (unformat_input_t * input, va_list * args)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
- u32 length = ntohl (mp->length);
+ u32 length = vl_api_string_len (&mp->reply);
vec_reset_length (vam->cmd_reply);
if (retval == 0)
{
vec_validate (vam->cmd_reply, length);
- clib_memcpy ((char *) (vam->cmd_reply), mp->reply, length);
+ clib_memcpy ((char *) (vam->cmd_reply),
+ vl_api_from_api_string (&mp->reply), length);
vam->cmd_reply[length] = 0;
}
vam->result_ready = 1;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_string_copy (&node, "reply", mp->reply);
+ vat_json_object_add_string_copy (&node, "reply",
+ vl_api_from_api_string (&mp->reply));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
if (retval >= 0)
{
- errmsg (" program: %s", mp->program);
- errmsg (" version: %s", mp->version);
- errmsg (" build date: %s", mp->build_date);
- errmsg ("build directory: %s", mp->build_directory);
+ char *s;
+ char *p = (char *) &mp->program;
+
+ s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+ errmsg (" program: %s\n", s);
+ free (s);
+
+ p +=
+ vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
+ s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+ errmsg (" version: %s\n", s);
+ free (s);
+
+ p +=
+ vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
+ s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+ errmsg (" build date: %s\n", s);
+ free (s);
+
+ p +=
+ vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
+ s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+ errmsg ("build directory: %s\n", s);
+ free (s);
}
vam->retval = retval;
vam->result_ready = 1;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- 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);
+ 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, "build_directory",
- mp->build_directory);
+ vl_api_from_api_string ((vl_api_string_t *)
+ p));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->result_ready = 1;
}
+static void vl_api_show_threads_reply_t_handler
+ (vl_api_show_threads_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ int i, count = 0;
+
+ if (retval >= 0)
+ count = ntohl (mp->count);
+
+ for (i = 0; i < count; i++)
+ print (vam->ofp,
+ "\n%-2d %-11s %-11s %-5d %-6d %-4d %-6d",
+ ntohl (mp->thread_data[i].id), mp->thread_data[i].name,
+ mp->thread_data[i].type, ntohl (mp->thread_data[i].pid),
+ ntohl (mp->thread_data[i].cpu_id), ntohl (mp->thread_data[i].core),
+ ntohl (mp->thread_data[i].cpu_socket));
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void vl_api_show_threads_reply_t_handler_json
+ (vl_api_show_threads_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ vl_api_thread_data_t *td;
+ i32 retval = ntohl (mp->retval);
+ int i, count = 0;
+
+ if (retval >= 0)
+ count = ntohl (mp->count);
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", retval);
+ vat_json_object_add_uint (&node, "count", count);
+
+ for (i = 0; i < count; i++)
+ {
+ td = &mp->thread_data[i];
+ vat_json_object_add_uint (&node, "id", ntohl (td->id));
+ vat_json_object_add_string_copy (&node, "name", td->name);
+ vat_json_object_add_string_copy (&node, "type", td->type);
+ vat_json_object_add_uint (&node, "pid", ntohl (td->pid));
+ vat_json_object_add_int (&node, "cpu_id", ntohl (td->cpu_id));
+ vat_json_object_add_int (&node, "core", ntohl (td->id));
+ vat_json_object_add_int (&node, "cpu_socket", ntohl (td->cpu_socket));
+ }
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static int
+api_show_threads (vat_main_t * vam)
+{
+ vl_api_show_threads_t *mp;
+ int ret;
+
+ print (vam->ofp,
+ "\n%-2s %-11s %-11s %-5s %-6s %-4s %-6s",
+ "ID", "Name", "Type", "LWP", "cpu_id", "Core", "Socket");
+
+ M (SHOW_THREADS, mp);
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
static void
vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp)
{
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->address,
- format_ethernet_address, mp->new_mac, sw_if_index);
+ ntohl (mp->pid), format_ip4_address, mp->ip,
+ format_vl_api_mac_address, &mp->mac, sw_if_index);
}
static void
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_ip6_address, mp->address,
- format_ethernet_address, mp->new_mac, sw_if_index);
+ ntohl (mp->pid), format_vl_api_ip6_address, mp->ip,
+ format_vl_api_mac_address, mp->mac, sw_if_index);
}
static void
vl_api_l2_macs_event_t_handler (vl_api_l2_macs_event_t * mp)
{
u32 n_macs = ntohl (mp->n_macs);
- errmsg ("L2MAC event recived with pid %d cl-idx %d for %d macs: \n",
+ errmsg ("L2MAC event received with pid %d cl-idx %d for %d macs: \n",
ntohl (mp->pid), mp->client_index, n_macs);
int i;
for (i = 0; i < n_macs; i++)
{
vl_api_mac_entry_t *mac = &mp->mac[i];
- errmsg (" [%d] sw_if_index %d mac_addr %U is_del %d \n",
+ errmsg (" [%d] sw_if_index %d mac_addr %U action %d \n",
i + 1, ntohl (mac->sw_if_index),
- format_ethernet_address, mac->mac_addr, mac->is_del);
+ format_ethernet_address, mac->mac_addr, mac->action);
if (i == 1000)
break;
}
u32 n_sw_ifs = ntohl (mp->n_sw_ifs);
int i;
- print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s",
- " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
+ print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-6s %-3s",
+ " ID", "LRN", "FWD", "FLD", "BVI", "UU-FWD", "#IF");
- print (vam->ofp, "%3d %3d %3d %3d %3d %3d",
+ print (vam->ofp, "%3d %3d %3d %3d %3d %6d %3d",
ntohl (mp->bd_id), mp->learn, mp->forward,
- mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
+ mp->flood, ntohl (mp->bvi_sw_if_index),
+ ntohl (mp->uu_fwd_sw_if_index), n_sw_ifs);
if (n_sw_ifs)
{
vam->retval = retval;
vam->result_ready = 1;
}
- vam->socket_client_main.control_pings_outstanding--;
+ if (vam->socket_client_main)
+ vam->socket_client_main->control_pings_outstanding--;
}
static void vl_api_control_ping_reply_t_handler_json
vam->result_ready = 1;
}
-static void vl_api_tap_connect_reply_t_handler
- (vl_api_tap_connect_reply_t * mp)
+static void
+vl_api_tap_create_v2_reply_t_handler (vl_api_tap_create_v2_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
}
-static void vl_api_tap_connect_reply_t_handler_json
- (vl_api_tap_connect_reply_t * mp)
+static void vl_api_tap_create_v2_reply_t_handler_json
+ (vl_api_tap_create_v2_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
}
static void
-vl_api_tap_modify_reply_t_handler (vl_api_tap_modify_reply_t * mp)
+vl_api_tap_delete_v2_reply_t_handler (vl_api_tap_delete_v2_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
else
{
vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
-static void vl_api_tap_modify_reply_t_handler_json
- (vl_api_tap_modify_reply_t * mp)
+static void vl_api_tap_delete_v2_reply_t_handler_json
+ (vl_api_tap_delete_v2_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
}
static void
-vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_reply_t * mp)
+vl_api_virtio_pci_create_reply_t_handler (vl_api_virtio_pci_create_reply_t *
+ mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
else
{
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
-static void vl_api_tap_delete_reply_t_handler_json
- (vl_api_tap_delete_reply_t * mp)
+static void vl_api_virtio_pci_create_reply_t_handler_json
+ (vl_api_virtio_pci_create_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->retval = ntohl (mp->retval);
vam->result_ready = 1;
+
}
-static void vl_api_mpls_tunnel_add_del_reply_t_handler
- (vl_api_mpls_tunnel_add_del_reply_t * mp)
+static void
+vl_api_virtio_pci_delete_reply_t_handler (vl_api_virtio_pci_delete_reply_t *
+ mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
}
}
-static void vl_api_mpls_tunnel_add_del_reply_t_handler_json
- (vl_api_mpls_tunnel_add_del_reply_t * mp)
+static void vl_api_virtio_pci_delete_reply_t_handler_json
+ (vl_api_virtio_pci_delete_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "tunnel_sw_if_index",
- ntohl (mp->sw_if_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->result_ready = 1;
}
-static void vl_api_l2tpv3_create_tunnel_reply_t_handler
- (vl_api_l2tpv3_create_tunnel_reply_t * mp)
+static void
+vl_api_bond_create_reply_t_handler (vl_api_bond_create_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
+
if (vam->async_mode)
{
vam->async_errors += (retval < 0);
}
}
-static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json
- (vl_api_l2tpv3_create_tunnel_reply_t * mp)
+static void vl_api_bond_create_reply_t_handler_json
+ (vl_api_bond_create_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vam->result_ready = 1;
}
-static void vl_api_gpe_add_del_fwd_entry_reply_t_handler
- (vl_api_gpe_add_del_fwd_entry_reply_t * mp)
+static void
+vl_api_bond_delete_reply_t_handler (vl_api_bond_delete_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
+
if (vam->async_mode)
{
vam->async_errors += (retval < 0);
}
}
-static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json
- (vl_api_gpe_add_del_fwd_entry_reply_t * mp)
+static void vl_api_bond_delete_reply_t_handler_json
+ (vl_api_bond_delete_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "fwd_entry_index",
- clib_net_to_host_u32 (mp->fwd_entry_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->result_ready = 1;
}
-u8 *
-format_lisp_transport_protocol (u8 * s, va_list * args)
-{
- u32 proto = va_arg (*args, u32);
-
- switch (proto)
- {
- case 1:
- return format (s, "udp");
- case 2:
- return format (s, "api");
- default:
- return 0;
- }
- return 0;
-}
-
-static void vl_api_one_get_transport_protocol_reply_t_handler
- (vl_api_one_get_transport_protocol_reply_t * mp)
+static void
+vl_api_bond_enslave_reply_t_handler (vl_api_bond_enslave_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
+
if (vam->async_mode)
{
vam->async_errors += (retval < 0);
}
else
{
- u32 proto = mp->protocol;
- print (vam->ofp, "Transport protocol: %U",
- format_lisp_transport_protocol, proto);
vam->retval = retval;
vam->result_ready = 1;
}
}
-static void vl_api_one_get_transport_protocol_reply_t_handler_json
- (vl_api_one_get_transport_protocol_reply_t * mp)
+static void vl_api_bond_enslave_reply_t_handler_json
+ (vl_api_bond_enslave_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
- u8 *s;
-
- s = format (0, "%U", format_lisp_transport_protocol, mp->protocol);
- vec_add1 (s, 0);
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_string_copy (&node, "transport-protocol", s);
- vec_free (s);
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->result_ready = 1;
}
-static void vl_api_one_add_del_locator_set_reply_t_handler
- (vl_api_one_add_del_locator_set_reply_t * mp)
+static void
+vl_api_bond_detach_slave_reply_t_handler (vl_api_bond_detach_slave_reply_t *
+ mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
+
if (vam->async_mode)
{
vam->async_errors += (retval < 0);
}
}
-static void vl_api_one_add_del_locator_set_reply_t_handler_json
- (vl_api_one_add_del_locator_set_reply_t * mp)
+static void vl_api_bond_detach_slave_reply_t_handler_json
+ (vl_api_bond_detach_slave_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "locator_set_index", ntohl (mp->ls_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->result_ready = 1;
}
-static void vl_api_vxlan_add_del_tunnel_reply_t_handler
- (vl_api_vxlan_add_del_tunnel_reply_t * mp)
+static void vl_api_sw_interface_bond_details_t_handler
+ (vl_api_sw_interface_bond_details_t * mp)
{
vat_main_t *vam = &vat_main;
- i32 retval = ntohl (mp->retval);
- if (vam->async_mode)
- {
- vam->async_errors += (retval < 0);
- }
- else
+
+ 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));
+}
+
+static void vl_api_sw_interface_bond_details_t_handler_json
+ (vl_api_sw_interface_bond_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_string_copy (node, "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, "active_slaves", ntohl (mp->active_slaves));
+ vat_json_object_add_uint (node, "slaves", ntohl (mp->slaves));
}
-static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json
- (vl_api_vxlan_add_del_tunnel_reply_t * mp)
+static int
+api_sw_interface_bond_dump (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
+ vl_api_sw_interface_bond_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
- vat_json_init_object (&node);
- vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+ print (vam->ofp,
+ "\n%-16s %-12s %-12s %-13s %-14s %-14s",
+ "interface name", "sw_if_index", "mode", "load balance",
+ "active slaves", "slaves");
- vat_json_print (vam->ofp, &node);
- vat_json_free (&node);
+ /* Get list of bond interfaces */
+ M (SW_INTERFACE_BOND_DUMP, mp);
+ S (mp);
- vam->retval = ntohl (mp->retval);
- vam->result_ready = 1;
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ W (ret);
+ return ret;
}
-static void vl_api_geneve_add_del_tunnel_reply_t_handler
- (vl_api_geneve_add_del_tunnel_reply_t * mp)
+static void vl_api_sw_interface_slave_details_t_handler
+ (vl_api_sw_interface_slave_details_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->sw_if_index = ntohl (mp->sw_if_index);
- vam->result_ready = 1;
- }
+
+ print (vam->ofp,
+ "%-25s %-12d %-12d %d", mp->interface_name,
+ ntohl (mp->sw_if_index), mp->is_passive, mp->is_long_timeout);
}
-static void vl_api_geneve_add_del_tunnel_reply_t_handler_json
- (vl_api_geneve_add_del_tunnel_reply_t * mp)
+static void vl_api_sw_interface_slave_details_t_handler_json
+ (vl_api_sw_interface_slave_details_t * mp)
{
vat_main_t *vam = &vat_main;
- vat_json_node_t node;
+ vat_json_node_t *node = NULL;
- vat_json_init_object (&node);
- vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+ 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_print (vam->ofp, &node);
- vat_json_free (&node);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_string_copy (node, "interface_name",
+ 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);
+}
- vam->retval = ntohl (mp->retval);
- vam->result_ready = 1;
+static int
+api_sw_interface_slave_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_slave_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ int ret;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing vpp interface name. ");
+ return -99;
+ }
+
+ print (vam->ofp,
+ "\n%-25s %-12s %-12s %s",
+ "slave interface name", "sw_if_index", "passive", "long_timeout");
+
+ /* Get list of bond interfaces */
+ M (SW_INTERFACE_SLAVE_DUMP, mp);
+ 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;
}
-static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler
- (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp)
+static void vl_api_mpls_tunnel_add_del_reply_t_handler
+ (vl_api_mpls_tunnel_add_del_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
+ vam->regenerate_interface_table = 1;
}
-static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler_json
- (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp)
+static void vl_api_mpls_tunnel_add_del_reply_t_handler_json
+ (vl_api_mpls_tunnel_add_del_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (&node, "tunnel_sw_if_index",
+ ntohl (mp->sw_if_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->result_ready = 1;
}
-static void vl_api_gre_add_del_tunnel_reply_t_handler
- (vl_api_gre_add_del_tunnel_reply_t * mp)
+static void vl_api_l2tpv3_create_tunnel_reply_t_handler
+ (vl_api_l2tpv3_create_tunnel_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
}
}
-static void vl_api_gre_add_del_tunnel_reply_t_handler_json
- (vl_api_gre_add_del_tunnel_reply_t * mp)
+static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json
+ (vl_api_l2tpv3_create_tunnel_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vam->result_ready = 1;
}
-static void vl_api_create_vhost_user_if_reply_t_handler
- (vl_api_create_vhost_user_if_reply_t * mp)
+static void vl_api_gpe_add_del_fwd_entry_reply_t_handler
+ (vl_api_gpe_add_del_fwd_entry_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
else
{
vam->retval = retval;
- vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
-static void vl_api_create_vhost_user_if_reply_t_handler_json
- (vl_api_create_vhost_user_if_reply_t * mp)
+static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json
+ (vl_api_gpe_add_del_fwd_entry_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (&node, "fwd_entry_index",
+ clib_net_to_host_u32 (mp->fwd_entry_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
vam->result_ready = 1;
}
-static clib_error_t *
-receive_fd_msg (int socket_fd, int *my_fd)
+u8 *
+format_lisp_transport_protocol (u8 * s, va_list * args)
{
- char msgbuf[16];
- char ctl[CMSG_SPACE (sizeof (int)) + CMSG_SPACE (sizeof (struct ucred))];
- struct msghdr mh = { 0 };
- struct iovec iov[1];
- ssize_t size;
- struct ucred *cr = 0;
- struct cmsghdr *cmsg;
- pid_t pid __attribute__ ((unused));
- uid_t uid __attribute__ ((unused));
- gid_t gid __attribute__ ((unused));
-
- iov[0].iov_base = msgbuf;
- iov[0].iov_len = 5;
- mh.msg_iov = iov;
- mh.msg_iovlen = 1;
- mh.msg_control = ctl;
- mh.msg_controllen = sizeof (ctl);
-
- memset (ctl, 0, sizeof (ctl));
-
- /* receive the incoming message */
- size = recvmsg (socket_fd, &mh, 0);
- if (size != 5)
- {
- return (size == 0) ? clib_error_return (0, "disconnected") :
- clib_error_return_unix (0, "recvmsg: malformed message (fd %d)",
- socket_fd);
- }
+ u32 proto = va_arg (*args, u32);
- cmsg = CMSG_FIRSTHDR (&mh);
- while (cmsg)
+ switch (proto)
{
- if (cmsg->cmsg_level == SOL_SOCKET)
- {
- if (cmsg->cmsg_type == SCM_CREDENTIALS)
- {
- cr = (struct ucred *) CMSG_DATA (cmsg);
- uid = cr->uid;
- gid = cr->gid;
- pid = cr->pid;
- }
- else if (cmsg->cmsg_type == SCM_RIGHTS)
- {
- clib_memcpy (my_fd, CMSG_DATA (cmsg), sizeof (int));
- }
- }
- cmsg = CMSG_NXTHDR (&mh, cmsg);
+ case 1:
+ return format (s, "udp");
+ case 2:
+ return format (s, "api");
+ default:
+ return 0;
}
return 0;
}
-static void vl_api_memfd_segment_create_reply_t_handler
- (vl_api_memfd_segment_create_reply_t * mp)
+static void vl_api_one_get_transport_protocol_reply_t_handler
+ (vl_api_one_get_transport_protocol_reply_t * mp)
{
- /* Dont bother in the builtin version */
-#if VPP_API_TEST_BUILTIN == 0
vat_main_t *vam = &vat_main;
- api_main_t *am = &api_main;
- socket_client_main_t *scm = &vam->socket_client_main;
- int my_fd = -1;
- clib_error_t *error;
- memfd_private_t memfd;
i32 retval = ntohl (mp->retval);
-
- if (retval == 0)
+ if (vam->async_mode)
{
- error = receive_fd_msg (scm->socket_fd, &my_fd);
- if (error)
- {
- retval = -99;
- goto out;
- }
-
- memset (&memfd, 0, sizeof (memfd));
- memfd.fd = my_fd;
-
- vam->client_index_invalid = 1;
-
- /* Note: this closes memfd.fd */
- retval = memfd_slave_init (&memfd);
- if (retval)
- clib_warning ("WARNING: segment map returned %d", retval);
-
- /* Pivot to the memory client segment that vpp just created */
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ u32 proto = mp->protocol;
+ print (vam->ofp, "Transport protocol: %U",
+ format_lisp_transport_protocol, proto);
+ vam->retval = retval;
+ vam->result_ready = 1;
+ }
+}
- am->vlib_rp = (void *) (memfd.requested_va + MMAP_PAGESIZE);
+static void vl_api_one_get_transport_protocol_reply_t_handler_json
+ (vl_api_one_get_transport_protocol_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ u8 *s;
- am->shmem_hdr = (void *) am->vlib_rp->user_ctx;
+ s = format (0, "%U", format_lisp_transport_protocol, mp->protocol);
+ vec_add1 (s, 0);
- vl_client_install_client_message_handlers ();
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_string_copy (&node, "transport-protocol", s);
- vl_client_connect_to_vlib_no_map ("pvt",
- "vpp_api_test(p)",
- 32 /* input_queue_length */ );
- vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
+ vec_free (s);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
- vl_socket_client_enable_disable (&vam->socket_client_main,
- 0 /* disable socket */ );
- }
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
-out:
+static void vl_api_one_add_del_locator_set_reply_t_handler
+ (vl_api_one_add_del_locator_set_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
if (vam->async_mode)
{
vam->async_errors += (retval < 0);
vam->retval = retval;
vam->result_ready = 1;
}
-#endif
}
-static void vl_api_memfd_segment_create_reply_t_handler_json
- (vl_api_memfd_segment_create_reply_t * mp)
+static void vl_api_one_add_del_locator_set_reply_t_handler_json
+ (vl_api_one_add_del_locator_set_reply_t * mp)
{
- clib_warning ("no");
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "locator_set_index", ntohl (mp->ls_index));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static void vl_api_dns_resolve_name_reply_t_handler
- (vl_api_dns_resolve_name_reply_t * mp)
+static void vl_api_vxlan_add_del_tunnel_reply_t_handler
+ (vl_api_vxlan_add_del_tunnel_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
else
{
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
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);
}
+ vam->regenerate_interface_table = 1;
}
-static void vl_api_dns_resolve_name_reply_t_handler_json
- (vl_api_dns_resolve_name_reply_t * mp)
+static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json
+ (vl_api_vxlan_add_del_tunnel_reply_t * mp)
{
- clib_warning ("not implemented");
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
}
-static void vl_api_dns_resolve_ip_reply_t_handler
- (vl_api_dns_resolve_ip_reply_t * mp)
+static void vl_api_vxlan_offload_rx_reply_t_handler
+ (vl_api_vxlan_offload_rx_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
{
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)
+static void vl_api_vxlan_offload_rx_reply_t_handler_json
+ (vl_api_vxlan_offload_rx_reply_t * mp)
{
vat_main_t *vam = &vat_main;
- static ip_address_details_t empty_ip_address_details = { {0} };
- ip_address_details_t *address = NULL;
- ip_details_t *current_ip_details = NULL;
- ip_details_t *details = NULL;
-
- details = vam->ip_details_by_sw_if_index[vam->is_ipv6];
+ vat_json_node_t node;
- if (!details || vam->current_sw_if_index >= vec_len (details)
- || !details[vam->current_sw_if_index].present)
- {
- errmsg ("ip address details arrived but not stored");
- errmsg ("ip_dump should be called first");
- return;
- }
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index);
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
-#define addresses (current_ip_details->addr)
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
- vec_validate_init_empty (addresses, vec_len (addresses),
+static void vl_api_geneve_add_del_tunnel_reply_t_handler
+ (vl_api_geneve_add_del_tunnel_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->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
+ }
+}
+
+static void vl_api_geneve_add_del_tunnel_reply_t_handler_json
+ (vl_api_geneve_add_del_tunnel_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler
+ (vl_api_vxlan_gpe_add_del_tunnel_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->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
+ }
+ vam->regenerate_interface_table = 1;
+}
+
+static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler_json
+ (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_gre_add_del_tunnel_reply_t_handler
+ (vl_api_gre_add_del_tunnel_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->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
+ }
+}
+
+static void vl_api_gre_add_del_tunnel_reply_t_handler_json
+ (vl_api_gre_add_del_tunnel_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_create_vhost_user_if_reply_t_handler
+ (vl_api_create_vhost_user_if_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->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
+ }
+ vam->regenerate_interface_table = 1;
+}
+
+static void vl_api_create_vhost_user_if_reply_t_handler_json
+ (vl_api_create_vhost_user_if_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ 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)
+{
+ vat_main_t *vam = &vat_main;
+ static ip_address_details_t empty_ip_address_details = { {0} };
+ ip_address_details_t *address = NULL;
+ ip_details_t *current_ip_details = NULL;
+ ip_details_t *details = NULL;
+
+ details = vam->ip_details_by_sw_if_index[vam->is_ipv6];
+
+ if (!details || vam->current_sw_if_index >= vec_len (details)
+ || !details[vam->current_sw_if_index].present)
+ {
+ errmsg ("ip address details arrived but not stored");
+ errmsg ("ip_dump should be called first");
+ return;
+ }
+
+ current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index);
+
+#define addresses (current_ip_details->addr)
+
+ vec_validate_init_empty (addresses, vec_len (addresses),
empty_ip_address_details);
address = vec_elt_at_index (addresses, vec_len (addresses) - 1);
clib_net_to_host_u32 (mp->sw_if_index));
}
-static void vl_api_map_domain_details_t_handler_json
- (vl_api_map_domain_details_t * mp)
+static void
+vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp)
{
- vat_json_node_t *node = NULL;
- vat_main_t *vam = &vat_main;
- struct in6_addr ip6;
- struct in_addr ip4;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
+ errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
+ "router_addr %U host_mac %U",
+ ntohl (mp->pid), mp->lease.is_ipv6 ? "ipv6" : "ipv4",
+ mp->lease.hostname,
+ format_ip4_address, &mp->lease.host_address,
+ format_ip4_address, &mp->lease.router_address,
+ format_ethernet_address, mp->lease.host_mac);
+}
- node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object (node);
+static void vl_api_dhcp_compl_event_t_handler_json
+ (vl_api_dhcp_compl_event_t * mp)
+{
+ /* JSON output not supported */
+}
- vat_json_object_add_uint (node, "domain_index",
- clib_net_to_host_u32 (mp->domain_index));
- clib_memcpy (&ip6, mp->ip6_prefix, sizeof (ip6));
- vat_json_object_add_ip6 (node, "ip6_prefix", ip6);
- clib_memcpy (&ip4, mp->ip4_prefix, sizeof (ip4));
- vat_json_object_add_ip4 (node, "ip4_prefix", ip4);
- clib_memcpy (&ip6, mp->ip6_src, sizeof (ip6));
- vat_json_object_add_ip6 (node, "ip6_src", ip6);
- vat_json_object_add_int (node, "ip6_prefix_len", mp->ip6_prefix_len);
- vat_json_object_add_int (node, "ip4_prefix_len", mp->ip4_prefix_len);
- vat_json_object_add_int (node, "ip6_src_len", mp->ip6_src_len);
- vat_json_object_add_int (node, "ea_bits_len", mp->ea_bits_len);
- vat_json_object_add_int (node, "psid_offset", mp->psid_offset);
- vat_json_object_add_int (node, "psid_length", mp->psid_length);
- vat_json_object_add_uint (node, "flags", mp->flags);
- vat_json_object_add_uint (node, "mtu", clib_net_to_host_u16 (mp->mtu));
- vat_json_object_add_int (node, "is_translation", mp->is_translation);
-}
-
-static void vl_api_map_domain_details_t_handler
- (vl_api_map_domain_details_t * mp)
+static void vl_api_get_first_msg_id_reply_t_handler
+ (vl_api_get_first_msg_id_reply_t * mp)
{
vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
- if (mp->is_translation)
+ if (vam->async_mode)
{
- print (vam->ofp,
- "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u",
- format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
- format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
- format_ip6_address, mp->ip6_src, mp->ip6_src_len,
- clib_net_to_host_u32 (mp->domain_index));
- }
- else
- {
- print (vam->ofp,
- "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u",
- format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len,
- format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len,
- format_ip6_address, mp->ip6_src,
- clib_net_to_host_u32 (mp->domain_index));
- }
- print (vam->ofp, " ea-len %d psid-offset %d psid-len %d mtu %d %s",
- mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu,
- mp->is_translation ? "map-t" : "");
-}
-
-static void vl_api_map_rule_details_t_handler_json
- (vl_api_map_rule_details_t * mp)
-{
- struct in6_addr ip6;
- vat_json_node_t *node = NULL;
- vat_main_t *vam = &vat_main;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
-
- node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object (node);
-
- vat_json_object_add_uint (node, "psid", clib_net_to_host_u16 (mp->psid));
- clib_memcpy (&ip6, mp->ip6_dst, sizeof (ip6));
- vat_json_object_add_ip6 (node, "ip6_dst", ip6);
-}
-
-static void
-vl_api_map_rule_details_t_handler (vl_api_map_rule_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- print (vam->ofp, " %d (psid) %U (ip6-dst)",
- clib_net_to_host_u16 (mp->psid), format_ip6_address, mp->ip6_dst);
-}
-
-static void
-vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp)
-{
- errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U "
- "router_addr %U host_mac %U",
- ntohl (mp->pid), mp->is_ipv6 ? "ipv6" : "ipv4", mp->hostname,
- format_ip4_address, &mp->host_address,
- format_ip4_address, &mp->router_address,
- format_ethernet_address, mp->host_mac);
-}
-
-static void vl_api_dhcp_compl_event_t_handler_json
- (vl_api_dhcp_compl_event_t * mp)
-{
- /* JSON output not supported */
-}
-
-static void
-set_simple_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
- u32 counter)
-{
- vat_main_t *vam = &vat_main;
- static u64 default_counter = 0;
-
- vec_validate_init_empty (vam->simple_interface_counters, vnet_counter_type,
- NULL);
- vec_validate_init_empty (vam->simple_interface_counters[vnet_counter_type],
- sw_if_index, default_counter);
- vam->simple_interface_counters[vnet_counter_type][sw_if_index] = counter;
-}
-
-static void
-set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index,
- interface_counter_t counter)
-{
- vat_main_t *vam = &vat_main;
- static interface_counter_t default_counter = { 0, };
-
- vec_validate_init_empty (vam->combined_interface_counters,
- vnet_counter_type, NULL);
- vec_validate_init_empty (vam->combined_interface_counters
- [vnet_counter_type], sw_if_index, default_counter);
- vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter;
-}
-
-static void vl_api_vnet_interface_simple_counters_t_handler
- (vl_api_vnet_interface_simple_counters_t * mp)
-{
- /* not supported */
-}
-
-static void vl_api_vnet_interface_combined_counters_t_handler
- (vl_api_vnet_interface_combined_counters_t * mp)
-{
- /* not supported */
-}
-
-static void vl_api_vnet_interface_simple_counters_t_handler_json
- (vl_api_vnet_interface_simple_counters_t * mp)
-{
- u64 *v_packets;
- u64 packets;
- u32 count;
- u32 first_sw_if_index;
- int i;
-
- count = ntohl (mp->count);
- first_sw_if_index = ntohl (mp->first_sw_if_index);
-
- v_packets = (u64 *) & mp->data;
- for (i = 0; i < count; i++)
- {
- packets = clib_net_to_host_u64 (clib_mem_unaligned (v_packets, u64));
- set_simple_interface_counter (mp->vnet_counter_type,
- first_sw_if_index + i, packets);
- v_packets++;
- }
-}
-
-static void vl_api_vnet_interface_combined_counters_t_handler_json
- (vl_api_vnet_interface_combined_counters_t * mp)
-{
- interface_counter_t counter;
- vlib_counter_t *v;
- u32 first_sw_if_index;
- int i;
- u32 count;
-
- count = ntohl (mp->count);
- first_sw_if_index = ntohl (mp->first_sw_if_index);
-
- v = (vlib_counter_t *) & mp->data;
- for (i = 0; i < count; i++)
- {
- counter.packets =
- clib_net_to_host_u64 (clib_mem_unaligned (&v->packets, u64));
- counter.bytes =
- clib_net_to_host_u64 (clib_mem_unaligned (&v->bytes, u64));
- set_combined_interface_counter (mp->vnet_counter_type,
- first_sw_if_index + i, counter);
- v++;
- }
-}
-
-static u32
-ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
-{
- vat_main_t *vam = &vat_main;
- u32 i;
-
- for (i = 0; i < vec_len (vam->ip4_fib_counters_vrf_id_by_index); i++)
- {
- if (vam->ip4_fib_counters_vrf_id_by_index[i] == vrf_id)
- {
- return i;
- }
- }
- return ~0;
-}
-
-static u32
-ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id)
-{
- vat_main_t *vam = &vat_main;
- u32 i;
-
- for (i = 0; i < vec_len (vam->ip6_fib_counters_vrf_id_by_index); i++)
- {
- if (vam->ip6_fib_counters_vrf_id_by_index[i] == vrf_id)
- {
- return i;
- }
- }
- return ~0;
-}
-
-static void vl_api_vnet_ip4_fib_counters_t_handler
- (vl_api_vnet_ip4_fib_counters_t * mp)
-{
- /* not supported */
-}
-
-static void vl_api_vnet_ip4_fib_counters_t_handler_json
- (vl_api_vnet_ip4_fib_counters_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vl_api_ip4_fib_counter_t *v;
- ip4_fib_counter_t *counter;
- struct in_addr ip4;
- u32 vrf_id;
- u32 vrf_index;
- u32 count;
- int i;
-
- vrf_id = ntohl (mp->vrf_id);
- vrf_index = ip4_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
- if (~0 == vrf_index)
- {
- vrf_index = vec_len (vam->ip4_fib_counters_vrf_id_by_index);
- vec_validate (vam->ip4_fib_counters_vrf_id_by_index, vrf_index);
- vam->ip4_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
- vec_validate (vam->ip4_fib_counters, vrf_index);
- vam->ip4_fib_counters[vrf_index] = NULL;
- }
-
- vec_free (vam->ip4_fib_counters[vrf_index]);
- v = (vl_api_ip4_fib_counter_t *) & mp->c;
- count = ntohl (mp->count);
- for (i = 0; i < count; i++)
- {
- vec_validate (vam->ip4_fib_counters[vrf_index], i);
- counter = &vam->ip4_fib_counters[vrf_index][i];
- clib_memcpy (&ip4, &v->address, sizeof (ip4));
- counter->address = ip4;
- counter->address_length = v->address_length;
- counter->packets = clib_net_to_host_u64 (v->packets);
- counter->bytes = clib_net_to_host_u64 (v->bytes);
- v++;
- }
-}
-
-static void vl_api_vnet_ip4_nbr_counters_t_handler
- (vl_api_vnet_ip4_nbr_counters_t * mp)
-{
- /* not supported */
-}
-
-static void vl_api_vnet_ip4_nbr_counters_t_handler_json
- (vl_api_vnet_ip4_nbr_counters_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vl_api_ip4_nbr_counter_t *v;
- ip4_nbr_counter_t *counter;
- u32 sw_if_index;
- u32 count;
- int i;
-
- sw_if_index = ntohl (mp->sw_if_index);
- count = ntohl (mp->count);
- vec_validate (vam->ip4_nbr_counters, sw_if_index);
-
- if (mp->begin)
- vec_free (vam->ip4_nbr_counters[sw_if_index]);
-
- v = (vl_api_ip4_nbr_counter_t *) & mp->c;
- for (i = 0; i < count; i++)
- {
- vec_validate (vam->ip4_nbr_counters[sw_if_index], i);
- counter = &vam->ip4_nbr_counters[sw_if_index][i];
- counter->address.s_addr = v->address;
- counter->packets = clib_net_to_host_u64 (v->packets);
- counter->bytes = clib_net_to_host_u64 (v->bytes);
- counter->linkt = v->link_type;
- v++;
- }
-}
-
-static void vl_api_vnet_ip6_fib_counters_t_handler
- (vl_api_vnet_ip6_fib_counters_t * mp)
-{
- /* not supported */
-}
-
-static void vl_api_vnet_ip6_fib_counters_t_handler_json
- (vl_api_vnet_ip6_fib_counters_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vl_api_ip6_fib_counter_t *v;
- ip6_fib_counter_t *counter;
- struct in6_addr ip6;
- u32 vrf_id;
- u32 vrf_index;
- u32 count;
- int i;
-
- vrf_id = ntohl (mp->vrf_id);
- vrf_index = ip6_fib_counters_get_vrf_index_by_vrf_id (vrf_id);
- if (~0 == vrf_index)
- {
- vrf_index = vec_len (vam->ip6_fib_counters_vrf_id_by_index);
- vec_validate (vam->ip6_fib_counters_vrf_id_by_index, vrf_index);
- vam->ip6_fib_counters_vrf_id_by_index[vrf_index] = vrf_id;
- vec_validate (vam->ip6_fib_counters, vrf_index);
- vam->ip6_fib_counters[vrf_index] = NULL;
- }
-
- vec_free (vam->ip6_fib_counters[vrf_index]);
- v = (vl_api_ip6_fib_counter_t *) & mp->c;
- count = ntohl (mp->count);
- for (i = 0; i < count; i++)
- {
- vec_validate (vam->ip6_fib_counters[vrf_index], i);
- counter = &vam->ip6_fib_counters[vrf_index][i];
- clib_memcpy (&ip6, &v->address, sizeof (ip6));
- counter->address = ip6;
- counter->address_length = v->address_length;
- counter->packets = clib_net_to_host_u64 (v->packets);
- counter->bytes = clib_net_to_host_u64 (v->bytes);
- v++;
- }
-}
-
-static void vl_api_vnet_ip6_nbr_counters_t_handler
- (vl_api_vnet_ip6_nbr_counters_t * mp)
-{
- /* not supported */
-}
-
-static void vl_api_vnet_ip6_nbr_counters_t_handler_json
- (vl_api_vnet_ip6_nbr_counters_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vl_api_ip6_nbr_counter_t *v;
- ip6_nbr_counter_t *counter;
- struct in6_addr ip6;
- u32 sw_if_index;
- u32 count;
- int i;
-
- sw_if_index = ntohl (mp->sw_if_index);
- count = ntohl (mp->count);
- vec_validate (vam->ip6_nbr_counters, sw_if_index);
-
- if (mp->begin)
- vec_free (vam->ip6_nbr_counters[sw_if_index]);
-
- v = (vl_api_ip6_nbr_counter_t *) & mp->c;
- for (i = 0; i < count; i++)
- {
- vec_validate (vam->ip6_nbr_counters[sw_if_index], i);
- counter = &vam->ip6_nbr_counters[sw_if_index][i];
- clib_memcpy (&ip6, &v->address, sizeof (ip6));
- counter->address = ip6;
- counter->packets = clib_net_to_host_u64 (v->packets);
- counter->bytes = clib_net_to_host_u64 (v->bytes);
- v++;
- }
-}
-
-static void vl_api_get_first_msg_id_reply_t_handler
- (vl_api_get_first_msg_id_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl (mp->retval);
-
- if (vam->async_mode)
- {
- vam->async_errors += (retval < 0);
+ vam->async_errors += (retval < 0);
}
else
{
{
hash_free (vam->graph_node_index_by_name);
- for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ for (i = 0; i < vec_len (vam->graph_nodes[0]); i++)
{
- node = vam->graph_nodes[i];
+ node = vam->graph_nodes[0][i];
vec_free (node->name);
vec_free (node->next_nodes);
vec_free (node);
}
+ vec_free (vam->graph_nodes[0]);
vec_free (vam->graph_nodes);
}
vam->graph_nodes = vlib_node_unserialize (pvt_copy);
vec_free (pvt_copy);
- for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ for (i = 0; i < vec_len (vam->graph_nodes[0]); i++)
{
- node = vam->graph_nodes[i];
+ node = vam->graph_nodes[0][i];
hash_set_mem (vam->graph_node_index_by_name, node->name, i);
}
}
vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
}
-static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler
- (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp)
+static void vl_api_ipsec_gre_tunnel_add_del_reply_t_handler
+ (vl_api_ipsec_gre_tunnel_add_del_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
+ vam->regenerate_interface_table = 1;
}
-static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler_json
- (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp)
+static void vl_api_ipsec_gre_tunnel_add_del_reply_t_handler_json
+ (vl_api_ipsec_gre_tunnel_add_del_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
}
-#define vl_api_vnet_interface_simple_counters_t_endian vl_noop_handler
-#define vl_api_vnet_interface_simple_counters_t_print vl_noop_handler
-#define vl_api_vnet_interface_combined_counters_t_endian vl_noop_handler
-#define vl_api_vnet_interface_combined_counters_t_print vl_noop_handler
-#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler
-#define vl_api_vnet_ip4_nbr_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip4_nbr_counters_t_print vl_noop_handler
-#define vl_api_vnet_ip6_nbr_counters_t_endian vl_noop_handler
-#define vl_api_vnet_ip6_nbr_counters_t_print vl_noop_handler
#define vl_api_one_adjacencies_get_reply_t_endian vl_noop_handler
#define vl_api_one_adjacencies_get_reply_t_print vl_noop_handler
#define vl_api_one_l2_arp_bd_get_reply_t_print vl_noop_handler
_(sw_interface_set_flags_reply) \
_(sw_interface_add_del_address_reply) \
_(sw_interface_set_rx_mode_reply) \
+_(sw_interface_set_rx_placement_reply) \
_(sw_interface_set_table_reply) \
_(sw_interface_set_mpls_enable_reply) \
_(sw_interface_set_vpath_reply) \
_(dhcp_client_config_reply) \
_(set_ip_flow_hash_reply) \
_(sw_interface_ip6_enable_disable_reply) \
-_(sw_interface_ip6_set_link_local_address_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) \
+_(sr_mpls_policy_del_reply) \
_(sr_policy_add_reply) \
_(sr_policy_mod_reply) \
_(sr_policy_del_reply) \
_(l2_interface_vlan_tag_rewrite_reply) \
_(modify_vhost_user_if_reply) \
_(delete_vhost_user_if_reply) \
+_(ip_probe_neighbor_reply) \
+_(ip_scan_neighbor_enable_disable_reply) \
_(want_ip4_arp_events_reply) \
_(want_ip6_nd_events_reply) \
_(want_l2_macs_events_reply) \
_(input_acl_set_interface_reply) \
_(ipsec_spd_add_del_reply) \
_(ipsec_interface_add_del_spd_reply) \
-_(ipsec_spd_add_del_entry_reply) \
-_(ipsec_sad_add_del_entry_reply) \
+_(ipsec_spd_entry_add_del_reply) \
+_(ipsec_sad_entry_add_del_reply) \
_(ipsec_sa_set_key_reply) \
_(ipsec_tunnel_if_add_del_reply) \
_(ipsec_tunnel_if_set_key_reply) \
_(ipsec_tunnel_if_set_sa_reply) \
-_(ikev2_profile_add_del_reply) \
-_(ikev2_profile_set_auth_reply) \
-_(ikev2_profile_set_id_reply) \
-_(ikev2_profile_set_ts_reply) \
-_(ikev2_set_local_key_reply) \
-_(ikev2_set_responder_reply) \
-_(ikev2_set_ike_transforms_reply) \
-_(ikev2_set_esp_transforms_reply) \
-_(ikev2_set_sa_lifetime_reply) \
-_(ikev2_initiate_sa_init_reply) \
-_(ikev2_initiate_del_ike_sa_reply) \
-_(ikev2_initiate_del_child_sa_reply) \
-_(ikev2_initiate_rekey_child_sa_reply) \
_(delete_loopback_reply) \
_(bd_ip_mac_add_del_reply) \
-_(map_del_domain_reply) \
-_(map_add_del_rule_reply) \
+_(bd_ip_mac_flush_reply) \
_(want_interface_events_reply) \
-_(want_stats_reply) \
_(cop_interface_enable_disable_reply) \
_(cop_whitelist_enable_disable_reply) \
_(sw_interface_clear_stats_reply) \
_(ip_source_and_port_range_check_interface_add_del_reply)\
_(delete_subif_reply) \
_(l2_interface_pbb_tag_rewrite_reply) \
-_(punt_reply) \
+_(set_punt_reply) \
_(feature_enable_disable_reply) \
_(sw_interface_tag_add_del_reply) \
-_(sw_interface_set_mtu_reply) \
+_(hw_interface_set_mtu_reply) \
_(p2p_ethernet_add_reply) \
_(p2p_ethernet_del_reply) \
_(lldp_config_reply) \
_(dns_enable_disable_reply) \
_(dns_name_server_add_del_reply) \
_(session_rule_add_del_reply) \
-_(ip_container_proxy_add_del_reply)
+_(ip_container_proxy_add_del_reply) \
+_(output_acl_set_interface_reply) \
+_(qos_record_enable_disable_reply)
#define _(n) \
static void vl_api_##n##_t_handler \
_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \
sw_interface_add_del_address_reply) \
_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \
+_(SW_INTERFACE_SET_RX_PLACEMENT_REPLY, sw_interface_set_rx_placement_reply) \
+_(SW_INTERFACE_RX_PLACEMENT_DETAILS, sw_interface_rx_placement_details) \
_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \
_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \
_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \
_(L2FIB_FLUSH_BD_REPLY, l2fib_flush_bd_reply) \
_(L2_FLAGS_REPLY, l2_flags_reply) \
_(BRIDGE_FLAGS_REPLY, bridge_flags_reply) \
-_(TAP_CONNECT_REPLY, tap_connect_reply) \
-_(TAP_MODIFY_REPLY, tap_modify_reply) \
-_(TAP_DELETE_REPLY, tap_delete_reply) \
-_(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_details) \
+_(TAP_CREATE_V2_REPLY, tap_create_v2_reply) \
+_(TAP_DELETE_V2_REPLY, tap_delete_v2_reply) \
+_(SW_INTERFACE_TAP_V2_DETAILS, sw_interface_tap_v2_details) \
+_(VIRTIO_PCI_CREATE_REPLY, virtio_pci_create_reply) \
+_(VIRTIO_PCI_DELETE_REPLY, virtio_pci_delete_reply) \
+_(SW_INTERFACE_VIRTIO_PCI_DETAILS, sw_interface_virtio_pci_details) \
+_(BOND_CREATE_REPLY, bond_create_reply) \
+_(BOND_DELETE_REPLY, bond_delete_reply) \
+_(BOND_ENSLAVE_REPLY, bond_enslave_reply) \
+_(BOND_DETACH_SLAVE_REPLY, bond_detach_slave_reply) \
+_(SW_INTERFACE_BOND_DETAILS, sw_interface_bond_details) \
+_(SW_INTERFACE_SLAVE_DETAILS, sw_interface_slave_details) \
_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply) \
_(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \
_(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \
_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply) \
_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, \
sw_interface_ip6_enable_disable_reply) \
-_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY, \
- sw_interface_ip6_set_link_local_address_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_config_reply) \
_(SET_ARP_NEIGHBOR_LIMIT_REPLY, set_arp_neighbor_limit_reply) \
_(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply) \
+_(SR_MPLS_POLICY_ADD_REPLY, sr_mpls_policy_add_reply) \
+_(SR_MPLS_POLICY_MOD_REPLY, sr_mpls_policy_mod_reply) \
+_(SR_MPLS_POLICY_DEL_REPLY, sr_mpls_policy_del_reply) \
_(SR_POLICY_ADD_REPLY, sr_policy_add_reply) \
_(SR_POLICY_MOD_REPLY, sr_policy_mod_reply) \
_(SR_POLICY_DEL_REPLY, sr_policy_del_reply) \
_(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply) \
_(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details) \
_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \
+_(VXLAN_OFFLOAD_RX_REPLY, vxlan_offload_rx_reply) \
_(GENEVE_ADD_DEL_TUNNEL_REPLY, geneve_add_del_tunnel_reply) \
_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \
_(GENEVE_TUNNEL_DETAILS, geneve_tunnel_details) \
_(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply) \
_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \
_(SHOW_VERSION_REPLY, show_version_reply) \
+_(SHOW_THREADS_REPLY, show_threads_reply) \
_(L2_FIB_TABLE_DETAILS, l2_fib_table_details) \
-_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \
+_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \
_(VXLAN_GPE_TUNNEL_DETAILS, vxlan_gpe_tunnel_details) \
_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \
+_(IP_PROBE_NEIGHBOR_REPLY, ip_probe_neighbor_reply) \
+_(IP_SCAN_NEIGHBOR_ENABLE_DISABLE_REPLY, ip_scan_neighbor_enable_disable_reply) \
_(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply) \
_(IP4_ARP_EVENT, ip4_arp_event) \
_(WANT_IP6_ND_EVENTS_REPLY, want_ip6_nd_events_reply) \
_(IP_DETAILS, ip_details) \
_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply) \
_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \
-_(IPSEC_SPD_ADD_DEL_ENTRY_REPLY, ipsec_spd_add_del_entry_reply) \
-_(IPSEC_SAD_ADD_DEL_ENTRY_REPLY, ipsec_sad_add_del_entry_reply) \
+_(IPSEC_SPD_ENTRY_ADD_DEL_REPLY, ipsec_spd_entry_add_del_reply) \
+_(IPSEC_SAD_ENTRY_ADD_DEL_REPLY, ipsec_sad_entry_add_del_reply) \
_(IPSEC_SA_DETAILS, ipsec_sa_details) \
_(IPSEC_SA_SET_KEY_REPLY, ipsec_sa_set_key_reply) \
_(IPSEC_TUNNEL_IF_ADD_DEL_REPLY, ipsec_tunnel_if_add_del_reply) \
_(IPSEC_TUNNEL_IF_SET_KEY_REPLY, ipsec_tunnel_if_set_key_reply) \
_(IPSEC_TUNNEL_IF_SET_SA_REPLY, ipsec_tunnel_if_set_sa_reply) \
-_(IKEV2_PROFILE_ADD_DEL_REPLY, ikev2_profile_add_del_reply) \
-_(IKEV2_PROFILE_SET_AUTH_REPLY, ikev2_profile_set_auth_reply) \
-_(IKEV2_PROFILE_SET_ID_REPLY, ikev2_profile_set_id_reply) \
-_(IKEV2_PROFILE_SET_TS_REPLY, ikev2_profile_set_ts_reply) \
-_(IKEV2_SET_LOCAL_KEY_REPLY, ikev2_set_local_key_reply) \
-_(IKEV2_SET_RESPONDER_REPLY, ikev2_set_responder_reply) \
-_(IKEV2_SET_IKE_TRANSFORMS_REPLY, ikev2_set_ike_transforms_reply) \
-_(IKEV2_SET_ESP_TRANSFORMS_REPLY, ikev2_set_esp_transforms_reply) \
-_(IKEV2_SET_SA_LIFETIME_REPLY, ikev2_set_sa_lifetime_reply) \
-_(IKEV2_INITIATE_SA_INIT_REPLY, ikev2_initiate_sa_init_reply) \
-_(IKEV2_INITIATE_DEL_IKE_SA_REPLY, ikev2_initiate_del_ike_sa_reply) \
-_(IKEV2_INITIATE_DEL_CHILD_SA_REPLY, ikev2_initiate_del_child_sa_reply) \
-_(IKEV2_INITIATE_REKEY_CHILD_SA_REPLY, ikev2_initiate_rekey_child_sa_reply) \
_(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \
_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \
+_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \
+_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \
_(DHCP_COMPL_EVENT, dhcp_compl_event) \
-_(MAP_ADD_DOMAIN_REPLY, map_add_domain_reply) \
-_(MAP_DEL_DOMAIN_REPLY, map_del_domain_reply) \
-_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply) \
-_(MAP_DOMAIN_DETAILS, map_domain_details) \
-_(MAP_RULE_DETAILS, map_rule_details) \
_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \
-_(WANT_STATS_REPLY, want_stats_reply) \
_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \
_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \
_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \
show_one_map_register_fallback_threshold_reply) \
_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \
_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \
+_(AF_PACKET_DETAILS, af_packet_details) \
_(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \
_(POLICER_DETAILS, policer_details) \
_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \
ip_source_and_port_range_check_add_del_reply) \
_(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY, \
ip_source_and_port_range_check_interface_add_del_reply) \
-_(IPSEC_GRE_ADD_DEL_TUNNEL_REPLY, ipsec_gre_add_del_tunnel_reply) \
+_(IPSEC_GRE_TUNNEL_ADD_DEL_REPLY, ipsec_gre_tunnel_add_del_reply) \
_(IPSEC_GRE_TUNNEL_DETAILS, ipsec_gre_tunnel_details) \
_(DELETE_SUBIF_REPLY, delete_subif_reply) \
_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \
-_(PUNT_REPLY, punt_reply) \
+_(SET_PUNT_REPLY, set_punt_reply) \
_(IP_FIB_DETAILS, ip_fib_details) \
_(IP6_FIB_DETAILS, ip6_fib_details) \
_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \
_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \
_(L2_XCONNECT_DETAILS, l2_xconnect_details) \
-_(SW_INTERFACE_SET_MTU_REPLY, sw_interface_set_mtu_reply) \
+_(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \
_(IP_NEIGHBOR_DETAILS, ip_neighbor_details) \
_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \
_(P2P_ETHERNET_ADD_REPLY, p2p_ethernet_add_reply) \
_(SESSION_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) \
+_(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \
+_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply)
#define foreach_standalone_reply_msg \
-_(SW_INTERFACE_EVENT, sw_interface_event) \
-_(VNET_INTERFACE_SIMPLE_COUNTERS, vnet_interface_simple_counters) \
-_(VNET_INTERFACE_COMBINED_COUNTERS, vnet_interface_combined_counters) \
-_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters) \
-_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters) \
-_(VNET_IP4_NBR_COUNTERS, vnet_ip4_nbr_counters) \
-_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters) \
-_(MEMFD_SEGMENT_CREATE_REPLY, memfd_segment_create_reply) \
+_(SW_INTERFACE_EVENT, sw_interface_event)
typedef struct
{
u32 value;
} name_sort_t;
-
#define STR_VTR_OP_CASE(op) \
case L2_VTR_ ## op: \
return "" # op;
return dump_ip_table (vam, 1);
}
-static char *
-counter_type_to_str (u8 counter_type, u8 is_combined)
-{
- if (!is_combined)
- {
- switch (counter_type)
- {
- case VNET_INTERFACE_COUNTER_DROP:
- return "drop";
- case VNET_INTERFACE_COUNTER_PUNT:
- return "punt";
- case VNET_INTERFACE_COUNTER_IP4:
- return "ip4";
- case VNET_INTERFACE_COUNTER_IP6:
- return "ip6";
- case VNET_INTERFACE_COUNTER_RX_NO_BUF:
- return "rx-no-buf";
- case VNET_INTERFACE_COUNTER_RX_MISS:
- return "rx-miss";
- case VNET_INTERFACE_COUNTER_RX_ERROR:
- return "rx-error";
- case VNET_INTERFACE_COUNTER_TX_ERROR:
- return "tx-error";
- default:
- return "INVALID-COUNTER-TYPE";
- }
- }
- else
- {
- switch (counter_type)
- {
- case VNET_INTERFACE_COUNTER_RX:
- return "rx";
- case VNET_INTERFACE_COUNTER_TX:
- return "tx";
- default:
- return "INVALID-COUNTER-TYPE";
- }
- }
-}
-
-static int
-dump_stats_table (vat_main_t * vam)
-{
- vat_json_node_t node;
- vat_json_node_t *msg_array;
- vat_json_node_t *msg;
- vat_json_node_t *counter_array;
- vat_json_node_t *counter;
- interface_counter_t c;
- u64 packets;
- ip4_fib_counter_t *c4;
- ip6_fib_counter_t *c6;
- ip4_nbr_counter_t *n4;
- ip6_nbr_counter_t *n6;
- int i, j;
-
- if (!vam->json_output)
- {
- clib_warning ("dump_stats_table supported only in JSON format");
- return -99;
- }
-
- vat_json_init_object (&node);
-
- /* interface counters */
- msg_array = vat_json_object_add (&node, "interface_counters");
- vat_json_init_array (msg_array);
- for (i = 0; i < vec_len (vam->simple_interface_counters); i++)
- {
- msg = vat_json_array_add (msg_array);
- vat_json_init_object (msg);
- vat_json_object_add_string_copy (msg, "vnet_counter_type",
- (u8 *) counter_type_to_str (i, 0));
- vat_json_object_add_int (msg, "is_combined", 0);
- counter_array = vat_json_object_add (msg, "data");
- vat_json_init_array (counter_array);
- for (j = 0; j < vec_len (vam->simple_interface_counters[i]); j++)
- {
- packets = vam->simple_interface_counters[i][j];
- vat_json_array_add_uint (counter_array, packets);
- }
- }
- for (i = 0; i < vec_len (vam->combined_interface_counters); i++)
- {
- msg = vat_json_array_add (msg_array);
- vat_json_init_object (msg);
- vat_json_object_add_string_copy (msg, "vnet_counter_type",
- (u8 *) counter_type_to_str (i, 1));
- vat_json_object_add_int (msg, "is_combined", 1);
- counter_array = vat_json_object_add (msg, "data");
- vat_json_init_array (counter_array);
- for (j = 0; j < vec_len (vam->combined_interface_counters[i]); j++)
- {
- c = vam->combined_interface_counters[i][j];
- counter = vat_json_array_add (counter_array);
- vat_json_init_object (counter);
- vat_json_object_add_uint (counter, "packets", c.packets);
- vat_json_object_add_uint (counter, "bytes", c.bytes);
- }
- }
-
- /* ip4 fib counters */
- msg_array = vat_json_object_add (&node, "ip4_fib_counters");
- vat_json_init_array (msg_array);
- for (i = 0; i < vec_len (vam->ip4_fib_counters); i++)
- {
- msg = vat_json_array_add (msg_array);
- vat_json_init_object (msg);
- vat_json_object_add_uint (msg, "vrf_id",
- vam->ip4_fib_counters_vrf_id_by_index[i]);
- counter_array = vat_json_object_add (msg, "c");
- vat_json_init_array (counter_array);
- for (j = 0; j < vec_len (vam->ip4_fib_counters[i]); j++)
- {
- counter = vat_json_array_add (counter_array);
- vat_json_init_object (counter);
- c4 = &vam->ip4_fib_counters[i][j];
- vat_json_object_add_ip4 (counter, "address", c4->address);
- vat_json_object_add_uint (counter, "address_length",
- c4->address_length);
- vat_json_object_add_uint (counter, "packets", c4->packets);
- vat_json_object_add_uint (counter, "bytes", c4->bytes);
- }
- }
-
- /* ip6 fib counters */
- msg_array = vat_json_object_add (&node, "ip6_fib_counters");
- vat_json_init_array (msg_array);
- for (i = 0; i < vec_len (vam->ip6_fib_counters); i++)
- {
- msg = vat_json_array_add (msg_array);
- vat_json_init_object (msg);
- vat_json_object_add_uint (msg, "vrf_id",
- vam->ip6_fib_counters_vrf_id_by_index[i]);
- counter_array = vat_json_object_add (msg, "c");
- vat_json_init_array (counter_array);
- for (j = 0; j < vec_len (vam->ip6_fib_counters[i]); j++)
- {
- counter = vat_json_array_add (counter_array);
- vat_json_init_object (counter);
- c6 = &vam->ip6_fib_counters[i][j];
- vat_json_object_add_ip6 (counter, "address", c6->address);
- vat_json_object_add_uint (counter, "address_length",
- c6->address_length);
- vat_json_object_add_uint (counter, "packets", c6->packets);
- vat_json_object_add_uint (counter, "bytes", c6->bytes);
- }
- }
-
- /* ip4 nbr counters */
- msg_array = vat_json_object_add (&node, "ip4_nbr_counters");
- vat_json_init_array (msg_array);
- for (i = 0; i < vec_len (vam->ip4_nbr_counters); i++)
- {
- msg = vat_json_array_add (msg_array);
- vat_json_init_object (msg);
- vat_json_object_add_uint (msg, "sw_if_index", i);
- counter_array = vat_json_object_add (msg, "c");
- vat_json_init_array (counter_array);
- for (j = 0; j < vec_len (vam->ip4_nbr_counters[i]); j++)
- {
- counter = vat_json_array_add (counter_array);
- vat_json_init_object (counter);
- n4 = &vam->ip4_nbr_counters[i][j];
- vat_json_object_add_ip4 (counter, "address", n4->address);
- vat_json_object_add_uint (counter, "link-type", n4->linkt);
- vat_json_object_add_uint (counter, "packets", n4->packets);
- vat_json_object_add_uint (counter, "bytes", n4->bytes);
- }
- }
-
- /* ip6 nbr counters */
- msg_array = vat_json_object_add (&node, "ip6_nbr_counters");
- vat_json_init_array (msg_array);
- for (i = 0; i < vec_len (vam->ip6_nbr_counters); i++)
- {
- msg = vat_json_array_add (msg_array);
- vat_json_init_object (msg);
- vat_json_object_add_uint (msg, "sw_if_index", i);
- counter_array = vat_json_object_add (msg, "c");
- vat_json_init_array (counter_array);
- for (j = 0; j < vec_len (vam->ip6_nbr_counters[i]); j++)
- {
- counter = vat_json_array_add (counter_array);
- vat_json_init_object (counter);
- n6 = &vam->ip6_nbr_counters[i][j];
- vat_json_object_add_ip6 (counter, "address", n6->address);
- vat_json_object_add_uint (counter, "packets", n6->packets);
- vat_json_object_add_uint (counter, "bytes", n6->bytes);
- }
- }
-
- vat_json_print (vam->ofp, &node);
- vat_json_free (&node);
-
- return 0;
-}
-
/*
* Pass CLI buffers directly in the CLI_INBAND API message,
* instead of an additional shared memory area.
*/
u32 len = vec_len (vam->input->buffer);
M2 (CLI_INBAND, mp, len);
- clib_memcpy (mp->cmd, vam->input->buffer, len);
- mp->length = htonl (len);
+ vl_api_to_api_string (len - 1, (const char *) vam->input->buffer, &mp->cmd);
S (mp);
W (ret);
u32 user_instance = 0;
int ret;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
return ret;
}
-static int
-api_want_stats (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_want_stats_t *mp;
- int enable = -1;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
- else
- break;
- }
-
- if (enable == -1)
- {
- errmsg ("missing enable|disable");
- return -99;
- }
-
- M (WANT_STATS, mp);
- mp->enable_disable = enable;
-
- S (mp);
- W (ret);
- return ret;
-}
-
static int
api_want_interface_events (vat_main_t * vam)
{
/* recreate the interface name hash table */
vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
- /* Get list of ethernets */
+ /*
+ * Ask for all interface names. Otherwise, the epic catalog of
+ * name filters becomes ridiculously long, and vat ends up needing
+ * to be taught about new interface types.
+ */
M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "Ether", sizeof (mp->name_filter) - 1);
S (mp);
- /* and local / loopback interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "lo", sizeof (mp->name_filter) - 1);
- S (mp);
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
- /* and packet-generator interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "pg", sizeof (mp->name_filter) - 1);
- S (mp);
+ W (ret);
+ return ret;
+}
- /* and vxlan-gpe tunnel interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "vxlan_gpe",
- sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* and vxlan tunnel interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "vxlan", sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* and geneve tunnel interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "geneve", sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* and host (af_packet) interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "host", sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* and l2tpv3 tunnel interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
- sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* and GRE tunnel interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "gre", sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* and LISP-GPE interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "lisp_gpe",
- sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* and IPSEC tunnel interfaces */
- M (SW_INTERFACE_DUMP, mp);
- mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "ipsec", sizeof (mp->name_filter) - 1);
- S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
- W (ret);
- return ret;
-}
-
-static int
-api_sw_interface_set_flags (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_flags_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 admin_up = 0;
- int ret;
+static int
+api_sw_interface_set_flags (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_flags_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 admin_up = 0;
+ int ret;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
return ret;
}
+static int
+api_sw_interface_set_rx_placement (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_rx_placement_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ int ret;
+ u8 is_main = 0;
+ u32 queue_id, thread_index;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "queue %d", &queue_id))
+ ;
+ else if (unformat (i, "main"))
+ is_main = 1;
+ else if (unformat (i, "worker %d", &thread_index))
+ ;
+ else
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
+
+ if (is_main)
+ thread_index = 0;
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_RX_PLACEMENT, mp);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->worker_id = ntohl (thread_index);
+ mp->queue_id = ntohl (queue_id);
+ mp->is_main = is_main;
+
+ /* send it... */
+ S (mp);
+ /* Wait for a reply, return the good/bad news... */
+ W (ret);
+ return ret;
+}
+
+static void vl_api_sw_interface_rx_placement_details_t_handler
+ (vl_api_sw_interface_rx_placement_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ u32 worker_id = ntohl (mp->worker_id);
+
+ print (vam->ofp,
+ "\n%-11d %-11s %-6d %-5d %-9s",
+ ntohl (mp->sw_if_index), (worker_id == 0) ? "main" : "worker",
+ worker_id, ntohl (mp->queue_id),
+ (mp->mode ==
+ 1) ? "polling" : ((mp->mode == 2) ? "interrupt" : "adaptive"));
+}
+
+static void vl_api_sw_interface_rx_placement_details_t_handler_json
+ (vl_api_sw_interface_rx_placement_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "worker_id", ntohl (mp->worker_id));
+ vat_json_object_add_uint (node, "queue_id", ntohl (mp->queue_id));
+ vat_json_object_add_uint (node, "mode", mp->mode);
+}
+
+static int
+api_sw_interface_rx_placement_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_rx_placement_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set++;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set++;
+ else
+ break;
+ }
+
+ print (vam->ofp,
+ "\n%-11s %-11s %-6s %-5s %-4s",
+ "sw_if_index", "main/worker", "thread", "queue", "mode");
+
+ /* Dump Interface rx placement */
+ M (SW_INTERFACE_RX_PLACEMENT_DUMP, mp);
+
+ if (sw_if_index_set)
+ mp->sw_if_index = htonl (sw_if_index);
+ else
+ mp->sw_if_index = ~0;
+
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ W (ret);
+ return ret;
+}
+
static int
api_sw_interface_clear_stats (vat_main_t * vam)
{
{
unformat_input_t *i = vam->input;
vl_api_sw_interface_set_l2_bridge_t *mp;
+ vl_api_l2_port_type_t port_type;
u32 rx_sw_if_index;
u8 rx_sw_if_index_set = 0;
u32 bd_id;
u8 bd_id_set = 0;
- u8 bvi = 0;
u32 shg = 0;
u8 enable = 1;
int ret;
+ port_type = L2_API_PORT_TYPE_NORMAL;
+
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
else if (unformat (i, "shg %d", &shg))
;
else if (unformat (i, "bvi"))
- bvi = 1;
+ port_type = L2_API_PORT_TYPE_BVI;
+ else if (unformat (i, "uu-fwd"))
+ port_type = L2_API_PORT_TYPE_UU_FWD;
else if (unformat (i, "enable"))
enable = 1;
else if (unformat (i, "disable"))
mp->rx_sw_if_index = ntohl (rx_sw_if_index);
mp->bd_id = ntohl (bd_id);
mp->shg = (u8) shg;
- mp->bvi = bvi;
+ mp->port_type = ntohl (port_type);
mp->enable = enable;
S (mp);
goto done;
}
- if ((bd_tag) && (strlen ((char *) bd_tag) > 63))
+ if ((bd_tag) && (vec_len (bd_tag) > 63))
{
errmsg ("bd-tag cannot be longer than 63");
ret = -99;
mp->is_add = is_add;
mp->mac_age = (u8) mac_age;
if (bd_tag)
- strcpy ((char *) mp->bd_tag, (char *) bd_tag);
-
+ {
+ clib_memcpy (mp->bd_tag, bd_tag, vec_len (bd_tag));
+ mp->bd_tag[vec_len (bd_tag)] = 0;
+ }
S (mp);
W (ret);
u8 mac_set = 0;
u32 bd_id;
u8 bd_id_set = 0;
- u32 sw_if_index = ~0;
+ u32 sw_if_index = 0;
u8 sw_if_index_set = 0;
u8 is_add = 1;
u8 static_mac = 0;
clib_memcpy (mp->mac, mac, 6);
mp->bd_id = ntohl (bd_id);
mp->is_add = is_add;
+ mp->sw_if_index = ntohl (sw_if_index);
if (is_add)
{
- mp->sw_if_index = ntohl (sw_if_index);
mp->static_mac = static_mac;
mp->filter_mac = filter_mac;
mp->bvi_mac = bvi_mac;
u32 bd_id;
u8 bd_id_set = 0;
u8 is_set = 1;
- u32 flags = 0;
+ bd_flags_t flags = 0;
int ret;
/* Parse args required to build the message */
if (unformat (i, "bd_id %d", &bd_id))
bd_id_set = 1;
else if (unformat (i, "learn"))
- flags |= L2_LEARN;
+ flags |= BRIDGE_API_FLAG_LEARN;
else if (unformat (i, "forward"))
- flags |= L2_FWD;
+ flags |= BRIDGE_API_FLAG_FWD;
else if (unformat (i, "flood"))
- flags |= L2_FLOOD;
+ flags |= BRIDGE_API_FLAG_FLOOD;
else if (unformat (i, "uu-flood"))
- flags |= L2_UU_FLOOD;
+ flags |= BRIDGE_API_FLAG_UU_FLOOD;
else if (unformat (i, "arp-term"))
- flags |= L2_ARP_TERM;
+ flags |= BRIDGE_API_FLAG_ARP_TERM;
else if (unformat (i, "off"))
is_set = 0;
else if (unformat (i, "disable"))
M (BRIDGE_FLAGS, mp);
mp->bd_id = ntohl (bd_id);
- mp->feature_bitmap = ntohl (flags);
+ mp->flags = ntohl (flags);
mp->is_set = is_set;
S (mp);
static int
api_bd_ip_mac_add_del (vat_main_t * vam)
{
+ vl_api_address_t ip = VL_API_ZERO_ADDRESS;
+ vl_api_mac_address_t mac = { 0 };
unformat_input_t *i = vam->input;
vl_api_bd_ip_mac_add_del_t *mp;
+ ip46_type_t type;
u32 bd_id;
u8 is_ipv6 = 0;
u8 is_add = 1;
u8 bd_id_set = 0;
u8 ip_set = 0;
u8 mac_set = 0;
- ip4_address_t v4addr;
- ip6_address_t v6addr;
u8 macaddr[6];
int ret;
{
bd_id_set++;
}
- else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
- {
- ip_set++;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
+ else if (unformat (i, "%U", unformat_vl_api_address, &ip))
{
ip_set++;
- is_ipv6++;
}
- else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
+ else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac))
{
mac_set++;
}
M (BD_IP_MAC_ADD_DEL, mp);
mp->bd_id = ntohl (bd_id);
- mp->is_ipv6 = is_ipv6;
mp->is_add = is_add;
- if (is_ipv6)
- clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
- else
- clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
- clib_memcpy (mp->mac_address, macaddr, 6);
+
+ clib_memcpy (&mp->ip, &ip, sizeof (ip));
+ clib_memcpy (&mp->mac, &mac, sizeof (mac));
+
S (mp);
W (ret);
return ret;
}
static int
-api_tap_connect (vat_main_t * vam)
+api_bd_ip_mac_flush (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_tap_connect_t *mp;
- u8 mac_address[6];
- u8 random_mac = 1;
- u8 name_set = 0;
- u8 *tap_name;
- u8 *tag = 0;
- ip4_address_t ip4_address;
- u32 ip4_mask_width;
- int ip4_address_set = 0;
- ip6_address_t ip6_address;
- u32 ip6_mask_width;
- int ip6_address_set = 0;
+ vl_api_bd_ip_mac_flush_t *mp;
+ u32 bd_id;
+ u8 bd_id_set = 0;
int ret;
- 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_ethernet_address, mac_address))
+ if (unformat (i, "bd_id %d", &bd_id))
{
- random_mac = 0;
+ bd_id_set++;
}
- else if (unformat (i, "random-mac"))
- random_mac = 1;
- else if (unformat (i, "tapname %s", &tap_name))
- name_set = 1;
- else if (unformat (i, "tag %s", &tag))
- ;
- else if (unformat (i, "address %U/%d",
- unformat_ip4_address, &ip4_address, &ip4_mask_width))
- ip4_address_set = 1;
- else if (unformat (i, "address %U/%d",
- unformat_ip6_address, &ip6_address, &ip6_mask_width))
- ip6_address_set = 1;
else
break;
}
- if (name_set == 0)
- {
- errmsg ("missing tap name");
- return -99;
- }
- if (vec_len (tap_name) > 63)
+ if (bd_id_set == 0)
{
- errmsg ("tap name too long");
+ errmsg ("missing bridge domain");
return -99;
}
- vec_add1 (tap_name, 0);
- if (vec_len (tag) > 63)
- {
- errmsg ("tag too long");
- return -99;
- }
+ M (BD_IP_MAC_FLUSH, mp);
- /* Construct the API message */
- M (TAP_CONNECT, mp);
+ mp->bd_id = ntohl (bd_id);
- mp->use_random_mac = random_mac;
- clib_memcpy (mp->mac_address, mac_address, 6);
- clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
- if (tag)
- clib_memcpy (mp->tag, tag, vec_len (tag));
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static void vl_api_bd_ip_mac_details_t_handler
+ (vl_api_bd_ip_mac_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ u8 *ip = 0;
+
+ if (!mp->is_ipv6)
+ ip =
+ format (0, "%U", format_ip4_address, (ip4_address_t *) mp->ip_address);
+ else
+ ip =
+ format (0, "%U", format_ip6_address, (ip6_address_t *) mp->ip_address);
+
+ print (vam->ofp,
+ "\n%-5d %-7s %-20U %-30s",
+ ntohl (mp->bd_id), mp->is_ipv6 ? "ip6" : "ip4",
+ format_ethernet_address, mp->mac_address, ip);
+
+ vec_free (ip);
+}
- if (ip4_address_set)
+static void vl_api_bd_ip_mac_details_t_handler_json
+ (vl_api_bd_ip_mac_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- mp->ip4_address_set = 1;
- clib_memcpy (mp->ip4_address, &ip4_address, sizeof (mp->ip4_address));
- mp->ip4_mask_width = ip4_mask_width;
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- if (ip6_address_set)
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+ vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6);
+ vat_json_object_add_string_copy (node, "mac_address",
+ format (0, "%U", format_ethernet_address,
+ &mp->mac_address));
+ u8 *ip = 0;
+
+ if (!mp->is_ipv6)
+ ip =
+ format (0, "%U", format_ip4_address, (ip4_address_t *) mp->ip_address);
+ else
+ ip =
+ format (0, "%U", format_ip6_address, (ip6_address_t *) mp->ip_address);
+ vat_json_object_add_string_copy (node, "ip_address", ip);
+ vec_free (ip);
+}
+
+static int
+api_bd_ip_mac_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_bd_ip_mac_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
+ u32 bd_id;
+ u8 bd_id_set = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- mp->ip6_address_set = 1;
- clib_memcpy (mp->ip6_address, &ip6_address, sizeof (mp->ip6_address));
- mp->ip6_mask_width = ip6_mask_width;
+ if (unformat (i, "bd_id %d", &bd_id))
+ {
+ bd_id_set++;
+ }
+ else
+ break;
}
- vec_free (tap_name);
- vec_free (tag);
+ print (vam->ofp,
+ "\n%-5s %-7s %-20s %-30s",
+ "bd_id", "is_ipv6", "mac_address", "ip_address");
+
+ /* Dump Bridge Domain Ip to Mac entries */
+ M (BD_IP_MAC_DUMP, mp);
+
+ if (bd_id_set)
+ mp->bd_id = htonl (bd_id);
+ else
+ mp->bd_id = ~0;
- /* send it... */
S (mp);
- /* Wait for a reply... */
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
W (ret);
return ret;
}
static int
-api_tap_modify (vat_main_t * vam)
+api_tap_create_v2 (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_tap_modify_t *mp;
+ vl_api_tap_create_v2_t *mp;
u8 mac_address[6];
u8 random_mac = 1;
- u8 name_set = 0;
- u8 *tap_name;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
+ u32 id = ~0;
+ u8 *host_if_name = 0;
+ u8 *host_ns = 0;
+ u8 host_mac_addr[6];
+ u8 host_mac_addr_set = 0;
+ u8 *host_bridge = 0;
+ ip4_address_t host_ip4_addr;
+ ip4_address_t host_ip4_gw;
+ u8 host_ip4_gw_set = 0;
+ u32 host_ip4_prefix_len = 0;
+ ip6_address_t host_ip6_addr;
+ ip6_address_t host_ip6_gw;
+ u8 host_ip6_gw_set = 0;
+ u32 host_ip6_prefix_len = 0;
int ret;
+ u32 rx_ring_sz = 0, tx_ring_sz = 0;
- memset (mac_address, 0, sizeof (mac_address));
+ clib_memset (mac_address, 0, sizeof (mac_address));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- 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, "mac %U", unformat_ethernet_address, mac_address))
+ if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address))
{
random_mac = 0;
}
- else if (unformat (i, "random-mac"))
- random_mac = 1;
- else if (unformat (i, "tapname %s", &tap_name))
- name_set = 1;
+ else if (unformat (i, "id %u", &id))
+ ;
+ else if (unformat (i, "host-if-name %s", &host_if_name))
+ ;
+ else if (unformat (i, "host-ns %s", &host_ns))
+ ;
+ 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_ip4_addr, &host_ip4_prefix_len))
+ ;
+ else if (unformat (i, "host-ip6-addr %U/%d", unformat_ip6_address,
+ &host_ip6_addr, &host_ip6_prefix_len))
+ ;
+ 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, "tx-ring-size %d", &tx_ring_sz))
+ ;
else
break;
}
- if (sw_if_index_set == 0)
+ if (vec_len (host_if_name) > 63)
{
- errmsg ("missing vpp interface name");
+ errmsg ("tap name too long. ");
return -99;
}
- if (name_set == 0)
+ if (vec_len (host_ns) > 63)
{
- errmsg ("missing tap name");
+ errmsg ("host name space too long. ");
return -99;
}
- if (vec_len (tap_name) > 63)
+ if (vec_len (host_bridge) > 63)
{
- errmsg ("tap name too long");
+ errmsg ("host bridge name too long. ");
+ return -99;
+ }
+ if (host_ip4_prefix_len > 32)
+ {
+ errmsg ("host ip4 prefix length not valid. ");
+ return -99;
+ }
+ if (host_ip6_prefix_len > 128)
+ {
+ errmsg ("host ip6 prefix length not valid. ");
+ return -99;
+ }
+ if (!is_pow2 (rx_ring_sz))
+ {
+ errmsg ("rx ring size must be power of 2. ");
+ return -99;
+ }
+ if (rx_ring_sz > 32768)
+ {
+ errmsg ("rx ring size must be 32768 or lower. ");
+ return -99;
+ }
+ if (!is_pow2 (tx_ring_sz))
+ {
+ errmsg ("tx ring size must be power of 2. ");
+ return -99;
+ }
+ if (tx_ring_sz > 32768)
+ {
+ errmsg ("tx ring size must be 32768 or lower. ");
+ return -99;
}
- vec_add1 (tap_name, 0);
/* Construct the API message */
- M (TAP_MODIFY, mp);
+ M (TAP_CREATE_V2, mp);
mp->use_random_mac = random_mac;
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->mac_address, mac_address, 6);
- clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
- vec_free (tap_name);
+
+ 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->tx_ring_sz = ntohs (tx_ring_sz);
+
+ 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)
+ clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+ if (host_ns)
+ clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns));
+ if (host_bridge)
+ 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_gw_set)
+ clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4);
+ if (host_ip6_gw_set)
+ clib_memcpy (mp->host_ip6_gw, &host_ip6_gw, 16);
+
+ vec_free (host_ns);
+ vec_free (host_if_name);
+ vec_free (host_bridge);
/* send it... */
S (mp);
}
static int
-api_tap_delete (vat_main_t * vam)
+api_tap_delete_v2 (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_tap_delete_t *mp;
+ vl_api_tap_delete_v2_t *mp;
u32 sw_if_index = ~0;
u8 sw_if_index_set = 0;
int ret;
if (sw_if_index_set == 0)
{
- errmsg ("missing vpp interface name");
+ errmsg ("missing vpp interface name. ");
return -99;
}
/* Construct the API message */
- M (TAP_DELETE, mp);
+ M (TAP_DELETE_V2, mp);
mp->sw_if_index = ntohl (sw_if_index);
return ret;
}
+uword
+unformat_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 *);
+ u32 x[4];
+
+ if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3]))
+ return 0;
+
+ addr->domain = x[0];
+ addr->bus = x[1];
+ addr->slot = x[2];
+ addr->function = x[3];
+
+ return 1;
+}
+
static int
-api_ip_table_add_del (vat_main_t * vam)
+api_virtio_pci_create (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ip_table_add_del_t *mp;
- u32 table_id = ~0;
- u8 is_ipv6 = 0;
- u8 is_add = 1;
- int ret = 0;
+ vl_api_virtio_pci_create_t *mp;
+ u8 mac_address[6];
+ u8 random_mac = 1;
+ u32 pci_addr = 0;
+ u64 features = (u64) ~ (0ULL);
+ u32 rx_ring_sz = 0, tx_ring_sz = 0;
+ int ret;
+
+ 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, "ipv6"))
- is_ipv6 = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "table %d", &table_id))
- ;
- else
+ if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address))
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ random_mac = 0;
}
+ else if (unformat (i, "pci-addr %U", unformat_pci_addr, &pci_addr))
+ ;
+ else if (unformat (i, "features 0x%llx", &features))
+ ;
+ else if (unformat (i, "rx-ring-size %u", &rx_ring_sz))
+ ;
+ else if (unformat (i, "tx-ring-size %u", &tx_ring_sz))
+ ;
+ else
+ break;
}
- if (~0 == table_id)
+ if (pci_addr == 0)
{
- errmsg ("missing table-ID");
+ errmsg ("pci address must be non zero. ");
+ return -99;
+ }
+ if (!is_pow2 (rx_ring_sz))
+ {
+ errmsg ("rx ring size must be power of 2. ");
+ return -99;
+ }
+ if (rx_ring_sz > 32768)
+ {
+ errmsg ("rx ring size must be 32768 or lower. ");
+ return -99;
+ }
+ if (!is_pow2 (tx_ring_sz))
+ {
+ errmsg ("tx ring size must be power of 2. ");
+ return -99;
+ }
+ if (tx_ring_sz > 32768)
+ {
+ errmsg ("tx ring size must be 32768 or lower. ");
return -99;
}
/* Construct the API message */
- M (IP_TABLE_ADD_DEL, mp);
+ M (VIRTIO_PCI_CREATE, mp);
- mp->table_id = ntohl (table_id);
- mp->is_ipv6 = is_ipv6;
- mp->is_add = is_add;
+ mp->use_random_mac = random_mac;
+
+ mp->pci_addr = htonl (pci_addr);
+ mp->features = clib_host_to_net_u64 (features);
+ mp->rx_ring_sz = htons (rx_ring_sz);
+ mp->tx_ring_sz = htons (tx_ring_sz);
+
+ if (random_mac == 0)
+ clib_memcpy (mp->mac_address, mac_address, 6);
/* send it... */
S (mp);
/* Wait for a reply... */
W (ret);
-
return ret;
}
static int
-api_ip_add_del_route (vat_main_t * vam)
+api_virtio_pci_delete (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ip_add_del_route_t *mp;
- u32 sw_if_index = ~0, vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 is_local = 0, is_drop = 0;
- u8 is_unreach = 0, is_prohibit = 0;
- u8 create_vrf_if_needed = 0;
- u8 is_add = 1;
- u32 next_hop_weight = 1;
- u8 is_multipath = 0;
- u8 address_set = 0;
- u8 address_length_set = 0;
- u32 next_hop_table_id = 0;
- u32 resolve_attempts = 0;
- u32 dst_address_length = 0;
- u8 next_hop_set = 0;
- ip4_address_t v4_dst_address, v4_next_hop_address;
- ip6_address_t v6_dst_address, v6_next_hop_address;
- int count = 1;
- int j;
- f64 before = 0;
- u32 random_add_del = 0;
- u32 *random_vector = 0;
- uword *random_hash;
- u32 random_seed = 0xdeaddabe;
- u32 classify_table_index = ~0;
- u8 is_classify = 0;
- u8 resolve_host = 0, resolve_attached = 0;
- mpls_label_t *next_hop_out_label_stack = NULL;
- mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
- mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ vl_api_virtio_pci_delete_t *mp;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ int ret;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
- ;
+ sw_if_index_set = 1;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (i, "%U", unformat_ip4_address, &v4_dst_address))
- {
- address_set = 1;
- is_ipv6 = 0;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address))
- {
- address_set = 1;
- is_ipv6 = 1;
- }
- else if (unformat (i, "/%d", &dst_address_length))
- {
- address_length_set = 1;
- }
-
- else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
- &v4_next_hop_address))
- {
- next_hop_set = 1;
- }
- else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
- &v6_next_hop_address))
- {
- next_hop_set = 1;
- }
- else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
- ;
- else if (unformat (i, "weight %d", &next_hop_weight))
- ;
- else if (unformat (i, "drop"))
- {
- is_drop = 1;
- }
- else if (unformat (i, "null-send-unreach"))
- {
- is_unreach = 1;
- }
- else if (unformat (i, "null-send-prohibit"))
- {
- is_prohibit = 1;
- }
- else if (unformat (i, "local"))
- {
- is_local = 1;
- }
- else if (unformat (i, "classify %d", &classify_table_index))
- {
- is_classify = 1;
- }
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "resolve-via-host"))
- resolve_host = 1;
- else if (unformat (i, "resolve-via-attached"))
- resolve_attached = 1;
- else if (unformat (i, "multipath"))
- is_multipath = 1;
- else if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "create-vrf"))
- create_vrf_if_needed = 1;
- else if (unformat (i, "count %d", &count))
- ;
- else if (unformat (i, "lookup-in-vrf %d", &next_hop_table_id))
- ;
- else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
- ;
- else if (unformat (i, "out-label %d", &next_hop_out_label))
- vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
- else if (unformat (i, "via-label %d", &next_hop_via_label))
- ;
- else if (unformat (i, "random"))
- random_add_del = 1;
- else if (unformat (i, "seed %d", &random_seed))
- ;
+ sw_if_index_set = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (!next_hop_set && !is_drop && !is_local &&
- !is_classify && !is_unreach && !is_prohibit &&
- MPLS_LABEL_INVALID == next_hop_via_label)
+ if (sw_if_index_set == 0)
{
- errmsg
- ("next hop / local / drop / unreach / prohibit / classify not set");
+ errmsg ("missing vpp interface name. ");
return -99;
}
- if (next_hop_set && MPLS_LABEL_INVALID != next_hop_via_label)
- {
- errmsg ("next hop and next-hop via label set");
- return -99;
- }
- if (address_set == 0)
+ /* Construct the API message */
+ M (VIRTIO_PCI_DELETE, mp);
+
+ mp->sw_if_index = htonl (sw_if_index);
+
+ /* send it... */
+ S (mp);
+
+ /* Wait for a reply... */
+ W (ret);
+ return ret;
+}
+
+static int
+api_bond_create (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_bond_create_t *mp;
+ u8 mac_address[6];
+ u8 custom_mac = 0;
+ int ret;
+ u8 mode;
+ u8 lb;
+ u8 mode_is_set = 0;
+ u32 id = ~0;
+
+ clib_memset (mac_address, 0, sizeof (mac_address));
+ lb = BOND_LB_L2;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- errmsg ("missing addresses");
- return -99;
+ if (unformat (i, "mode %U", unformat_bond_mode, &mode))
+ mode_is_set = 1;
+ else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR))
+ && unformat (i, "lb %U", unformat_bond_load_balance, &lb))
+ ;
+ else if (unformat (i, "hw-addr %U", unformat_ethernet_address,
+ mac_address))
+ custom_mac = 1;
+ else if (unformat (i, "id %u", &id))
+ ;
+ else
+ break;
}
- if (address_length_set == 0)
+ if (mode_is_set == 0)
{
- errmsg ("missing address length");
+ errmsg ("Missing bond mode. ");
return -99;
}
- /* Generate a pile of unique, random routes */
- if (random_add_del)
- {
- u32 this_random_address;
- random_hash = hash_create (count, sizeof (uword));
+ /* Construct the API message */
+ M (BOND_CREATE, mp);
- hash_set (random_hash, v4_next_hop_address.as_u32, 1);
- for (j = 0; j <= count; j++)
- {
- do
- {
- this_random_address = random_u32 (&random_seed);
- this_random_address =
- clib_host_to_net_u32 (this_random_address);
- }
- while (hash_get (random_hash, this_random_address));
- vec_add1 (random_vector, this_random_address);
- hash_set (random_hash, this_random_address, 1);
- }
- hash_free (random_hash);
- v4_dst_address.as_u32 = random_vector[0];
- }
-
- if (count > 1)
- {
- /* Turn on async mode */
- vam->async_mode = 1;
- vam->async_errors = 0;
- before = vat_time_now (vam);
- }
-
- for (j = 0; j < count; j++)
- {
- /* Construct the API message */
- M2 (IP_ADD_DEL_ROUTE, mp,
- sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
-
- mp->next_hop_sw_if_index = ntohl (sw_if_index);
- mp->table_id = ntohl (vrf_id);
- mp->create_vrf_if_needed = create_vrf_if_needed;
-
- mp->is_add = is_add;
- mp->is_drop = is_drop;
- mp->is_unreach = is_unreach;
- mp->is_prohibit = is_prohibit;
- mp->is_ipv6 = is_ipv6;
- mp->is_local = is_local;
- mp->is_classify = is_classify;
- mp->is_multipath = is_multipath;
- mp->is_resolve_host = resolve_host;
- mp->is_resolve_attached = resolve_attached;
- mp->next_hop_weight = next_hop_weight;
- mp->dst_address_length = dst_address_length;
- mp->next_hop_table_id = ntohl (next_hop_table_id);
- mp->classify_table_index = ntohl (classify_table_index);
- mp->next_hop_via_label = ntohl (next_hop_via_label);
- mp->next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
- if (0 != mp->next_hop_n_out_labels)
- {
- memcpy (mp->next_hop_out_label_stack,
- next_hop_out_label_stack,
- vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
- vec_free (next_hop_out_label_stack);
- }
-
- if (is_ipv6)
- {
- clib_memcpy (mp->dst_address, &v6_dst_address,
- sizeof (v6_dst_address));
- if (next_hop_set)
- clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
- sizeof (v6_next_hop_address));
- increment_v6_address (&v6_dst_address);
- }
- else
- {
- clib_memcpy (mp->dst_address, &v4_dst_address,
- sizeof (v4_dst_address));
- if (next_hop_set)
- clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
- sizeof (v4_next_hop_address));
- if (random_add_del)
- v4_dst_address.as_u32 = random_vector[j + 1];
- else
- increment_v4_address (&v4_dst_address);
- }
- /* send it... */
- S (mp);
- /* If we receive SIGTERM, stop now... */
- if (vam->do_exit)
- break;
- }
-
- /* When testing multiple add/del ops, use a control-ping to sync */
- if (count > 1)
- {
- vl_api_control_ping_t *mp_ping;
- f64 after;
- f64 timeout;
-
- /* Shut off async mode */
- vam->async_mode = 0;
-
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
- timeout = vat_time_now (vam) + 1.0;
- while (vat_time_now (vam) < timeout)
- if (vam->result_ready == 1)
- goto out;
- vam->retval = -99;
-
- out:
- if (vam->retval == -99)
- errmsg ("timeout");
-
- if (vam->async_errors > 0)
- {
- errmsg ("%d asynchronous errors", vam->async_errors);
- vam->retval = -98;
- }
- vam->async_errors = 0;
- after = vat_time_now (vam);
+ mp->use_custom_mac = custom_mac;
- /* slim chance, but we might have eaten SIGTERM on the first iteration */
- if (j > 0)
- count = j;
+ mp->mode = mode;
+ mp->lb = lb;
+ mp->id = htonl (id);
- print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
- count, after - before, count / (after - before));
- }
- else
- {
- int ret;
+ if (custom_mac)
+ clib_memcpy (mp->mac_address, mac_address, 6);
- /* Wait for a reply... */
- W (ret);
- return ret;
- }
+ /* send it... */
+ S (mp);
- /* Return the good/bad news */
- return (vam->retval);
+ /* Wait for a reply... */
+ W (ret);
+ return ret;
}
static int
-api_ip_mroute_add_del (vat_main_t * vam)
+api_bond_delete (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ip_mroute_add_del_t *mp;
- u32 sw_if_index = ~0, vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 is_local = 0;
- u8 create_vrf_if_needed = 0;
- u8 is_add = 1;
- u8 address_set = 0;
- u32 grp_address_length = 0;
- ip4_address_t v4_grp_address, v4_src_address;
- ip6_address_t v6_grp_address, v6_src_address;
- mfib_itf_flags_t iflags = 0;
- mfib_entry_flags_t eflags = 0;
+ vl_api_bond_delete_t *mp;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
int ret;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- ;
- else if (unformat (i, "%U %U",
- unformat_ip4_address, &v4_src_address,
- unformat_ip4_address, &v4_grp_address))
- {
- grp_address_length = 64;
- address_set = 1;
- is_ipv6 = 0;
- }
- else if (unformat (i, "%U %U",
- unformat_ip6_address, &v6_src_address,
- unformat_ip6_address, &v6_grp_address))
- {
- grp_address_length = 256;
- address_set = 1;
- is_ipv6 = 1;
- }
- else if (unformat (i, "%U", unformat_ip4_address, &v4_grp_address))
- {
- memset (&v4_src_address, 0, sizeof (v4_src_address));
- grp_address_length = 32;
- address_set = 1;
- is_ipv6 = 0;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &v6_grp_address))
- {
- memset (&v6_src_address, 0, sizeof (v6_src_address));
- grp_address_length = 128;
- address_set = 1;
- is_ipv6 = 1;
- }
- else if (unformat (i, "/%d", &grp_address_length))
- ;
- else if (unformat (i, "local"))
- {
- is_local = 1;
- }
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "create-vrf"))
- create_vrf_if_needed = 1;
- else if (unformat (i, "%U", unformat_mfib_itf_flags, &iflags))
- ;
- else if (unformat (i, "%U", unformat_mfib_entry_flags, &eflags))
- ;
+ 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
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (address_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing addresses\n");
+ errmsg ("missing vpp interface name. ");
return -99;
}
/* Construct the API message */
- M (IP_MROUTE_ADD_DEL, mp);
-
- mp->next_hop_sw_if_index = ntohl (sw_if_index);
- mp->table_id = ntohl (vrf_id);
- mp->create_vrf_if_needed = create_vrf_if_needed;
-
- mp->is_add = is_add;
- mp->is_ipv6 = is_ipv6;
- mp->is_local = is_local;
- mp->itf_flags = ntohl (iflags);
- mp->entry_flags = ntohl (eflags);
- mp->grp_address_length = grp_address_length;
- mp->grp_address_length = ntohs (mp->grp_address_length);
-
- if (is_ipv6)
- {
- clib_memcpy (mp->grp_address, &v6_grp_address, sizeof (v6_grp_address));
- clib_memcpy (mp->src_address, &v6_src_address, sizeof (v6_src_address));
- }
- else
- {
- clib_memcpy (mp->grp_address, &v4_grp_address, sizeof (v4_grp_address));
- clib_memcpy (mp->src_address, &v4_src_address, sizeof (v4_src_address));
+ M (BOND_DELETE, mp);
- }
+ mp->sw_if_index = ntohl (sw_if_index);
/* send it... */
S (mp);
+
/* Wait for a reply... */
W (ret);
return ret;
}
static int
-api_mpls_table_add_del (vat_main_t * vam)
+api_bond_enslave (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_mpls_table_add_del_t *mp;
- u32 table_id = ~0;
- u8 is_add = 1;
- int ret = 0;
+ vl_api_bond_enslave_t *mp;
+ u32 bond_sw_if_index;
+ int ret;
+ u8 is_passive;
+ u8 is_long_timeout;
+ u32 bond_sw_if_index_is_set = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_is_set = 0;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "table %d", &table_id))
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_is_set = 1;
+ else if (unformat (i, "bond %u", &bond_sw_if_index))
+ bond_sw_if_index_is_set = 1;
+ else if (unformat (i, "passive %d", &is_passive))
+ ;
+ else if (unformat (i, "long-timeout %d", &is_long_timeout))
;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "add"))
- is_add = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (~0 == table_id)
+ if (bond_sw_if_index_is_set == 0)
{
- errmsg ("missing table-ID");
+ errmsg ("Missing bond sw_if_index. ");
+ return -99;
+ }
+ if (sw_if_index_is_set == 0)
+ {
+ errmsg ("Missing slave sw_if_index. ");
return -99;
}
/* Construct the API message */
- M (MPLS_TABLE_ADD_DEL, mp);
+ M (BOND_ENSLAVE, mp);
- mp->mt_table_id = ntohl (table_id);
- mp->mt_is_add = is_add;
+ mp->bond_sw_if_index = ntohl (bond_sw_if_index);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_long_timeout = is_long_timeout;
+ mp->is_passive = is_passive;
/* send it... */
S (mp);
/* Wait for a reply... */
W (ret);
-
return ret;
}
static int
-api_mpls_route_add_del (vat_main_t * vam)
+api_bond_detach_slave (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_mpls_route_add_del_t *mp;
- u32 sw_if_index = ~0, table_id = 0;
- u8 create_table_if_needed = 0;
- u8 is_add = 1;
- u32 next_hop_weight = 1;
+ vl_api_bond_detach_slave_t *mp;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ int ret;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing vpp interface name. ");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (BOND_DETACH_SLAVE, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+
+ /* send it... */
+ S (mp);
+
+ /* Wait for a reply... */
+ W (ret);
+ return ret;
+}
+
+static int
+api_ip_table_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ip_table_add_del_t *mp;
+ u32 table_id = ~0;
+ u8 is_ipv6 = 0;
+ u8 is_add = 1;
+ int ret = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "table %d", &table_id))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (~0 == table_id)
+ {
+ errmsg ("missing table-ID");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (IP_TABLE_ADD_DEL, mp);
+
+ mp->table_id = ntohl (table_id);
+ mp->is_ipv6 = is_ipv6;
+ mp->is_add = is_add;
+
+ /* send it... */
+ S (mp);
+
+ /* Wait for a reply... */
+ W (ret);
+
+ return ret;
+}
+
+static int
+api_ip_add_del_route (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ip_add_del_route_t *mp;
+ u32 sw_if_index = ~0, vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 is_local = 0, is_drop = 0;
+ u8 is_unreach = 0, is_prohibit = 0;
+ u8 is_add = 1;
+ u32 next_hop_weight = 1;
u8 is_multipath = 0;
+ u8 address_set = 0;
+ u8 address_length_set = 0;
u32 next_hop_table_id = 0;
+ u32 resolve_attempts = 0;
+ u32 dst_address_length = 0;
u8 next_hop_set = 0;
- ip4_address_t v4_next_hop_address = {
- .as_u32 = 0,
- };
- ip6_address_t v6_next_hop_address = { {0} };
+ ip4_address_t v4_dst_address, v4_next_hop_address;
+ ip6_address_t v6_dst_address, v6_next_hop_address;
int count = 1;
int j;
f64 before = 0;
+ u32 random_add_del = 0;
+ u32 *random_vector = 0;
+ uword *random_hash;
+ u32 random_seed = 0xdeaddabe;
u32 classify_table_index = ~0;
u8 is_classify = 0;
u8 resolve_host = 0, resolve_attached = 0;
- mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ vl_api_fib_mpls_label_t *next_hop_out_label_stack = NULL;
mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
- mpls_label_t *next_hop_out_label_stack = NULL;
- mpls_label_t local_label = MPLS_LABEL_INVALID;
- u8 is_eos = 0;
- dpo_proto_t next_hop_proto = DPO_PROTO_IP4;
+ mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ clib_memset (&v4_next_hop_address, 0, sizeof (ip4_address_t));
+ clib_memset (&v6_next_hop_address, 0, sizeof (ip6_address_t));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
;
- else if (unformat (i, "%d", &local_label))
- ;
- else if (unformat (i, "eos"))
- is_eos = 1;
- else if (unformat (i, "non-eos"))
- is_eos = 0;
- else if (unformat (i, "via %U", unformat_ip4_address,
- &v4_next_hop_address))
+ else if (unformat (i, "%U", unformat_ip4_address, &v4_dst_address))
+ {
+ address_set = 1;
+ is_ipv6 = 0;
+ }
+ else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address))
+ {
+ address_set = 1;
+ is_ipv6 = 1;
+ }
+ else if (unformat (i, "/%d", &dst_address_length))
+ {
+ address_length_set = 1;
+ }
+
+ else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
+ &v4_next_hop_address))
{
next_hop_set = 1;
- next_hop_proto = DPO_PROTO_IP4;
}
- else if (unformat (i, "via %U", unformat_ip6_address,
- &v6_next_hop_address))
+ else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
+ &v6_next_hop_address))
+ {
+ next_hop_set = 1;
+ }
+ else
+ if (unformat
+ (i, "via %U", api_unformat_sw_if_index, vam, &sw_if_index))
+ {
+ next_hop_set = 1;
+ }
+ else if (unformat (i, "via sw_if_index %d", &sw_if_index))
{
next_hop_set = 1;
- next_hop_proto = DPO_PROTO_IP6;
}
+ else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
+ ;
else if (unformat (i, "weight %d", &next_hop_weight))
;
- else if (unformat (i, "create-table"))
- create_table_if_needed = 1;
+ else if (unformat (i, "drop"))
+ {
+ is_drop = 1;
+ }
+ else if (unformat (i, "null-send-unreach"))
+ {
+ is_unreach = 1;
+ }
+ else if (unformat (i, "null-send-prohibit"))
+ {
+ is_prohibit = 1;
+ }
+ else if (unformat (i, "local"))
+ {
+ is_local = 1;
+ }
else if (unformat (i, "classify %d", &classify_table_index))
{
is_classify = 1;
resolve_attached = 1;
else if (unformat (i, "multipath"))
is_multipath = 1;
+ else if (unformat (i, "vrf %d", &vrf_id))
+ ;
else if (unformat (i, "count %d", &count))
;
- else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id))
- {
- next_hop_set = 1;
- next_hop_proto = DPO_PROTO_IP4;
- }
- else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id))
+ else if (unformat (i, "lookup-in-vrf %d", &next_hop_table_id))
+ ;
+ else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+ ;
+ else if (unformat (i, "out-label %d", &next_hop_out_label))
{
- next_hop_set = 1;
- next_hop_proto = DPO_PROTO_IP6;
+ vl_api_fib_mpls_label_t fib_label = {
+ .label = ntohl (next_hop_out_label),
+ .ttl = 64,
+ .exp = 0,
+ };
+ vec_add1 (next_hop_out_label_stack, fib_label);
}
- else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+ else if (unformat (i, "via via-label %d", &next_hop_via_label))
;
- else if (unformat (i, "via-label %d", &next_hop_via_label))
+ else if (unformat (i, "random"))
+ random_add_del = 1;
+ else if (unformat (i, "seed %d", &random_seed))
;
- else if (unformat (i, "out-label %d", &next_hop_out_label))
- vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (!next_hop_set && !is_classify)
+ if (!next_hop_set && !is_drop && !is_local &&
+ !is_classify && !is_unreach && !is_prohibit &&
+ MPLS_LABEL_INVALID == next_hop_via_label)
{
- errmsg ("next hop / classify not set");
+ errmsg
+ ("next hop / local / drop / unreach / prohibit / classify not set");
return -99;
}
- if (MPLS_LABEL_INVALID == local_label)
+ if (next_hop_set && MPLS_LABEL_INVALID != next_hop_via_label)
{
- errmsg ("missing label");
+ errmsg ("next hop and next-hop via label set");
+ return -99;
+ }
+ if (address_set == 0)
+ {
+ errmsg ("missing addresses");
+ return -99;
+ }
+
+ if (address_length_set == 0)
+ {
+ errmsg ("missing address length");
return -99;
}
+ /* Generate a pile of unique, random routes */
+ if (random_add_del)
+ {
+ u32 this_random_address;
+ random_hash = hash_create (count, sizeof (uword));
+
+ hash_set (random_hash, v4_next_hop_address.as_u32, 1);
+ for (j = 0; j <= count; j++)
+ {
+ do
+ {
+ this_random_address = random_u32 (&random_seed);
+ this_random_address =
+ clib_host_to_net_u32 (this_random_address);
+ }
+ while (hash_get (random_hash, this_random_address));
+ vec_add1 (random_vector, this_random_address);
+ hash_set (random_hash, this_random_address, 1);
+ }
+ hash_free (random_hash);
+ v4_dst_address.as_u32 = random_vector[0];
+ }
+
if (count > 1)
{
/* Turn on async mode */
for (j = 0; j < count; j++)
{
/* Construct the API message */
- M2 (MPLS_ROUTE_ADD_DEL, mp,
- sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
+ M2 (IP_ADD_DEL_ROUTE, mp, sizeof (vl_api_fib_mpls_label_t) *
+ vec_len (next_hop_out_label_stack));
- mp->mr_next_hop_sw_if_index = ntohl (sw_if_index);
- mp->mr_table_id = ntohl (table_id);
- mp->mr_create_table_if_needed = create_table_if_needed;
-
- mp->mr_is_add = is_add;
- mp->mr_next_hop_proto = next_hop_proto;
- mp->mr_is_classify = is_classify;
- mp->mr_is_multipath = is_multipath;
- mp->mr_is_resolve_host = resolve_host;
- mp->mr_is_resolve_attached = resolve_attached;
- mp->mr_next_hop_weight = next_hop_weight;
- mp->mr_next_hop_table_id = ntohl (next_hop_table_id);
- mp->mr_classify_table_index = ntohl (classify_table_index);
- mp->mr_next_hop_via_label = ntohl (next_hop_via_label);
- mp->mr_label = ntohl (local_label);
- mp->mr_eos = is_eos;
+ mp->next_hop_sw_if_index = ntohl (sw_if_index);
+ mp->table_id = ntohl (vrf_id);
- mp->mr_next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
- if (0 != mp->mr_next_hop_n_out_labels)
- {
- memcpy (mp->mr_next_hop_out_label_stack,
- next_hop_out_label_stack,
- vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
- vec_free (next_hop_out_label_stack);
- }
-
- if (next_hop_set)
+ mp->is_add = is_add;
+ mp->is_drop = is_drop;
+ mp->is_unreach = is_unreach;
+ mp->is_prohibit = is_prohibit;
+ mp->is_ipv6 = is_ipv6;
+ mp->is_local = is_local;
+ mp->is_classify = is_classify;
+ mp->is_multipath = is_multipath;
+ mp->is_resolve_host = resolve_host;
+ mp->is_resolve_attached = resolve_attached;
+ mp->next_hop_weight = next_hop_weight;
+ mp->next_hop_preference = 0;
+ mp->dst_address_length = dst_address_length;
+ mp->next_hop_table_id = ntohl (next_hop_table_id);
+ mp->classify_table_index = ntohl (classify_table_index);
+ mp->next_hop_via_label = ntohl (next_hop_via_label);
+ mp->next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
+ if (0 != mp->next_hop_n_out_labels)
{
- if (DPO_PROTO_IP4 == next_hop_proto)
- {
- clib_memcpy (mp->mr_next_hop,
- &v4_next_hop_address,
- sizeof (v4_next_hop_address));
- }
- else if (DPO_PROTO_IP6 == next_hop_proto)
-
- {
- clib_memcpy (mp->mr_next_hop,
- &v6_next_hop_address,
- sizeof (v6_next_hop_address));
- }
+ memcpy (mp->next_hop_out_label_stack,
+ next_hop_out_label_stack,
+ (vec_len (next_hop_out_label_stack) *
+ sizeof (vl_api_fib_mpls_label_t)));
+ vec_free (next_hop_out_label_stack);
}
- local_label++;
+ if (is_ipv6)
+ {
+ clib_memcpy (mp->dst_address, &v6_dst_address,
+ sizeof (v6_dst_address));
+ if (next_hop_set)
+ clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
+ sizeof (v6_next_hop_address));
+ increment_v6_address (&v6_dst_address);
+ }
+ else
+ {
+ clib_memcpy (mp->dst_address, &v4_dst_address,
+ sizeof (v4_dst_address));
+ if (next_hop_set)
+ clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
+ sizeof (v4_next_hop_address));
+ if (random_add_del)
+ v4_dst_address.as_u32 = random_vector[j + 1];
+ else
+ increment_v4_address (&v4_dst_address);
+ }
/* send it... */
S (mp);
/* If we receive SIGTERM, stop now... */
}
static int
-api_mpls_ip_bind_unbind (vat_main_t * vam)
+api_ip_mroute_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_mpls_ip_bind_unbind_t *mp;
- u32 ip_table_id = 0;
- u8 create_table_if_needed = 0;
- u8 is_bind = 1;
- u8 is_ip4 = 1;
- ip4_address_t v4_address;
- ip6_address_t v6_address;
- u32 address_length;
+ vl_api_ip_mroute_add_del_t *mp;
+ u32 sw_if_index = ~0, vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 is_local = 0;
+ u8 is_add = 1;
u8 address_set = 0;
- mpls_label_t local_label = MPLS_LABEL_INVALID;
+ u32 grp_address_length = 0;
+ ip4_address_t v4_grp_address, v4_src_address;
+ ip6_address_t v6_grp_address, v6_src_address;
+ mfib_itf_flags_t iflags = 0;
+ mfib_entry_flags_t eflags = 0;
int ret;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U/%d", unformat_ip4_address,
- &v4_address, &address_length))
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "%U %U",
+ unformat_ip4_address, &v4_src_address,
+ unformat_ip4_address, &v4_grp_address))
{
- is_ip4 = 1;
+ grp_address_length = 64;
address_set = 1;
+ is_ipv6 = 0;
}
- else if (unformat (i, "%U/%d", unformat_ip6_address,
- &v6_address, &address_length))
+ else if (unformat (i, "%U %U",
+ unformat_ip6_address, &v6_src_address,
+ unformat_ip6_address, &v6_grp_address))
{
- is_ip4 = 0;
+ grp_address_length = 256;
address_set = 1;
+ is_ipv6 = 1;
}
- else if (unformat (i, "%d", &local_label))
+ else if (unformat (i, "%U", unformat_ip4_address, &v4_grp_address))
+ {
+ clib_memset (&v4_src_address, 0, sizeof (v4_src_address));
+ grp_address_length = 32;
+ address_set = 1;
+ is_ipv6 = 0;
+ }
+ else if (unformat (i, "%U", unformat_ip6_address, &v6_grp_address))
+ {
+ clib_memset (&v6_src_address, 0, sizeof (v6_src_address));
+ grp_address_length = 128;
+ address_set = 1;
+ is_ipv6 = 1;
+ }
+ else if (unformat (i, "/%d", &grp_address_length))
;
- else if (unformat (i, "create-table"))
- create_table_if_needed = 1;
- else if (unformat (i, "table-id %d", &ip_table_id))
+ else if (unformat (i, "local"))
+ {
+ is_local = 1;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "%U", unformat_mfib_itf_flags, &iflags))
+ ;
+ else if (unformat (i, "%U", unformat_mfib_entry_flags, &eflags))
;
- else if (unformat (i, "unbind"))
- is_bind = 0;
- else if (unformat (i, "bind"))
- is_bind = 1;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (!address_set)
- {
- errmsg ("IP addres not set");
- return -99;
- }
-
- if (MPLS_LABEL_INVALID == local_label)
+ if (address_set == 0)
{
- errmsg ("missing label");
+ errmsg ("missing addresses\n");
return -99;
}
/* Construct the API message */
- M (MPLS_IP_BIND_UNBIND, mp);
+ M (IP_MROUTE_ADD_DEL, mp);
- mp->mb_create_table_if_needed = create_table_if_needed;
- mp->mb_is_bind = is_bind;
- mp->mb_is_ip4 = is_ip4;
- mp->mb_ip_table_id = ntohl (ip_table_id);
- mp->mb_mpls_table_id = 0;
- mp->mb_label = ntohl (local_label);
- mp->mb_address_length = address_length;
+ mp->next_hop_sw_if_index = ntohl (sw_if_index);
+ mp->table_id = ntohl (vrf_id);
- if (is_ip4)
- clib_memcpy (mp->mb_address, &v4_address, sizeof (v4_address));
+ mp->is_add = is_add;
+ mp->is_ipv6 = is_ipv6;
+ mp->is_local = is_local;
+ mp->itf_flags = ntohl (iflags);
+ mp->entry_flags = ntohl (eflags);
+ mp->grp_address_length = grp_address_length;
+ mp->grp_address_length = ntohs (mp->grp_address_length);
+
+ if (is_ipv6)
+ {
+ clib_memcpy (mp->grp_address, &v6_grp_address, sizeof (v6_grp_address));
+ clib_memcpy (mp->src_address, &v6_src_address, sizeof (v6_src_address));
+ }
else
- clib_memcpy (mp->mb_address, &v6_address, sizeof (v6_address));
+ {
+ clib_memcpy (mp->grp_address, &v4_grp_address, sizeof (v4_grp_address));
+ clib_memcpy (mp->src_address, &v4_src_address, sizeof (v4_src_address));
+
+ }
/* send it... */
S (mp);
-
/* Wait for a reply... */
W (ret);
return ret;
}
static int
-api_bier_table_add_del (vat_main_t * vam)
+api_mpls_table_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_bier_table_add_del_t *mp;
+ vl_api_mpls_table_add_del_t *mp;
+ u32 table_id = ~0;
u8 is_add = 1;
- u32 set = 0, sub_domain = 0, hdr_len = 3;
- mpls_label_t local_label = MPLS_LABEL_INVALID;
- int ret;
+ int ret = 0;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sub-domain %d", &sub_domain))
- ;
- else if (unformat (i, "set %d", &set))
- ;
- else if (unformat (i, "label %d", &local_label))
- ;
- else if (unformat (i, "hdr-len %d", &hdr_len))
+ if (unformat (i, "table %d", &table_id))
;
- else if (unformat (i, "add"))
- is_add = 1;
else if (unformat (i, "del"))
is_add = 0;
+ else if (unformat (i, "add"))
+ is_add = 1;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (MPLS_LABEL_INVALID == local_label)
+ if (~0 == table_id)
{
- errmsg ("missing label\n");
+ errmsg ("missing table-ID");
return -99;
}
/* Construct the API message */
- M (BIER_TABLE_ADD_DEL, mp);
+ M (MPLS_TABLE_ADD_DEL, mp);
- mp->bt_is_add = is_add;
- mp->bt_label = ntohl (local_label);
- mp->bt_tbl_id.bt_set = set;
- mp->bt_tbl_id.bt_sub_domain = sub_domain;
- mp->bt_tbl_id.bt_hdr_len_id = hdr_len;
+ mp->mt_table_id = ntohl (table_id);
+ mp->mt_is_add = is_add;
/* send it... */
S (mp);
/* Wait for a reply... */
W (ret);
- return (ret);
+ return ret;
}
static int
-api_bier_route_add_del (vat_main_t * vam)
+api_mpls_route_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_bier_route_add_del_t *mp;
+ vl_api_mpls_route_add_del_t *mp;
+ u32 sw_if_index = ~0, table_id = 0;
u8 is_add = 1;
- u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0;
- ip4_address_t v4_next_hop_address;
- ip6_address_t v6_next_hop_address;
+ u32 next_hop_weight = 1;
+ u8 is_multipath = 0;
+ u32 next_hop_table_id = 0;
u8 next_hop_set = 0;
- u8 next_hop_proto_is_ip4 = 1;
+ ip4_address_t v4_next_hop_address = {
+ .as_u32 = 0,
+ };
+ ip6_address_t v6_next_hop_address = { {0} };
+ int count = 1;
+ int j;
+ f64 before = 0;
+ u32 classify_table_index = ~0;
+ u8 is_classify = 0;
+ u8 resolve_host = 0, resolve_attached = 0;
+ u8 is_interface_rx = 0;
+ mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
- int ret;
+ vl_api_fib_mpls_label_t *next_hop_out_label_stack = NULL;
+ mpls_label_t local_label = MPLS_LABEL_INVALID;
+ u8 is_eos = 0;
+ dpo_proto_t next_hop_proto = DPO_PROTO_MPLS;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U", unformat_ip4_address, &v4_next_hop_address))
+ 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, "%d", &local_label))
+ ;
+ else if (unformat (i, "eos"))
+ is_eos = 1;
+ else if (unformat (i, "non-eos"))
+ is_eos = 0;
+ else if (unformat (i, "via %U", unformat_ip4_address,
+ &v4_next_hop_address))
{
- next_hop_proto_is_ip4 = 1;
next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_IP4;
}
- else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address))
+ else if (unformat (i, "via %U", unformat_ip6_address,
+ &v6_next_hop_address))
{
- next_hop_proto_is_ip4 = 0;
next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_IP6;
}
- if (unformat (i, "sub-domain %d", &sub_domain))
- ;
- else if (unformat (i, "set %d", &set))
- ;
- else if (unformat (i, "hdr-len %d", &hdr_len))
+ else if (unformat (i, "weight %d", &next_hop_weight))
;
- else if (unformat (i, "bp %d", &bp))
- ;
- else if (unformat (i, "add"))
- is_add = 1;
+ else if (unformat (i, "classify %d", &classify_table_index))
+ {
+ is_classify = 1;
+ }
else if (unformat (i, "del"))
is_add = 0;
- else if (unformat (i, "out-label %d", &next_hop_out_label))
+ else if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "resolve-via-host"))
+ resolve_host = 1;
+ else if (unformat (i, "resolve-via-attached"))
+ resolve_attached = 1;
+ else if (unformat (i, "multipath"))
+ is_multipath = 1;
+ else if (unformat (i, "count %d", &count))
;
+ else if (unformat (i, "via lookup-in-ip4-table %d", &next_hop_table_id))
+ {
+ next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_IP4;
+ }
+ else if (unformat (i, "via lookup-in-ip6-table %d", &next_hop_table_id))
+ {
+ next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_IP6;
+ }
+ else
+ if (unformat
+ (i, "via l2-input-on %U", api_unformat_sw_if_index, vam,
+ &sw_if_index))
+ {
+ next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_ETHERNET;
+ is_interface_rx = 1;
+ }
+ else if (unformat (i, "via l2-input-on sw_if_index %d", &sw_if_index))
+ {
+ next_hop_set = 1;
+ next_hop_proto = DPO_PROTO_ETHERNET;
+ is_interface_rx = 1;
+ }
+ else if (unformat (i, "via next-hop-table %d", &next_hop_table_id))
+ next_hop_set = 1;
+ else if (unformat (i, "via via-label %d", &next_hop_via_label))
+ next_hop_set = 1;
+ else if (unformat (i, "out-label %d", &next_hop_out_label))
+ {
+ vl_api_fib_mpls_label_t fib_label = {
+ .label = ntohl (next_hop_out_label),
+ .ttl = 64,
+ .exp = 0,
+ };
+ vec_add1 (next_hop_out_label_stack, fib_label);
+ }
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label))
+ if (!next_hop_set && !is_classify)
{
- errmsg ("next hop / label set\n");
+ errmsg ("next hop / classify not set");
return -99;
}
- if (0 == bp)
+
+ if (MPLS_LABEL_INVALID == local_label)
{
- errmsg ("bit=position not set\n");
+ errmsg ("missing label");
return -99;
}
- /* Construct the API message */
- M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path3_t));
+ if (count > 1)
+ {
+ /* Turn on async mode */
+ vam->async_mode = 1;
+ vam->async_errors = 0;
+ before = vat_time_now (vam);
+ }
- mp->br_is_add = is_add;
- mp->br_tbl_id.bt_set = set;
- mp->br_tbl_id.bt_sub_domain = sub_domain;
- mp->br_tbl_id.bt_hdr_len_id = hdr_len;
- mp->br_bp = ntohs (bp);
- mp->br_n_paths = 1;
- mp->br_paths[0].n_labels = 1;
- mp->br_paths[0].label_stack[0] = ntohl (next_hop_out_label);
- mp->br_paths[0].afi = (next_hop_proto_is_ip4 ? 0 : 1);
+ for (j = 0; j < count; j++)
+ {
+ /* Construct the API message */
+ M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_mpls_label_t) *
+ vec_len (next_hop_out_label_stack));
- if (next_hop_proto_is_ip4)
+ mp->mr_next_hop_sw_if_index = ntohl (sw_if_index);
+ mp->mr_table_id = ntohl (table_id);
+
+ mp->mr_is_add = is_add;
+ mp->mr_next_hop_proto = next_hop_proto;
+ mp->mr_is_classify = is_classify;
+ mp->mr_is_multipath = is_multipath;
+ mp->mr_is_resolve_host = resolve_host;
+ mp->mr_is_resolve_attached = resolve_attached;
+ mp->mr_is_interface_rx = is_interface_rx;
+ mp->mr_next_hop_weight = next_hop_weight;
+ mp->mr_next_hop_preference = 0;
+ mp->mr_next_hop_table_id = ntohl (next_hop_table_id);
+ mp->mr_classify_table_index = ntohl (classify_table_index);
+ mp->mr_next_hop_via_label = ntohl (next_hop_via_label);
+ mp->mr_label = ntohl (local_label);
+ mp->mr_eos = is_eos;
+
+ mp->mr_next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
+ if (0 != mp->mr_next_hop_n_out_labels)
+ {
+ memcpy (mp->mr_next_hop_out_label_stack,
+ next_hop_out_label_stack,
+ vec_len (next_hop_out_label_stack) *
+ sizeof (vl_api_fib_mpls_label_t));
+ vec_free (next_hop_out_label_stack);
+ }
+
+ if (next_hop_set)
+ {
+ if (DPO_PROTO_IP4 == next_hop_proto)
+ {
+ clib_memcpy (mp->mr_next_hop,
+ &v4_next_hop_address,
+ sizeof (v4_next_hop_address));
+ }
+ else if (DPO_PROTO_IP6 == next_hop_proto)
+
+ {
+ clib_memcpy (mp->mr_next_hop,
+ &v6_next_hop_address,
+ sizeof (v6_next_hop_address));
+ }
+ }
+ local_label++;
+
+ /* send it... */
+ S (mp);
+ /* If we receive SIGTERM, stop now... */
+ if (vam->do_exit)
+ break;
+ }
+
+ /* When testing multiple add/del ops, use a control-ping to sync */
+ if (count > 1)
{
- clib_memcpy (mp->br_paths[0].next_hop,
- &v4_next_hop_address, sizeof (v4_next_hop_address));
+ vl_api_control_ping_t *mp_ping;
+ f64 after;
+ f64 timeout;
+
+ /* Shut off async mode */
+ vam->async_mode = 0;
+
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ timeout = vat_time_now (vam) + 1.0;
+ while (vat_time_now (vam) < timeout)
+ if (vam->result_ready == 1)
+ goto out;
+ vam->retval = -99;
+
+ out:
+ if (vam->retval == -99)
+ errmsg ("timeout");
+
+ if (vam->async_errors > 0)
+ {
+ errmsg ("%d asynchronous errors", vam->async_errors);
+ vam->retval = -98;
+ }
+ vam->async_errors = 0;
+ after = vat_time_now (vam);
+
+ /* slim chance, but we might have eaten SIGTERM on the first iteration */
+ if (j > 0)
+ count = j;
+
+ print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec",
+ count, after - before, count / (after - before));
}
else
{
- clib_memcpy (mp->br_paths[0].next_hop,
- &v6_next_hop_address, sizeof (v6_next_hop_address));
- }
-
- /* send it... */
- S (mp);
+ int ret;
- /* Wait for a reply... */
- W (ret);
+ /* Wait for a reply... */
+ W (ret);
+ return ret;
+ }
- return (ret);
+ /* Return the good/bad news */
+ return (vam->retval);
}
static int
-api_proxy_arp_add_del (vat_main_t * vam)
+api_mpls_ip_bind_unbind (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;
- ip4_address_t lo, hi;
- u8 range_set = 0;
+ vl_api_mpls_ip_bind_unbind_t *mp;
+ u32 ip_table_id = 0;
+ u8 is_bind = 1;
+ u8 is_ip4 = 1;
+ ip4_address_t v4_address;
+ ip6_address_t v6_address;
+ u32 address_length;
+ u8 address_set = 0;
+ mpls_label_t local_label = MPLS_LABEL_INVALID;
int ret;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "vrf %d", &vrf_id))
+ if (unformat (i, "%U/%d", unformat_ip4_address,
+ &v4_address, &address_length))
+ {
+ is_ip4 = 1;
+ address_set = 1;
+ }
+ else if (unformat (i, "%U/%d", unformat_ip6_address,
+ &v6_address, &address_length))
+ {
+ is_ip4 = 0;
+ address_set = 1;
+ }
+ else if (unformat (i, "%d", &local_label))
;
- else if (unformat (i, "%U - %U", unformat_ip4_address, &lo,
- unformat_ip4_address, &hi))
- range_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
+ else if (unformat (i, "table-id %d", &ip_table_id))
+ ;
+ else if (unformat (i, "unbind"))
+ is_bind = 0;
+ else if (unformat (i, "bind"))
+ is_bind = 1;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (range_set == 0)
+ if (!address_set)
{
- errmsg ("address range not set");
+ errmsg ("IP address not set");
return -99;
}
- M (PROXY_ARP_ADD_DEL, mp);
+ if (MPLS_LABEL_INVALID == local_label)
+ {
+ errmsg ("missing label");
+ return -99;
+ }
- mp->vrf_id = ntohl (vrf_id);
- mp->is_add = is_add;
- clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address));
- clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address));
+ /* Construct the API message */
+ M (MPLS_IP_BIND_UNBIND, mp);
+
+ mp->mb_is_bind = is_bind;
+ mp->mb_is_ip4 = is_ip4;
+ mp->mb_ip_table_id = ntohl (ip_table_id);
+ mp->mb_mpls_table_id = 0;
+ mp->mb_label = ntohl (local_label);
+ mp->mb_address_length = address_length;
+
+ if (is_ip4)
+ clib_memcpy (mp->mb_address, &v4_address, sizeof (v4_address));
+ else
+ clib_memcpy (mp->mb_address, &v6_address, sizeof (v6_address));
+ /* send it... */
S (mp);
+
+ /* Wait for a reply... */
W (ret);
return ret;
}
static int
-api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
+api_sr_mpls_policy_add (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;
+ vl_api_sr_mpls_policy_add_t *mp;
+ u32 bsid = 0;
+ u32 weight = 1;
+ u8 type = 0;
+ u8 n_segments = 0;
+ u32 sid;
+ u32 *segments = NULL;
int ret;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%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;
+ if (unformat (i, "bsid %d", &bsid))
+ ;
+ else if (unformat (i, "weight %d", &weight))
+ ;
+ else if (unformat (i, "spray"))
+ type = 1;
+ else if (unformat (i, "next %d", &sid))
+ {
+ n_segments += 1;
+ vec_add1 (segments, htonl (sid));
+ }
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (sw_if_index_set == 0)
+ if (bsid == 0)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("bsid not set");
return -99;
}
- M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp);
+ if (n_segments == 0)
+ {
+ errmsg ("no sid in segment stack");
+ return -99;
+ }
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable_disable = enable;
+ /* Construct the API message */
+ M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments);
+ mp->bsid = htonl (bsid);
+ mp->weight = htonl (weight);
+ mp->type = type;
+ mp->n_segments = n_segments;
+ memcpy (mp->segments, segments, sizeof (u32) * n_segments);
+ vec_free (segments);
+
+ /* send it... */
S (mp);
+
+ /* Wait for a reply... */
W (ret);
return ret;
}
static int
-api_mpls_tunnel_add_del (vat_main_t * vam)
+api_sr_mpls_policy_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_mpls_tunnel_add_del_t *mp;
-
- u8 is_add = 1;
- u8 l2_only = 0;
- u32 sw_if_index = ~0;
- u32 next_hop_sw_if_index = ~0;
- u32 next_hop_proto_is_ip4 = 1;
-
- u32 next_hop_table_id = 0;
- ip4_address_t v4_next_hop_address = {
- .as_u32 = 0,
- };
- ip6_address_t v6_next_hop_address = { {0} };
- mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID, *labels = NULL;
+ vl_api_sr_mpls_policy_del_t *mp;
+ u32 bsid = 0;
int ret;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "del sw_if_index %d", &sw_if_index))
- is_add = 0;
- else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index))
- ;
- else if (unformat (i, "via %U",
- unformat_ip4_address, &v4_next_hop_address))
- {
- next_hop_proto_is_ip4 = 1;
- }
- else if (unformat (i, "via %U",
- unformat_ip6_address, &v6_next_hop_address))
- {
- next_hop_proto_is_ip4 = 0;
- }
- else if (unformat (i, "l2-only"))
- l2_only = 1;
- else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+ if (unformat (i, "bsid %d", &bsid))
;
- else if (unformat (i, "out-label %d", &next_hop_out_label))
- vec_add1 (labels, ntohl (next_hop_out_label));
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (mpls_label_t) * vec_len (labels));
-
- mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index);
- mp->mt_sw_if_index = ntohl (sw_if_index);
- mp->mt_is_add = is_add;
- mp->mt_l2_only = l2_only;
- mp->mt_next_hop_table_id = ntohl (next_hop_table_id);
- mp->mt_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
-
- mp->mt_next_hop_n_out_labels = vec_len (labels);
-
- if (0 != mp->mt_next_hop_n_out_labels)
+ if (bsid == 0)
{
- clib_memcpy (mp->mt_next_hop_out_label_stack, labels,
- sizeof (mpls_label_t) * mp->mt_next_hop_n_out_labels);
- vec_free (labels);
+ errmsg ("bsid not set");
+ return -99;
}
- if (next_hop_proto_is_ip4)
- {
- clib_memcpy (mp->mt_next_hop,
- &v4_next_hop_address, sizeof (v4_next_hop_address));
- }
- else
- {
- clib_memcpy (mp->mt_next_hop,
- &v6_next_hop_address, sizeof (v6_next_hop_address));
- }
+ /* Construct the API message */
+ M (SR_MPLS_POLICY_DEL, mp);
+ mp->bsid = htonl (bsid);
+
+ /* send it... */
S (mp);
+
+ /* Wait for a reply... */
W (ret);
return ret;
}
static int
-api_sw_interface_set_unnumbered (vat_main_t * vam)
+api_bier_table_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_unnumbered_t *mp;
- u32 sw_if_index;
- u32 unnum_sw_index = ~0;
+ vl_api_bier_table_add_del_t *mp;
u8 is_add = 1;
- u8 sw_if_index_set = 0;
+ u32 set = 0, sub_domain = 0, hdr_len = 3;
+ mpls_label_t local_label = MPLS_LABEL_INVALID;
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, "unnum_if_index %d", &unnum_sw_index))
+ if (unformat (i, "sub-domain %d", &sub_domain))
+ ;
+ else if (unformat (i, "set %d", &set))
+ ;
+ else if (unformat (i, "label %d", &local_label))
+ ;
+ else if (unformat (i, "hdr-len %d", &hdr_len))
;
+ else if (unformat (i, "add"))
+ is_add = 1;
else if (unformat (i, "del"))
is_add = 0;
else
}
}
- if (sw_if_index_set == 0)
+ if (MPLS_LABEL_INVALID == local_label)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("missing label\n");
return -99;
}
- M (SW_INTERFACE_SET_UNNUMBERED, mp);
+ /* Construct the API message */
+ M (BIER_TABLE_ADD_DEL, mp);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
- mp->is_add = is_add;
+ mp->bt_is_add = is_add;
+ mp->bt_label = ntohl (local_label);
+ mp->bt_tbl_id.bt_set = set;
+ mp->bt_tbl_id.bt_sub_domain = sub_domain;
+ mp->bt_tbl_id.bt_hdr_len_id = hdr_len;
+ /* send it... */
S (mp);
+
+ /* Wait for a reply... */
W (ret);
- return ret;
+
+ return (ret);
}
static int
-api_ip_neighbor_add_del (vat_main_t * vam)
+api_bier_route_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ip_neighbor_add_del_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ vl_api_bier_route_add_del_t *mp;
u8 is_add = 1;
- u8 is_static = 0;
- u8 is_no_fib_entry = 0;
- u8 mac_address[6];
- u8 mac_set = 0;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
+ u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0;
+ ip4_address_t v4_next_hop_address;
+ ip6_address_t v6_next_hop_address;
+ u8 next_hop_set = 0;
+ u8 next_hop_proto_is_ip4 = 1;
+ mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
int ret;
- 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_ethernet_address, mac_address))
+ if (unformat (i, "%U", unformat_ip4_address, &v4_next_hop_address))
{
- mac_set = 1;
+ next_hop_proto_is_ip4 = 1;
+ next_hop_set = 1;
+ }
+ else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address))
+ {
+ next_hop_proto_is_ip4 = 0;
+ next_hop_set = 1;
}
+ if (unformat (i, "sub-domain %d", &sub_domain))
+ ;
+ else if (unformat (i, "set %d", &set))
+ ;
+ else if (unformat (i, "hdr-len %d", &hdr_len))
+ ;
+ else if (unformat (i, "bp %d", &bp))
+ ;
+ else if (unformat (i, "add"))
+ is_add = 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, "is_static"))
- is_static = 1;
- else if (unformat (i, "no-fib-entry"))
- is_no_fib_entry = 1;
- else if (unformat (i, "dst %U", unformat_ip4_address, &v4address))
- v4_address_set = 1;
- else if (unformat (i, "dst %U", unformat_ip6_address, &v6address))
- v6_address_set = 1;
+ else if (unformat (i, "out-label %d", &next_hop_out_label))
+ ;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (sw_if_index_set == 0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
- if (v4_address_set && v6_address_set)
+ if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label))
{
- errmsg ("both v4 and v6 addresses set");
+ errmsg ("next hop / label set\n");
return -99;
}
- if (!v4_address_set && !v6_address_set)
+ if (0 == bp)
{
- errmsg ("no address set");
+ errmsg ("bit=position not set\n");
return -99;
}
/* Construct the API message */
- M (IP_NEIGHBOR_ADD_DEL, mp);
+ M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t));
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->is_static = is_static;
- mp->is_no_adj_fib = is_no_fib_entry;
- if (mac_set)
- clib_memcpy (mp->mac_address, mac_address, 6);
- if (v6_address_set)
+ mp->br_is_add = is_add;
+ mp->br_tbl_id.bt_set = set;
+ mp->br_tbl_id.bt_sub_domain = sub_domain;
+ mp->br_tbl_id.bt_hdr_len_id = hdr_len;
+ mp->br_bp = ntohs (bp);
+ mp->br_n_paths = 1;
+ mp->br_paths[0].n_labels = 1;
+ mp->br_paths[0].label_stack[0].label = ntohl (next_hop_out_label);
+ mp->br_paths[0].afi = (next_hop_proto_is_ip4 ? 0 : 1);
+
+ if (next_hop_proto_is_ip4)
{
- mp->is_ipv6 = 1;
- clib_memcpy (mp->dst_address, &v6address, sizeof (v6address));
+ clib_memcpy (mp->br_paths[0].next_hop,
+ &v4_next_hop_address, sizeof (v4_next_hop_address));
}
else
{
- /* mp->is_ipv6 = 0; via memset in M macro above */
- clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
+ clib_memcpy (mp->br_paths[0].next_hop,
+ &v6_next_hop_address, sizeof (v6_next_hop_address));
}
/* send it... */
S (mp);
- /* Wait for a reply, return good/bad news */
+ /* Wait for a reply... */
W (ret);
- return ret;
+
+ return (ret);
}
static int
-api_create_vlan_subif (vat_main_t * vam)
+api_proxy_arp_add_del (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;
+ 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, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else
- if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "vlan %d", &vlan_id))
- vlan_id_set = 1;
+ 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);
}
}
- if (sw_if_index_set == 0)
+ if (range_set == 0)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("address range not set");
return -99;
}
- if (vlan_id_set == 0)
- {
- errmsg ("missing vlan_id");
- return -99;
- }
- M (CREATE_VLAN_SUBIF, mp);
+ M (PROXY_ARP_ADD_DEL, mp);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->vlan_id = ntohl (vlan_id);
+ 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;
}
-#define foreach_create_subif_bit \
-_(no_tags) \
-_(one_tag) \
-_(two_tags) \
-_(dot1ad) \
-_(exact_match) \
-_(default_sub) \
-_(outer_vlan_id_any) \
-_(inner_vlan_id_any)
-
static int
-api_create_subif (vat_main_t * vam)
+api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_create_subif_t *mp;
+ vl_api_proxy_arp_intfc_enable_disable_t *mp;
u32 sw_if_index;
+ u8 enable = 1;
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 tmp;
- u16 outer_vlan_id = 0;
- u16 inner_vlan_id = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
sw_if_index_set = 1;
- else
- if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "sub_id %d", &sub_id))
- sub_id_set = 1;
- else if (unformat (i, "outer_vlan_id %d", &tmp))
- outer_vlan_id = tmp;
- else if (unformat (i, "inner_vlan_id %d", &tmp))
- inner_vlan_id = tmp;
-
-#define _(a) else if (unformat (i, #a)) a = 1 ;
- foreach_create_subif_bit
-#undef _
- else
+ 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;
return -99;
}
- if (sub_id_set == 0)
- {
- errmsg ("missing sub_id");
- return -99;
- }
- M (CREATE_SUBIF, mp);
+ M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp);
mp->sw_if_index = ntohl (sw_if_index);
- mp->sub_id = ntohl (sub_id);
-
-#define _(a) mp->a = a;
- foreach_create_subif_bit;
-#undef _
-
- mp->outer_vlan_id = ntohs (outer_vlan_id);
- mp->inner_vlan_id = ntohs (inner_vlan_id);
+ mp->enable_disable = enable;
S (mp);
W (ret);
}
static int
-api_oam_add_del (vat_main_t * vam)
+api_mpls_tunnel_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_oam_add_del_t *mp;
- u32 vrf_id = 0;
+ vl_api_mpls_tunnel_add_del_t *mp;
+
u8 is_add = 1;
- ip4_address_t src, dst;
- u8 src_set = 0;
- u8 dst_set = 0;
+ u8 l2_only = 0;
+ u32 sw_if_index = ~0;
+ u32 next_hop_sw_if_index = ~0;
+ u32 next_hop_proto_is_ip4 = 1;
+
+ u32 next_hop_table_id = 0;
+ ip4_address_t v4_next_hop_address = {
+ .as_u32 = 0,
+ };
+ ip6_address_t v6_next_hop_address = { {0} };
+ vl_api_fib_mpls_label_t *next_hop_out_label_stack = NULL;
+ mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "src %U", unformat_ip4_address, &src))
- src_set = 1;
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
- dst_set = 1;
- else if (unformat (i, "del"))
+ if (unformat (i, "add"))
+ is_add = 1;
+ else
+ if (unformat
+ (i, "del %U", api_unformat_sw_if_index, vam, &sw_if_index))
+ is_add = 0;
+ else if (unformat (i, "del sw_if_index %d", &sw_if_index))
is_add = 0;
+ else if (unformat (i, "via %U",
+ unformat_ip4_address, &v4_next_hop_address))
+ {
+ next_hop_proto_is_ip4 = 1;
+ }
+ else if (unformat (i, "via %U",
+ unformat_ip6_address, &v6_next_hop_address))
+ {
+ next_hop_proto_is_ip4 = 0;
+ }
+ else if (unformat (i, "via-label %d", &next_hop_via_label))
+ ;
+ else
+ if (unformat
+ (i, "%U", api_unformat_sw_if_index, vam, &next_hop_sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index))
+ ;
+ else if (unformat (i, "l2-only"))
+ l2_only = 1;
+ else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+ ;
+ else if (unformat (i, "out-label %d", &next_hop_out_label))
+ {
+ vl_api_fib_mpls_label_t fib_label = {
+ .label = ntohl (next_hop_out_label),
+ .ttl = 64,
+ .exp = 0,
+ };
+ vec_add1 (next_hop_out_label_stack, fib_label);
+ }
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (src_set == 0)
+ M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_mpls_label_t) *
+ vec_len (next_hop_out_label_stack));
+
+ mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index);
+ mp->mt_sw_if_index = ntohl (sw_if_index);
+ mp->mt_is_add = is_add;
+ mp->mt_l2_only = l2_only;
+ mp->mt_next_hop_table_id = ntohl (next_hop_table_id);
+ mp->mt_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
+ mp->mt_next_hop_via_label = ntohl (next_hop_via_label);
+ mp->mt_next_hop_weight = 1;
+ mp->mt_next_hop_preference = 0;
+
+ mp->mt_next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
+
+ if (0 != mp->mt_next_hop_n_out_labels)
{
- errmsg ("missing src addr");
- return -99;
+ clib_memcpy (mp->mt_next_hop_out_label_stack,
+ next_hop_out_label_stack,
+ (vec_len (next_hop_out_label_stack) *
+ sizeof (vl_api_fib_mpls_label_t)));
+ vec_free (next_hop_out_label_stack);
}
- if (dst_set == 0)
+ if (next_hop_proto_is_ip4)
{
- errmsg ("missing dst addr");
- return -99;
+ clib_memcpy (mp->mt_next_hop,
+ &v4_next_hop_address, sizeof (v4_next_hop_address));
+ }
+ else
+ {
+ clib_memcpy (mp->mt_next_hop,
+ &v6_next_hop_address, sizeof (v6_next_hop_address));
}
-
- M (OAM_ADD_DEL, mp);
-
- mp->vrf_id = ntohl (vrf_id);
- mp->is_add = is_add;
- clib_memcpy (mp->src_address, &src, sizeof (mp->src_address));
- clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address));
S (mp);
W (ret);
}
static int
-api_reset_fib (vat_main_t * vam)
+api_sw_interface_set_unnumbered (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_reset_fib_t *mp;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
-
+ vl_api_sw_interface_set_unnumbered_t *mp;
+ u32 sw_if_index;
+ u32 unnum_sw_index = ~0;
+ u8 is_add = 1;
+ u8 sw_if_index_set = 0;
int ret;
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
+ 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, "unnum_if_index %d", &unnum_sw_index))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (vrf_id_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing vrf id");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (RESET_FIB, mp);
+ M (SW_INTERFACE_SET_UNNUMBERED, mp);
- mp->vrf_id = ntohl (vrf_id);
- mp->is_ipv6 = is_ipv6;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
+ mp->is_add = is_add;
S (mp);
W (ret);
}
static int
-api_dhcp_proxy_config (vat_main_t * vam)
+api_ip_neighbor_add_del (vat_main_t * vam)
{
+ vl_api_mac_address_t mac_address;
unformat_input_t *i = vam->input;
- vl_api_dhcp_proxy_config_t *mp;
- u32 rx_vrf_id = 0;
- u32 server_vrf_id = 0;
+ vl_api_ip_neighbor_add_del_t *mp;
+ vl_api_address_t ip_address;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 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;
+ 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, "del"))
+ 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, "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 (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 (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)
+ if (sw_if_index_set == 0)
{
- errmsg ("no src addresses set");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
-
- if (!(v4_src_address_set && v4_address_set) &&
- !(v6_src_address_set && v6_address_set))
+ if (!address_set)
{
- errmsg ("no matching server and src addresses set");
+ errmsg ("no address set");
return -99;
}
/* Construct the API message */
- M (DHCP_PROXY_CONFIG, mp);
+ M (IP_NEIGHBOR_ADD_DEL, mp);
+ mp->neighbor.sw_if_index = ntohl (sw_if_index);
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->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);
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)
+static int
+api_create_vlan_subif (vat_main_t * vam)
{
- 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 FIB-ID %d, VSS OUI %d",
- ntohl (mp->rx_vrf_id),
- format_ip6_address, mp->dhcp_src_address,
- ntohl (mp->vss_oui), ntohl (mp->vss_fib_id));
- else
- print (vam->ofp,
- "RX Table-ID %d, Source Address %U, VSS FIB-ID %d, VSS OUI %d",
- ntohl (mp->rx_vrf_id),
- format_ip4_address, mp->dhcp_src_address,
- ntohl (mp->vss_oui), ntohl (mp->vss_fib_id));
+ 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;
+ int ret;
- for (i = 0; i < count; i++)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- 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);
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else
- print (vam->ofp,
- " Server Table-ID %d, Server Address %U",
- ntohl (s->server_vrf_id), format_ip4_address, s->dhcp_server);
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "vlan %d", &vlan_id))
+ vlan_id_set = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
-}
-
-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)
+ if (sw_if_index_set == 0)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
}
- 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_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
+ if (vlan_id_set == 0)
{
- clib_memcpy (&ip4, &mp->dhcp_src_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
+ errmsg ("missing vlan_id");
+ return -99;
}
+ M (CREATE_VLAN_SUBIF, mp);
- for (i = 0; i < count; i++)
- {
- s = &mp->servers[i];
-
- vat_json_object_add_uint (node, "server-table-id",
- ntohl (s->server_vrf_id));
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->vlan_id = ntohl (vlan_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);
- }
- }
+ S (mp);
+ W (ret);
+ return ret;
}
+#define foreach_create_subif_bit \
+_(no_tags) \
+_(one_tag) \
+_(two_tags) \
+_(dot1ad) \
+_(exact_match) \
+_(default_sub) \
+_(outer_vlan_id_any) \
+_(inner_vlan_id_any)
+
static int
-api_dhcp_proxy_dump (vat_main_t * vam)
+api_create_subif (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_control_ping_t *mp_ping;
- vl_api_dhcp_proxy_dump_t *mp;
- u8 is_ipv6 = 0;
+ vl_api_create_subif_t *mp;
+ u32 sw_if_index;
+ 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 tmp;
+ u16 outer_vlan_id = 0;
+ u16 inner_vlan_id = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "ipv6"))
- is_ipv6 = 1;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sub_id %d", &sub_id))
+ sub_id_set = 1;
+ else if (unformat (i, "outer_vlan_id %d", &tmp))
+ outer_vlan_id = tmp;
+ else if (unformat (i, "inner_vlan_id %d", &tmp))
+ inner_vlan_id = tmp;
+
+#define _(a) else if (unformat (i, #a)) a = 1 ;
+ foreach_create_subif_bit
+#undef _
+ else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- M (DHCP_PROXY_DUMP, mp);
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
- mp->is_ip6 = is_ipv6;
- S (mp);
+ if (sub_id_set == 0)
+ {
+ errmsg ("missing sub_id");
+ return -99;
+ }
+ M (CREATE_SUBIF, mp);
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->sub_id = ntohl (sub_id);
+
+#define _(a) mp->a = a;
+ foreach_create_subif_bit;
+#undef _
+
+ mp->outer_vlan_id = ntohs (outer_vlan_id);
+ mp->inner_vlan_id = ntohs (inner_vlan_id);
+ S (mp);
W (ret);
return ret;
}
static int
-api_dhcp_proxy_set_vss (vat_main_t * vam)
+api_oam_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_dhcp_proxy_set_vss_t *mp;
- u8 is_ipv6 = 0;
+ vl_api_oam_add_del_t *mp;
+ u32 vrf_id = 0;
u8 is_add = 1;
- u32 tbl_id;
- u8 tbl_id_set = 0;
- u32 oui;
- u8 oui_set = 0;
- u32 fib_id;
- u8 fib_id_set = 0;
+ ip4_address_t src, dst;
+ u8 src_set = 0;
+ u8 dst_set = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "tbl_id %d", &tbl_id))
- tbl_id_set = 1;
- if (unformat (i, "fib_id %d", &fib_id))
- fib_id_set = 1;
- if (unformat (i, "oui %d", &oui))
- oui_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
+ if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "src %U", unformat_ip4_address, &src))
+ src_set = 1;
+ else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
+ dst_set = 1;
else if (unformat (i, "del"))
is_add = 0;
else
}
}
- if (tbl_id_set == 0)
+ if (src_set == 0)
{
- errmsg ("missing tbl id");
+ errmsg ("missing src addr");
return -99;
}
- if (fib_id_set == 0)
- {
- errmsg ("missing fib id");
- return -99;
- }
- if (oui_set == 0)
+ if (dst_set == 0)
{
- errmsg ("missing oui");
+ errmsg ("missing dst addr");
return -99;
}
- M (DHCP_PROXY_SET_VSS, mp);
- mp->tbl_id = ntohl (tbl_id);
- mp->fib_id = ntohl (fib_id);
- mp->oui = ntohl (oui);
- mp->is_ipv6 = is_ipv6;
+ M (OAM_ADD_DEL, mp);
+
+ mp->vrf_id = ntohl (vrf_id);
mp->is_add = is_add;
+ clib_memcpy (mp->src_address, &src, sizeof (mp->src_address));
+ clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address));
S (mp);
W (ret);
}
static int
-api_dhcp_client_config (vat_main_t * vam)
+api_reset_fib (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;
+ vl_api_reset_fib_t *mp;
+ u32 vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 vrf_id_set = 0;
- /* Parse args required to build the message */
+ int ret;
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");
- }
- vec_add1 (hostname, 0);
-
- /* Construct the API message */
- M (DHCP_CLIENT_CONFIG, mp);
-
- mp->sw_if_index = htonl (sw_if_index);
- clib_memcpy (mp->hostname, hostname, vec_len (hostname));
- vec_free (hostname);
- mp->is_add = is_add;
- mp->want_dhcp_event = disable_event ? 0 : 1;
- mp->pid = htonl (getpid ());
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
-}
-
-static int
-api_set_ip_flow_hash (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_set_ip_flow_hash_t *mp;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
- u8 src = 0;
- u8 dst = 0;
- u8 sport = 0;
- u8 dport = 0;
- u8 proto = 0;
- u8 reverse = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else if (unformat (i, "src"))
- src = 1;
- else if (unformat (i, "dst"))
- dst = 1;
- else if (unformat (i, "sport"))
- sport = 1;
- else if (unformat (i, "dport"))
- dport = 1;
- else if (unformat (i, "proto"))
- proto = 1;
- else if (unformat (i, "reverse"))
- reverse = 1;
-
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
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;
+ M (RESET_FIB, mp);
+
mp->vrf_id = ntohl (vrf_id);
mp->is_ipv6 = is_ipv6;
}
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_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
+api_dhcp_proxy_config (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6_set_link_local_address_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ 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, "%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_ip6_address, &v6address))
+ 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 (sw_if_index_set == 0)
+ if (v4_address_set && v6_address_set)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("both v4 and v6 server addresses set");
return -99;
}
- if (!v6_address_set)
+ if (!v4_address_set && !v6_address_set)
{
- errmsg ("no address set");
+ errmsg ("no server addresses set");
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- 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;
- 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 (v4_src_address_set && v6_src_address_set)
{
- 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_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;
- }
+ errmsg ("both v4 and v6 src addresses set");
+ return -99;
}
-
- if (sw_if_index == ~0)
+ if (!v4_src_address_set && !v6_src_address_set)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("no src addresses set");
return -99;
}
- if (!v6_address_set)
+
+ if (!(v4_src_address_set && v4_address_set) &&
+ !(v6_src_address_set && v6_address_set))
{
- errmsg ("no address set");
+ errmsg ("no matching server and src addresses set");
return -99;
}
/* Construct the API message */
- M (IP6ND_PROXY_ADD_DEL, mp);
+ M (DHCP_PROXY_CONFIG, mp);
- mp->is_del = is_del;
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
+ 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));
+ }
/* send it... */
S (mp);
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;
-}
+#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_ip6nd_proxy_details_t_handler
- (vl_api_ip6nd_proxy_details_t * mp)
+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;
- print (vam->ofp, "host %U sw_if_index %d",
- format_ip6_address, mp->address, ntohl (mp->sw_if_index));
+ 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_ip6nd_proxy_details_t_handler_json
- (vl_api_ip6nd_proxy_details_t * mp)
+static void vl_api_dhcp_proxy_details_t_handler_json
+ (vl_api_dhcp_proxy_details_t * mp)
{
vat_main_t *vam = &vat_main;
- struct in6_addr ip6;
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)
{
node = vat_json_array_add (&vam->json_tree);
vat_json_init_object (node);
- vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "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));
- clib_memcpy (&ip6, mp->address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "host", ip6);
+ 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_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
+api_dhcp_proxy_dump (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;
- u32 address_length = 0;
- u8 v6_address_set = 0;
- ip6_address_t v6address;
- 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;
+ vl_api_control_ping_t *mp_ping;
+ vl_api_dhcp_proxy_dump_t *mp;
+ u8 is_ipv6 = 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/%d",
- unformat_ip6_address, &v6address, &address_length))
- 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;
+ if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (sw_if_index_set == 0)
+ M (DHCP_PROXY_DUMP, mp);
+
+ mp->is_ip6 = is_ipv6;
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ W (ret);
+ return ret;
+}
+
+static int
+api_dhcp_proxy_set_vss (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_dhcp_proxy_set_vss_t *mp;
+ 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;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- errmsg ("missing interface name or sw_if_index");
- return -99;
+ if (unformat (i, "tbl_id %d", &tbl_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 (!v6_address_set)
+
+ if (tbl_id == ~0)
{
- errmsg ("no address set");
+ errmsg ("missing tbl_id ");
+ vec_free (vpn_ascii_id);
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_PREFIX, mp);
+ 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;
+ }
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
- mp->address_length = address_length;
- 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 (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;
- /* send it... */
S (mp);
-
- /* Wait for a reply, return good/bad news */
W (ret);
+
+ vec_free (vpn_ascii_id);
return ret;
}
static int
-api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
+api_dhcp_client_config (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6nd_ra_config_t *mp;
+ vl_api_dhcp_client_config_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 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, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ 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, "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, "hostname %s", &hostname))
;
- 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, "disable_event"))
+ disable_event = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
if (sw_if_index_set == 0)
return -99;
}
+ if (vec_len (hostname) > 63)
+ {
+ errmsg ("hostname too long");
+ }
+ vec_add1 (hostname, 0);
+
/* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_CONFIG, mp);
+ M (DHCP_CLIENT_CONFIG, 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->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 ());
/* send it... */
S (mp);
}
static int
-api_set_arp_neighbor_limit (vat_main_t * vam)
+api_set_ip_flow_hash (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;
+ vl_api_set_ip_flow_hash_t *mp;
+ u32 vrf_id = 0;
u8 is_ipv6 = 0;
+ u8 vrf_id_set = 0;
+ u8 src = 0;
+ u8 dst = 0;
+ u8 sport = 0;
+ u8 dport = 0;
+ u8 proto = 0;
+ u8 reverse = 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;
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
else if (unformat (i, "ipv6"))
is_ipv6 = 1;
+ else if (unformat (i, "src"))
+ src = 1;
+ else if (unformat (i, "dst"))
+ dst = 1;
+ else if (unformat (i, "sport"))
+ sport = 1;
+ else if (unformat (i, "dport"))
+ dport = 1;
+ else if (unformat (i, "proto"))
+ proto = 1;
+ else if (unformat (i, "reverse"))
+ reverse = 1;
+
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (limit_set == 0)
+ if (vrf_id_set == 0)
{
- errmsg ("missing limit value");
+ errmsg ("missing vrf id");
return -99;
}
- M (SET_ARP_NEIGHBOR_LIMIT, mp);
-
- mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
+ 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);
}
static int
-api_l2_patch_add_del (vat_main_t * vam)
+api_sw_interface_ip6_enable_disable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2_patch_add_del_t *mp;
- u32 rx_sw_if_index;
- u8 rx_sw_if_index_set = 0;
- u32 tx_sw_if_index;
- u8 tx_sw_if_index_set = 0;
- u8 is_add = 1;
+ vl_api_sw_interface_ip6_enable_disable_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 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, "rx_sw_if_index %d", &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "rx"))
- {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", api_unformat_sw_if_index, vam,
- &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- }
- else
- break;
- }
- else if (unformat (i, "tx"))
+ 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
{
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", api_unformat_sw_if_index, vam,
- &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- }
- else
- break;
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
}
- else if (unformat (i, "del"))
- is_add = 0;
- else
- break;
- }
-
- if (rx_sw_if_index_set == 0)
- {
- errmsg ("missing rx interface name or rx_sw_if_index");
- return -99;
}
- if (tx_sw_if_index_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing tx interface name or tx_sw_if_index");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (L2_PATCH_ADD_DEL, mp);
+ M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp);
- mp->rx_sw_if_index = ntohl (rx_sw_if_index);
- mp->tx_sw_if_index = ntohl (tx_sw_if_index);
- mp->is_add = is_add;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable = enable;
S (mp);
W (ret);
return ret;
}
-u8 is_del;
-u8 localsid_addr[16];
-u8 end_psp;
-u8 behavior;
-u32 sw_if_index;
-u32 vlan_index;
-u32 fib_table;
-u8 nh_addr[16];
-
static int
-api_sr_localsid_add_del (vat_main_t * vam)
+api_ip6nd_proxy_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sr_localsid_add_del_t *mp;
-
- u8 is_del;
- ip6_address_t localsid;
- u8 end_psp = 0;
- u8 behavior = ~0;
- u32 sw_if_index;
- u32 fib_table = ~(u32) 0;
- ip6_address_t next_hop;
-
- bool nexthop_set = 0;
-
+ 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 if (unformat (i, "address %U", unformat_ip6_address, &localsid));
- else if (unformat (i, "next-hop %U", unformat_ip6_address, &next_hop))
- nexthop_set = 1;
- else if (unformat (i, "behavior %u", &behavior));
- else if (unformat (i, "sw_if_index %u", &sw_if_index));
- else if (unformat (i, "fib-table %u", &fib_table));
- else if (unformat (i, "end.psp %u", &behavior));
else
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- M (SR_LOCALSID_ADD_DEL, mp);
+ 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);
- clib_memcpy (mp->localsid_addr, &localsid, sizeof (mp->localsid_addr));
- if (nexthop_set)
- clib_memcpy (mp->nh_addr, &next_hop, sizeof (mp->nh_addr));
- mp->behavior = behavior;
- mp->sw_if_index = ntohl (sw_if_index);
- mp->fib_table = ntohl (fib_table);
- mp->end_psp = end_psp;
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_ioam_enable (vat_main_t * vam)
+api_ip6nd_proxy_dump (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_ioam_enable_t *mp;
- u32 id = 0;
- int has_trace_option = 0;
- int has_pot_option = 0;
- int has_seqno_option = 0;
- int has_analyse_option = 0;
+ vl_api_ip6nd_proxy_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
int ret;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "trace"))
- has_trace_option = 1;
- else if (unformat (input, "pot"))
- has_pot_option = 1;
- else if (unformat (input, "seqno"))
- has_seqno_option = 1;
- else if (unformat (input, "analyse"))
- has_analyse_option = 1;
- else
- break;
- }
- M (IOAM_ENABLE, mp);
- mp->id = htons (id);
- mp->seqno = has_seqno_option;
- mp->analyse = has_analyse_option;
- mp->pot_enable = has_pot_option;
- mp->trace_enable = has_trace_option;
+ 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 int
-api_ioam_disable (vat_main_t * vam)
+static void vl_api_ip6nd_proxy_details_t_handler
+ (vl_api_ip6nd_proxy_details_t * mp)
{
- vl_api_ioam_disable_t *mp;
- int ret;
+ vat_main_t *vam = &vat_main;
- M (IOAM_DISABLE, mp);
- S (mp);
- W (ret);
- return ret;
+ print (vam->ofp, "host %U sw_if_index %d",
+ format_vl_api_ip6_address, mp->ip, ntohl (mp->sw_if_index));
}
-#define foreach_tcp_proto_field \
-_(src_port) \
-_(dst_port)
+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;
-#define foreach_udp_proto_field \
-_(src_port) \
-_(dst_port)
+ 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);
-#define foreach_ip4_proto_field \
-_(src_address) \
-_(dst_address) \
-_(tos) \
-_(length) \
-_(fragment_id) \
-_(ttl) \
-_(protocol) \
-_(checksum)
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-typedef struct
-{
- u16 src_port, dst_port;
-} tcpudp_header_t;
+ clib_memcpy (&ip6, mp->ip, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "host", ip6);
+}
-#if VPP_API_TEST_BUILTIN == 0
-uword
-unformat_tcp_mask (unformat_input_t * input, va_list * args)
+static int
+api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
- u8 *mask = 0;
- u8 found_something = 0;
- tcp_header_t *tcp;
-
-#define _(a) u8 a=0;
- foreach_tcp_proto_field;
-#undef _
+ 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;
+ u32 address_length = 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;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (0);
-#define _(a) else if (unformat (input, #a)) a=1;
- foreach_tcp_proto_field
-#undef _
- else
- break;
+ 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;
+ }
}
-#define _(a) found_something += a;
- foreach_tcp_proto_field;
-#undef _
-
- if (found_something == 0)
- return 0;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
+ if (!v6_address_set)
+ {
+ errmsg ("no address set");
+ return -99;
+ }
- vec_validate (mask, sizeof (*tcp) - 1);
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6ND_RA_PREFIX, mp);
- tcp = (tcp_header_t *) mask;
+ 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);
-#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
- foreach_tcp_proto_field;
-#undef _
+ /* send it... */
+ S (mp);
- *maskp = mask;
- return 1;
+ /* Wait for a reply, return good/bad news */
+ W (ret);
+ return ret;
}
-uword
-unformat_udp_mask (unformat_input_t * input, va_list * args)
+static int
+api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
- u8 *mask = 0;
- u8 found_something = 0;
- udp_header_t *udp;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6nd_ra_config_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;
+ int ret;
-#define _(a) u8 a=0;
- foreach_udp_proto_field;
-#undef _
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (0);
-#define _(a) else if (unformat (input, #a)) a=1;
- foreach_udp_proto_field
-#undef _
- else
- break;
+ 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
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
-#define _(a) found_something += a;
- foreach_udp_proto_field;
-#undef _
-
- if (found_something == 0)
- return 0;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
- vec_validate (mask, sizeof (*udp) - 1);
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6ND_RA_CONFIG, mp);
- udp = (udp_header_t *) mask;
+ 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;
-#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
- foreach_udp_proto_field;
-#undef _
+ /* send it... */
+ S (mp);
- *maskp = mask;
- return 1;
+ /* Wait for a reply, return good/bad news */
+ W (ret);
+ return ret;
}
-uword
-unformat_l4_mask (unformat_input_t * input, va_list * args)
+static int
+api_set_arp_neighbor_limit (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
- u16 src_port = 0, dst_port = 0;
- tcpudp_header_t *tcpudp;
+ 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 (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "tcp %U", unformat_tcp_mask, maskp))
- return 1;
- else if (unformat (input, "udp %U", unformat_udp_mask, maskp))
- return 1;
- else if (unformat (input, "src_port"))
- src_port = 0xFFFF;
- else if (unformat (input, "dst_port"))
- dst_port = 0xFFFF;
+ if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
+ limit_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
else
- return 0;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (!src_port && !dst_port)
- return 0;
-
- u8 *mask = 0;
- vec_validate (mask, sizeof (tcpudp_header_t) - 1);
+ if (limit_set == 0)
+ {
+ errmsg ("missing limit value");
+ return -99;
+ }
- tcpudp = (tcpudp_header_t *) mask;
- tcpudp->src_port = src_port;
- tcpudp->dst_port = dst_port;
+ M (SET_ARP_NEIGHBOR_LIMIT, mp);
- *maskp = mask;
+ mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
+ mp->is_ipv6 = is_ipv6;
- return 1;
+ S (mp);
+ W (ret);
+ return ret;
}
-uword
-unformat_ip4_mask (unformat_input_t * input, va_list * args)
+static int
+api_l2_patch_add_del (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
- u8 *mask = 0;
- u8 found_something = 0;
- ip4_header_t *ip;
+ unformat_input_t *i = vam->input;
+ vl_api_l2_patch_add_del_t *mp;
+ u32 rx_sw_if_index;
+ u8 rx_sw_if_index_set = 0;
+ u32 tx_sw_if_index;
+ u8 tx_sw_if_index_set = 0;
+ u8 is_add = 1;
+ int ret;
-#define _(a) u8 a=0;
- foreach_ip4_proto_field;
-#undef _
- u8 version = 0;
- u8 hdr_length = 0;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ else if (unformat (i, "rx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam,
+ &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "tx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam,
+ &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ break;
+ }
+ if (rx_sw_if_index_set == 0)
+ {
+ errmsg ("missing rx interface name or rx_sw_if_index");
+ return -99;
+ }
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ if (tx_sw_if_index_set == 0)
{
- if (unformat (input, "version"))
- version = 1;
- else if (unformat (input, "hdr_length"))
- hdr_length = 1;
- else if (unformat (input, "src"))
- src_address = 1;
- else if (unformat (input, "dst"))
- dst_address = 1;
- else if (unformat (input, "proto"))
- protocol = 1;
+ errmsg ("missing tx interface name or tx_sw_if_index");
+ return -99;
+ }
-#define _(a) else if (unformat (input, #a)) a=1;
- foreach_ip4_proto_field
-#undef _
- else
+ M (L2_PATCH_ADD_DEL, mp);
+
+ mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+ mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+ mp->is_add = is_add;
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+u8 is_del;
+u8 localsid_addr[16];
+u8 end_psp;
+u8 behavior;
+u32 sw_if_index;
+u32 vlan_index;
+u32 fib_table;
+u8 nh_addr[16];
+
+static int
+api_sr_localsid_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sr_localsid_add_del_t *mp;
+
+ u8 is_del;
+ ip6_address_t localsid;
+ u8 end_psp = 0;
+ u8 behavior = ~0;
+ u32 sw_if_index;
+ u32 fib_table = ~(u32) 0;
+ ip6_address_t nh_addr6;
+ ip4_address_t nh_addr4;
+ clib_memset (&nh_addr6, 0, sizeof (ip6_address_t));
+ clib_memset (&nh_addr4, 0, sizeof (ip4_address_t));
+
+ bool nexthop_set = 0;
+
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_del = 1;
+ else if (unformat (i, "address %U", unformat_ip6_address, &localsid));
+ else if (unformat (i, "next-hop %U", unformat_ip4_address, &nh_addr4))
+ nexthop_set = 1;
+ else if (unformat (i, "next-hop %U", unformat_ip6_address, &nh_addr6))
+ nexthop_set = 1;
+ else if (unformat (i, "behavior %u", &behavior));
+ else if (unformat (i, "sw_if_index %u", &sw_if_index));
+ else if (unformat (i, "fib-table %u", &fib_table));
+ else if (unformat (i, "end.psp %u", &behavior));
+ else
break;
}
-#define _(a) found_something += a;
- foreach_ip4_proto_field;
-#undef _
+ M (SR_LOCALSID_ADD_DEL, mp);
- if (found_something == 0)
- return 0;
+ clib_memcpy (mp->localsid.addr, &localsid, sizeof (mp->localsid));
+ if (nexthop_set)
+ {
+ clib_memcpy (mp->nh_addr6, &nh_addr6, sizeof (mp->nh_addr6));
+ clib_memcpy (mp->nh_addr4, &nh_addr4, sizeof (mp->nh_addr4));
+ }
+ mp->behavior = behavior;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->fib_table = ntohl (fib_table);
+ mp->end_psp = end_psp;
+ mp->is_del = is_del;
- vec_validate (mask, sizeof (*ip) - 1);
+ S (mp);
+ W (ret);
+ return ret;
+}
- ip = (ip4_header_t *) mask;
+static int
+api_ioam_enable (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_ioam_enable_t *mp;
+ u32 id = 0;
+ int has_trace_option = 0;
+ int has_pot_option = 0;
+ int has_seqno_option = 0;
+ int has_analyse_option = 0;
+ int ret;
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
- foreach_ip4_proto_field;
-#undef _
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "trace"))
+ has_trace_option = 1;
+ else if (unformat (input, "pot"))
+ has_pot_option = 1;
+ else if (unformat (input, "seqno"))
+ has_seqno_option = 1;
+ else if (unformat (input, "analyse"))
+ has_analyse_option = 1;
+ else
+ break;
+ }
+ M (IOAM_ENABLE, mp);
+ mp->id = htons (id);
+ mp->seqno = has_seqno_option;
+ mp->analyse = has_analyse_option;
+ mp->pot_enable = has_pot_option;
+ mp->trace_enable = has_trace_option;
- ip->ip_version_and_header_length = 0;
+ S (mp);
+ W (ret);
+ return ret;
+}
- if (version)
- ip->ip_version_and_header_length |= 0xF0;
- if (hdr_length)
- ip->ip_version_and_header_length |= 0x0F;
+static int
+api_ioam_disable (vat_main_t * vam)
+{
+ vl_api_ioam_disable_t *mp;
+ int ret;
- *maskp = mask;
- return 1;
+ M (IOAM_DISABLE, mp);
+ S (mp);
+ W (ret);
+ return ret;
}
-#define foreach_ip6_proto_field \
+#define foreach_tcp_proto_field \
+_(src_port) \
+_(dst_port)
+
+#define foreach_udp_proto_field \
+_(src_port) \
+_(dst_port)
+
+#define foreach_ip4_proto_field \
_(src_address) \
_(dst_address) \
-_(payload_length) \
-_(hop_limit) \
-_(protocol)
+_(tos) \
+_(length) \
+_(fragment_id) \
+_(ttl) \
+_(protocol) \
+_(checksum)
+typedef struct
+{
+ u16 src_port, dst_port;
+} tcpudp_header_t;
+
+#if VPP_API_TEST_BUILTIN == 0
uword
-unformat_ip6_mask (unformat_input_t * input, va_list * args)
+unformat_tcp_mask (unformat_input_t * input, va_list * args)
{
u8 **maskp = va_arg (*args, u8 **);
u8 *mask = 0;
u8 found_something = 0;
- ip6_header_t *ip;
- u32 ip_version_traffic_class_and_flow_label;
+ tcp_header_t *tcp;
#define _(a) u8 a=0;
- foreach_ip6_proto_field;
+ foreach_tcp_proto_field;
#undef _
- u8 version = 0;
- u8 traffic_class = 0;
- u8 flow_label = 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (0);
+#define _(a) else if (unformat (input, #a)) a=1;
+ foreach_tcp_proto_field
+#undef _
+ else
+ break;
+ }
+
+#define _(a) found_something += a;
+ foreach_tcp_proto_field;
+#undef _
+
+ if (found_something == 0)
+ return 0;
+
+ vec_validate (mask, sizeof (*tcp) - 1);
+
+ tcp = (tcp_header_t *) mask;
+
+#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a));
+ foreach_tcp_proto_field;
+#undef _
+
+ *maskp = mask;
+ return 1;
+}
+
+uword
+unformat_udp_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 found_something = 0;
+ udp_header_t *udp;
+
+#define _(a) u8 a=0;
+ foreach_udp_proto_field;
+#undef _
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (0);
+#define _(a) else if (unformat (input, #a)) a=1;
+ foreach_udp_proto_field
+#undef _
+ else
+ break;
+ }
+
+#define _(a) found_something += a;
+ foreach_udp_proto_field;
+#undef _
+
+ if (found_something == 0)
+ return 0;
+
+ vec_validate (mask, sizeof (*udp) - 1);
+
+ udp = (udp_header_t *) mask;
+
+#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a));
+ foreach_udp_proto_field;
+#undef _
+
+ *maskp = mask;
+ return 1;
+}
+
+uword
+unformat_l4_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u16 src_port = 0, dst_port = 0;
+ tcpudp_header_t *tcpudp;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "tcp %U", unformat_tcp_mask, maskp))
+ return 1;
+ else if (unformat (input, "udp %U", unformat_udp_mask, maskp))
+ return 1;
+ else if (unformat (input, "src_port"))
+ src_port = 0xFFFF;
+ else if (unformat (input, "dst_port"))
+ dst_port = 0xFFFF;
+ else
+ return 0;
+ }
+
+ if (!src_port && !dst_port)
+ return 0;
+
+ u8 *mask = 0;
+ vec_validate (mask, sizeof (tcpudp_header_t) - 1);
+
+ tcpudp = (tcpudp_header_t *) mask;
+ tcpudp->src_port = src_port;
+ tcpudp->dst_port = dst_port;
+
+ *maskp = mask;
+
+ return 1;
+}
+
+uword
+unformat_ip4_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 found_something = 0;
+ ip4_header_t *ip;
+
+#define _(a) u8 a=0;
+ foreach_ip4_proto_field;
+#undef _
+ u8 version = 0;
+ u8 hdr_length = 0;
+
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "version"))
+ version = 1;
+ else if (unformat (input, "hdr_length"))
+ hdr_length = 1;
+ else if (unformat (input, "src"))
+ src_address = 1;
+ else if (unformat (input, "dst"))
+ dst_address = 1;
+ else if (unformat (input, "proto"))
+ protocol = 1;
+
+#define _(a) else if (unformat (input, #a)) a=1;
+ foreach_ip4_proto_field
+#undef _
+ else
+ break;
+ }
+
+#define _(a) found_something += a;
+ foreach_ip4_proto_field;
+#undef _
+
+ if (found_something == 0)
+ return 0;
+
+ vec_validate (mask, sizeof (*ip) - 1);
+
+ ip = (ip4_header_t *) mask;
+
+#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a));
+ foreach_ip4_proto_field;
+#undef _
+
+ ip->ip_version_and_header_length = 0;
+
+ if (version)
+ ip->ip_version_and_header_length |= 0xF0;
+
+ if (hdr_length)
+ ip->ip_version_and_header_length |= 0x0F;
+
+ *maskp = mask;
+ return 1;
+}
+
+#define foreach_ip6_proto_field \
+_(src_address) \
+_(dst_address) \
+_(payload_length) \
+_(hop_limit) \
+_(protocol)
+
+uword
+unformat_ip6_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 found_something = 0;
+ ip6_header_t *ip;
+ u32 ip_version_traffic_class_and_flow_label;
+
+#define _(a) u8 a=0;
+ foreach_ip6_proto_field;
+#undef _
+ u8 version = 0;
+ u8 traffic_class = 0;
+ u8 flow_label = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
ip = (ip6_header_t *) mask;
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a));
foreach_ip6_proto_field;
#undef _
vec_validate (mask, len - 1);
if (dst)
- memset (mask, 0xff, 6);
+ clib_memset (mask, 0xff, 6);
if (src)
- memset (mask + 6, 0xff, 6);
+ clib_memset (mask + 6, 0xff, 6);
if (tag2 || dot1ad)
{
mp->miss_next_index = ntohl (miss_next_index);
mp->current_data_flag = ntohl (current_data_flag);
mp->current_data_offset = ntohl (current_data_offset);
+ mp->mask_len = ntohl (vec_len (mask));
clib_memcpy (mp->mask, mask, vec_len (mask));
vec_free (mask);
*matchp = match;
return 1;
}
+
+uword
+unformat_qos_source (unformat_input_t * input, va_list * args)
+{
+ int *qs = va_arg (*args, int *);
+
+ if (unformat (input, "ip"))
+ *qs = QOS_SOURCE_IP;
+ else if (unformat (input, "mpls"))
+ *qs = QOS_SOURCE_MPLS;
+ else if (unformat (input, "ext"))
+ *qs = QOS_SOURCE_EXT;
+ else if (unformat (input, "vlan"))
+ *qs = QOS_SOURCE_VLAN;
+ else
+ return 0;
+
+ return 1;
+}
#endif
uword
;
else
break;
- }
-
- if (l4 && !l3)
- {
- vec_free (match);
- vec_free (l2);
- vec_free (l4);
- return 0;
- }
-
- if (match || l2 || l3 || l4)
- {
- if (l2 || l3 || l4)
- {
- /* "Win a free Ethernet header in every packet" */
- if (l2 == 0)
- vec_validate_aligned (l2, 13, sizeof (u32x4));
- match = l2;
- if (vec_len (l3))
- {
- vec_append_aligned (match, l3, sizeof (u32x4));
- vec_free (l3);
- }
- if (vec_len (l4))
- {
- vec_append_aligned (match, l4, sizeof (u32x4));
- vec_free (l4);
- }
- }
-
- /* Make sure the vector is big enough even if key is all 0's */
- vec_validate_aligned
- (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1,
- sizeof (u32x4));
-
- /* Set size, include skipped vectors */
- _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4);
-
- *matchp = match;
-
- return 1;
- }
-
- return 0;
-}
-
-static int
-api_classify_add_del_session (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_classify_add_del_session_t *mp;
- int is_add = 1;
- u32 table_index = ~0;
- u32 hit_next_index = ~0;
- u32 opaque_index = ~0;
- u8 *match = 0;
- i32 advance = 0;
- u32 skip_n_vectors = 0;
- u32 match_n_vectors = 0;
- u32 action = 0;
- u32 metadata = 0;
- int ret;
-
- /*
- * Warning: you have to supply skip_n and match_n
- * because the API client cant simply look at the classify
- * table object.
- */
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "hit-next %U", api_unformat_ip_next_index,
- &hit_next_index))
- ;
- else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
- &hit_next_index))
- ;
- else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index,
- &hit_next_index))
- ;
- else if (unformat (i, "policer-hit-next %d", &hit_next_index))
- ;
- else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
- ;
- else if (unformat (i, "opaque-index %d", &opaque_index))
- ;
- else if (unformat (i, "skip_n %d", &skip_n_vectors))
- ;
- else if (unformat (i, "match_n %d", &match_n_vectors))
- ;
- else if (unformat (i, "match %U", api_unformat_classify_match,
- &match, skip_n_vectors, match_n_vectors))
- ;
- else if (unformat (i, "advance %d", &advance))
- ;
- else if (unformat (i, "table-index %d", &table_index))
- ;
- else if (unformat (i, "action set-ip4-fib-id %d", &metadata))
- action = 1;
- else if (unformat (i, "action set-ip6-fib-id %d", &metadata))
- action = 2;
- else if (unformat (i, "action %d", &action))
- ;
- else if (unformat (i, "metadata %d", &metadata))
- ;
- else
- break;
- }
-
- if (table_index == ~0)
- {
- errmsg ("Table index required");
- return -99;
- }
-
- if (is_add && match == 0)
- {
- errmsg ("Match value required");
- return -99;
- }
-
- M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match));
-
- mp->is_add = is_add;
- mp->table_index = ntohl (table_index);
- mp->hit_next_index = ntohl (hit_next_index);
- mp->opaque_index = ntohl (opaque_index);
- mp->advance = ntohl (advance);
- mp->action = action;
- mp->metadata = ntohl (metadata);
- clib_memcpy (mp->match, match, vec_len (match));
- vec_free (match);
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_classify_set_interface_ip_table (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_classify_set_interface_ip_table_t *mp;
- u32 sw_if_index;
- int sw_if_index_set;
- u32 table_index = ~0;
- u8 is_ipv6 = 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, "table %d", &table_index))
- ;
- 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 (CLASSIFY_SET_INTERFACE_IP_TABLE, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->table_index = ntohl (table_index);
- mp->is_ipv6 = is_ipv6;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_classify_set_interface_l2_tables (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_classify_set_interface_l2_tables_t *mp;
- u32 sw_if_index;
- int sw_if_index_set;
- u32 ip4_table_index = ~0;
- u32 ip6_table_index = ~0;
- u32 other_table_index = ~0;
- u32 is_input = 1;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "ip4-table %d", &ip4_table_index))
- ;
- else if (unformat (i, "ip6-table %d", &ip6_table_index))
- ;
- else if (unformat (i, "other-table %d", &other_table_index))
- ;
- else if (unformat (i, "is-input %d", &is_input))
- ;
- 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 (CLASSIFY_SET_INTERFACE_L2_TABLES, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->ip4_table_index = ntohl (ip4_table_index);
- mp->ip6_table_index = ntohl (ip6_table_index);
- mp->other_table_index = ntohl (other_table_index);
- mp->is_input = (u8) is_input;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_set_ipfix_exporter (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_set_ipfix_exporter_t *mp;
- ip4_address_t collector_address;
- u8 collector_address_set = 0;
- u32 collector_port = ~0;
- ip4_address_t src_address;
- u8 src_address_set = 0;
- u32 vrf_id = ~0;
- u32 path_mtu = ~0;
- u32 template_interval = ~0;
- u8 udp_checksum = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "collector_address %U", unformat_ip4_address,
- &collector_address))
- collector_address_set = 1;
- else if (unformat (i, "collector_port %d", &collector_port))
- ;
- else if (unformat (i, "src_address %U", unformat_ip4_address,
- &src_address))
- src_address_set = 1;
- else if (unformat (i, "vrf_id %d", &vrf_id))
- ;
- else if (unformat (i, "path_mtu %d", &path_mtu))
- ;
- else if (unformat (i, "template_interval %d", &template_interval))
- ;
- else if (unformat (i, "udp_checksum"))
- udp_checksum = 1;
- else
- break;
- }
-
- if (collector_address_set == 0)
- {
- errmsg ("collector_address required");
- return -99;
- }
-
- if (src_address_set == 0)
- {
- errmsg ("src_address required");
- return -99;
- }
-
- M (SET_IPFIX_EXPORTER, mp);
-
- memcpy (mp->collector_address, 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));
- mp->vrf_id = htonl (vrf_id);
- mp->path_mtu = htonl (path_mtu);
- mp->template_interval = htonl (template_interval);
- mp->udp_checksum = udp_checksum;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_set_ipfix_classify_stream (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_set_ipfix_classify_stream_t *mp;
- u32 domain_id = 0;
- u32 src_port = UDP_DST_PORT_ipfix;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "domain %d", &domain_id))
- ;
- else if (unformat (i, "src_port %d", &src_port))
- ;
- else
- {
- errmsg ("unknown input `%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M (SET_IPFIX_CLASSIFY_STREAM, mp);
-
- mp->domain_id = htonl (domain_id);
- mp->src_port = htons ((u16) src_port);
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_ipfix_classify_table_add_del (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_ipfix_classify_table_add_del_t *mp;
- int is_add = -1;
- u32 classify_table_index = ~0;
- u8 ip_version = 0;
- u8 transport_protocol = 255;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "table %d", &classify_table_index))
- ;
- else if (unformat (i, "ip4"))
- ip_version = 4;
- else if (unformat (i, "ip6"))
- ip_version = 6;
- else if (unformat (i, "tcp"))
- transport_protocol = 6;
- else if (unformat (i, "udp"))
- transport_protocol = 17;
- else
- {
- errmsg ("unknown input `%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (is_add == -1)
- {
- errmsg ("expecting: add|del");
- return -99;
- }
- if (classify_table_index == ~0)
- {
- errmsg ("classifier table not specified");
- return -99;
- }
- if (ip_version == 0)
- {
- errmsg ("IP version not specified");
- return -99;
- }
-
- M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp);
-
- mp->is_add = is_add;
- mp->table_id = htonl (classify_table_index);
- mp->ip_version = ip_version;
- mp->transport_protocol = transport_protocol;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_get_node_index (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_get_node_index_t *mp;
- u8 *name = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "node %s", &name))
- ;
- else
- break;
- }
- if (name == 0)
- {
- errmsg ("node name required");
- return -99;
- }
- if (vec_len (name) >= ARRAY_LEN (mp->node_name))
- {
- errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
- return -99;
- }
-
- M (GET_NODE_INDEX, mp);
- clib_memcpy (mp->node_name, name, vec_len (name));
- vec_free (name);
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_get_next_index (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_get_next_index_t *mp;
- u8 *node_name = 0, *next_node_name = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "node-name %s", &node_name))
- ;
- else if (unformat (i, "next-node-name %s", &next_node_name))
- break;
- }
-
- if (node_name == 0)
- {
- errmsg ("node name required");
- return -99;
- }
- if (vec_len (node_name) >= ARRAY_LEN (mp->node_name))
- {
- errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
- return -99;
- }
-
- if (next_node_name == 0)
- {
- errmsg ("next node name required");
- return -99;
- }
- if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name))
- {
- errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name));
- return -99;
- }
-
- M (GET_NEXT_INDEX, mp);
- clib_memcpy (mp->node_name, node_name, vec_len (node_name));
- clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name));
- vec_free (node_name);
- vec_free (next_node_name);
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_add_node_next (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_add_node_next_t *mp;
- u8 *name = 0;
- u8 *next = 0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "node %s", &name))
- ;
- else if (unformat (i, "next %s", &next))
- ;
- else
- break;
- }
- if (name == 0)
- {
- errmsg ("node name required");
- return -99;
- }
- if (vec_len (name) >= ARRAY_LEN (mp->node_name))
- {
- errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
- return -99;
- }
- if (next == 0)
- {
- errmsg ("next node required");
- return -99;
- }
- if (vec_len (next) >= ARRAY_LEN (mp->next_name))
- {
- errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name));
- return -99;
- }
-
- M (ADD_NODE_NEXT, mp);
- clib_memcpy (mp->node_name, name, vec_len (name));
- clib_memcpy (mp->next_name, next, vec_len (next));
- vec_free (name);
- vec_free (next);
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_l2tpv3_create_tunnel (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- ip6_address_t client_address, our_address;
- int client_address_set = 0;
- int our_address_set = 0;
- u32 local_session_id = 0;
- u32 remote_session_id = 0;
- u64 local_cookie = 0;
- u64 remote_cookie = 0;
- u8 l2_sublayer_present = 0;
- vl_api_l2tpv3_create_tunnel_t *mp;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "client_address %U", unformat_ip6_address,
- &client_address))
- client_address_set = 1;
- else if (unformat (i, "our_address %U", unformat_ip6_address,
- &our_address))
- our_address_set = 1;
- else if (unformat (i, "local_session_id %d", &local_session_id))
- ;
- else if (unformat (i, "remote_session_id %d", &remote_session_id))
- ;
- else if (unformat (i, "local_cookie %lld", &local_cookie))
- ;
- else if (unformat (i, "remote_cookie %lld", &remote_cookie))
- ;
- else if (unformat (i, "l2-sublayer-present"))
- l2_sublayer_present = 1;
- else
- break;
- }
-
- if (client_address_set == 0)
- {
- errmsg ("client_address required");
- return -99;
- }
-
- if (our_address_set == 0)
- {
- errmsg ("our_address required");
- return -99;
- }
-
- M (L2TPV3_CREATE_TUNNEL, mp);
-
- clib_memcpy (mp->client_address, client_address.as_u8,
- sizeof (mp->client_address));
-
- clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address));
-
- 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);
- return ret;
-}
-
-static int
-api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u64 new_local_cookie = 0;
- u64 new_remote_cookie = 0;
- vl_api_l2tpv3_set_tunnel_cookies_t *mp;
- 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, "new_local_cookie %lld", &new_local_cookie))
- ;
- else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
- ;
- else
- break;
- }
-
- if (sw_if_index_set == 0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
-
- M (L2TPV3_SET_TUNNEL_COOKIES, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
- mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_l2tpv3_interface_enable_disable (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_l2tpv3_interface_enable_disable_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 enable_disable = 1;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "enable"))
- enable_disable = 1;
- else if (unformat (i, "disable"))
- enable_disable = 0;
- else
- break;
- }
-
- if (sw_if_index_set == 0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
-
- M (L2TPV3_INTERFACE_ENABLE_DISABLE, mp);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable_disable = enable_disable;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static int
-api_l2tpv3_set_lookup_key (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_l2tpv3_set_lookup_key_t *mp;
- u8 key = ~0;
- int ret;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "lookup_v6_src"))
- key = L2T_LOOKUP_SRC_ADDRESS;
- else if (unformat (i, "lookup_v6_dst"))
- key = L2T_LOOKUP_DST_ADDRESS;
- else if (unformat (i, "lookup_session_id"))
- key = L2T_LOOKUP_SESSION_ID;
- else
- break;
- }
-
- if (key == (u8) ~ 0)
- {
- errmsg ("l2tp session lookup key unset");
- return -99;
- }
-
- M (L2TPV3_SET_LOOKUP_KEY, mp);
-
- mp->key = key;
-
- S (mp);
- W (ret);
- return ret;
-}
-
-static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler
- (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
-
- print (vam->ofp, "* %U (our) %U (client) (sw_if_index %d)",
- format_ip6_address, mp->our_address,
- format_ip6_address, mp->client_address,
- clib_net_to_host_u32 (mp->sw_if_index));
-
- print (vam->ofp,
- " local cookies %016llx %016llx remote cookie %016llx",
- clib_net_to_host_u64 (mp->local_cookie[0]),
- clib_net_to_host_u64 (mp->local_cookie[1]),
- clib_net_to_host_u64 (mp->remote_cookie));
-
- print (vam->ofp, " local session-id %d remote session-id %d",
- clib_net_to_host_u32 (mp->local_session_id),
- clib_net_to_host_u32 (mp->remote_session_id));
-
- print (vam->ofp, " l2 specific sublayer %s\n",
- mp->l2_sublayer_present ? "preset" : "absent");
-
-}
-
-static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
- (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in6_addr addr;
-
- 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);
-
- clib_memcpy (&addr, mp->our_address, sizeof (addr));
- vat_json_object_add_ip6 (node, "our_address", addr);
- clib_memcpy (&addr, mp->client_address, sizeof (addr));
- vat_json_object_add_ip6 (node, "client_address", addr);
-
- vat_json_node_t *lc = vat_json_object_add (node, "local_cookie");
- vat_json_init_array (lc);
- vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0]));
- vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1]));
- vat_json_object_add_uint (node, "remote_cookie",
- clib_net_to_host_u64 (mp->remote_cookie));
-
- printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id));
- vat_json_object_add_uint (node, "local_session_id",
- clib_net_to_host_u32 (mp->local_session_id));
- vat_json_object_add_uint (node, "remote_session_id",
- clib_net_to_host_u32 (mp->remote_session_id));
- vat_json_object_add_string_copy (node, "l2_sublayer",
- mp->l2_sublayer_present ? (u8 *) "present"
- : (u8 *) "absent");
-}
-
-static int
-api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
-{
- vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- int ret;
-
- /* Get list of l2tpv3-tunnel interfaces */
- M (SW_IF_L2TPV3_TUNNEL_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_sw_interface_tap_details_t_handler
- (vl_api_sw_interface_tap_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
-
- print (vam->ofp, "%-16s %d",
- mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index));
-}
-
-static void vl_api_sw_interface_tap_details_t_handler_json
- (vl_api_sw_interface_tap_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
- node = vat_json_array_add (&vam->json_tree);
-
- vat_json_init_object (node);
- vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_object_add_string_copy (node, "dev_name", mp->dev_name);
-}
-
-static int
-api_sw_interface_tap_dump (vat_main_t * vam)
-{
- vl_api_sw_interface_tap_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- int ret;
-
- print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index");
- /* Get list of tap interfaces */
- M (SW_INTERFACE_TAP_DUMP, mp);
- S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
- W (ret);
- return ret;
-}
-
-static uword unformat_vxlan_decap_next
- (unformat_input_t * input, va_list * args)
-{
- u32 *result = va_arg (*args, u32 *);
- u32 tmp;
-
- if (unformat (input, "l2"))
- *result = VXLAN_INPUT_NEXT_L2_INPUT;
- else if (unformat (input, "%d", &tmp))
- *result = tmp;
- else
- return 0;
- return 1;
-}
-
-static int
-api_vxlan_add_del_tunnel (vat_main_t * vam)
-{
- unformat_input_t *line_input = vam->input;
- vl_api_vxlan_add_del_tunnel_t *mp;
- ip46_address_t src, dst;
- u8 is_add = 1;
- u8 ipv4_set = 0, ipv6_set = 0;
- u8 src_set = 0;
- u8 dst_set = 0;
- u8 grp_set = 0;
- u32 mcast_sw_if_index = ~0;
- u32 encap_vrf_id = 0;
- u32 decap_next_index = ~0;
- u32 vni = 0;
- int ret;
-
- /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
- memset (&src, 0, sizeof src);
- memset (&dst, 0, sizeof dst);
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (line_input, "del"))
- is_add = 0;
- else
- if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
- {
- ipv4_set = 1;
- src_set = 1;
- }
- else
- if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
- {
- ipv4_set = 1;
- dst_set = 1;
- }
- else
- if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
- {
- ipv6_set = 1;
- src_set = 1;
- }
- else
- if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
- {
- ipv6_set = 1;
- dst_set = 1;
- }
- else if (unformat (line_input, "group %U %U",
- unformat_ip4_address, &dst.ip4,
- api_unformat_sw_if_index, vam, &mcast_sw_if_index))
- {
- grp_set = dst_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "group %U",
- unformat_ip4_address, &dst.ip4))
- {
- grp_set = dst_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "group %U %U",
- unformat_ip6_address, &dst.ip6,
- api_unformat_sw_if_index, vam, &mcast_sw_if_index))
- {
- grp_set = dst_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "group %U",
- unformat_ip6_address, &dst.ip6))
- {
- grp_set = dst_set = 1;
- ipv6_set = 1;
- }
- else
- if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
- ;
- else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
- ;
- else if (unformat (line_input, "decap-next %U",
- unformat_vxlan_decap_next, &decap_next_index))
- ;
- else if (unformat (line_input, "vni %d", &vni))
- ;
- else
- {
- errmsg ("parse error '%U'", format_unformat_error, line_input);
- return -99;
- }
- }
-
- if (src_set == 0)
- {
- errmsg ("tunnel src address not specified");
- return -99;
- }
- if (dst_set == 0)
- {
- errmsg ("tunnel dst address not specified");
- return -99;
- }
-
- if (grp_set && !ip46_address_is_multicast (&dst))
- {
- errmsg ("tunnel group address not multicast");
- return -99;
- }
- if (grp_set && mcast_sw_if_index == ~0)
- {
- errmsg ("tunnel nonexistent multicast device");
- return -99;
- }
- if (grp_set == 0 && ip46_address_is_multicast (&dst))
- {
- errmsg ("tunnel dst address must be unicast");
- return -99;
- }
-
-
- if (ipv4_set && ipv6_set)
- {
- errmsg ("both IPv4 and IPv6 addresses specified");
- return -99;
- }
-
- if ((vni == 0) || (vni >> 24))
- {
- errmsg ("vni not specified or out of range");
- return -99;
- }
-
- M (VXLAN_ADD_DEL_TUNNEL, mp);
-
- if (ipv6_set)
- {
- clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6));
- clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6));
- }
- else
- {
- clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4));
- clib_memcpy (mp->dst_address, &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);
- return ret;
-}
-
-static void vl_api_vxlan_tunnel_details_t_handler
- (vl_api_vxlan_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);
-
- print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d",
- ntohl (mp->sw_if_index),
- format_ip46_address, &src, IP46_TYPE_ANY,
- format_ip46_address, &dst, IP46_TYPE_ANY,
- ntohl (mp->encap_vrf_id),
- ntohl (mp->decap_next_index), ntohl (mp->vni),
- ntohl (mp->mcast_sw_if_index));
-}
-
-static void vl_api_vxlan_tunnel_details_t_handler_json
- (vl_api_vxlan_tunnel_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
+ }
- if (VAT_JSON_ARRAY != vam->json_tree.type)
+ if (l4 && !l3)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ vec_free (match);
+ vec_free (l2);
+ vec_free (l4);
+ return 0;
}
- 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));
- if (mp->is_ipv6)
+ if (match || l2 || l3 || l4)
{
- struct in6_addr ip6;
+ if (l2 || l3 || l4)
+ {
+ /* "Win a free Ethernet header in every packet" */
+ if (l2 == 0)
+ vec_validate_aligned (l2, 13, sizeof (u32x4));
+ match = l2;
+ if (vec_len (l3))
+ {
+ vec_append_aligned (match, l3, sizeof (u32x4));
+ vec_free (l3);
+ }
+ if (vec_len (l4))
+ {
+ vec_append_aligned (match, l4, sizeof (u32x4));
+ vec_free (l4);
+ }
+ }
- clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "src_address", ip6);
- clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "dst_address", ip6);
- }
- else
- {
- struct in_addr ip4;
+ /* Make sure the vector is big enough even if key is all 0's */
+ vec_validate_aligned
+ (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1,
+ sizeof (u32x4));
- clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
- clib_memcpy (&ip4, mp->dst_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "dst_address", ip4);
+ /* Set size, include skipped vectors */
+ _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4);
+
+ *matchp = match;
+
+ return 1;
}
- 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));
+
+ return 0;
}
static int
-api_vxlan_tunnel_dump (vat_main_t * vam)
+api_classify_add_del_session (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_vxlan_tunnel_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ vl_api_classify_add_del_session_t *mp;
+ int is_add = 1;
+ u32 table_index = ~0;
+ u32 hit_next_index = ~0;
+ u32 opaque_index = ~0;
+ u8 *match = 0;
+ i32 advance = 0;
+ u32 skip_n_vectors = 0;
+ u32 match_n_vectors = 0;
+ u32 action = 0;
+ u32 metadata = 0;
int ret;
- /* Parse args required to build the message */
+ /*
+ * Warning: you have to supply skip_n and match_n
+ * because the API client cant simply look at the classify
+ * table object.
+ */
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "hit-next %U", api_unformat_ip_next_index,
+ &hit_next_index))
+ ;
+ else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
+ &hit_next_index))
+ ;
+ else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index,
+ &hit_next_index))
+ ;
+ else if (unformat (i, "policer-hit-next %d", &hit_next_index))
+ ;
+ else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
+ ;
+ else if (unformat (i, "opaque-index %d", &opaque_index))
+ ;
+ else if (unformat (i, "skip_n %d", &skip_n_vectors))
+ ;
+ else if (unformat (i, "match_n %d", &match_n_vectors))
+ ;
+ else if (unformat (i, "match %U", api_unformat_classify_match,
+ &match, skip_n_vectors, match_n_vectors))
+ ;
+ else if (unformat (i, "advance %d", &advance))
+ ;
+ else if (unformat (i, "table-index %d", &table_index))
+ ;
+ else if (unformat (i, "action set-ip4-fib-id %d", &metadata))
+ action = 1;
+ else if (unformat (i, "action set-ip6-fib-id %d", &metadata))
+ action = 2;
+ else if (unformat (i, "action %d", &action))
+ ;
+ else if (unformat (i, "metadata %d", &metadata))
+ ;
else
break;
}
- if (sw_if_index_set == 0)
+ if (table_index == ~0)
{
- sw_if_index = ~0;
+ errmsg ("Table index required");
+ return -99;
}
- if (!vam->json_output)
+ if (is_add && match == 0)
{
- print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s",
- "sw_if_index", "src_address", "dst_address",
- "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index");
+ errmsg ("Match value required");
+ return -99;
}
- /* Get list of vxlan-tunnel interfaces */
- M (VXLAN_TUNNEL_DUMP, mp);
+ M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match));
- mp->sw_if_index = htonl (sw_if_index);
+ mp->is_add = is_add;
+ mp->table_index = ntohl (table_index);
+ mp->hit_next_index = ntohl (hit_next_index);
+ mp->opaque_index = ntohl (opaque_index);
+ mp->advance = ntohl (advance);
+ mp->action = action;
+ mp->metadata = ntohl (metadata);
+ mp->match_len = ntohl (vec_len (match));
+ clib_memcpy (mp->match, match, vec_len (match));
+ vec_free (match);
S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
W (ret);
return ret;
}
-static uword unformat_geneve_decap_next
- (unformat_input_t * input, va_list * args)
-{
- u32 *result = va_arg (*args, u32 *);
- u32 tmp;
-
- if (unformat (input, "l2"))
- *result = GENEVE_INPUT_NEXT_L2_INPUT;
- else if (unformat (input, "%d", &tmp))
- *result = tmp;
- else
- return 0;
- return 1;
-}
-
static int
-api_geneve_add_del_tunnel (vat_main_t * vam)
+api_classify_set_interface_ip_table (vat_main_t * vam)
{
- unformat_input_t *line_input = vam->input;
- vl_api_geneve_add_del_tunnel_t *mp;
- ip46_address_t src, dst;
- u8 is_add = 1;
- u8 ipv4_set = 0, ipv6_set = 0;
- u8 src_set = 0;
- u8 dst_set = 0;
- u8 grp_set = 0;
- u32 mcast_sw_if_index = ~0;
- u32 encap_vrf_id = 0;
- u32 decap_next_index = ~0;
- u32 vni = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_classify_set_interface_ip_table_t *mp;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 table_index = ~0;
+ u8 is_ipv6 = 0;
int ret;
-
- /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
- memset (&src, 0, sizeof src);
- memset (&dst, 0, sizeof dst);
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (line_input, "del"))
- is_add = 0;
- else
- if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
- {
- ipv4_set = 1;
- src_set = 1;
- }
- else
- if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
- {
- ipv4_set = 1;
- dst_set = 1;
- }
- else
- if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
- {
- ipv6_set = 1;
- src_set = 1;
- }
- else
- if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
- {
- ipv6_set = 1;
- dst_set = 1;
- }
- else if (unformat (line_input, "group %U %U",
- unformat_ip4_address, &dst.ip4,
- api_unformat_sw_if_index, vam, &mcast_sw_if_index))
- {
- grp_set = dst_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "group %U",
- unformat_ip4_address, &dst.ip4))
- {
- grp_set = dst_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "group %U %U",
- unformat_ip6_address, &dst.ip6,
- api_unformat_sw_if_index, vam, &mcast_sw_if_index))
- {
- grp_set = dst_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "group %U",
- unformat_ip6_address, &dst.ip6))
- {
- grp_set = dst_set = 1;
- ipv6_set = 1;
- }
- else
- if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
- ;
- else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
- ;
- else if (unformat (line_input, "decap-next %U",
- unformat_geneve_decap_next, &decap_next_index))
- ;
- else if (unformat (line_input, "vni %d", &vni))
+
+ 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, "table %d", &table_index))
;
else
{
- errmsg ("parse error '%U'", format_unformat_error, line_input);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (src_set == 0)
- {
- errmsg ("tunnel src address not specified");
- return -99;
- }
- if (dst_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("tunnel dst address not specified");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- if (grp_set && !ip46_address_is_multicast (&dst))
+
+ M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->table_index = ntohl (table_index);
+ mp->is_ipv6 = is_ipv6;
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static int
+api_classify_set_interface_l2_tables (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_classify_set_interface_l2_tables_t *mp;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 ip4_table_index = ~0;
+ u32 ip6_table_index = ~0;
+ u32 other_table_index = ~0;
+ u32 is_input = 1;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- errmsg ("tunnel group address not multicast");
- return -99;
+ 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, "ip4-table %d", &ip4_table_index))
+ ;
+ else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ ;
+ else if (unformat (i, "other-table %d", &other_table_index))
+ ;
+ else if (unformat (i, "is-input %d", &is_input))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (grp_set && mcast_sw_if_index == ~0)
+
+ if (sw_if_index_set == 0)
{
- errmsg ("tunnel nonexistent multicast device");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- if (grp_set == 0 && ip46_address_is_multicast (&dst))
+
+
+ M (CLASSIFY_SET_INTERFACE_L2_TABLES, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->ip4_table_index = ntohl (ip4_table_index);
+ mp->ip6_table_index = ntohl (ip6_table_index);
+ mp->other_table_index = ntohl (other_table_index);
+ mp->is_input = (u8) is_input;
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static int
+api_set_ipfix_exporter (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_set_ipfix_exporter_t *mp;
+ ip4_address_t collector_address;
+ u8 collector_address_set = 0;
+ u32 collector_port = ~0;
+ ip4_address_t src_address;
+ u8 src_address_set = 0;
+ u32 vrf_id = ~0;
+ u32 path_mtu = ~0;
+ u32 template_interval = ~0;
+ u8 udp_checksum = 0;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- errmsg ("tunnel dst address must be unicast");
- return -99;
+ if (unformat (i, "collector_address %U", unformat_ip4_address,
+ &collector_address))
+ collector_address_set = 1;
+ else if (unformat (i, "collector_port %d", &collector_port))
+ ;
+ else if (unformat (i, "src_address %U", unformat_ip4_address,
+ &src_address))
+ src_address_set = 1;
+ else if (unformat (i, "vrf_id %d", &vrf_id))
+ ;
+ else if (unformat (i, "path_mtu %d", &path_mtu))
+ ;
+ else if (unformat (i, "template_interval %d", &template_interval))
+ ;
+ else if (unformat (i, "udp_checksum"))
+ udp_checksum = 1;
+ else
+ break;
}
-
- if (ipv4_set && ipv6_set)
+ if (collector_address_set == 0)
{
- errmsg ("both IPv4 and IPv6 addresses specified");
+ errmsg ("collector_address required");
return -99;
}
- if ((vni == 0) || (vni >> 24))
+ if (src_address_set == 0)
{
- errmsg ("vni not specified or out of range");
+ errmsg ("src_address required");
return -99;
}
- M (GENEVE_ADD_DEL_TUNNEL, mp);
+ M (SET_IPFIX_EXPORTER, mp);
- if (ipv6_set)
- {
- clib_memcpy (mp->local_address, &src.ip6, sizeof (src.ip6));
- clib_memcpy (mp->remote_address, &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));
- }
- 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;
+ memcpy (mp->collector_address, 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));
+ mp->vrf_id = htonl (vrf_id);
+ mp->path_mtu = htonl (path_mtu);
+ mp->template_interval = htonl (template_interval);
+ mp->udp_checksum = udp_checksum;
S (mp);
W (ret);
return ret;
}
-static void vl_api_geneve_tunnel_details_t_handler
- (vl_api_geneve_tunnel_details_t * mp)
+static int
+api_set_ipfix_classify_stream (vat_main_t * vam)
{
- 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);
+ unformat_input_t *i = vam->input;
+ vl_api_set_ipfix_classify_stream_t *mp;
+ u32 domain_id = 0;
+ u32 src_port = UDP_DST_PORT_ipfix;
+ int ret;
- print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d",
- ntohl (mp->sw_if_index),
- format_ip46_address, &src, IP46_TYPE_ANY,
- format_ip46_address, &dst, IP46_TYPE_ANY,
- ntohl (mp->encap_vrf_id),
- ntohl (mp->decap_next_index), ntohl (mp->vni),
- ntohl (mp->mcast_sw_if_index));
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "domain %d", &domain_id))
+ ;
+ else if (unformat (i, "src_port %d", &src_port))
+ ;
+ else
+ {
+ errmsg ("unknown input `%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ M (SET_IPFIX_CLASSIFY_STREAM, mp);
+
+ mp->domain_id = htonl (domain_id);
+ mp->src_port = htons ((u16) src_port);
+
+ S (mp);
+ W (ret);
+ return ret;
}
-static void vl_api_geneve_tunnel_details_t_handler_json
- (vl_api_geneve_tunnel_details_t * mp)
+static int
+api_ipfix_classify_table_add_del (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
+ unformat_input_t *i = vam->input;
+ vl_api_ipfix_classify_table_add_del_t *mp;
+ int is_add = -1;
+ u32 classify_table_index = ~0;
+ u8 ip_version = 0;
+ u8 transport_protocol = 255;
+ int ret;
- if (VAT_JSON_ARRAY != vam->json_tree.type)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "table %d", &classify_table_index))
+ ;
+ else if (unformat (i, "ip4"))
+ ip_version = 4;
+ else if (unformat (i, "ip6"))
+ ip_version = 6;
+ else if (unformat (i, "tcp"))
+ transport_protocol = 6;
+ else if (unformat (i, "udp"))
+ transport_protocol = 17;
+ else
+ {
+ errmsg ("unknown input `%U'", format_unformat_error, i);
+ return -99;
+ }
}
- 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));
- if (mp->is_ipv6)
+ if (is_add == -1)
{
- struct in6_addr ip6;
-
- clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "src_address", ip6);
- clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "dst_address", ip6);
+ errmsg ("expecting: add|del");
+ return -99;
}
- else
+ if (classify_table_index == ~0)
{
- struct in_addr ip4;
-
- clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
- clib_memcpy (&ip4, mp->dst_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "dst_address", ip4);
+ errmsg ("classifier table not specified");
+ return -99;
}
- 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));
+ if (ip_version == 0)
+ {
+ errmsg ("IP version not specified");
+ return -99;
+ }
+
+ M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp);
+
+ mp->is_add = is_add;
+ mp->table_id = htonl (classify_table_index);
+ mp->ip_version = ip_version;
+ mp->transport_protocol = transport_protocol;
+
+ S (mp);
+ W (ret);
+ return ret;
}
static int
-api_geneve_tunnel_dump (vat_main_t * vam)
+api_get_node_index (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_geneve_tunnel_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ vl_api_get_node_index_t *mp;
+ u8 *name = 0;
int ret;
- /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
+ if (unformat (i, "node %s", &name))
+ ;
else
break;
}
-
- if (sw_if_index_set == 0)
+ if (name == 0)
{
- sw_if_index = ~0;
+ errmsg ("node name required");
+ return -99;
}
-
- if (!vam->json_output)
+ if (vec_len (name) >= ARRAY_LEN (mp->node_name))
{
- print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s",
- "sw_if_index", "local_address", "remote_address",
- "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index");
+ errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
+ return -99;
}
- /* Get list of geneve-tunnel interfaces */
- M (GENEVE_TUNNEL_DUMP, mp);
-
- mp->sw_if_index = htonl (sw_if_index);
+ M (GET_NODE_INDEX, mp);
+ clib_memcpy (mp->node_name, name, vec_len (name));
+ vec_free (name);
S (mp);
-
- /* Use a control ping for synchronization */
- M (CONTROL_PING, mp_ping);
- S (mp_ping);
-
W (ret);
return ret;
}
static int
-api_gre_add_del_tunnel (vat_main_t * vam)
+api_get_next_index (vat_main_t * vam)
{
- unformat_input_t *line_input = vam->input;
- vl_api_gre_add_del_tunnel_t *mp;
- ip4_address_t src4, dst4;
- ip6_address_t src6, dst6;
- u8 is_add = 1;
- u8 ipv4_set = 0;
- u8 ipv6_set = 0;
- u8 teb = 0;
- u8 src_set = 0;
- u8 dst_set = 0;
- u32 outer_fib_id = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_get_next_index_t *mp;
+ u8 *node_name = 0, *next_node_name = 0;
int ret;
- memset (&src4, 0, sizeof src4);
- memset (&dst4, 0, sizeof dst4);
- memset (&src6, 0, sizeof src6);
- memset (&dst6, 0, sizeof dst6);
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "del"))
- is_add = 0;
- else if (unformat (line_input, "src %U", unformat_ip4_address, &src4))
- {
- src_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4))
- {
- dst_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "src %U", unformat_ip6_address, &src6))
- {
- src_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "dst %U", unformat_ip6_address, &dst6))
- {
- dst_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+ if (unformat (i, "node-name %s", &node_name))
;
- else if (unformat (line_input, "teb"))
- teb = 1;
- else
- {
- errmsg ("parse error '%U'", format_unformat_error, line_input);
- return -99;
- }
+ else if (unformat (i, "next-node-name %s", &next_node_name))
+ break;
}
- if (src_set == 0)
- {
- errmsg ("tunnel src address not specified");
- return -99;
- }
- if (dst_set == 0)
+ if (node_name == 0)
{
- errmsg ("tunnel dst address not specified");
+ errmsg ("node name required");
return -99;
}
- if (ipv4_set && ipv6_set)
+ if (vec_len (node_name) >= ARRAY_LEN (mp->node_name))
{
- errmsg ("both IPv4 and IPv6 addresses specified");
+ errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
return -99;
}
-
- M (GRE_ADD_DEL_TUNNEL, mp);
-
- if (ipv4_set)
+ if (next_node_name == 0)
{
- clib_memcpy (&mp->src_address, &src4, 4);
- clib_memcpy (&mp->dst_address, &dst4, 4);
+ errmsg ("next node name required");
+ return -99;
}
- else
+ if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name))
{
- clib_memcpy (&mp->src_address, &src6, 16);
- clib_memcpy (&mp->dst_address, &dst6, 16);
+ errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name));
+ return -99;
}
- mp->outer_fib_id = ntohl (outer_fib_id);
- mp->is_add = is_add;
- mp->teb = teb;
- mp->is_ipv6 = ipv6_set;
+
+ M (GET_NEXT_INDEX, mp);
+ clib_memcpy (mp->node_name, node_name, vec_len (node_name));
+ clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name));
+ vec_free (node_name);
+ vec_free (next_node_name);
S (mp);
W (ret);
return ret;
}
-static void vl_api_gre_tunnel_details_t_handler
- (vl_api_gre_tunnel_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- ip46_address_t src = to_ip46 (mp->is_ipv6, mp->src_address);
- ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->dst_address);
-
- print (vam->ofp, "%11d%24U%24U%6d%14d",
- ntohl (mp->sw_if_index),
- format_ip46_address, &src, IP46_TYPE_ANY,
- format_ip46_address, &dst, IP46_TYPE_ANY,
- mp->teb, ntohl (mp->outer_fib_id));
-}
-
-static void vl_api_gre_tunnel_details_t_handler_json
- (vl_api_gre_tunnel_details_t * mp)
+static int
+api_add_node_next (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in_addr ip4;
- struct in6_addr ip6;
+ unformat_input_t *i = vam->input;
+ vl_api_add_node_next_t *mp;
+ u8 *name = 0;
+ u8 *next = 0;
+ int ret;
- if (VAT_JSON_ARRAY != vam->json_tree.type)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ if (unformat (i, "node %s", &name))
+ ;
+ else if (unformat (i, "next %s", &next))
+ ;
+ else
+ break;
}
- 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));
- if (!mp->is_ipv6)
+ if (name == 0)
{
- clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
- clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "dst_address", ip4);
+ errmsg ("node name required");
+ return -99;
}
- else
+ if (vec_len (name) >= ARRAY_LEN (mp->node_name))
{
- clib_memcpy (&ip6, &mp->src_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "src_address", ip6);
- clib_memcpy (&ip6, &mp->dst_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "dst_address", ip6);
+ errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name));
+ return -99;
}
- vat_json_object_add_uint (node, "teb", mp->teb);
- vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_id));
- vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6);
+ if (next == 0)
+ {
+ errmsg ("next node required");
+ return -99;
+ }
+ if (vec_len (next) >= ARRAY_LEN (mp->next_name))
+ {
+ errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name));
+ return -99;
+ }
+
+ M (ADD_NODE_NEXT, mp);
+ clib_memcpy (mp->node_name, name, vec_len (name));
+ clib_memcpy (mp->next_name, next, vec_len (next));
+ vec_free (name);
+ vec_free (next);
+
+ S (mp);
+ W (ret);
+ return ret;
}
static int
-api_gre_tunnel_dump (vat_main_t * vam)
+api_l2tpv3_create_tunnel (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_gre_tunnel_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ ip6_address_t client_address, our_address;
+ int client_address_set = 0;
+ int our_address_set = 0;
+ u32 local_session_id = 0;
+ u32 remote_session_id = 0;
+ u64 local_cookie = 0;
+ u64 remote_cookie = 0;
+ u8 l2_sublayer_present = 0;
+ vl_api_l2tpv3_create_tunnel_t *mp;
int ret;
- /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
+ if (unformat (i, "client_address %U", unformat_ip6_address,
+ &client_address))
+ client_address_set = 1;
+ else if (unformat (i, "our_address %U", unformat_ip6_address,
+ &our_address))
+ our_address_set = 1;
+ else if (unformat (i, "local_session_id %d", &local_session_id))
+ ;
+ else if (unformat (i, "remote_session_id %d", &remote_session_id))
+ ;
+ else if (unformat (i, "local_cookie %lld", &local_cookie))
+ ;
+ else if (unformat (i, "remote_cookie %lld", &remote_cookie))
+ ;
+ else if (unformat (i, "l2-sublayer-present"))
+ l2_sublayer_present = 1;
else
break;
}
- if (sw_if_index_set == 0)
+ if (client_address_set == 0)
{
- sw_if_index = ~0;
+ errmsg ("client_address required");
+ return -99;
}
- if (!vam->json_output)
+ if (our_address_set == 0)
{
- print (vam->ofp, "%11s%24s%24s%6s%14s",
- "sw_if_index", "src_address", "dst_address", "teb",
- "outer_fib_id");
+ errmsg ("our_address required");
+ return -99;
}
- /* Get list of gre-tunnel interfaces */
- M (GRE_TUNNEL_DUMP, mp);
-
- mp->sw_if_index = htonl (sw_if_index);
-
- S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
+ M (L2TPV3_CREATE_TUNNEL, mp);
- W (ret);
- return ret;
-}
+ clib_memcpy (mp->client_address, client_address.as_u8,
+ sizeof (mp->client_address));
-static int
-api_l2_fib_clear_table (vat_main_t * vam)
-{
-// unformat_input_t * i = vam->input;
- vl_api_l2_fib_clear_table_t *mp;
- int ret;
+ clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address));
- M (L2_FIB_CLEAR_TABLE, mp);
+ 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);
}
static int
-api_l2_interface_efp_filter (vat_main_t * vam)
+api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2_interface_efp_filter_t *mp;
u32 sw_if_index;
- u8 enable = 1;
u8 sw_if_index_set = 0;
+ u64 new_local_cookie = 0;
+ u64 new_remote_cookie = 0;
+ vl_api_l2tpv3_set_tunnel_cookies_t *mp;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
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 if (unformat (i, "new_local_cookie %lld", &new_local_cookie))
+ ;
+ else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
+ ;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
if (sw_if_index_set == 0)
{
- errmsg ("missing sw_if_index");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (L2_INTERFACE_EFP_FILTER, mp);
+ M (L2TPV3_SET_TUNNEL_COOKIES, mp);
mp->sw_if_index = ntohl (sw_if_index);
- mp->enable_disable = enable;
+ mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie);
+ mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie);
S (mp);
W (ret);
return ret;
}
-#define foreach_vtr_op \
-_("disable", L2_VTR_DISABLED) \
-_("push-1", L2_VTR_PUSH_1) \
-_("push-2", L2_VTR_PUSH_2) \
-_("pop-1", L2_VTR_POP_1) \
-_("pop-2", L2_VTR_POP_2) \
-_("translate-1-1", L2_VTR_TRANSLATE_1_1) \
-_("translate-1-2", L2_VTR_TRANSLATE_1_2) \
-_("translate-2-1", L2_VTR_TRANSLATE_2_1) \
-_("translate-2-2", L2_VTR_TRANSLATE_2_2)
-
static int
-api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
+api_l2tpv3_interface_enable_disable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2_interface_vlan_tag_rewrite_t *mp;
+ vl_api_l2tpv3_interface_enable_disable_t *mp;
u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 vtr_op_set = 0;
- u32 vtr_op = 0;
- u32 push_dot1q = 1;
- u32 tag1 = ~0;
- u32 tag2 = ~0;
+ u8 enable_disable = 1;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
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, "vtr_op %d", &vtr_op))
- vtr_op_set = 1;
-#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;}
- foreach_vtr_op
-#undef _
- else if (unformat (i, "push_dot1q %d", &push_dot1q))
- ;
- else if (unformat (i, "tag1 %d", &tag1))
- ;
- else if (unformat (i, "tag2 %d", &tag2))
- ;
+ else if (unformat (i, "enable"))
+ enable_disable = 1;
+ else if (unformat (i, "disable"))
+ enable_disable = 0;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if ((sw_if_index_set == 0) || (vtr_op_set == 0))
+ if (sw_if_index_set == 0)
{
- errmsg ("missing vtr operation or sw_if_index");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (L2_INTERFACE_VLAN_TAG_REWRITE, mp);
+ M (L2TPV3_INTERFACE_ENABLE_DISABLE, mp);
+
mp->sw_if_index = ntohl (sw_if_index);
- mp->vtr_op = ntohl (vtr_op);
- mp->push_dot1q = ntohl (push_dot1q);
- mp->tag1 = ntohl (tag1);
- mp->tag2 = ntohl (tag2);
+ mp->enable_disable = enable_disable;
S (mp);
W (ret);
}
static int
-api_create_vhost_user_if (vat_main_t * vam)
+api_l2tpv3_set_lookup_key (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_create_vhost_user_if_t *mp;
- u8 *file_name;
- u8 is_server = 0;
- u8 file_name_set = 0;
- u32 custom_dev_instance = ~0;
- u8 hwaddr[6];
- u8 use_custom_mac = 0;
- u8 *tag = 0;
+ vl_api_l2tpv3_set_lookup_key_t *mp;
+ u8 key = ~0;
int ret;
- /* Shut up coverity */
- memset (hwaddr, 0, sizeof (hwaddr));
-
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "socket %s", &file_name))
- {
- file_name_set = 1;
- }
- else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
- ;
- else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr))
- use_custom_mac = 1;
- else if (unformat (i, "server"))
- is_server = 1;
- else if (unformat (i, "tag %s", &tag))
- ;
+ if (unformat (i, "lookup_v6_src"))
+ key = L2T_LOOKUP_SRC_ADDRESS;
+ else if (unformat (i, "lookup_v6_dst"))
+ key = L2T_LOOKUP_DST_ADDRESS;
+ else if (unformat (i, "lookup_session_id"))
+ key = L2T_LOOKUP_SESSION_ID;
else
break;
}
- if (file_name_set == 0)
+ if (key == (u8) ~ 0)
{
- errmsg ("missing socket file name");
+ errmsg ("l2tp session lookup key unset");
return -99;
}
- if (vec_len (file_name) > 255)
- {
- errmsg ("socket file name too long");
- return -99;
- }
- vec_add1 (file_name, 0);
+ M (L2TPV3_SET_LOOKUP_KEY, mp);
- M (CREATE_VHOST_USER_IF, mp);
+ mp->key = key;
- mp->is_server = is_server;
- clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
- vec_free (file_name);
- if (custom_dev_instance != ~0)
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler
+ (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ print (vam->ofp, "* %U (our) %U (client) (sw_if_index %d)",
+ format_ip6_address, mp->our_address,
+ format_ip6_address, mp->client_address,
+ clib_net_to_host_u32 (mp->sw_if_index));
+
+ print (vam->ofp,
+ " local cookies %016llx %016llx remote cookie %016llx",
+ clib_net_to_host_u64 (mp->local_cookie[0]),
+ clib_net_to_host_u64 (mp->local_cookie[1]),
+ clib_net_to_host_u64 (mp->remote_cookie));
+
+ print (vam->ofp, " local session-id %d remote session-id %d",
+ clib_net_to_host_u32 (mp->local_session_id),
+ clib_net_to_host_u32 (mp->remote_session_id));
+
+ print (vam->ofp, " l2 specific sublayer %s\n",
+ mp->l2_sublayer_present ? "preset" : "absent");
+
+}
+
+static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
+ (vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in6_addr addr;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- mp->renumber = 1;
- mp->custom_dev_instance = ntohl (custom_dev_instance);
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
- mp->use_custom_mac = use_custom_mac;
- clib_memcpy (mp->mac_address, hwaddr, 6);
- if (tag)
- strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
- vec_free (tag);
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+
+ clib_memcpy (&addr, mp->our_address, sizeof (addr));
+ vat_json_object_add_ip6 (node, "our_address", addr);
+ clib_memcpy (&addr, mp->client_address, sizeof (addr));
+ vat_json_object_add_ip6 (node, "client_address", addr);
+
+ vat_json_node_t *lc = vat_json_object_add (node, "local_cookie");
+ vat_json_init_array (lc);
+ vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0]));
+ vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1]));
+ vat_json_object_add_uint (node, "remote_cookie",
+ clib_net_to_host_u64 (mp->remote_cookie));
+
+ printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id));
+ vat_json_object_add_uint (node, "local_session_id",
+ clib_net_to_host_u32 (mp->local_session_id));
+ vat_json_object_add_uint (node, "remote_session_id",
+ clib_net_to_host_u32 (mp->remote_session_id));
+ vat_json_object_add_string_copy (node, "l2_sublayer",
+ mp->l2_sublayer_present ? (u8 *) "present"
+ : (u8 *) "absent");
+}
+
+static int
+api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
+{
+ vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
+
+ /* Get list of l2tpv3-tunnel interfaces */
+ M (SW_IF_L2TPV3_TUNNEL_DUMP, mp);
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
- S (mp);
W (ret);
return ret;
}
-static int
-api_modify_vhost_user_if (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_modify_vhost_user_if_t *mp;
- u8 *file_name;
- u8 is_server = 0;
- u8 file_name_set = 0;
- u32 custom_dev_instance = ~0;
- u8 sw_if_index_set = 0;
- u32 sw_if_index = (u32) ~ 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, "socket %s", &file_name))
- {
- file_name_set = 1;
- }
- else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
- ;
- else if (unformat (i, "server"))
- is_server = 1;
- else
- break;
- }
+static void vl_api_sw_interface_tap_v2_details_t_handler
+ (vl_api_sw_interface_tap_v2_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
- if (sw_if_index_set == 0)
- {
- errmsg ("missing sw_if_index or interface name");
- return -99;
- }
+ 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);
- if (file_name_set == 0)
- {
- errmsg ("missing socket file name");
- return -99;
- }
+ print (vam->ofp,
+ "\n%-16s %-12d %-5d %-12d %-12d %-14U %-30s %-20s %-20s %-30s 0x%-08x",
+ mp->dev_name, ntohl (mp->sw_if_index), ntohl (mp->id),
+ ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz),
+ format_ethernet_address, mp->host_mac_addr, mp->host_namespace,
+ mp->host_bridge, ip4, ip6, ntohl (mp->tap_flags));
- if (vec_len (file_name) > 255)
- {
- errmsg ("socket file name too long");
- return -99;
- }
- vec_add1 (file_name, 0);
+ vec_free (ip4);
+ vec_free (ip6);
+}
- M (MODIFY_VHOST_USER_IF, mp);
+static void vl_api_sw_interface_tap_v2_details_t_handler_json
+ (vl_api_sw_interface_tap_v2_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_server = is_server;
- clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
- vec_free (file_name);
- if (custom_dev_instance != ~0)
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- mp->renumber = 1;
- mp->custom_dev_instance = ntohl (custom_dev_instance);
+ 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, "id", ntohl (mp->id));
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "tap_flags", ntohl (mp->tap_flags));
+ vat_json_object_add_string_copy (node, "dev_name", mp->dev_name);
+ 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));
+ vat_json_object_add_string_copy (node, "host_mac_addr",
+ format (0, "%U", format_ethernet_address,
+ &mp->host_mac_addr));
+ vat_json_object_add_string_copy (node, "host_namespace",
+ mp->host_namespace);
+ 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",
+ format (0, "%U/%d", format_ip6_address,
+ mp->host_ip6_addr,
+ mp->host_ip6_prefix_len));
- S (mp);
- W (ret);
- return ret;
}
static int
-api_delete_vhost_user_if (vat_main_t * vam)
+api_sw_interface_tap_v2_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_delete_vhost_user_if_t *mp;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
+ vl_api_sw_interface_tap_v2_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
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
- break;
- }
-
- if (sw_if_index_set == 0)
- {
- errmsg ("missing sw_if_index or interface name");
- return -99;
- }
-
+ print (vam->ofp,
+ "\n%-16s %-12s %-5s %-12s %-12s %-14s %-30s %-20s %-20s %-30s",
+ "dev_name", "sw_if_index", "id", "rx_ring_sz", "tx_ring_sz",
+ "host_mac_addr", "host_namespace", "host_bridge", "host_ip4_addr",
+ "host_ip6_addr");
- M (DELETE_VHOST_USER_IF, mp);
+ /* Get list of tap interfaces */
+ M (SW_INTERFACE_TAP_V2_DUMP, mp);
+ S (mp);
- mp->sw_if_index = ntohl (sw_if_index);
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
- S (mp);
W (ret);
return ret;
}
-static void vl_api_sw_interface_vhost_user_details_t_handler
- (vl_api_sw_interface_vhost_user_details_t * mp)
+static void vl_api_sw_interface_virtio_pci_details_t_handler
+ (vl_api_sw_interface_virtio_pci_details_t * mp)
{
vat_main_t *vam = &vat_main;
- 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,
- ntohl (mp->num_regions), (char *) mp->sock_filename);
- print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno)));
+ typedef union
+ {
+ struct
+ {
+ u16 domain;
+ u8 bus;
+ u8 slot:5;
+ u8 function:3;
+ };
+ u32 as_u32;
+ } pci_addr_t;
+ pci_addr_t addr;
+ addr.as_u32 = ntohl (mp->pci_addr);
+ u8 *pci_addr = format (0, "%04x:%02x:%02x.%x", addr.domain, addr.bus,
+ addr.slot, addr.function);
+
+ print (vam->ofp,
+ "\n%-12s %-12d %-12d %-12d %-17U 0x%-08llx",
+ pci_addr, ntohl (mp->sw_if_index),
+ ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz),
+ format_ethernet_address, mp->mac_addr,
+ clib_net_to_host_u64 (mp->features));
+ vec_free (pci_addr);
}
-static void vl_api_sw_interface_vhost_user_details_t_handler_json
- (vl_api_sw_interface_vhost_user_details_t * mp)
+static void vl_api_sw_interface_virtio_pci_details_t_handler_json
+ (vl_api_sw_interface_virtio_pci_details_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
node = vat_json_array_add (&vam->json_tree);
vat_json_init_object (node);
+ vat_json_object_add_uint (node, "pci-addr", ntohl (mp->pci_addr));
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, "virtio_net_hdr_sz",
- ntohl (mp->virtio_net_hdr_sz));
+ 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));
vat_json_object_add_uint (node, "features",
clib_net_to_host_u64 (mp->features));
- 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));
- vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno));
+ vat_json_object_add_string_copy (node, "mac_addr",
+ format (0, "%U", format_ethernet_address,
+ &mp->mac_addr));
}
static int
-api_sw_interface_vhost_user_dump (vat_main_t * vam)
+api_sw_interface_virtio_pci_dump (vat_main_t * vam)
{
- vl_api_sw_interface_vhost_user_dump_t *mp;
+ vl_api_sw_interface_virtio_pci_dump_t *mp;
vl_api_control_ping_t *mp_ping;
int ret;
+
print (vam->ofp,
- "Interface name idx hdr_sz features server regions filename");
+ "\n%-12s %-12s %-12s %-12s %-17s %-08s",
+ "pci_addr", "sw_if_index", "rx_ring_sz", "tx_ring_sz",
+ "mac_addr", "features");
- /* Get list of vhost-user interfaces */
- M (SW_INTERFACE_VHOST_USER_DUMP, mp);
+ /* Get list of tap interfaces */
+ M (SW_INTERFACE_VIRTIO_PCI_DUMP, mp);
S (mp);
/* Use a control ping for synchronization */
}
static int
-api_show_version (vat_main_t * vam)
+api_vxlan_offload_rx (vat_main_t * vam)
{
- vl_api_show_version_t *mp;
+ unformat_input_t *line_input = vam->input;
+ vl_api_vxlan_offload_rx_t *mp;
+ u32 hw_if_index = ~0, rx_if_index = ~0;
+ u8 is_add = 1;
int ret;
- M (SHOW_VERSION, mp);
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ is_add = 0;
+ else if (unformat (line_input, "hw %U", api_unformat_hw_if_index, vam,
+ &hw_if_index))
+ ;
+ else if (unformat (line_input, "hw hw_if_index %u", &hw_if_index))
+ ;
+ else if (unformat (line_input, "rx %U", api_unformat_sw_if_index, vam,
+ &rx_if_index))
+ ;
+ else if (unformat (line_input, "rx sw_if_index %u", &rx_if_index))
+ ;
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, line_input);
+ return -99;
+ }
+ }
+
+ if (hw_if_index == ~0)
+ {
+ errmsg ("no hw interface");
+ return -99;
+ }
+
+ if (rx_if_index == ~0)
+ {
+ errmsg ("no rx tunnel");
+ return -99;
+ }
+
+ M (VXLAN_OFFLOAD_RX, mp);
+
+ mp->hw_if_index = ntohl (hw_if_index);
+ mp->sw_if_index = ntohl (rx_if_index);
+ mp->enable = is_add;
S (mp);
W (ret);
return ret;
}
+static uword unformat_vxlan_decap_next
+ (unformat_input_t * input, va_list * args)
+{
+ u32 *result = va_arg (*args, u32 *);
+ u32 tmp;
+
+ if (unformat (input, "l2"))
+ *result = VXLAN_INPUT_NEXT_L2_INPUT;
+ else if (unformat (input, "%d", &tmp))
+ *result = tmp;
+ else
+ return 0;
+ return 1;
+}
static int
-api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
+api_vxlan_add_del_tunnel (vat_main_t * vam)
{
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;
+ vl_api_vxlan_add_del_tunnel_t *mp;
+ ip46_address_t src, dst;
u8 is_add = 1;
u8 ipv4_set = 0, ipv6_set = 0;
- u8 local_set = 0;
- u8 remote_set = 0;
+ u8 src_set = 0;
+ u8 dst_set = 0;
u8 grp_set = 0;
+ u32 instance = ~0;
u32 mcast_sw_if_index = ~0;
u32 encap_vrf_id = 0;
- u32 decap_vrf_id = 0;
- u8 protocol = ~0;
- u32 vni;
- u8 vni_set = 0;
+ u32 decap_next_index = ~0;
+ u32 vni = 0;
int ret;
/* Can't "universally zero init" (={0}) due to GCC bug 53119 */
- memset (&local4, 0, sizeof local4);
- memset (&remote4, 0, sizeof remote4);
- memset (&local6, 0, sizeof local6);
- memset (&remote6, 0, sizeof remote6);
+ clib_memset (&src, 0, sizeof src);
+ clib_memset (&dst, 0, sizeof dst);
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))
+ else if (unformat (line_input, "instance %d", &instance))
+ ;
+ else
+ if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
{
- local_set = 1;
ipv4_set = 1;
+ src_set = 1;
}
- else if (unformat (line_input, "remote %U",
- unformat_ip4_address, &remote4))
+ else
+ if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
{
- remote_set = 1;
ipv4_set = 1;
+ dst_set = 1;
}
- else if (unformat (line_input, "local %U",
- unformat_ip6_address, &local6))
+ else
+ if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
{
- local_set = 1;
ipv6_set = 1;
+ src_set = 1;
}
- else if (unformat (line_input, "remote %U",
- unformat_ip6_address, &remote6))
+ else
+ if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
{
- remote_set = 1;
ipv6_set = 1;
+ dst_set = 1;
}
else if (unformat (line_input, "group %U %U",
- unformat_ip4_address, &remote4,
+ unformat_ip4_address, &dst.ip4,
api_unformat_sw_if_index, vam, &mcast_sw_if_index))
{
- grp_set = remote_set = 1;
+ grp_set = dst_set = 1;
ipv4_set = 1;
}
else if (unformat (line_input, "group %U",
- unformat_ip4_address, &remote4))
+ unformat_ip4_address, &dst.ip4))
{
- grp_set = remote_set = 1;
+ grp_set = dst_set = 1;
ipv4_set = 1;
}
else if (unformat (line_input, "group %U %U",
- unformat_ip6_address, &remote6,
+ unformat_ip6_address, &dst.ip6,
api_unformat_sw_if_index, vam, &mcast_sw_if_index))
{
- grp_set = remote_set = 1;
+ grp_set = dst_set = 1;
ipv6_set = 1;
}
else if (unformat (line_input, "group %U",
- unformat_ip6_address, &remote6))
+ unformat_ip6_address, &dst.ip6))
{
- grp_set = remote_set = 1;
+ grp_set = dst_set = 1;
ipv6_set = 1;
}
else
;
else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
;
- else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+ else if (unformat (line_input, "decap-next %U",
+ unformat_vxlan_decap_next, &decap_next_index))
;
else if (unformat (line_input, "vni %d", &vni))
- vni_set = 1;
- else if (unformat (line_input, "next-ip4"))
- protocol = 1;
- else if (unformat (line_input, "next-ip6"))
- protocol = 2;
- else if (unformat (line_input, "next-ethernet"))
- protocol = 3;
- else if (unformat (line_input, "next-nsh"))
- protocol = 4;
+ ;
else
{
errmsg ("parse error '%U'", format_unformat_error, line_input);
}
}
- if (local_set == 0)
+ if (src_set == 0)
+ {
+ errmsg ("tunnel src address not specified");
+ return -99;
+ }
+ if (dst_set == 0)
{
- errmsg ("tunnel local address not specified");
+ errmsg ("tunnel dst address not specified");
return -99;
}
- if (remote_set == 0)
+
+ if (grp_set && !ip46_address_is_multicast (&dst))
{
- errmsg ("tunnel remote address not specified");
+ errmsg ("tunnel group address not multicast");
return -99;
}
if (grp_set && mcast_sw_if_index == ~0)
errmsg ("tunnel nonexistent multicast device");
return -99;
}
+ if (grp_set == 0 && ip46_address_is_multicast (&dst))
+ {
+ errmsg ("tunnel dst address must be unicast");
+ return -99;
+ }
+
+
if (ipv4_set && ipv6_set)
{
errmsg ("both IPv4 and IPv6 addresses specified");
return -99;
}
- if (vni_set == 0)
+ if ((vni == 0) || (vni >> 24))
{
- errmsg ("vni not specified");
+ errmsg ("vni not specified or out of range");
return -99;
}
- M (VXLAN_GPE_ADD_DEL_TUNNEL, mp);
-
+ M (VXLAN_ADD_DEL_TUNNEL, mp);
if (ipv6_set)
{
- clib_memcpy (&mp->local, &local6, sizeof (local6));
- clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
+ clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6));
+ clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6));
}
else
{
- clib_memcpy (&mp->local, &local4, sizeof (local4));
- clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
+ clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4));
+ clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4));
}
- mp->mcast_sw_if_index = ntohl (mcast_sw_if_index);
+ mp->instance = htonl (instance);
mp->encap_vrf_id = ntohl (encap_vrf_id);
- mp->decap_vrf_id = ntohl (decap_vrf_id);
- mp->protocol = protocol;
+ 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;
return ret;
}
-static void vl_api_vxlan_gpe_tunnel_details_t_handler
- (vl_api_vxlan_gpe_tunnel_details_t * mp)
+static void vl_api_vxlan_tunnel_details_t_handler
+ (vl_api_vxlan_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 src = to_ip46 (mp->is_ipv6, mp->dst_address);
+ ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->src_address);
- print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d",
+ print (vam->ofp, "%11d%11d%24U%24U%14d%18d%13d%19d",
ntohl (mp->sw_if_index),
- format_ip46_address, &local, IP46_TYPE_ANY,
- format_ip46_address, &remote, IP46_TYPE_ANY,
- ntohl (mp->vni), mp->protocol,
- ntohl (mp->mcast_sw_if_index),
- ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id));
+ ntohl (mp->instance),
+ format_ip46_address, &src, IP46_TYPE_ANY,
+ format_ip46_address, &dst, IP46_TYPE_ANY,
+ ntohl (mp->encap_vrf_id),
+ ntohl (mp->decap_next_index), ntohl (mp->vni),
+ ntohl (mp->mcast_sw_if_index));
}
-
-static void vl_api_vxlan_gpe_tunnel_details_t_handler_json
- (vl_api_vxlan_gpe_tunnel_details_t * mp)
+static void vl_api_vxlan_tunnel_details_t_handler_json
+ (vl_api_vxlan_tunnel_details_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
- struct in_addr ip4;
- struct in6_addr ip6;
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));
+
+ vat_json_object_add_uint (node, "instance", ntohl (mp->instance));
+
if (mp->is_ipv6)
{
- 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);
+ struct in6_addr ip6;
+
+ clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "src_address", ip6);
+ clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "dst_address", ip6);
}
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);
+ struct in_addr ip4;
+
+ clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "src_address", ip4);
+ clib_memcpy (&ip4, mp->dst_address, 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, "protocol", ntohl (mp->protocol));
+ 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));
- vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
- vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id));
- vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
}
static int
-api_vxlan_gpe_tunnel_dump (vat_main_t * vam)
+api_vxlan_tunnel_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_vxlan_gpe_tunnel_dump_t *mp;
+ vl_api_vxlan_tunnel_dump_t *mp;
vl_api_control_ping_t *mp_ping;
u32 sw_if_index;
u8 sw_if_index_set = 0;
if (!vam->json_output)
{
- print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s",
- "sw_if_index", "local", "remote", "vni",
- "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id");
+ print (vam->ofp, "%11s%11s%24s%24s%14s%18s%13s%19s",
+ "sw_if_index", "instance", "src_address", "dst_address",
+ "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index");
}
/* Get list of vxlan-tunnel interfaces */
- M (VXLAN_GPE_TUNNEL_DUMP, mp);
+ M (VXLAN_TUNNEL_DUMP, mp);
mp->sw_if_index = htonl (sw_if_index);
return ret;
}
-static void vl_api_l2_fib_table_details_t_handler
- (vl_api_l2_fib_table_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
-
- print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32
- " %d %d %d",
- ntohl (mp->bd_id), format_ethernet_address, mp->mac,
- ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac,
- mp->bvi_mac);
-}
-
-static void vl_api_l2_fib_table_details_t_handler_json
- (vl_api_l2_fib_table_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
-
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
- node = vat_json_array_add (&vam->json_tree);
-
- vat_json_init_object (node);
- vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
- vat_json_object_add_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)
+static uword unformat_geneve_decap_next
+ (unformat_input_t * input, va_list * args)
{
- 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);
+ u32 *result = va_arg (*args, u32 *);
+ u32 tmp;
- W (ret);
- return ret;
+ if (unformat (input, "l2"))
+ *result = GENEVE_INPUT_NEXT_L2_INPUT;
+ else if (unformat (input, "%d", &tmp))
+ *result = tmp;
+ else
+ return 0;
+ return 1;
}
-
static int
-api_interface_name_renumber (vat_main_t * vam)
+api_geneve_add_del_tunnel (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;
+ vl_api_geneve_add_del_tunnel_t *mp;
+ ip46_address_t src, dst;
+ u8 is_add = 1;
+ u8 ipv4_set = 0, ipv6_set = 0;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u8 grp_set = 0;
+ u32 mcast_sw_if_index = ~0;
+ u32 encap_vrf_id = 0;
+ u32 decap_next_index = ~0;
+ u32 vni = 0;
int ret;
+ /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
+ clib_memset (&src, 0, sizeof src);
+ clib_memset (&dst, 0, sizeof dst);
+
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "%U", api_unformat_sw_if_index, vam,
- &sw_if_index))
+ if (unformat (line_input, "del"))
+ is_add = 0;
+ else
+ if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
+ {
+ ipv4_set = 1;
+ src_set = 1;
+ }
+ else
+ if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
+ {
+ ipv4_set = 1;
+ dst_set = 1;
+ }
+ else
+ if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
+ {
+ ipv6_set = 1;
+ src_set = 1;
+ }
+ else
+ if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
+ {
+ ipv6_set = 1;
+ dst_set = 1;
+ }
+ else if (unformat (line_input, "group %U %U",
+ unformat_ip4_address, &dst.ip4,
+ api_unformat_sw_if_index, vam, &mcast_sw_if_index))
+ {
+ grp_set = dst_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "group %U",
+ unformat_ip4_address, &dst.ip4))
+ {
+ grp_set = dst_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "group %U %U",
+ unformat_ip6_address, &dst.ip6,
+ api_unformat_sw_if_index, vam, &mcast_sw_if_index))
+ {
+ grp_set = dst_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "group %U",
+ unformat_ip6_address, &dst.ip6))
+ {
+ grp_set = dst_set = 1;
+ ipv6_set = 1;
+ }
+ else
+ if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
;
- else if (unformat (line_input, "new_show_dev_instance %d",
- &new_show_dev_instance))
+ else if (unformat (line_input, "decap-next %U",
+ unformat_geneve_decap_next, &decap_next_index))
+ ;
+ else if (unformat (line_input, "vni %d", &vni))
;
else
- break;
+ {
+ errmsg ("parse error '%U'", format_unformat_error, line_input);
+ return -99;
+ }
}
- if (sw_if_index == ~0)
+ if (src_set == 0)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("tunnel src address not specified");
return -99;
}
-
- if (new_show_dev_instance == ~0)
+ if (dst_set == 0)
{
- errmsg ("missing new_show_dev_instance");
+ errmsg ("tunnel dst address not specified");
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;
-}
+ if (grp_set && !ip46_address_is_multicast (&dst))
+ {
+ errmsg ("tunnel group address not multicast");
+ return -99;
+ }
+ if (grp_set && mcast_sw_if_index == ~0)
+ {
+ errmsg ("tunnel nonexistent multicast device");
+ return -99;
+ }
+ if (grp_set == 0 && ip46_address_is_multicast (&dst))
+ {
+ errmsg ("tunnel dst address must be unicast");
+ return -99;
+ }
-static int
-api_want_ip4_arp_events (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;
- int ret;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ if (ipv4_set && ipv6_set)
{
- if (unformat (line_input, "address %U", unformat_ip4_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
- else
- break;
+ errmsg ("both IPv4 and IPv6 addresses specified");
+ return -99;
}
- if (address_set == 0)
+ if ((vni == 0) || (vni >> 24))
{
- errmsg ("missing addresses");
+ errmsg ("vni not specified or out of range");
return -99;
}
- M (WANT_IP4_ARP_EVENTS, mp);
- mp->enable_disable = enable_disable;
- mp->pid = htonl (getpid ());
- mp->address = address.as_u32;
+ M (GENEVE_ADD_DEL_TUNNEL, mp);
+
+ if (ipv6_set)
+ {
+ clib_memcpy (mp->local_address, &src.ip6, sizeof (src.ip6));
+ clib_memcpy (mp->remote_address, &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));
+ }
+ 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);
return ret;
}
-static int
-api_want_ip6_nd_events (vat_main_t * vam)
+static void vl_api_geneve_tunnel_details_t_handler
+ (vl_api_geneve_tunnel_details_t * mp)
{
- unformat_input_t *line_input = vam->input;
- vl_api_want_ip6_nd_events_t *mp;
- ip6_address_t address;
- int address_set = 0;
- u32 enable_disable = 1;
- int ret;
+ 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);
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d",
+ ntohl (mp->sw_if_index),
+ format_ip46_address, &src, IP46_TYPE_ANY,
+ format_ip46_address, &dst, IP46_TYPE_ANY,
+ ntohl (mp->encap_vrf_id),
+ ntohl (mp->decap_next_index), ntohl (mp->vni),
+ ntohl (mp->mcast_sw_if_index));
+}
+
+static void vl_api_geneve_tunnel_details_t_handler_json
+ (vl_api_geneve_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- if (unformat (line_input, "address %U", unformat_ip6_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
- else
- break;
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- if (address_set == 0)
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ if (mp->is_ipv6)
{
- errmsg ("missing addresses");
- return -99;
- }
+ struct in6_addr ip6;
- M (WANT_IP6_ND_EVENTS, mp);
- mp->enable_disable = enable_disable;
- mp->pid = htonl (getpid ());
- clib_memcpy (mp->address, &address, sizeof (ip6_address_t));
+ clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "src_address", ip6);
+ clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "dst_address", ip6);
+ }
+ else
+ {
+ struct in_addr ip4;
- S (mp);
- W (ret);
- return ret;
+ clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "src_address", ip4);
+ clib_memcpy (&ip4, mp->dst_address, 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));
}
static int
-api_want_l2_macs_events (vat_main_t * vam)
+api_geneve_tunnel_dump (vat_main_t * vam)
{
- unformat_input_t *line_input = vam->input;
- vl_api_want_l2_macs_events_t *mp;
- u8 enable_disable = 1;
- u32 scan_delay = 0;
- u32 max_macs_in_event = 0;
- u32 learn_limit = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_geneve_tunnel_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
int ret;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "learn-limit %d", &learn_limit))
- ;
- else if (unformat (line_input, "scan-delay %d", &scan_delay))
- ;
- else if (unformat (line_input, "max-entries %d", &max_macs_in_event))
- ;
- else if (unformat (line_input, "disable"))
- enable_disable = 0;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else
break;
}
- M (WANT_L2_MACS_EVENTS, mp);
- mp->enable_disable = enable_disable;
- mp->pid = htonl (getpid ());
- mp->learn_limit = htonl (learn_limit);
- mp->scan_delay = (u8) scan_delay;
- mp->max_macs_in_event = (u8) (max_macs_in_event / 10);
+ if (sw_if_index_set == 0)
+ {
+ sw_if_index = ~0;
+ }
+
+ if (!vam->json_output)
+ {
+ print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s",
+ "sw_if_index", "local_address", "remote_address",
+ "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index");
+ }
+
+ /* Get list of geneve-tunnel interfaces */
+ M (GENEVE_TUNNEL_DUMP, mp);
+
+ mp->sw_if_index = htonl (sw_if_index);
+
S (mp);
+
+ /* Use a control ping for synchronization */
+ M (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
W (ret);
return ret;
}
static int
-api_input_acl_set_interface (vat_main_t * vam)
+api_gre_add_del_tunnel (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_input_acl_set_interface_t *mp;
- u32 sw_if_index;
- int sw_if_index_set;
- u32 ip4_table_index = ~0;
- u32 ip6_table_index = ~0;
- u32 l2_table_index = ~0;
+ unformat_input_t *line_input = vam->input;
+ vl_api_gre_add_del_tunnel_t *mp;
+ ip4_address_t src4, dst4;
+ ip6_address_t src6, dst6;
u8 is_add = 1;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ u8 t_type = GRE_TUNNEL_TYPE_L3;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u32 outer_fib_id = 0;
+ u32 session_id = 0;
+ u32 instance = ~0;
int ret;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ clib_memset (&src4, 0, sizeof src4);
+ clib_memset (&dst4, 0, sizeof dst4);
+ clib_memset (&src6, 0, sizeof src6);
+ clib_memset (&dst6, 0, sizeof dst6);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- 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, "del"))
+ if (unformat (line_input, "del"))
is_add = 0;
- else if (unformat (i, "ip4-table %d", &ip4_table_index))
- ;
- else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ else if (unformat (line_input, "instance %d", &instance))
;
- else if (unformat (i, "l2-table %d", &l2_table_index))
+ else if (unformat (line_input, "src %U", unformat_ip4_address, &src4))
+ {
+ src_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4))
+ {
+ dst_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "src %U", unformat_ip6_address, &src6))
+ {
+ src_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "dst %U", unformat_ip6_address, &dst6))
+ {
+ dst_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
;
+ else if (unformat (line_input, "teb"))
+ t_type = GRE_TUNNEL_TYPE_TEB;
+ else if (unformat (line_input, "erspan %d", &session_id))
+ t_type = GRE_TUNNEL_TYPE_ERSPAN;
else
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ errmsg ("parse error '%U'", format_unformat_error, line_input);
return -99;
}
}
- if (sw_if_index_set == 0)
+ if (src_set == 0)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("tunnel src address not specified");
+ return -99;
+ }
+ if (dst_set == 0)
+ {
+ errmsg ("tunnel dst address not specified");
+ return -99;
+ }
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("both IPv4 and IPv6 addresses specified");
return -99;
}
- M (INPUT_ACL_SET_INTERFACE, mp);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->ip4_table_index = ntohl (ip4_table_index);
- mp->ip6_table_index = ntohl (ip6_table_index);
- mp->l2_table_index = ntohl (l2_table_index);
+ M (GRE_ADD_DEL_TUNNEL, mp);
+
+ if (ipv4_set)
+ {
+ clib_memcpy (&mp->src_address, &src4, 4);
+ clib_memcpy (&mp->dst_address, &dst4, 4);
+ }
+ else
+ {
+ clib_memcpy (&mp->src_address, &src6, 16);
+ clib_memcpy (&mp->dst_address, &dst6, 16);
+ }
+ mp->instance = htonl (instance);
+ mp->outer_fib_id = htonl (outer_fib_id);
mp->is_add = is_add;
+ mp->session_id = htons ((u16) session_id);
+ mp->tunnel_type = t_type;
+ mp->is_ipv6 = ipv6_set;
S (mp);
W (ret);
return ret;
}
+static void vl_api_gre_tunnel_details_t_handler
+ (vl_api_gre_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ ip46_address_t src = to_ip46 (mp->is_ipv6, mp->src_address);
+ ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->dst_address);
+
+ print (vam->ofp, "%11d%11d%24U%24U%13d%14d%12d",
+ ntohl (mp->sw_if_index),
+ ntohl (mp->instance),
+ format_ip46_address, &src, IP46_TYPE_ANY,
+ format_ip46_address, &dst, IP46_TYPE_ANY,
+ mp->tunnel_type, ntohl (mp->outer_fib_id), ntohl (mp->session_id));
+}
+
+static void vl_api_gre_tunnel_details_t_handler_json
+ (vl_api_gre_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "instance", ntohl (mp->instance));
+ if (!mp->is_ipv6)
+ {
+ clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "src_address", ip4);
+ clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "dst_address", ip4);
+ }
+ else
+ {
+ clib_memcpy (&ip6, &mp->src_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "src_address", ip6);
+ clib_memcpy (&ip6, &mp->dst_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "dst_address", ip6);
+ }
+ vat_json_object_add_uint (node, "tunnel_type", mp->tunnel_type);
+ vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_id));
+ vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6);
+ vat_json_object_add_uint (node, "session_id", mp->session_id);
+}
+
static int
-api_ip_address_dump (vat_main_t * vam)
+api_gre_tunnel_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ip_address_dump_t *mp;
+ vl_api_gre_tunnel_dump_t *mp;
vl_api_control_ping_t *mp_ping;
- u32 sw_if_index = ~0;
+ u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 ipv4_set = 0;
- u8 ipv6_set = 0;
int ret;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
- else
- if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "ipv4"))
- ipv4_set = 1;
- else if (unformat (i, "ipv6"))
- ipv6_set = 1;
else
break;
}
- if (ipv4_set && ipv6_set)
+ if (sw_if_index_set == 0)
{
- errmsg ("ipv4 and ipv6 flags cannot be both set");
- return -99;
+ sw_if_index = ~0;
}
- if ((!ipv4_set) && (!ipv6_set))
+ if (!vam->json_output)
{
- errmsg ("no ipv4 nor ipv6 flag set");
- return -99;
+ print (vam->ofp, "%11s%11s%24s%24s%13s%14s%12s",
+ "sw_if_index", "instance", "src_address", "dst_address",
+ "tunnel_type", "outer_fib_id", "session_id");
}
- if (sw_if_index_set == 0)
- {
- errmsg ("missing interface name or sw_if_index");
- return -99;
- }
+ /* Get list of gre-tunnel interfaces */
+ M (GRE_TUNNEL_DUMP, mp);
- vam->current_sw_if_index = sw_if_index;
- vam->is_ipv6 = ipv6_set;
+ mp->sw_if_index = htonl (sw_if_index);
- M (IP_ADDRESS_DUMP, mp);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_ipv6 = ipv6_set;
S (mp);
/* Use a control ping for synchronization */
}
static int
-api_ip_dump (vat_main_t * vam)
+api_l2_fib_clear_table (vat_main_t * vam)
{
- vl_api_ip_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- unformat_input_t *in = vam->input;
- int ipv4_set = 0;
- int ipv6_set = 0;
- int is_ipv6;
- int i;
+// unformat_input_t * i = vam->input;
+ vl_api_l2_fib_clear_table_t *mp;
int ret;
- while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (in, "ipv4"))
- ipv4_set = 1;
- else if (unformat (in, "ipv6"))
- ipv6_set = 1;
- else
- break;
- }
+ M (L2_FIB_CLEAR_TABLE, mp);
- if (ipv4_set && ipv6_set)
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static int
+api_l2_interface_efp_filter (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_l2_interface_efp_filter_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)
{
- errmsg ("ipv4 and ipv6 flags cannot be both set");
- return -99;
+ 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 ((!ipv4_set) && (!ipv6_set))
+ if (sw_if_index_set == 0)
{
- errmsg ("no ipv4 nor ipv6 flag set");
+ errmsg ("missing sw_if_index");
return -99;
}
- is_ipv6 = ipv6_set;
- vam->is_ipv6 = is_ipv6;
+ M (L2_INTERFACE_EFP_FILTER, mp);
- /* free old data */
- for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++)
- {
- vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
- }
- vec_free (vam->ip_details_by_sw_if_index[is_ipv6]);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable_disable = enable;
- M (IP_DUMP, mp);
- mp->is_ipv6 = ipv6_set;
S (mp);
-
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
-
W (ret);
return ret;
}
+#define foreach_vtr_op \
+_("disable", L2_VTR_DISABLED) \
+_("push-1", L2_VTR_PUSH_1) \
+_("push-2", L2_VTR_PUSH_2) \
+_("pop-1", L2_VTR_POP_1) \
+_("pop-2", L2_VTR_POP_2) \
+_("translate-1-1", L2_VTR_TRANSLATE_1_1) \
+_("translate-1-2", L2_VTR_TRANSLATE_1_2) \
+_("translate-2-1", L2_VTR_TRANSLATE_2_1) \
+_("translate-2-2", L2_VTR_TRANSLATE_2_2)
+
static int
-api_ipsec_spd_add_del (vat_main_t * vam)
+api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_spd_add_del_t *mp;
- u32 spd_id = ~0;
- u8 is_add = 1;
+ vl_api_l2_interface_vlan_tag_rewrite_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 vtr_op_set = 0;
+ u32 vtr_op = 0;
+ u32 push_dot1q = 1;
+ u32 tag1 = ~0;
+ u32 tag2 = ~0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "spd_id %d", &spd_id))
+ 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, "vtr_op %d", &vtr_op))
+ vtr_op_set = 1;
+#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;}
+ foreach_vtr_op
+#undef _
+ else if (unformat (i, "push_dot1q %d", &push_dot1q))
+ ;
+ else if (unformat (i, "tag1 %d", &tag1))
+ ;
+ else if (unformat (i, "tag2 %d", &tag2))
;
- else if (unformat (i, "del"))
- is_add = 0;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (spd_id == ~0)
+
+ if ((sw_if_index_set == 0) || (vtr_op_set == 0))
{
- errmsg ("spd_id must be set");
+ errmsg ("missing vtr operation or sw_if_index");
return -99;
}
- M (IPSEC_SPD_ADD_DEL, mp);
-
- mp->spd_id = ntohl (spd_id);
- mp->is_add = is_add;
+ M (L2_INTERFACE_VLAN_TAG_REWRITE, mp);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->vtr_op = ntohl (vtr_op);
+ mp->push_dot1q = ntohl (push_dot1q);
+ mp->tag1 = ntohl (tag1);
+ mp->tag2 = ntohl (tag2);
S (mp);
W (ret);
}
static int
-api_ipsec_interface_add_del_spd (vat_main_t * vam)
+api_create_vhost_user_if (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_interface_add_del_spd_t *mp;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 spd_id = (u32) ~ 0;
- u8 is_add = 1;
+ vl_api_create_vhost_user_if_t *mp;
+ u8 *file_name;
+ u8 is_server = 0;
+ u8 file_name_set = 0;
+ u32 custom_dev_instance = ~0;
+ u8 hwaddr[6];
+ u8 use_custom_mac = 0;
+ u8 disable_mrg_rxbuf = 0;
+ u8 disable_indirect_desc = 0;
+ u8 *tag = 0;
int ret;
+ /* Shut up coverity */
+ clib_memset (hwaddr, 0, sizeof (hwaddr));
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "spd_id %d", &spd_id))
- ;
- 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, "socket %s", &file_name))
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ file_name_set = 1;
}
-
+ else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
+ ;
+ else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr))
+ use_custom_mac = 1;
+ else if (unformat (i, "server"))
+ is_server = 1;
+ else if (unformat (i, "disable_mrg_rxbuf"))
+ disable_mrg_rxbuf = 1;
+ else if (unformat (i, "disable_indirect_desc"))
+ disable_indirect_desc = 1;
+ else if (unformat (i, "tag %s", &tag))
+ ;
+ else
+ break;
}
- if (spd_id == (u32) ~ 0)
+ if (file_name_set == 0)
{
- errmsg ("spd_id must be set");
+ errmsg ("missing socket file name");
return -99;
}
- if (sw_if_index_set == 0)
+ if (vec_len (file_name) > 255)
{
- errmsg ("missing interface name or sw_if_index");
+ errmsg ("socket file name too long");
return -99;
}
+ vec_add1 (file_name, 0);
- M (IPSEC_INTERFACE_ADD_DEL_SPD, mp);
+ M (CREATE_VHOST_USER_IF, mp);
- mp->spd_id = ntohl (spd_id);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
+ mp->is_server = is_server;
+ mp->disable_mrg_rxbuf = disable_mrg_rxbuf;
+ mp->disable_indirect_desc = disable_indirect_desc;
+ clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
+ vec_free (file_name);
+ if (custom_dev_instance != ~0)
+ {
+ mp->renumber = 1;
+ mp->custom_dev_instance = ntohl (custom_dev_instance);
+ }
+
+ mp->use_custom_mac = use_custom_mac;
+ clib_memcpy (mp->mac_address, hwaddr, 6);
+ if (tag)
+ strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
+ vec_free (tag);
S (mp);
W (ret);
}
static int
-api_ipsec_spd_add_del_entry (vat_main_t * vam)
+api_modify_vhost_user_if (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_spd_add_del_entry_t *mp;
- u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
- u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0;
- i32 priority = 0;
- u32 rport_start = 0, rport_stop = (u32) ~ 0;
- u32 lport_start = 0, lport_stop = (u32) ~ 0;
- ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
- ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
+ vl_api_modify_vhost_user_if_t *mp;
+ u8 *file_name;
+ u8 is_server = 0;
+ u8 file_name_set = 0;
+ u32 custom_dev_instance = ~0;
+ u8 sw_if_index_set = 0;
+ u32 sw_if_index = (u32) ~ 0;
int ret;
- laddr4_start.as_u32 = raddr4_start.as_u32 = 0;
- laddr4_stop.as_u32 = raddr4_stop.as_u32 = (u32) ~ 0;
- laddr6_start.as_u64[0] = raddr6_start.as_u64[0] = 0;
- laddr6_start.as_u64[1] = raddr6_start.as_u64[1] = 0;
- laddr6_stop.as_u64[0] = raddr6_stop.as_u64[0] = (u64) ~ 0;
- laddr6_stop.as_u64[1] = raddr6_stop.as_u64[1] = (u64) ~ 0;
-
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
- is_add = 0;
- if (unformat (i, "outbound"))
- is_outbound = 1;
- if (unformat (i, "inbound"))
- is_outbound = 0;
- else if (unformat (i, "spd_id %d", &spd_id))
- ;
- else if (unformat (i, "sa_id %d", &sa_id))
- ;
- else if (unformat (i, "priority %d", &priority))
- ;
- else if (unformat (i, "protocol %d", &protocol))
- ;
- else if (unformat (i, "lport_start %d", &lport_start))
- ;
- else if (unformat (i, "lport_stop %d", &lport_stop))
- ;
- else if (unformat (i, "rport_start %d", &rport_start))
- ;
- else if (unformat (i, "rport_stop %d", &rport_stop))
- ;
- else
- if (unformat
- (i, "laddr_start %U", unformat_ip4_address, &laddr4_start))
- {
- is_ipv6 = 0;
- is_ip_any = 0;
- }
- else
- if (unformat (i, "laddr_stop %U", unformat_ip4_address, &laddr4_stop))
- {
- is_ipv6 = 0;
- is_ip_any = 0;
- }
- else
- if (unformat
- (i, "raddr_start %U", unformat_ip4_address, &raddr4_start))
- {
- is_ipv6 = 0;
- is_ip_any = 0;
- }
- else
- if (unformat (i, "raddr_stop %U", unformat_ip4_address, &raddr4_stop))
- {
- is_ipv6 = 0;
- is_ip_any = 0;
- }
- else
- if (unformat
- (i, "laddr_start %U", unformat_ip6_address, &laddr6_start))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else
- if (unformat (i, "laddr_stop %U", unformat_ip6_address, &laddr6_stop))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else
- if (unformat
- (i, "raddr_start %U", unformat_ip6_address, &raddr6_start))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else
- if (unformat (i, "raddr_stop %U", unformat_ip6_address, &raddr6_stop))
- {
- is_ipv6 = 1;
- is_ip_any = 0;
- }
- else
- if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy))
+ 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, "socket %s", &file_name))
{
- if (policy == IPSEC_POLICY_ACTION_RESOLVE)
- {
- clib_warning ("unsupported action: 'resolve'");
- return -99;
- }
+ file_name_set = 1;
}
+ else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
+ ;
+ else if (unformat (i, "server"))
+ is_server = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
-
+ break;
}
- M (IPSEC_SPD_ADD_DEL_ENTRY, mp);
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing sw_if_index or interface name");
+ return -99;
+ }
- mp->spd_id = ntohl (spd_id);
- mp->priority = ntohl (priority);
- mp->is_outbound = is_outbound;
+ if (file_name_set == 0)
+ {
+ errmsg ("missing socket file name");
+ return -99;
+ }
- mp->is_ipv6 = is_ipv6;
- if (is_ipv6 || is_ip_any)
+ if (vec_len (file_name) > 255)
{
- clib_memcpy (mp->remote_address_start, &raddr6_start,
- sizeof (ip6_address_t));
- clib_memcpy (mp->remote_address_stop, &raddr6_stop,
- sizeof (ip6_address_t));
- clib_memcpy (mp->local_address_start, &laddr6_start,
- sizeof (ip6_address_t));
- clib_memcpy (mp->local_address_stop, &laddr6_stop,
- sizeof (ip6_address_t));
+ errmsg ("socket file name too long");
+ return -99;
}
- else
+ vec_add1 (file_name, 0);
+
+ M (MODIFY_VHOST_USER_IF, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_server = is_server;
+ clib_memcpy (mp->sock_filename, file_name, vec_len (file_name));
+ vec_free (file_name);
+ if (custom_dev_instance != ~0)
{
- clib_memcpy (mp->remote_address_start, &raddr4_start,
- sizeof (ip4_address_t));
- clib_memcpy (mp->remote_address_stop, &raddr4_stop,
- sizeof (ip4_address_t));
- clib_memcpy (mp->local_address_start, &laddr4_start,
- sizeof (ip4_address_t));
- clib_memcpy (mp->local_address_stop, &laddr4_stop,
- sizeof (ip4_address_t));
+ mp->renumber = 1;
+ mp->custom_dev_instance = ntohl (custom_dev_instance);
}
- mp->protocol = (u8) protocol;
- mp->local_port_start = ntohs ((u16) lport_start);
- mp->local_port_stop = ntohs ((u16) lport_stop);
- mp->remote_port_start = ntohs ((u16) rport_start);
- mp->remote_port_stop = ntohs ((u16) rport_stop);
- mp->policy = (u8) policy;
- mp->sa_id = ntohl (sa_id);
- mp->is_add = is_add;
- mp->is_ip_any = is_ip_any;
+
S (mp);
W (ret);
return ret;
}
static int
-api_ipsec_sad_add_del_entry (vat_main_t * vam)
+api_delete_vhost_user_if (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_sad_add_del_entry_t *mp;
- u32 sad_id = 0, spi = 0;
- u8 *ck = 0, *ik = 0;
- u8 is_add = 1;
-
- u8 protocol = IPSEC_PROTOCOL_AH;
- u8 is_tunnel = 0, is_tunnel_ipv6 = 0;
- u32 crypto_alg = 0, integ_alg = 0;
- ip4_address_t tun_src4;
- ip4_address_t tun_dst4;
- ip6_address_t tun_src6;
- ip6_address_t tun_dst6;
+ vl_api_delete_vhost_user_if_t *mp;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "sad_id %d", &sad_id))
- ;
- else if (unformat (i, "spi %d", &spi))
- ;
- else if (unformat (i, "esp"))
- protocol = IPSEC_PROTOCOL_ESP;
- else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4))
- {
- is_tunnel = 1;
- is_tunnel_ipv6 = 0;
- }
- else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4))
- {
- is_tunnel = 1;
- is_tunnel_ipv6 = 0;
- }
- else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6))
- {
- is_tunnel = 1;
- is_tunnel_ipv6 = 1;
- }
- else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6))
- {
- is_tunnel = 1;
- is_tunnel_ipv6 = 1;
- }
- else
- if (unformat
- (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
- {
- if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
- crypto_alg >= IPSEC_CRYPTO_N_ALG)
- {
- clib_warning ("unsupported crypto-alg: '%U'",
- format_ipsec_crypto_alg, crypto_alg);
- return -99;
- }
- }
- else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
- ;
- else
- if (unformat
- (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
- {
- if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
- integ_alg >= IPSEC_INTEG_N_ALG)
- {
- clib_warning ("unsupported integ-alg: '%U'",
- format_ipsec_integ_alg, integ_alg);
- return -99;
- }
- }
- else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
- ;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing sw_if_index or interface name");
+ return -99;
}
- M (IPSEC_SAD_ADD_DEL_ENTRY, mp);
- mp->sad_id = ntohl (sad_id);
- mp->is_add = is_add;
- mp->protocol = protocol;
- mp->spi = ntohl (spi);
- mp->is_tunnel = is_tunnel;
- mp->is_tunnel_ipv6 = is_tunnel_ipv6;
- mp->crypto_algorithm = crypto_alg;
- mp->integrity_algorithm = integ_alg;
- mp->crypto_key_length = vec_len (ck);
- mp->integrity_key_length = vec_len (ik);
+ M (DELETE_VHOST_USER_IF, mp);
- if (mp->crypto_key_length > sizeof (mp->crypto_key))
- mp->crypto_key_length = sizeof (mp->crypto_key);
+ mp->sw_if_index = ntohl (sw_if_index);
- if (mp->integrity_key_length > sizeof (mp->integrity_key))
- mp->integrity_key_length = sizeof (mp->integrity_key);
+ S (mp);
+ W (ret);
+ return ret;
+}
- if (ck)
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- if (ik)
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+static void vl_api_sw_interface_vhost_user_details_t_handler
+ (vl_api_sw_interface_vhost_user_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ 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,
+ ntohl (mp->num_regions), (char *) mp->sock_filename);
+ print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno)));
+}
+
+static void vl_api_sw_interface_vhost_user_details_t_handler_json
+ (vl_api_sw_interface_vhost_user_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (is_tunnel)
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- if (is_tunnel_ipv6)
- {
- clib_memcpy (mp->tunnel_src_address, &tun_src6,
- sizeof (ip6_address_t));
- clib_memcpy (mp->tunnel_dst_address, &tun_dst6,
- sizeof (ip6_address_t));
- }
- else
- {
- clib_memcpy (mp->tunnel_src_address, &tun_src4,
- sizeof (ip4_address_t));
- clib_memcpy (mp->tunnel_dst_address, &tun_dst4,
- sizeof (ip4_address_t));
- }
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ 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, "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, "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, "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));
+ vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno));
}
static int
-api_ipsec_sa_set_key (vat_main_t * vam)
+api_sw_interface_vhost_user_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ipsec_sa_set_key_t *mp;
- u32 sa_id;
- u8 *ck = 0, *ik = 0;
+ vl_api_sw_interface_vhost_user_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
int ret;
+ print (vam->ofp,
+ "Interface name idx hdr_sz features server regions filename");
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "sa_id %d", &sa_id))
- ;
- else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
- ;
- else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
- ;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- M (IPSEC_SA_SET_KEY, mp);
+ /* Get list of vhost-user interfaces */
+ M (SW_INTERFACE_VHOST_USER_DUMP, mp);
+ S (mp);
- mp->sa_id = ntohl (sa_id);
- mp->crypto_key_length = vec_len (ck);
- mp->integrity_key_length = vec_len (ik);
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
- if (mp->crypto_key_length > sizeof (mp->crypto_key))
- mp->crypto_key_length = sizeof (mp->crypto_key);
+ W (ret);
+ return ret;
+}
- if (mp->integrity_key_length > sizeof (mp->integrity_key))
- mp->integrity_key_length = sizeof (mp->integrity_key);
+static int
+api_show_version (vat_main_t * vam)
+{
+ vl_api_show_version_t *mp;
+ int ret;
- if (ck)
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- if (ik)
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+ M (SHOW_VERSION, mp);
S (mp);
W (ret);
return ret;
}
+
static int
-api_ipsec_tunnel_if_add_del (vat_main_t * vam)
+api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ipsec_tunnel_if_add_del_t *mp;
- u32 local_spi = 0, remote_spi = 0;
- u32 crypto_alg = 0, integ_alg = 0;
- u8 *lck = NULL, *rck = NULL;
- u8 *lik = NULL, *rik = NULL;
- ip4_address_t local_ip = { {0} };
- ip4_address_t remote_ip = { {0} };
+ 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;
u8 is_add = 1;
- u8 esn = 0;
- u8 anti_replay = 0;
+ u8 ipv4_set = 0, ipv6_set = 0;
+ u8 local_set = 0;
+ u8 remote_set = 0;
+ u8 grp_set = 0;
+ u32 mcast_sw_if_index = ~0;
+ u32 encap_vrf_id = 0;
+ u32 decap_vrf_id = 0;
+ u8 protocol = ~0;
+ u32 vni;
+ u8 vni_set = 0;
int ret;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* 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 (i, "del"))
+ if (unformat (line_input, "del"))
is_add = 0;
- else if (unformat (i, "esn"))
- esn = 1;
- else if (unformat (i, "anti_replay"))
- anti_replay = 1;
- else if (unformat (i, "local_spi %d", &local_spi))
- ;
- else if (unformat (i, "remote_spi %d", &remote_spi))
- ;
- else if (unformat (i, "local_ip %U", unformat_ip4_address, &local_ip))
- ;
- else if (unformat (i, "remote_ip %U", unformat_ip4_address, &remote_ip))
- ;
- else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck))
- ;
- else
- if (unformat (i, "remote_crypto_key %U", unformat_hex_string, &rck))
- ;
- else if (unformat (i, "local_integ_key %U", unformat_hex_string, &lik))
- ;
- else if (unformat (i, "remote_integ_key %U", unformat_hex_string, &rik))
- ;
- else
- if (unformat
- (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
+ else if (unformat (line_input, "local %U",
+ unformat_ip4_address, &local4))
{
- if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
- crypto_alg >= IPSEC_CRYPTO_N_ALG)
- {
- errmsg ("unsupported crypto-alg: '%U'\n",
- format_ipsec_crypto_alg, crypto_alg);
- return -99;
- }
+ local_set = 1;
+ ipv4_set = 1;
}
- else
- if (unformat
- (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
+ else if (unformat (line_input, "remote %U",
+ unformat_ip4_address, &remote4))
{
- if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
- integ_alg >= IPSEC_INTEG_N_ALG)
- {
- errmsg ("unsupported integ-alg: '%U'\n",
- format_ipsec_integ_alg, integ_alg);
- return -99;
- }
+ remote_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "local %U",
+ unformat_ip6_address, &local6))
+ {
+ local_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "remote %U",
+ unformat_ip6_address, &remote6))
+ {
+ 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,
+ 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))
+ {
+ grp_set = remote_set = 1;
+ ipv6_set = 1;
}
+ else
+ if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
+ ;
+ else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+ ;
+ else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+ ;
+ else if (unformat (line_input, "vni %d", &vni))
+ vni_set = 1;
+ else if (unformat (line_input, "next-ip4"))
+ protocol = 1;
+ else if (unformat (line_input, "next-ip6"))
+ protocol = 2;
+ else if (unformat (line_input, "next-ethernet"))
+ protocol = 3;
+ else if (unformat (line_input, "next-nsh"))
+ protocol = 4;
else
{
- errmsg ("parse error '%U'\n", format_unformat_error, i);
+ errmsg ("parse error '%U'", format_unformat_error, line_input);
return -99;
}
}
- M (IPSEC_TUNNEL_IF_ADD_DEL, mp);
-
- mp->is_add = is_add;
- mp->esn = esn;
- mp->anti_replay = anti_replay;
-
- clib_memcpy (mp->local_ip, &local_ip, sizeof (ip4_address_t));
- clib_memcpy (mp->remote_ip, &remote_ip, sizeof (ip4_address_t));
-
- mp->local_spi = htonl (local_spi);
- mp->remote_spi = htonl (remote_spi);
- mp->crypto_alg = (u8) crypto_alg;
-
- mp->local_crypto_key_len = 0;
- if (lck)
+ if (local_set == 0)
+ {
+ errmsg ("tunnel local address not specified");
+ return -99;
+ }
+ if (remote_set == 0)
+ {
+ errmsg ("tunnel remote address not specified");
+ return -99;
+ }
+ if (grp_set && mcast_sw_if_index == ~0)
{
- mp->local_crypto_key_len = vec_len (lck);
- if (mp->local_crypto_key_len > sizeof (mp->local_crypto_key))
- mp->local_crypto_key_len = sizeof (mp->local_crypto_key);
- clib_memcpy (mp->local_crypto_key, lck, mp->local_crypto_key_len);
+ errmsg ("tunnel nonexistent multicast device");
+ return -99;
+ }
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("both IPv4 and IPv6 addresses specified");
+ return -99;
}
- mp->remote_crypto_key_len = 0;
- if (rck)
+ if (vni_set == 0)
{
- mp->remote_crypto_key_len = vec_len (rck);
- if (mp->remote_crypto_key_len > sizeof (mp->remote_crypto_key))
- mp->remote_crypto_key_len = sizeof (mp->remote_crypto_key);
- clib_memcpy (mp->remote_crypto_key, rck, mp->remote_crypto_key_len);
+ errmsg ("vni not specified");
+ return -99;
}
- mp->integ_alg = (u8) integ_alg;
+ M (VXLAN_GPE_ADD_DEL_TUNNEL, mp);
- mp->local_integ_key_len = 0;
- if (lik)
+
+ if (ipv6_set)
{
- mp->local_integ_key_len = vec_len (lik);
- if (mp->local_integ_key_len > sizeof (mp->local_integ_key))
- mp->local_integ_key_len = sizeof (mp->local_integ_key);
- clib_memcpy (mp->local_integ_key, lik, mp->local_integ_key_len);
+ clib_memcpy (&mp->local, &local6, sizeof (local6));
+ clib_memcpy (&mp->remote, &remote6, sizeof (remote6));
}
-
- mp->remote_integ_key_len = 0;
- if (rik)
+ else
{
- mp->remote_integ_key_len = vec_len (rik);
- if (mp->remote_integ_key_len > sizeof (mp->remote_integ_key))
- mp->remote_integ_key_len = sizeof (mp->remote_integ_key);
- clib_memcpy (mp->remote_integ_key, rik, mp->remote_integ_key_len);
+ clib_memcpy (&mp->local, &local4, sizeof (local4));
+ clib_memcpy (&mp->remote, &remote4, sizeof (remote4));
}
+ mp->mcast_sw_if_index = ntohl (mcast_sw_if_index);
+ mp->encap_vrf_id = ntohl (encap_vrf_id);
+ mp->decap_vrf_id = ntohl (decap_vrf_id);
+ mp->protocol = protocol;
+ mp->vni = ntohl (vni);
+ mp->is_add = is_add;
+ mp->is_ipv6 = ipv6_set;
+
S (mp);
W (ret);
return ret;
}
-static void
-vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp)
+static void vl_api_vxlan_gpe_tunnel_details_t_handler
+ (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);
- print (vam->ofp, "sa_id %u sw_if_index %u spi %u proto %u crypto_alg %u "
- "crypto_key %U integ_alg %u integ_key %U use_esn %u "
- "use_anti_replay %u is_tunnel %u is_tunnel_ip6 %u "
- "tunnel_src_addr %U tunnel_dst_addr %U "
- "salt %u seq_outbound %lu last_seq_inbound %lu "
- "replay_window %lu total_data_size %lu\n",
- ntohl (mp->sa_id), ntohl (mp->sw_if_index), ntohl (mp->spi),
- mp->protocol,
- mp->crypto_alg, format_hex_bytes, mp->crypto_key, mp->crypto_key_len,
- mp->integ_alg, format_hex_bytes, mp->integ_key, mp->integ_key_len,
- mp->use_esn, mp->use_anti_replay, mp->is_tunnel, mp->is_tunnel_ip6,
- (mp->is_tunnel_ip6) ? format_ip6_address : format_ip4_address,
- mp->tunnel_src_addr,
- (mp->is_tunnel_ip6) ? format_ip6_address : format_ip4_address,
- mp->tunnel_dst_addr,
- ntohl (mp->salt),
- clib_net_to_host_u64 (mp->seq_outbound),
- clib_net_to_host_u64 (mp->last_seq_inbound),
- clib_net_to_host_u64 (mp->replay_window),
- clib_net_to_host_u64 (mp->total_data_size));
+ print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d",
+ ntohl (mp->sw_if_index),
+ format_ip46_address, &local, IP46_TYPE_ANY,
+ format_ip46_address, &remote, IP46_TYPE_ANY,
+ ntohl (mp->vni), mp->protocol,
+ ntohl (mp->mcast_sw_if_index),
+ ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id));
}
-#define vl_api_ipsec_sa_details_t_endian vl_noop_handler
-#define vl_api_ipsec_sa_details_t_print vl_noop_handler
-static void vl_api_ipsec_sa_details_t_handler_json
- (vl_api_ipsec_sa_details_t * mp)
+static void vl_api_vxlan_gpe_tunnel_details_t_handler_json
+ (vl_api_vxlan_gpe_tunnel_details_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
- struct in_addr src_ip4, dst_ip4;
- struct in6_addr src_ip6, dst_ip6;
+ struct in_addr ip4;
+ struct in6_addr ip6;
if (VAT_JSON_ARRAY != vam->json_tree.type)
{
node = vat_json_array_add (&vam->json_tree);
vat_json_init_object (node);
- vat_json_object_add_uint (node, "sa_id", ntohl (mp->sa_id));
vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
- vat_json_object_add_uint (node, "spi", ntohl (mp->spi));
- vat_json_object_add_uint (node, "proto", mp->protocol);
- vat_json_object_add_uint (node, "crypto_alg", mp->crypto_alg);
- vat_json_object_add_uint (node, "integ_alg", mp->integ_alg);
- vat_json_object_add_uint (node, "use_esn", mp->use_esn);
- vat_json_object_add_uint (node, "use_anti_replay", mp->use_anti_replay);
- vat_json_object_add_uint (node, "is_tunnel", mp->is_tunnel);
- vat_json_object_add_uint (node, "is_tunnel_ip6", mp->is_tunnel_ip6);
- vat_json_object_add_bytes (node, "crypto_key", mp->crypto_key,
- mp->crypto_key_len);
- vat_json_object_add_bytes (node, "integ_key", mp->integ_key,
- mp->integ_key_len);
- if (mp->is_tunnel_ip6)
- {
- clib_memcpy (&src_ip6, mp->tunnel_src_addr, sizeof (src_ip6));
- vat_json_object_add_ip6 (node, "tunnel_src_addr", src_ip6);
- clib_memcpy (&dst_ip6, mp->tunnel_dst_addr, sizeof (dst_ip6));
- vat_json_object_add_ip6 (node, "tunnel_dst_addr", dst_ip6);
+ if (mp->is_ipv6)
+ {
+ 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);
}
else
{
- clib_memcpy (&src_ip4, mp->tunnel_src_addr, sizeof (src_ip4));
- vat_json_object_add_ip4 (node, "tunnel_src_addr", src_ip4);
- clib_memcpy (&dst_ip4, mp->tunnel_dst_addr, sizeof (dst_ip4));
- vat_json_object_add_ip4 (node, "tunnel_dst_addr", dst_ip4);
+ 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);
}
- vat_json_object_add_uint (node, "replay_window",
- clib_net_to_host_u64 (mp->replay_window));
- vat_json_object_add_uint (node, "total_data_size",
- clib_net_to_host_u64 (mp->total_data_size));
-
+ vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
+ vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol));
+ vat_json_object_add_uint (node, "mcast_sw_if_index",
+ ntohl (mp->mcast_sw_if_index));
+ vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
+ vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id));
+ vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
}
static int
-api_ipsec_sa_dump (vat_main_t * vam)
+api_vxlan_gpe_tunnel_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_sa_dump_t *mp;
+ vl_api_vxlan_gpe_tunnel_dump_t *mp;
vl_api_control_ping_t *mp_ping;
- u32 sa_id = ~0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
int ret;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sa_id %d", &sa_id))
- ;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- M (IPSEC_SA_DUMP, mp);
+ if (sw_if_index_set == 0)
+ {
+ sw_if_index = ~0;
+ }
- mp->sa_id = ntohl (sa_id);
+ if (!vam->json_output)
+ {
+ print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s",
+ "sw_if_index", "local", "remote", "vni",
+ "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id");
+ }
+
+ /* Get list of vxlan-tunnel interfaces */
+ M (VXLAN_GPE_TUNNEL_DUMP, mp);
+
+ mp->sw_if_index = htonl (sw_if_index);
S (mp);
/* Use a control ping for synchronization */
- M (CONTROL_PING, mp_ping);
+ MPING (CONTROL_PING, mp_ping);
S (mp_ping);
W (ret);
return ret;
}
+static void vl_api_l2_fib_table_details_t_handler
+ (vl_api_l2_fib_table_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32
+ " %d %d %d",
+ ntohl (mp->bd_id), format_ethernet_address, mp->mac,
+ ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac,
+ mp->bvi_mac);
+}
+
+static void vl_api_l2_fib_table_details_t_handler_json
+ (vl_api_l2_fib_table_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id));
+ vat_json_object_add_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_ipsec_tunnel_if_set_key (vat_main_t * vam)
+api_l2_fib_table_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_tunnel_if_set_key_t *mp;
- u32 sw_if_index = ~0;
- u8 key_type = IPSEC_IF_SET_KEY_TYPE_NONE;
- u8 *key = 0;
- u32 alg = ~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, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
- ;
- else
- if (unformat (i, "local crypto %U", unformat_ipsec_crypto_alg, &alg))
- key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO;
- else
- if (unformat (i, "remote crypto %U", unformat_ipsec_crypto_alg, &alg))
- key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO;
- else if (unformat (i, "local integ %U", unformat_ipsec_integ_alg, &alg))
- key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG;
- else
- if (unformat (i, "remote integ %U", unformat_ipsec_integ_alg, &alg))
- key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG;
- else if (unformat (i, "%U", unformat_hex_string, &key))
- ;
+ if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (sw_if_index == ~0)
- {
- errmsg ("interface must be specified");
- return -99;
+ break;
}
- if (key_type == IPSEC_IF_SET_KEY_TYPE_NONE)
+ if (bd_id_set == 0)
{
- errmsg ("key type must be specified");
+ errmsg ("missing bridge domain");
return -99;
}
- if (alg == ~0)
- {
- errmsg ("algorithm must be specified");
- return -99;
- }
+ print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI");
- if (vec_len (key) == 0)
- {
- errmsg ("key must be specified");
- return -99;
- }
+ /* Get list of l2 fib entries */
+ M (L2_FIB_TABLE_DUMP, mp);
- M (IPSEC_TUNNEL_IF_SET_KEY, mp);
+ mp->bd_id = ntohl (bd_id);
+ S (mp);
- mp->sw_if_index = htonl (sw_if_index);
- mp->alg = alg;
- mp->key_type = key_type;
- mp->key_len = vec_len (key);
- clib_memcpy (mp->key, key, vec_len (key));
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
- S (mp);
W (ret);
-
return ret;
}
+
static int
-api_ipsec_tunnel_if_set_sa (vat_main_t * vam)
+api_interface_name_renumber (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ipsec_tunnel_if_set_sa_t *mp;
+ unformat_input_t *line_input = vam->input;
+ vl_api_interface_name_renumber_t *mp;
u32 sw_if_index = ~0;
- u32 sa_id = ~0;
- u8 is_outbound = (u8) ~ 0;
+ u32 new_show_dev_instance = ~0;
int ret;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ if (unformat (line_input, "%U", api_unformat_sw_if_index, vam,
+ &sw_if_index))
;
- else if (unformat (i, "sa_id %d", &sa_id))
+ 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 if (unformat (i, "outbound"))
- is_outbound = 1;
- else if (unformat (i, "inbound"))
- is_outbound = 0;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
if (sw_if_index == ~0)
{
- errmsg ("interface must be specified");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- if (sa_id == ~0)
+ if (new_show_dev_instance == ~0)
{
- errmsg ("SA ID must be specified");
+ errmsg ("missing new_show_dev_instance");
return -99;
}
- M (IPSEC_TUNNEL_IF_SET_SA, mp);
+ M (INTERFACE_NAME_RENUMBER, mp);
- mp->sw_if_index = htonl (sw_if_index);
- mp->sa_id = htonl (sa_id);
- mp->is_outbound = is_outbound;
+ 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_ikev2_profile_add_del (vat_main_t * vam)
+api_ip_probe_neighbor (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_profile_add_del_t *mp;
- u8 is_add = 1;
- u8 *name = 0;
+ 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;
- const char *valid_chars = "a-zA-Z0-9_";
-
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
+ 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
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (!vec_len (name))
+ if (int_set == 0)
{
- errmsg ("profile name must be specified");
+ errmsg ("missing interface");
return -99;
}
- if (vec_len (name) > 64)
+ if (adr_set == 0)
{
- errmsg ("profile name too long");
+ errmsg ("missing addresses");
return -99;
}
- M (IKEV2_PROFILE_ADD_DEL, mp);
+ M (IP_PROBE_NEIGHBOR, mp);
- clib_memcpy (mp->name, name, vec_len (name));
- mp->is_add = is_add;
- vec_free (name);
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (&mp->dst, &dst_adr, sizeof (dst_adr));
S (mp);
W (ret);
}
static int
-api_ikev2_profile_set_auth (vat_main_t * vam)
+api_ip_scan_neighbor_enable_disable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_profile_set_auth_t *mp;
- u8 *name = 0;
- u8 *data = 0;
- u32 auth_method = 0;
- u8 is_hex = 0;
+ vl_api_ip_scan_neighbor_enable_disable_t *mp;
+ u8 mode = IP_SCAN_V46_NEIGHBORS;
+ u32 interval = 0, time = 0, update = 0, delay = 0, stale = 0;
int ret;
- const char *valid_chars = "a-zA-Z0-9_";
-
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else if (unformat (i, "auth_method %U",
- unformat_ikev2_auth_method, &auth_method))
+ 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, "auth_data 0x%U", unformat_hex_string, &data))
- is_hex = 1;
- else if (unformat (i, "auth_data %v", &data))
+ else if (unformat (i, "delay %d", &delay))
+ ;
+ else if (unformat (i, "stale %d", &stale))
;
else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (!vec_len (name))
+ if (interval > 255)
{
- errmsg ("profile name must be specified");
+ errmsg ("interval cannot exceed 255 minutes.");
return -99;
}
-
- if (vec_len (name) > 64)
+ if (time > 255)
{
- errmsg ("profile name too long");
+ errmsg ("max-time cannot exceed 255 usec.");
return -99;
}
-
- if (!vec_len (data))
+ if (update > 255)
{
- errmsg ("auth_data must be specified");
+ errmsg ("max-update cannot exceed 255.");
return -99;
}
-
- if (!auth_method)
+ if (delay > 255)
{
- errmsg ("auth_method must be specified");
+ errmsg ("delay cannot exceed 255 msec.");
+ return -99;
+ }
+ if (stale > 255)
+ {
+ errmsg ("stale cannot exceed 255 minutes.");
return -99;
}
- M (IKEV2_PROFILE_SET_AUTH, mp);
-
- mp->is_hex = is_hex;
- mp->auth_method = (u8) auth_method;
- mp->data_len = vec_len (data);
- clib_memcpy (mp->name, name, vec_len (name));
- clib_memcpy (mp->data, data, vec_len (data));
- vec_free (name);
- vec_free (data);
+ M (IP_SCAN_NEIGHBOR_ENABLE_DISABLE, mp);
+ mp->mode = mode;
+ mp->scan_interval = interval;
+ mp->max_proc_time = time;
+ mp->max_update = update;
+ mp->scan_int_delay = delay;
+ mp->stale_threshold = stale;
S (mp);
W (ret);
}
static int
-api_ikev2_profile_set_id (vat_main_t * vam)
+api_want_ip4_arp_events (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ikev2_profile_set_id_t *mp;
- u8 *name = 0;
- u8 *data = 0;
- u8 is_local = 0;
- u32 id_type = 0;
- ip4_address_t ip4;
+ 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;
int ret;
- const char *valid_chars = "a-zA-Z0-9_";
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else if (unformat (i, "id_type %U", unformat_ikev2_id_type, &id_type))
- ;
- else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4))
- {
- data = vec_new (u8, 4);
- clib_memcpy (data, ip4.as_u8, 4);
- }
- else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data))
- ;
- else if (unformat (i, "id_data %v", &data))
- ;
- else if (unformat (i, "local"))
- is_local = 1;
- else if (unformat (i, "remote"))
- is_local = 0;
+ if (unformat (line_input, "address %U", unformat_ip4_address, &address))
+ address_set = 1;
+ else if (unformat (line_input, "del"))
+ enable_disable = 0;
else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (!vec_len (name))
+ if (address_set == 0)
{
- errmsg ("profile name must be specified");
+ errmsg ("missing addresses");
return -99;
}
- if (vec_len (name) > 64)
- {
- errmsg ("profile name too long");
- 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;
- if (!vec_len (data))
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- errmsg ("id_data must be specified");
- return -99;
+ 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 (!id_type)
+ if (address_set == 0)
{
- errmsg ("id_type must be specified");
+ errmsg ("missing addresses");
return -99;
}
- M (IKEV2_PROFILE_SET_ID, mp);
-
- mp->is_local = is_local;
- mp->id_type = (u8) id_type;
- mp->data_len = vec_len (data);
- clib_memcpy (mp->name, name, vec_len (name));
- clib_memcpy (mp->data, data, vec_len (data));
- vec_free (name);
- vec_free (data);
+ M (WANT_IP6_ND_EVENTS, mp);
+ mp->enable_disable = enable_disable;
+ mp->pid = htonl (getpid ());
+ clib_memcpy (&mp->ip, &address, sizeof (address));
S (mp);
W (ret);
}
static int
-api_ikev2_profile_set_ts (vat_main_t * vam)
+api_want_l2_macs_events (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ikev2_profile_set_ts_t *mp;
- u8 *name = 0;
- u8 is_local = 0;
- u32 proto = 0, start_port = 0, end_port = (u32) ~ 0;
- ip4_address_t start_addr, end_addr;
-
- const char *valid_chars = "a-zA-Z0-9_";
+ unformat_input_t *line_input = vam->input;
+ vl_api_want_l2_macs_events_t *mp;
+ u8 enable_disable = 1;
+ u32 scan_delay = 0;
+ u32 max_macs_in_event = 0;
+ u32 learn_limit = 0;
int ret;
- start_addr.as_u32 = 0;
- end_addr.as_u32 = (u32) ~ 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else if (unformat (i, "protocol %d", &proto))
- ;
- else if (unformat (i, "start_port %d", &start_port))
- ;
- else if (unformat (i, "end_port %d", &end_port))
+ if (unformat (line_input, "learn-limit %d", &learn_limit))
;
- else
- if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr))
+ else if (unformat (line_input, "scan-delay %d", &scan_delay))
;
- else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr))
+ else if (unformat (line_input, "max-entries %d", &max_macs_in_event))
;
- else if (unformat (i, "local"))
- is_local = 1;
- else if (unformat (i, "remote"))
- is_local = 0;
+ else if (unformat (line_input, "disable"))
+ enable_disable = 0;
else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (!vec_len (name))
- {
- errmsg ("profile name must be specified");
- return -99;
- }
-
- if (vec_len (name) > 64)
- {
- errmsg ("profile name too long");
- return -99;
+ break;
}
- M (IKEV2_PROFILE_SET_TS, mp);
-
- mp->is_local = is_local;
- mp->proto = (u8) proto;
- mp->start_port = (u16) start_port;
- mp->end_port = (u16) end_port;
- mp->start_addr = start_addr.as_u32;
- mp->end_addr = end_addr.as_u32;
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
-
+ M (WANT_L2_MACS_EVENTS, mp);
+ mp->enable_disable = enable_disable;
+ mp->pid = htonl (getpid ());
+ mp->learn_limit = htonl (learn_limit);
+ mp->scan_delay = (u8) scan_delay;
+ mp->max_macs_in_event = (u8) (max_macs_in_event / 10);
S (mp);
W (ret);
return ret;
}
static int
-api_ikev2_set_local_key (vat_main_t * vam)
+api_input_acl_set_interface (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_set_local_key_t *mp;
- u8 *file = 0;
+ vl_api_input_acl_set_interface_t *mp;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 ip4_table_index = ~0;
+ u32 ip6_table_index = ~0;
+ u32 l2_table_index = ~0;
+ u8 is_add = 1;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "file %v", &file))
- vec_add1 (file, 0);
+ 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, "del"))
+ is_add = 0;
+ else if (unformat (i, "ip4-table %d", &ip4_table_index))
+ ;
+ else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ ;
+ else if (unformat (i, "l2-table %d", &l2_table_index))
+ ;
else
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (!vec_len (file))
- {
- errmsg ("RSA key file must be specified");
- return -99;
- }
-
- if (vec_len (file) > 256)
+ if (sw_if_index_set == 0)
{
- errmsg ("file name too long");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (IKEV2_SET_LOCAL_KEY, mp);
+ M (INPUT_ACL_SET_INTERFACE, mp);
- clib_memcpy (mp->key_file, file, vec_len (file));
- vec_free (file);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->ip4_table_index = ntohl (ip4_table_index);
+ mp->ip6_table_index = ntohl (ip6_table_index);
+ mp->l2_table_index = ntohl (l2_table_index);
+ mp->is_add = is_add;
S (mp);
W (ret);
}
static int
-api_ikev2_set_responder (vat_main_t * vam)
+api_output_acl_set_interface (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_set_responder_t *mp;
+ vl_api_output_acl_set_interface_t *mp;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 ip4_table_index = ~0;
+ u32 ip6_table_index = ~0;
+ u32 l2_table_index = ~0;
+ u8 is_add = 1;
int ret;
- u8 *name = 0;
- u32 sw_if_index = ~0;
- ip4_address_t address;
-
- const char *valid_chars = "a-zA-Z0-9_";
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat
- (i, "%U interface %d address %U", unformat_token, valid_chars,
- &name, &sw_if_index, unformat_ip4_address, &address))
- vec_add1 (name, 0);
+ 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, "del"))
+ is_add = 0;
+ else if (unformat (i, "ip4-table %d", &ip4_table_index))
+ ;
+ else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ ;
+ else if (unformat (i, "l2-table %d", &l2_table_index))
+ ;
else
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (!vec_len (name))
- {
- errmsg ("profile name must be specified");
- return -99;
- }
-
- if (vec_len (name) > 64)
+ if (sw_if_index_set == 0)
{
- errmsg ("profile name too long");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (IKEV2_SET_RESPONDER, mp);
-
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
+ M (OUTPUT_ACL_SET_INTERFACE, mp);
- mp->sw_if_index = sw_if_index;
- clib_memcpy (mp->address, &address, sizeof (address));
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->ip4_table_index = ntohl (ip4_table_index);
+ mp->ip6_table_index = ntohl (ip6_table_index);
+ mp->l2_table_index = ntohl (l2_table_index);
+ mp->is_add = is_add;
S (mp);
W (ret);
}
static int
-api_ikev2_set_ike_transforms (vat_main_t * vam)
+api_ip_address_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_set_ike_transforms_t *mp;
+ vl_api_ip_address_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
int ret;
- u8 *name = 0;
- u32 crypto_alg, crypto_key_size, integ_alg, dh_group;
-
- const char *valid_chars = "a-zA-Z0-9_";
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U %d %d %d %d", unformat_token, valid_chars, &name,
- &crypto_alg, &crypto_key_size, &integ_alg, &dh_group))
- vec_add1 (name, 0);
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "ipv4"))
+ ipv4_set = 1;
+ else if (unformat (i, "ipv6"))
+ ipv6_set = 1;
+ else
+ break;
}
- if (!vec_len (name))
+ if (ipv4_set && ipv6_set)
{
- errmsg ("profile name must be specified");
+ errmsg ("ipv4 and ipv6 flags cannot be both set");
return -99;
}
- if (vec_len (name) > 64)
+ if ((!ipv4_set) && (!ipv6_set))
{
- errmsg ("profile name too long");
+ errmsg ("no ipv4 nor ipv6 flag set");
return -99;
}
- M (IKEV2_SET_IKE_TRANSFORMS, mp);
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
- mp->crypto_alg = crypto_alg;
- mp->crypto_key_size = crypto_key_size;
- mp->integ_alg = integ_alg;
- mp->dh_group = dh_group;
+ vam->current_sw_if_index = sw_if_index;
+ vam->is_ipv6 = ipv6_set;
+ M (IP_ADDRESS_DUMP, mp);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_ipv6 = ipv6_set;
S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
W (ret);
return ret;
}
-
static int
-api_ikev2_set_esp_transforms (vat_main_t * vam)
+api_ip_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ikev2_set_esp_transforms_t *mp;
+ vl_api_ip_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ unformat_input_t *in = vam->input;
+ int ipv4_set = 0;
+ int ipv6_set = 0;
+ int is_ipv6;
+ int i;
int ret;
- u8 *name = 0;
- u32 crypto_alg, crypto_key_size, integ_alg, dh_group;
-
- const char *valid_chars = "a-zA-Z0-9_";
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U %d %d %d %d", unformat_token, valid_chars, &name,
- &crypto_alg, &crypto_key_size, &integ_alg, &dh_group))
- vec_add1 (name, 0);
+ if (unformat (in, "ipv4"))
+ ipv4_set = 1;
+ else if (unformat (in, "ipv6"))
+ ipv6_set = 1;
else
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (!vec_len (name))
+ if (ipv4_set && ipv6_set)
{
- errmsg ("profile name must be specified");
+ errmsg ("ipv4 and ipv6 flags cannot be both set");
return -99;
}
- if (vec_len (name) > 64)
+ if ((!ipv4_set) && (!ipv6_set))
{
- errmsg ("profile name too long");
+ errmsg ("no ipv4 nor ipv6 flag set");
return -99;
}
- M (IKEV2_SET_ESP_TRANSFORMS, mp);
+ is_ipv6 = ipv6_set;
+ vam->is_ipv6 = is_ipv6;
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
- mp->crypto_alg = crypto_alg;
- mp->crypto_key_size = crypto_key_size;
- mp->integ_alg = integ_alg;
- mp->dh_group = dh_group;
+ /* free old data */
+ for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++)
+ {
+ vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
+ }
+ vec_free (vam->ip_details_by_sw_if_index[is_ipv6]);
+ M (IP_DUMP, mp);
+ mp->is_ipv6 = ipv6_set;
S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
W (ret);
return ret;
}
static int
-api_ikev2_set_sa_lifetime (vat_main_t * vam)
+api_ipsec_spd_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_set_sa_lifetime_t *mp;
+ vl_api_ipsec_spd_add_del_t *mp;
+ u32 spd_id = ~0;
+ u8 is_add = 1;
int ret;
- u8 *name = 0;
- u64 lifetime, lifetime_maxdata;
- u32 lifetime_jitter, handover;
-
- const char *valid_chars = "a-zA-Z0-9_";
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U %lu %u %u %lu", unformat_token, valid_chars, &name,
- &lifetime, &lifetime_jitter, &handover,
- &lifetime_maxdata))
- vec_add1 (name, 0);
+ if (unformat (i, "spd_id %d", &spd_id))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
else
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
-
- if (!vec_len (name))
- {
- errmsg ("profile name must be specified");
- return -99;
- }
-
- if (vec_len (name) > 64)
+ if (spd_id == ~0)
{
- errmsg ("profile name too long");
+ errmsg ("spd_id must be set");
return -99;
}
- M (IKEV2_SET_SA_LIFETIME, mp);
+ M (IPSEC_SPD_ADD_DEL, mp);
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
- mp->lifetime = lifetime;
- mp->lifetime_jitter = lifetime_jitter;
- mp->handover = handover;
- mp->lifetime_maxdata = lifetime_maxdata;
+ mp->spd_id = ntohl (spd_id);
+ mp->is_add = is_add;
S (mp);
W (ret);
}
static int
-api_ikev2_initiate_sa_init (vat_main_t * vam)
+api_ipsec_interface_add_del_spd (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_initiate_sa_init_t *mp;
+ vl_api_ipsec_interface_add_del_spd_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 spd_id = (u32) ~ 0;
+ u8 is_add = 1;
int ret;
- u8 *name = 0;
-
- const char *valid_chars = "a-zA-Z0-9_";
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "spd_id %d", &spd_id))
+ ;
+ 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
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
+
}
- if (!vec_len (name))
+ if (spd_id == (u32) ~ 0)
{
- errmsg ("profile name must be specified");
+ errmsg ("spd_id must be set");
return -99;
}
- if (vec_len (name) > 64)
+ if (sw_if_index_set == 0)
{
- errmsg ("profile name too long");
+ errmsg ("missing interface name or sw_if_index");
return -99;
}
- M (IKEV2_INITIATE_SA_INIT, mp);
+ M (IPSEC_INTERFACE_ADD_DEL_SPD, mp);
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
+ mp->spd_id = ntohl (spd_id);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
S (mp);
W (ret);
}
static int
-api_ikev2_initiate_del_ike_sa (vat_main_t * vam)
+api_ipsec_spd_entry_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_initiate_del_ike_sa_t *mp;
+ vl_api_ipsec_spd_entry_add_del_t *mp;
+ u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
+ u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0;
+ i32 priority = 0;
+ u32 rport_start = 0, rport_stop = (u32) ~ 0;
+ u32 lport_start = 0, lport_stop = (u32) ~ 0;
+ vl_api_address_t laddr_start = { }, laddr_stop =
+ {
+ }, raddr_start =
+ {
+ }, raddr_stop =
+ {
+ };
int ret;
- u64 ispi;
-
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%lx", &ispi))
+ if (unformat (i, "del"))
+ is_add = 0;
+ if (unformat (i, "outbound"))
+ is_outbound = 1;
+ if (unformat (i, "inbound"))
+ is_outbound = 0;
+ else if (unformat (i, "spd_id %d", &spd_id))
+ ;
+ else if (unformat (i, "sa_id %d", &sa_id))
+ ;
+ else if (unformat (i, "priority %d", &priority))
+ ;
+ else if (unformat (i, "protocol %d", &protocol))
+ ;
+ else if (unformat (i, "lport_start %d", &lport_start))
+ ;
+ else if (unformat (i, "lport_stop %d", &lport_stop))
+ ;
+ else if (unformat (i, "rport_start %d", &rport_start))
+ ;
+ else if (unformat (i, "rport_stop %d", &rport_stop))
;
+ else if (unformat (i, "laddr_start %U",
+ unformat_vl_api_address, &laddr_start))
+ is_ip_any = 0;
+ else if (unformat (i, "laddr_stop %U", unformat_vl_api_address,
+ &laddr_stop))
+ is_ip_any = 0;
+ else if (unformat (i, "raddr_start %U", unformat_vl_api_address,
+ &raddr_start))
+ is_ip_any = 0;
+ else if (unformat (i, "raddr_stop %U", unformat_vl_api_address,
+ &raddr_stop))
+ is_ip_any = 0;
else
+ if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy))
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ if (policy == IPSEC_POLICY_ACTION_RESOLVE)
+ {
+ clib_warning ("unsupported action: 'resolve'");
+ return -99;
+ }
+ }
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
+
}
- M (IKEV2_INITIATE_DEL_IKE_SA, mp);
+ M (IPSEC_SPD_ENTRY_ADD_DEL, mp);
+
+ mp->is_add = is_add;
+
+ mp->entry.spd_id = ntohl (spd_id);
+ mp->entry.priority = ntohl (priority);
+ mp->entry.is_outbound = is_outbound;
+
+ clib_memcpy (&mp->entry.remote_address_start, &raddr_start,
+ sizeof (vl_api_address_t));
+ clib_memcpy (&mp->entry.remote_address_stop, &raddr_stop,
+ sizeof (vl_api_address_t));
+ clib_memcpy (&mp->entry.local_address_start, &laddr_start,
+ sizeof (vl_api_address_t));
+ clib_memcpy (&mp->entry.local_address_stop, &laddr_stop,
+ sizeof (vl_api_address_t));
- mp->ispi = ispi;
+ mp->entry.protocol = (u8) protocol;
+ mp->entry.local_port_start = ntohs ((u16) lport_start);
+ mp->entry.local_port_stop = ntohs ((u16) lport_stop);
+ mp->entry.remote_port_start = ntohs ((u16) rport_start);
+ mp->entry.remote_port_stop = ntohs ((u16) rport_stop);
+ mp->entry.policy = (u8) policy;
+ mp->entry.sa_id = ntohl (sa_id);
S (mp);
W (ret);
}
static int
-api_ikev2_initiate_del_child_sa (vat_main_t * vam)
+api_ipsec_sad_entry_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_initiate_del_child_sa_t *mp;
- int ret;
- u32 ispi;
+ vl_api_ipsec_sad_entry_add_del_t *mp;
+ u32 sad_id = 0, spi = 0;
+ u8 *ck = 0, *ik = 0;
+ u8 is_add = 1;
+ vl_api_ipsec_crypto_alg_t crypto_alg = IPSEC_API_CRYPTO_ALG_NONE;
+ vl_api_ipsec_integ_alg_t integ_alg = IPSEC_API_INTEG_ALG_NONE;
+ vl_api_ipsec_sad_flags_t flags = IPSEC_API_SAD_FLAG_NONE;
+ vl_api_ipsec_proto_t protocol = IPSEC_API_PROTO_AH;
+ vl_api_address_t tun_src, tun_dst;
+ int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%x", &ispi))
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "sad_id %d", &sad_id))
;
+ else if (unformat (i, "spi %d", &spi))
+ ;
+ else if (unformat (i, "esp"))
+ protocol = IPSEC_API_PROTO_ESP;
else
+ if (unformat (i, "tunnel_src %U", unformat_vl_api_address, &tun_src))
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL;
+ if (ADDRESS_IP6 == tun_src.af)
+ flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6;
+ }
+ else
+ if (unformat (i, "tunnel_dst %U", unformat_vl_api_address, &tun_dst))
+ {
+ flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL;
+ if (ADDRESS_IP6 == tun_src.af)
+ flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6;
+ }
+ else
+ if (unformat (i, "crypto_alg %U",
+ unformat_ipsec_api_crypto_alg, &crypto_alg))
+ ;
+ else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+ ;
+ else if (unformat (i, "integ_alg %U",
+ unformat_ipsec_api_integ_alg, &integ_alg))
+ ;
+ else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
+
}
- M (IKEV2_INITIATE_DEL_CHILD_SA, mp);
+ M (IPSEC_SAD_ENTRY_ADD_DEL, mp);
+
+ mp->is_add = is_add;
+ mp->entry.sad_id = ntohl (sad_id);
+ mp->entry.protocol = protocol;
+ mp->entry.spi = ntohl (spi);
+ mp->entry.flags = flags;
+
+ mp->entry.crypto_algorithm = crypto_alg;
+ mp->entry.integrity_algorithm = integ_alg;
+ mp->entry.crypto_key.length = vec_len (ck);
+ mp->entry.integrity_key.length = vec_len (ik);
+
+ if (mp->entry.crypto_key.length > sizeof (mp->entry.crypto_key.data))
+ mp->entry.crypto_key.length = sizeof (mp->entry.crypto_key.data);
+
+ if (mp->entry.integrity_key.length > sizeof (mp->entry.integrity_key.data))
+ mp->entry.integrity_key.length = sizeof (mp->entry.integrity_key.data);
- mp->ispi = ispi;
+ if (ck)
+ clib_memcpy (mp->entry.crypto_key.data, ck, mp->entry.crypto_key.length);
+ if (ik)
+ clib_memcpy (mp->entry.integrity_key.data, ik,
+ mp->entry.integrity_key.length);
+
+ if (flags & IPSEC_API_SAD_FLAG_IS_TUNNEL)
+ {
+ clib_memcpy (&mp->entry.tunnel_src, &tun_src,
+ sizeof (mp->entry.tunnel_src));
+ clib_memcpy (&mp->entry.tunnel_dst, &tun_dst,
+ sizeof (mp->entry.tunnel_dst));
+ }
S (mp);
W (ret);
}
static int
-api_ikev2_initiate_rekey_child_sa (vat_main_t * vam)
+api_ipsec_sa_set_key (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ikev2_initiate_rekey_child_sa_t *mp;
+ vl_api_ipsec_sa_set_key_t *mp;
+ u32 sa_id;
+ u8 *ck = 0, *ik = 0;
int ret;
- u32 ispi;
-
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%x", &ispi))
+ if (unformat (i, "sa_id %d", &sa_id))
+ ;
+ else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+ ;
+ else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
;
else
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- M (IKEV2_INITIATE_REKEY_CHILD_SA, mp);
+ M (IPSEC_SA_SET_KEY, mp);
+
+ mp->sa_id = ntohl (sa_id);
+ mp->crypto_key.length = vec_len (ck);
+ mp->integrity_key.length = vec_len (ik);
+
+ if (mp->crypto_key.length > sizeof (mp->crypto_key.data))
+ mp->crypto_key.length = sizeof (mp->crypto_key.data);
+
+ if (mp->integrity_key.length > sizeof (mp->integrity_key.data))
+ mp->integrity_key.length = sizeof (mp->integrity_key.data);
- mp->ispi = ispi;
+ if (ck)
+ clib_memcpy (mp->crypto_key.data, ck, mp->crypto_key.length);
+ if (ik)
+ clib_memcpy (mp->integrity_key.data, ik, mp->integrity_key.length);
S (mp);
W (ret);
return ret;
}
-/*
- * MAP
- */
static int
-api_map_add_domain (vat_main_t * vam)
+api_ipsec_tunnel_if_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_map_add_domain_t *mp;
-
- ip4_address_t ip4_prefix;
- ip6_address_t ip6_prefix;
- ip6_address_t ip6_src;
- u32 num_m_args = 0;
- u32 ip6_prefix_len = 0, ip4_prefix_len = 0, ea_bits_len = 0, psid_offset =
- 0, psid_length = 0;
- u8 is_translation = 0;
- u32 mtu = 0;
- u32 ip6_src_len = 128;
+ vl_api_ipsec_tunnel_if_add_del_t *mp;
+ u32 local_spi = 0, remote_spi = 0;
+ u32 crypto_alg = 0, integ_alg = 0;
+ u8 *lck = NULL, *rck = NULL;
+ u8 *lik = NULL, *rik = NULL;
+ vl_api_address_t local_ip = { 0 };
+ vl_api_address_t remote_ip = { 0 };
+ u8 is_add = 1;
+ u8 esn = 0;
+ u8 anti_replay = 0;
+ u8 renumber = 0;
+ u32 instance = ~0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
- &ip4_prefix, &ip4_prefix_len))
- num_m_args++;
- else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
- &ip6_prefix, &ip6_prefix_len))
- num_m_args++;
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "esn"))
+ esn = 1;
+ else if (unformat (i, "anti_replay"))
+ anti_replay = 1;
+ else if (unformat (i, "local_spi %d", &local_spi))
+ ;
+ else if (unformat (i, "remote_spi %d", &remote_spi))
+ ;
+ else
+ if (unformat (i, "local_ip %U", unformat_vl_api_address, &local_ip))
+ ;
+ else
+ if (unformat (i, "remote_ip %U", unformat_vl_api_address, &remote_ip))
+ ;
+ else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck))
+ ;
+ else
+ if (unformat (i, "remote_crypto_key %U", unformat_hex_string, &rck))
+ ;
+ else if (unformat (i, "local_integ_key %U", unformat_hex_string, &lik))
+ ;
+ else if (unformat (i, "remote_integ_key %U", unformat_hex_string, &rik))
+ ;
+ else
+ if (unformat
+ (i, "crypto_alg %U", unformat_ipsec_api_crypto_alg, &crypto_alg))
+ {
+ if (crypto_alg >= IPSEC_CRYPTO_N_ALG)
+ {
+ errmsg ("unsupported crypto-alg: '%U'\n",
+ format_ipsec_crypto_alg, crypto_alg);
+ return -99;
+ }
+ }
else
if (unformat
- (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
- &ip6_src_len))
- num_m_args++;
- else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
- num_m_args++;
- else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
- num_m_args++;
- else if (unformat (i, "psid-offset %d", &psid_offset))
- num_m_args++;
- else if (unformat (i, "psid-len %d", &psid_length))
- num_m_args++;
- else if (unformat (i, "mtu %d", &mtu))
- num_m_args++;
- else if (unformat (i, "map-t"))
- is_translation = 1;
+ (i, "integ_alg %U", unformat_ipsec_api_integ_alg, &integ_alg))
+ {
+ if (integ_alg >= IPSEC_INTEG_N_ALG)
+ {
+ errmsg ("unsupported integ-alg: '%U'\n",
+ format_ipsec_integ_alg, integ_alg);
+ return -99;
+ }
+ }
+ else if (unformat (i, "instance %u", &instance))
+ renumber = 1;
else
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ errmsg ("parse error '%U'\n", format_unformat_error, i);
return -99;
}
}
- if (num_m_args < 3)
+ M (IPSEC_TUNNEL_IF_ADD_DEL, mp);
+
+ mp->is_add = is_add;
+ mp->esn = esn;
+ mp->anti_replay = anti_replay;
+
+ clib_memcpy (&mp->local_ip, &local_ip, sizeof (local_ip));
+ clib_memcpy (&mp->remote_ip, &remote_ip, sizeof (remote_ip));
+
+ mp->local_spi = htonl (local_spi);
+ mp->remote_spi = htonl (remote_spi);
+ mp->crypto_alg = (u8) crypto_alg;
+
+ mp->local_crypto_key_len = 0;
+ if (lck)
{
- errmsg ("mandatory argument(s) missing");
- return -99;
+ mp->local_crypto_key_len = vec_len (lck);
+ if (mp->local_crypto_key_len > sizeof (mp->local_crypto_key))
+ mp->local_crypto_key_len = sizeof (mp->local_crypto_key);
+ clib_memcpy (mp->local_crypto_key, lck, mp->local_crypto_key_len);
}
- /* Construct the API message */
- M (MAP_ADD_DOMAIN, mp);
+ mp->remote_crypto_key_len = 0;
+ if (rck)
+ {
+ mp->remote_crypto_key_len = vec_len (rck);
+ if (mp->remote_crypto_key_len > sizeof (mp->remote_crypto_key))
+ mp->remote_crypto_key_len = sizeof (mp->remote_crypto_key);
+ clib_memcpy (mp->remote_crypto_key, rck, mp->remote_crypto_key_len);
+ }
- clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix));
- mp->ip4_prefix_len = ip4_prefix_len;
+ mp->integ_alg = (u8) integ_alg;
- clib_memcpy (mp->ip6_prefix, &ip6_prefix, sizeof (ip6_prefix));
- mp->ip6_prefix_len = ip6_prefix_len;
+ mp->local_integ_key_len = 0;
+ if (lik)
+ {
+ mp->local_integ_key_len = vec_len (lik);
+ if (mp->local_integ_key_len > sizeof (mp->local_integ_key))
+ mp->local_integ_key_len = sizeof (mp->local_integ_key);
+ clib_memcpy (mp->local_integ_key, lik, mp->local_integ_key_len);
+ }
- clib_memcpy (mp->ip6_src, &ip6_src, sizeof (ip6_src));
- mp->ip6_src_prefix_len = ip6_src_len;
+ mp->remote_integ_key_len = 0;
+ if (rik)
+ {
+ mp->remote_integ_key_len = vec_len (rik);
+ if (mp->remote_integ_key_len > sizeof (mp->remote_integ_key))
+ mp->remote_integ_key_len = sizeof (mp->remote_integ_key);
+ clib_memcpy (mp->remote_integ_key, rik, mp->remote_integ_key_len);
+ }
- mp->ea_bits_len = ea_bits_len;
- mp->psid_offset = psid_offset;
- mp->psid_length = psid_length;
- mp->is_translation = is_translation;
- mp->mtu = htons (mtu);
+ if (renumber)
+ {
+ mp->renumber = renumber;
+ mp->show_instance = ntohl (instance);
+ }
- /* send it... */
S (mp);
-
- /* Wait for a reply, return good/bad news */
W (ret);
return ret;
}
-static int
-api_map_del_domain (vat_main_t * vam)
+static void
+vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp)
{
- unformat_input_t *i = vam->input;
- vl_api_map_del_domain_t *mp;
+ vat_main_t *vam = &vat_main;
- u32 num_m_args = 0;
- u32 index;
- int ret;
+ print (vam->ofp, "sa_id %u sw_if_index %u spi %u proto %u crypto_alg %u "
+ "crypto_key %U integ_alg %u integ_key %U flags %x "
+ "tunnel_src_addr %U tunnel_dst_addr %U "
+ "salt %u seq_outbound %lu last_seq_inbound %lu "
+ "replay_window %lu\n",
+ ntohl (mp->entry.sad_id),
+ ntohl (mp->sw_if_index),
+ ntohl (mp->entry.spi),
+ ntohl (mp->entry.protocol),
+ ntohl (mp->entry.crypto_algorithm),
+ format_hex_bytes, mp->entry.crypto_key.data,
+ mp->entry.crypto_key.length, ntohl (mp->entry.integrity_algorithm),
+ format_hex_bytes, mp->entry.integrity_key.data,
+ mp->entry.integrity_key.length, ntohl (mp->entry.flags),
+ format_vl_api_address, &mp->entry.tunnel_src, format_vl_api_address,
+ &mp->entry.tunnel_dst, ntohl (mp->salt),
+ clib_net_to_host_u64 (mp->seq_outbound),
+ clib_net_to_host_u64 (mp->last_seq_inbound),
+ clib_net_to_host_u64 (mp->replay_window));
+}
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
+#define vl_api_ipsec_sa_details_t_endian vl_noop_handler
+#define vl_api_ipsec_sa_details_t_print vl_noop_handler
- if (num_m_args != 1)
+static void
+vat_json_object_add_address (vat_json_node_t * node,
+ const vl_api_address_t * addr)
+{
+ if (ADDRESS_IP6 == addr->af)
{
- errmsg ("mandatory argument(s) missing");
- return -99;
+ struct in6_addr ip6;
+
+ clib_memcpy (&ip6, &addr->un.ip6, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "ip_address", ip6);
}
+ else
+ {
+ struct in_addr ip4;
- /* Construct the API message */
- M (MAP_DEL_DOMAIN, mp);
+ clib_memcpy (&ip4, &addr->un.ip4, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "ip_address", ip4);
+ }
+}
- mp->index = ntohl (index);
+static void vl_api_ipsec_sa_details_t_handler_json
+ (vl_api_ipsec_sa_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ vl_api_ipsec_sad_flags_t flags;
- /* send it... */
- S (mp);
+ 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);
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sa_id", ntohl (mp->entry.sad_id));
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "spi", ntohl (mp->entry.spi));
+ vat_json_object_add_uint (node, "proto", ntohl (mp->entry.protocol));
+ vat_json_object_add_uint (node, "crypto_alg",
+ ntohl (mp->entry.crypto_algorithm));
+ vat_json_object_add_uint (node, "integ_alg",
+ ntohl (mp->entry.integrity_algorithm));
+ flags = ntohl (mp->entry.flags);
+ vat_json_object_add_uint (node, "use_esn",
+ ! !(flags & IPSEC_API_SAD_FLAG_USE_ESN));
+ vat_json_object_add_uint (node, "use_anti_replay",
+ ! !(flags & IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY));
+ vat_json_object_add_uint (node, "is_tunnel",
+ ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL));
+ vat_json_object_add_uint (node, "is_tunnel_ip6",
+ ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL_V6));
+ vat_json_object_add_uint (node, "udp_encap",
+ ! !(flags & IPSEC_API_SAD_FLAG_UDP_ENCAP));
+ vat_json_object_add_bytes (node, "crypto_key", mp->entry.crypto_key.data,
+ mp->entry.crypto_key.length);
+ vat_json_object_add_bytes (node, "integ_key", mp->entry.integrity_key.data,
+ mp->entry.integrity_key.length);
+ vat_json_object_add_address (node, &mp->entry.tunnel_src);
+ vat_json_object_add_address (node, &mp->entry.tunnel_dst);
+ vat_json_object_add_uint (node, "replay_window",
+ clib_net_to_host_u64 (mp->replay_window));
}
static int
-api_map_add_del_rule (vat_main_t * vam)
+api_ipsec_sa_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_map_add_del_rule_t *mp;
- u8 is_add = 1;
- ip6_address_t ip6_dst;
- u32 num_m_args = 0, index, psid = 0;
+ vl_api_ipsec_sa_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ u32 sa_id = ~0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else if (unformat (i, "psid %d", &psid))
- num_m_args++;
- else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst))
- num_m_args++;
- else if (unformat (i, "del"))
- {
- is_add = 0;
- }
+ if (unformat (i, "sa_id %d", &sa_id))
+ ;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- /* Construct the API message */
- M (MAP_ADD_DEL_RULE, mp);
-
- mp->index = ntohl (index);
- mp->is_add = is_add;
- clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst));
- mp->psid = ntohs (psid);
-
- /* send it... */
- S (mp);
-
- /* Wait for a reply, return good/bad news */
- W (ret);
- return ret;
-}
-
-static int
-api_map_domain_dump (vat_main_t * vam)
-{
- vl_api_map_domain_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- int ret;
+ M (IPSEC_SA_DUMP, mp);
- /* Construct the API message */
- M (MAP_DOMAIN_DUMP, mp);
+ mp->sa_id = ntohl (sa_id);
- /* send it... */
S (mp);
/* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
+ M (CONTROL_PING, mp_ping);
S (mp_ping);
W (ret);
}
static int
-api_map_rule_dump (vat_main_t * vam)
+api_ipsec_tunnel_if_set_key (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_map_rule_dump_t *mp;
- vl_api_control_ping_t *mp_ping;
- u32 domain_index = ~0;
+ vl_api_ipsec_tunnel_if_set_key_t *mp;
+ u32 sw_if_index = ~0;
+ u8 key_type = IPSEC_IF_SET_KEY_TYPE_NONE;
+ u8 *key = 0;
+ u32 alg = ~0;
int ret;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "index %u", &domain_index))
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
;
else
- break;
+ if (unformat
+ (i, "local crypto %U", unformat_ipsec_api_crypto_alg, &alg))
+ key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO;
+ else
+ if (unformat
+ (i, "remote crypto %U", unformat_ipsec_api_crypto_alg, &alg))
+ key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO;
+ else
+ if (unformat
+ (i, "local integ %U", unformat_ipsec_api_integ_alg, &alg))
+ key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG;
+ else
+ if (unformat
+ (i, "remote integ %U", unformat_ipsec_api_integ_alg, &alg))
+ key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG;
+ else if (unformat (i, "%U", unformat_hex_string, &key))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (domain_index == ~0)
+ if (sw_if_index == ~0)
{
- clib_warning ("parse error: domain index expected");
+ errmsg ("interface must be specified");
return -99;
}
- /* Construct the API message */
- M (MAP_RULE_DUMP, mp);
+ if (key_type == IPSEC_IF_SET_KEY_TYPE_NONE)
+ {
+ errmsg ("key type must be specified");
+ return -99;
+ }
- mp->domain_index = htonl (domain_index);
+ if (alg == ~0)
+ {
+ errmsg ("algorithm must be specified");
+ return -99;
+ }
- /* send it... */
- S (mp);
+ if (vec_len (key) == 0)
+ {
+ errmsg ("key must be specified");
+ return -99;
+ }
- /* Use a control ping for synchronization */
- MPING (CONTROL_PING, mp_ping);
- S (mp_ping);
+ M (IPSEC_TUNNEL_IF_SET_KEY, mp);
+
+ mp->sw_if_index = htonl (sw_if_index);
+ mp->alg = alg;
+ mp->key_type = key_type;
+ mp->key_len = vec_len (key);
+ clib_memcpy (mp->key, key, vec_len (key));
+ S (mp);
W (ret);
+
return ret;
}
-static void vl_api_map_add_domain_reply_t_handler
- (vl_api_map_add_domain_reply_t * mp)
+static int
+api_ipsec_tunnel_if_set_sa (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl (mp->retval);
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_tunnel_if_set_sa_t *mp;
+ u32 sw_if_index = ~0;
+ u32 sa_id = ~0;
+ u8 is_outbound = (u8) ~ 0;
+ int ret;
- if (vam->async_mode)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- vam->async_errors += (retval < 0);
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (i, "sa_id %d", &sa_id))
+ ;
+ else if (unformat (i, "outbound"))
+ is_outbound = 1;
+ else if (unformat (i, "inbound"))
+ is_outbound = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- else
+
+ if (sw_if_index == ~0)
{
- vam->retval = retval;
- vam->result_ready = 1;
+ errmsg ("interface must be specified");
+ return -99;
}
-}
-static void vl_api_map_add_domain_reply_t_handler_json
- (vl_api_map_add_domain_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
+ if (sa_id == ~0)
+ {
+ errmsg ("SA ID must be specified");
+ return -99;
+ }
- vat_json_init_object (&node);
- vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "index", ntohl (mp->index));
+ M (IPSEC_TUNNEL_IF_SET_SA, mp);
- vat_json_print (vam->ofp, &node);
- vat_json_free (&node);
+ mp->sw_if_index = htonl (sw_if_index);
+ mp->sa_id = htonl (sa_id);
+ mp->is_outbound = is_outbound;
- vam->retval = ntohl (mp->retval);
- vam->result_ready = 1;
+ S (mp);
+ W (ret);
+
+ return ret;
}
static int
{
lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
- memset (a, 0, sizeof (a[0]));
+ clib_memset (a, 0, sizeof (a[0]));
if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
{
vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
int ret;
- memset (&rloc, 0, sizeof (rloc));
+ clib_memset (&rloc, 0, sizeof (rloc));
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
ip_address_t ip;
int ret;
- memset (&ip, 0, sizeof (ip));
+ clib_memset (&ip, 0, sizeof (ip));
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0;
int ret;
- memset (&rloc, 0, sizeof (rloc));
+ clib_memset (&rloc, 0, sizeof (rloc));
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
}
else
{
- memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
+ clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
}
vec_free (locator_set_name);
struct in6_addr ip6;
u32 table_id = 0, nh_sw_if_index = ~0;
- memset (&ip4, 0, sizeof (ip4));
- memset (&ip6, 0, sizeof (ip6));
+ clib_memset (&ip4, 0, sizeof (ip4));
+ clib_memset (&ip6, 0, sizeof (ip6));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
u8 random_hw_addr = 1;
int ret;
- memset (hw_addr, 0, sizeof (hw_addr));
+ clib_memset (hw_addr, 0, sizeof (hw_addr));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
return ret;
}
+static void vl_api_af_packet_details_t_handler
+ (vl_api_af_packet_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ print (vam->ofp, "%-16s %d",
+ mp->host_if_name, clib_net_to_host_u32 (mp->sw_if_index));
+}
+
+static void vl_api_af_packet_details_t_handler_json
+ (vl_api_af_packet_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_string_copy (node, "dev_name", mp->host_if_name);
+}
+
+static int
+api_af_packet_dump (vat_main_t * vam)
+{
+ vl_api_af_packet_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
+
+ print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index");
+ /* Get list of tap interfaces */
+ M (AF_PACKET_DUMP, mp);
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ MPING (CONTROL_PING, mp_ping);
+ S (mp_ping);
+
+ W (ret);
+ return ret;
+}
+
static int
api_policer_add_del (vat_main_t * vam)
{
u8 is_master = 0;
int ret;
- memset (hw_addr, 0, sizeof (hw_addr));
+ clib_memset (hw_addr, 0, sizeof (hw_addr));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
}
static void
-vl_api_mpls_fib_path_print (vat_main_t * vam, vl_api_fib_path2_t * fp)
+vl_api_mpls_fib_path_print (vat_main_t * vam, vl_api_fib_path_t * fp)
{
if (fp->afi == IP46_TYPE_IP6)
print (vam->ofp,
" weight %d, sw_if_index %d, is_local %d, is_drop %d, "
"is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
- ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->weight, ntohl (fp->sw_if_index), fp->is_local,
fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
format_ip6_address, fp->next_hop);
else if (fp->afi == IP46_TYPE_IP4)
print (vam->ofp,
" weight %d, sw_if_index %d, is_local %d, is_drop %d, "
"is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
- ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->weight, ntohl (fp->sw_if_index), fp->is_local,
fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
format_ip4_address, fp->next_hop);
}
static void
vl_api_mpls_fib_path_json_print (vat_json_node_t * node,
- vl_api_fib_path2_t * fp)
+ vl_api_fib_path_t * fp)
{
struct in_addr ip4;
struct in6_addr ip6;
{
vat_main_t *vam = &vat_main;
int count = ntohl (mp->mt_count);
- vl_api_fib_path2_t *fp;
+ vl_api_fib_path_t *fp;
i32 i;
print (vam->ofp, "[%d]: sw_if_index %d via:",
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
int count = ntohl (mp->mt_count);
- vl_api_fib_path2_t *fp;
+ vl_api_fib_path_t *fp;
i32 i;
if (VAT_JSON_ARRAY != vam->json_tree.type)
{
vl_api_mpls_tunnel_dump_t *mp;
vl_api_control_ping_t *mp_ping;
- i32 index = -1;
+ u32 sw_if_index = ~0;
int ret;
/* Parse args required to build the message */
while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT)
{
- if (!unformat (vam->input, "tunnel_index %d", &index))
- {
- index = -1;
- break;
- }
+ if (unformat (vam->input, "sw_if_index %d", &sw_if_index))
+ ;
}
- print (vam->ofp, " tunnel_index %d", index);
+ print (vam->ofp, " sw_if_index %d", sw_if_index);
M (MPLS_TUNNEL_DUMP, mp);
- mp->tunnel_index = htonl (index);
+ mp->sw_if_index = htonl (sw_if_index);
S (mp);
/* Use a control ping for synchronization */
{
vat_main_t *vam = &vat_main;
int count = ntohl (mp->count);
- vl_api_fib_path2_t *fp;
+ vl_api_fib_path_t *fp;
int i;
print (vam->ofp,
vat_main_t *vam = &vat_main;
int count = ntohl (mp->count);
vat_json_node_t *node = NULL;
- vl_api_fib_path2_t *fp;
+ vl_api_fib_path_t *fp;
int i;
if (VAT_JSON_ARRAY != vam->json_tree.type)
int i;
print (vam->ofp,
- "table-id %d, prefix %U/%d",
+ "table-id %d, prefix %U/%d stats-index %d",
ntohl (mp->table_id), format_ip4_address, mp->address,
- mp->address_length);
+ mp->address_length, ntohl (mp->stats_index));
fp = mp->path;
for (i = 0; i < count; i++)
{
if (fp->afi == IP46_TYPE_IP6)
print (vam->ofp,
" weight %d, sw_if_index %d, is_local %d, is_drop %d, "
- "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U, "
+ "next_hop_table %d",
ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
- format_ip6_address, fp->next_hop);
+ format_ip6_address, fp->next_hop, ntohl (fp->table_id));
else if (fp->afi == IP46_TYPE_IP4)
print (vam->ofp,
" weight %d, sw_if_index %d, is_local %d, is_drop %d, "
- "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U, "
+ "next_hop_table %d",
ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
- format_ip4_address, fp->next_hop);
+ format_ip4_address, fp->next_hop, ntohl (fp->table_id));
fp++;
}
}
vat_main_t *vam = &vat_main;
print (vam->ofp, "%c %U %U",
- (mp->is_static) ? 'S' : 'D',
- format_ethernet_address, &mp->mac_address,
- (mp->is_ipv6) ? format_ip6_address : format_ip4_address,
- &mp->ip_address);
+ (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
vat_main_t *vam = &vat_main;
vat_json_node_t *node;
- struct in_addr ip4;
- struct in6_addr ip6;
if (VAT_JSON_ARRAY != vam->json_tree.type)
{
node = vat_json_array_add (&vam->json_tree);
vat_json_init_object (node);
- vat_json_object_add_string_copy (node, "flag",
- (mp->is_static) ? (u8 *) "static" : (u8 *)
- "dynamic");
+ 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_ethernet_address,
- &mp->mac_address));
-
- if (mp->is_ipv6)
- {
- clib_memcpy (&ip6, &mp->ip_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "ip_address", ip6);
- }
- else
- {
- clib_memcpy (&ip4, &mp->ip_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "ip_address", ip4);
- }
+ format (0, "%U", format_vl_api_mac_address,
+ &mp->neighbor.mac_address));
+ vat_json_object_add_address (node, &mp->neighbor.ip_address);
}
static int
int i;
print (vam->ofp,
- "table-id %d, prefix %U/%d",
+ "table-id %d, prefix %U/%d stats-index %d",
ntohl (mp->table_id), format_ip6_address, mp->address,
- mp->address_length);
+ mp->address_length, ntohl (mp->stats_index));
fp = mp->path;
for (i = 0; i < count; i++)
{
}
}));
/* *INDENT-ON* */
- print (vam->ofp, "%20s => %20s (%s)",
- sw_if_from_name, sw_if_to_name, states[mp->state]);
+ print (vam->ofp, "%20s => %20s (%s) %s",
+ sw_if_from_name, sw_if_to_name, states[mp->state],
+ mp->is_l2 ? "l2" : "device");
}
static void
vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name);
}
vat_json_object_add_uint (node, "state", mp->state);
+ vat_json_object_add_uint (node, "is-l2", mp->is_l2);
}
static int
u16 *high_ports = 0;
u16 this_low;
u16 this_hi;
- ip4_address_t ip4_addr;
- ip6_address_t ip6_addr;
- u32 length;
+ vl_api_prefix_t prefix;
u32 tmp, tmp2;
u8 prefix_set = 0;
u32 vrf_id = ~0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
- {
- prefix_set = 1;
- }
- else
- if (unformat
- (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
- {
- prefix_set = 1;
- is_ipv6 = 1;
- }
+ if (unformat (input, "%U", unformat_vl_api_prefix, &prefix))
+ prefix_set = 1;
else if (unformat (input, "vrf %d", &vrf_id))
;
else if (unformat (input, "del"))
mp->is_add = is_add;
- if (is_ipv6)
- {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
- }
- else
- {
- mp->is_ipv6 = 0;
- clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
- }
+ clib_memcpy (&mp->prefix, &prefix, sizeof (prefix));
- mp->mask_length = length;
mp->number_of_ranges = vec_len (low_ports);
clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports));
}
static int
-api_ipsec_gre_add_del_tunnel (vat_main_t * vam)
+api_ipsec_gre_tunnel_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_gre_add_del_tunnel_t *mp;
+ vl_api_ipsec_gre_tunnel_add_del_t *mp;
u32 local_sa_id = 0;
u32 remote_sa_id = 0;
- ip4_address_t src_address;
- ip4_address_t dst_address;
+ vl_api_ip4_address_t src_address;
+ vl_api_ip4_address_t dst_address;
u8 is_add = 1;
int ret;
;
else if (unformat (i, "remote_sa %d", &remote_sa_id))
;
- else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
+ else
+ if (unformat (i, "src %U", unformat_vl_api_ip4_address, &src_address))
;
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+ else
+ if (unformat (i, "dst %U", unformat_vl_api_ip4_address, &dst_address))
;
else if (unformat (i, "del"))
is_add = 0;
}
}
- M (IPSEC_GRE_ADD_DEL_TUNNEL, mp);
+ M (IPSEC_GRE_TUNNEL_ADD_DEL, mp);
- mp->local_sa_id = ntohl (local_sa_id);
- mp->remote_sa_id = ntohl (remote_sa_id);
- clib_memcpy (mp->src_address, &src_address, sizeof (src_address));
- clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
+ mp->tunnel.local_sa_id = ntohl (local_sa_id);
+ mp->tunnel.remote_sa_id = ntohl (remote_sa_id);
+ clib_memcpy (mp->tunnel.src, &src_address, sizeof (src_address));
+ clib_memcpy (mp->tunnel.dst, &dst_address, sizeof (dst_address));
mp->is_add = is_add;
S (mp);
}
static int
-api_punt (vat_main_t * vam)
+api_set_punt (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_punt_t *mp;
+ vl_api_set_punt_t *mp;
u32 ipv = ~0;
u32 protocol = ~0;
u32 port = ~0;
}
}
- M (PUNT, mp);
+ M (SET_PUNT, mp);
mp->is_add = (u8) is_add;
- mp->ipv = (u8) ipv;
- mp->l4_protocol = (u8) protocol;
- mp->l4_port = htons ((u16) port);
+ mp->punt.ipv = (u8) ipv;
+ mp->punt.l4_protocol = (u8) protocol;
+ mp->punt.l4_port = htons ((u16) port);
S (mp);
W (ret);
vat_main_t *vam = &vat_main;
print (vam->ofp, "%11d%15U%15U%14d%14d",
- ntohl (mp->sw_if_index),
- format_ip4_address, &mp->src_address,
- format_ip4_address, &mp->dst_address,
- ntohl (mp->local_sa_id), ntohl (mp->remote_sa_id));
+ ntohl (mp->tunnel.sw_if_index),
+ format_vl_api_ip4_address, mp->tunnel.src,
+ format_vl_api_ip4_address, mp->tunnel.dst,
+ ntohl (mp->tunnel.local_sa_id), ntohl (mp->tunnel.remote_sa_id));
+}
+
+static void
+vat_json_object_add_vl_api_ip4 (vat_json_node_t * node,
+ const char *name,
+ const vl_api_ip4_address_t addr)
+{
+ struct in_addr ip4;
+
+ clib_memcpy (&ip4, addr, sizeof (ip4));
+ vat_json_object_add_ip4 (node, name, ip4);
}
static void vl_api_ipsec_gre_tunnel_details_t_handler_json
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 (&ip4, &mp->src_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
- clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "dst_address", ip4);
- vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id));
- vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id));
+ vat_json_object_add_uint (node, "sw_if_index",
+ ntohl (mp->tunnel.sw_if_index));
+ vat_json_object_add_vl_api_ip4 (node, "src", mp->tunnel.src);
+ vat_json_object_add_vl_api_ip4 (node, "src", mp->tunnel.dst);
+ vat_json_object_add_uint (node, "local_sa_id",
+ ntohl (mp->tunnel.local_sa_id));
+ vat_json_object_add_uint (node, "remote_sa_id",
+ ntohl (mp->tunnel.remote_sa_id));
}
static int
int ret;
/* Shut up coverity */
- memset (dmac, 0, sizeof (dmac));
- memset (smac, 0, sizeof (smac));
+ clib_memset (dmac, 0, sizeof (dmac));
+ clib_memset (smac, 0, sizeof (smac));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
}
static int
-api_sw_interface_set_mtu (vat_main_t * vam)
+api_hw_interface_set_mtu (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_mtu_t *mp;
+ vl_api_hw_interface_set_mtu_t *mp;
u32 sw_if_index = ~0;
u32 mtu = 0;
int ret;
}
/* Construct the API message */
- M (SW_INTERFACE_SET_MTU, mp);
+ M (HW_INTERFACE_SET_MTU, mp);
mp->sw_if_index = ntohl (sw_if_index);
mp->mtu = ntohs ((u16) mtu);
u8 mac_set = 0;
int ret;
- memset (remote_mac, 0, sizeof (remote_mac));
+ clib_memset (remote_mac, 0, sizeof (remote_mac));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index))
u8 mac_set = 0;
int ret;
- memset (remote_mac, 0, sizeof (remote_mac));
+ clib_memset (remote_mac, 0, sizeof (remote_mac));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index))
ip6_address_t ip6_addr;
int ret;
- memset (&ip4_addr, 0, sizeof (ip4_addr));
- memset (&ip6_addr, 0, sizeof (ip6_addr));
+ clib_memset (&ip4_addr, 0, sizeof (ip4_addr));
+ clib_memset (&ip6_addr, 0, sizeof (ip6_addr));
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
}
static int
-api_memfd_segment_create (vat_main_t * vam)
+api_sock_init_shm (vat_main_t * vam)
{
#if VPP_API_TEST_BUILTIN == 0
unformat_input_t *i = vam->input;
- vl_api_memfd_segment_create_t *mp;
+ vl_api_shm_elem_config_t *config = 0;
u64 size = 64 << 20;
- int ret;
+ int rv;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
break;
}
- M (MEMFD_SEGMENT_CREATE, mp);
- mp->requested_size = size;
- S (mp);
- W (ret);
- return ret;
-
+ /*
+ * Canned custom ring allocator config.
+ * Should probably parse all of this
+ */
+ vec_validate (config, 6);
+ config[0].type = VL_API_VLIB_RING;
+ config[0].size = 256;
+ config[0].count = 32;
+
+ config[1].type = VL_API_VLIB_RING;
+ config[1].size = 1024;
+ config[1].count = 16;
+
+ config[2].type = VL_API_VLIB_RING;
+ config[2].size = 4096;
+ config[2].count = 2;
+
+ config[3].type = VL_API_CLIENT_RING;
+ config[3].size = 256;
+ config[3].count = 32;
+
+ config[4].type = VL_API_CLIENT_RING;
+ config[4].size = 1024;
+ config[4].count = 16;
+
+ config[5].type = VL_API_CLIENT_RING;
+ config[5].size = 4096;
+ config[5].count = 2;
+
+ config[6].type = VL_API_QUEUE;
+ config[6].count = 128;
+ config[6].size = sizeof (uword);
+
+ rv = vl_socket_client_init_shm (config, 1 /* want_pthread */ );
+ if (!rv)
+ vam->client_index_invalid = 1;
+ return rv;
#else
- errmsg ("memfd_segment_create (builtin) not supported");
return -99;
#endif
}
{
vl_api_ip_container_proxy_add_del_t *mp;
unformat_input_t *i = vam->input;
- u32 plen = ~0, sw_if_index = ~0;
- ip4_address_t ip4;
- ip6_address_t ip6;
- u8 is_ip4 = 1;
+ u32 sw_if_index = ~0;
+ vl_api_prefix_t pfx = { };
u8 is_add = 1;
int ret;
is_add = 0;
else if (unformat (i, "add"))
;
- if (unformat (i, "%U", unformat_ip4_address, &ip4))
- {
- is_ip4 = 1;
- plen = 32;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &ip6))
- {
- is_ip4 = 0;
- plen = 128;
- }
+ if (unformat (i, "%U", unformat_vl_api_prefix, &pfx))
+ ;
else if (unformat (i, "sw_if_index %u", &sw_if_index))
;
else
break;
}
- if (sw_if_index == ~0 || plen == ~0)
+ if (sw_if_index == ~0 || pfx.address_length == 0)
{
errmsg ("address and sw_if_index must be set");
return -99;
M (IP_CONTAINER_PROXY_ADD_DEL, mp);
- mp->is_ip4 = is_ip4;
mp->sw_if_index = clib_host_to_net_u32 (sw_if_index);
- mp->plen = plen;
mp->is_add = is_add;
- if (is_ip4)
- clib_memcpy (mp->ip, &ip4, sizeof (ip4));
- else
- clib_memcpy (mp->ip, &ip6, sizeof (ip6));
+ clib_memcpy (&mp->pfx, &pfx, sizeof (pfx));
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static int
+api_qos_record_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_qos_record_enable_disable_t *mp;
+ u32 sw_if_index, qs = 0xff;
+ u8 sw_if_index_set = 0;
+ u8 enable = 1;
+ int ret;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U", unformat_qos_source, &qs))
+ ;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index");
+ return -99;
+ }
+ if (qs == 0xff)
+ {
+ errmsg ("input location must be specified");
+ return -99;
+ }
+
+ M (QOS_RECORD_ENABLE_DISABLE, mp);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->input_source = qs;
+ mp->enable = enable;
S (mp);
W (ret);
return ret;
}
+
static int
q_or_quit (vat_main_t * vam)
{
return 0;
}
+static int
+statseg (vat_main_t * vam)
+{
+ ssvm_private_t *ssvmp = &vam->stat_segment;
+ ssvm_shared_header_t *shared_header = ssvmp->sh;
+ vlib_counter_t **counters;
+ u64 thread0_index1_packets;
+ u64 thread0_index1_bytes;
+ f64 vector_rate, input_rate;
+ uword *p;
+
+ uword *counter_vector_by_name;
+ if (vam->stat_segment_lockp == 0)
+ {
+ errmsg ("Stat segment not mapped...");
+ return -99;
+ }
+
+ /* look up "/if/rx for sw_if_index 1 as a test */
+
+ clib_spinlock_lock (vam->stat_segment_lockp);
+
+ counter_vector_by_name = (uword *) shared_header->opaque[1];
+
+ p = hash_get_mem (counter_vector_by_name, "/if/rx");
+ if (p == 0)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("/if/tx not found?");
+ return -99;
+ }
+
+ /* Fish per-thread vector of combined counters from shared memory */
+ counters = (vlib_counter_t **) p[0];
+
+ if (vec_len (counters[0]) < 2)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("/if/tx vector length %d", vec_len (counters[0]));
+ return -99;
+ }
+
+ /* Read thread 0 sw_if_index 1 counter */
+ thread0_index1_packets = counters[0][1].packets;
+ thread0_index1_bytes = counters[0][1].bytes;
+
+ p = hash_get_mem (counter_vector_by_name, "vector_rate");
+ if (p == 0)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("vector_rate not found?");
+ return -99;
+ }
+
+ vector_rate = *(f64 *) (p[0]);
+ p = hash_get_mem (counter_vector_by_name, "input_rate");
+ if (p == 0)
+ {
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+ errmsg ("input_rate not found?");
+ return -99;
+ }
+ input_rate = *(f64 *) (p[0]);
+
+ clib_spinlock_unlock (vam->stat_segment_lockp);
+
+ print (vam->ofp, "vector_rate %.2f input_rate %.2f",
+ vector_rate, input_rate);
+ print (vam->ofp, "thread 0 sw_if_index 1 rx pkts %lld, bytes %lld",
+ thread0_index1_packets, thread0_index1_bytes);
+
+ return 0;
+}
+
static int
cmd_cmp (void *a1, void *a2)
{
return 0;
}
- for (i = 0; i < vec_len (vam->graph_nodes); i++)
+ for (i = 0; i < vec_len (vam->graph_nodes[0]); i++)
{
- node = vam->graph_nodes[i];
+ node = vam->graph_nodes[0][i];
print (vam->ofp, "[%d] %s", i, node->name);
for (j = 0; j < vec_len (node->next_nodes); j++)
{
if (node->next_nodes[j] != ~0)
{
- next_node = vam->graph_nodes[node->next_nodes[j]];
+ next_node = vam->graph_nodes[0][node->next_nodes[j]];
print (vam->ofp, " [%d] %s", j, next_node->name);
}
}
if (unformat (vam->input, "%s", &name_and_crc))
{
- message_index = vl_api_get_msg_index (name_and_crc);
+ message_index = vl_msg_api_get_msg_index (name_and_crc);
if (message_index == ~0)
{
print (vam->ofp, " '%s' not found", name_and_crc);
print (vam->ofp, "%s not found...", node_to_find);
goto out;
}
- node = vam->graph_nodes[p[0]];
+ node = vam->graph_nodes[0][p[0]];
print (vam->ofp, "[%d] %s", p[0], node->name);
for (j = 0; j < vec_len (node->next_nodes); j++)
{
if (node->next_nodes[j] != ~0)
{
- next_node = vam->graph_nodes[node->next_nodes[j]];
+ next_node = vam->graph_nodes[0][node->next_nodes[j]];
print (vam->ofp, " [%d] %s", j, next_node->name);
}
}
vam->current_file = s;
do_one_file (vam);
- clib_memcpy (&vam->input, &save_input, sizeof (vam->input));
+ clib_memcpy (&vam->input, &save_input, sizeof (save_input));
clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf));
vam->ifp = save_ifp;
vam->input_line_number = save_line_number;
"<intfc> | sw_if_index <id> <ip4-address> | <ip6-address> [del] [del-all] ") \
_(sw_interface_set_rx_mode, \
"<intfc> | sw_if_index <id> [queue <id>] <polling | interrupt | adaptive>") \
+_(sw_interface_set_rx_placement, \
+ "<intfc> | sw_if_index <id> [queue <id>] [worker <id> | main]") \
+_(sw_interface_rx_placement_dump, \
+ "[<intfc> | sw_if_index <id>]") \
_(sw_interface_set_table, \
"<intfc> | sw_if_index <id> vrf <table-id> [ipv6]") \
_(sw_interface_set_mpls_enable, \
"enable | disable") \
_(bridge_domain_set_mac_age, "bd_id <bridge-domain-id> mac-age 0-255") \
_(bridge_domain_add_del, \
- "bd_id <bridge-domain-id> [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [mac-age 0-255] [bd-tag <tag>] [del]\n") \
+ "bd_id <bridge-domain-id> [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [mac-age 0-255] [bd-tag <text>] [del]\n") \
_(bridge_domain_dump, "[bd_id <bridge-domain-id>]\n") \
_(l2fib_add_del, \
"mac <mac-addr> bd_id <bridge-domain-id> [del] | sw_if <intfc> | sw_if_index <id> [static] [filter] [bvi] [count <nn>]\n") \
"sw_if <intfc> | sw_if_index <id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \
_(bridge_flags, \
"bd_id <bridge-domain-id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \
-_(tap_connect, \
- "tapname <name> mac <mac-addr> | random-mac [tag <string>]") \
-_(tap_modify, \
- "<vpp-if-name> | sw_if_index <id> tapname <name> mac <mac-addr> | random-mac") \
-_(tap_delete, \
+_(tap_create_v2, \
+ "id <num> [hw-addr <mac-addr>] [host-ns <name>] [rx-ring-size <num> [tx-ring-size <num>]") \
+_(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>] [tx-ring-size <num> [rx-ring-size <num>] [features <hex-value>]") \
+_(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>]") \
+_(bond_delete, \
+ "<vpp-if-name> | sw_if_index <id>") \
+_(bond_enslave, \
+ "sw_if_index <n> bond <sw_if_index> [is_passive] [is_long_timeout]") \
+_(bond_detach_slave, \
+ "sw_if_index <n>") \
+_(sw_interface_bond_dump, "") \
+_(sw_interface_slave_dump, \
"<vpp-if-name> | sw_if_index <id>") \
-_(sw_interface_tap_dump, "") \
_(ip_table_add_del, \
- "table-id <n> [ipv6]\n") \
+ "table <n> [ipv6] [add | del]\n") \
_(ip_add_del_route, \
- "<addr>/<mask> via <addr> [table-id <n>]\n" \
- "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n" \
- "[weight <n>] [drop] [local] [classify <n>] [del]\n" \
- "[multipath] [count <n>]") \
+ "<addr>/<mask> via <<addr>|<intfc>|sw_if_index <id>|via-label <n>>\n" \
+ "[table-id <n>] [<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n"\
+ "[weight <n>] [drop] [local] [classify <n>] [out-label <n>]\n" \
+ "[multipath] [count <n>] [del]") \
_(ip_mroute_add_del, \
"<src> <grp>/<mask> [table-id <n>]\n" \
"[<intfc> | sw_if_index <id>] [local] [del]") \
_(mpls_table_add_del, \
- "table-id <n>\n") \
+ "table <n> [add | del]\n") \
_(mpls_route_add_del, \
- "<label> <eos> via <addr> [table-id <n>]\n" \
- "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n" \
- "[weight <n>] [drop] [local] [classify <n>] [del]\n" \
- "[multipath] [count <n>]") \
+ "<label> <eos> via <addr | next-hop-table <n> | via-label <n> |\n" \
+ "lookup-ip4-table <n> | lookup-in-ip6-table <n> |\n" \
+ "l2-input-on <intfc> | l2-input-on sw_if_index <id>>\n" \
+ "[<intfc> | sw_if_index <id>] [resolve-attempts <n>] [weight <n>]\n" \
+ "[drop] [local] [classify <n>] [out-label <n>] [multipath]\n" \
+ "[count <n>] [del]") \
_(mpls_ip_bind_unbind, \
"<label> <addr/len>") \
_(mpls_tunnel_add_del, \
- " via <addr> [table-id <n>]\n" \
- "sw_if_index <id>] [l2] [del]") \
+ "[add | del <intfc | sw_if_index <id>>] via <addr | via-label <n>>\n" \
+ "[<intfc> | sw_if_index <id> | next-hop-table <id>]\n" \
+ "[l2-only] [out-label <n>]") \
+_(sr_mpls_policy_add, \
+ "bsid <id> [weight <n>] [spray] next <sid> [next <sid>]") \
+_(sr_mpls_policy_del, \
+ "bsid <id>") \
_(bier_table_add_del, \
"<label> <sub-domain> <set> <bsl> [del]") \
_(bier_route_add_del, \
"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> [ipv6] [del]") \
+ "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]") \
"vrf <n> [src] [dst] [sport] [dport] [proto] [reverse] [ipv6]") \
_(sw_interface_ip6_enable_disable, \
"<intfc> | sw_if_index <id> enable | disable") \
-_(sw_interface_ip6_set_link_local_address, \
- "<intfc> | sw_if_index <id> <ip6-address>/<mask-width>") \
_(ip6nd_proxy_add_del, \
"<intfc> | sw_if_index <id> <ip6-address>") \
_(ip6nd_proxy_dump, "") \
_(l2tpv3_set_lookup_key, \
"lookup_v6_src | lookup_v6_dst | lookup_session_id") \
_(sw_if_l2tpv3_tunnel_dump, "") \
+_(vxlan_offload_rx, \
+ "hw { <interface name> | hw_if_index <nn>} " \
+ "rx { <vxlan tunnel name> | sw_if_index <nn> } [del]") \
_(vxlan_add_del_tunnel, \
"src <ip-addr> { dst <ip-addr> | group <mcast-ip-addr>\n" \
- "{ <intfc> | mcast_sw_if_index <nn> } }\n" \
+ "{ <intfc> | mcast_sw_if_index <nn> } [instance <id>]}\n" \
"vni <vni> [encap-vrf-id <nn>] [decap-next <l2|nn>] [del]") \
_(geneve_add_del_tunnel, \
"src <ip-addr> { dst <ip-addr> | group <mcast-ip-addr>\n" \
_(vxlan_tunnel_dump, "[<intfc> | sw_if_index <nn>]") \
_(geneve_tunnel_dump, "[<intfc> | sw_if_index <nn>]") \
_(gre_add_del_tunnel, \
- "src <ip-addr> dst <ip-addr> [outer-fib-id <nn>] [teb] [del]\n") \
+ "src <ip-addr> dst <ip-addr> [outer-fib-id <nn>] [instance <n>]\n" \
+ "[teb | erspan <session-id>] [del]") \
_(gre_tunnel_dump, "[<intfc> | sw_if_index <nn>]") \
_(l2_fib_clear_table, "") \
_(l2_interface_efp_filter, "sw_if_index <nn> 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] " \
"[mac <mac_address>]") \
_(modify_vhost_user_if, \
"<intfc> | sw_if_index <nn> socket <filename>\n" \
_(delete_vhost_user_if, "<intfc> | sw_if_index <nn>") \
_(sw_interface_vhost_user_dump, "") \
_(show_version, "") \
+_(show_threads, "") \
_(vxlan_gpe_add_del_tunnel, \
"local <addr> remote <addr> | group <mcast-ip-addr>\n" \
"{ <intfc> | mcast_sw_if_index <nn> } }\n" \
_(input_acl_set_interface, \
"<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n" \
" [l2-table <nn>] [del]") \
+_(ip_probe_neighbor, "(<intc> | sw_if_index <nn>) address <ip4|ip6-addr>") \
+_(ip_scan_neighbor_enable_disable, "[ip4|ip6|both|disable] [interval <n-min>]\n" \
+ " [max-time <n-usec>] [max-update <n>] [delay <n-msec>] [stale <n-min>]") \
_(want_ip4_arp_events, "address <ip4-address> [del]") \
_(want_ip6_nd_events, "address <ip6-address> [del]") \
_(want_l2_macs_events, "[disable] [learn-limit <n>] [scan-delay <n>] [max-entries <n>]") \
_(ipsec_spd_add_del, "spd_id <n> [del]") \
_(ipsec_interface_add_del_spd, "(<intfc> | sw_if_index <id>)\n" \
" spid_id <n> ") \
-_(ipsec_sad_add_del_entry, "sad_id <n> spi <n> crypto_alg <alg>\n" \
+_(ipsec_sad_entry_add_del, "sad_id <n> spi <n> crypto_alg <alg>\n" \
" crypto_key <hex> tunnel_src <ip4|ip6> tunnel_dst <ip4|ip6>\n" \
" integ_alg <alg> integ_key <hex>") \
-_(ipsec_spd_add_del_entry, "spd_id <n> priority <n> action <action>\n" \
+_(ipsec_spd_entry_add_del, "spd_id <n> priority <n> action <action>\n" \
" (inbound|outbound) [sa_id <n>] laddr_start <ip4|ip6>\n" \
" laddr_stop <ip4|ip6> raddr_start <ip4|ip6> raddr_stop <ip4|ip6>\n" \
" [lport_start <n> lport_stop <n>] [rport_start <n> rport_stop <n>]" ) \
_(ipsec_tunnel_if_add_del, "local_spi <n> remote_spi <n>\n" \
" crypto_alg <alg> local_crypto_key <hex> remote_crypto_key <hex>\n" \
" integ_alg <alg> local_integ_key <hex> remote_integ_key <hex>\n" \
- " local_ip <addr> remote_ip <addr> [esn] [anti_replay] [del]\n") \
+ " local_ip <addr> remote_ip <addr> [esn] [anti_replay] [del]\n" \
+ " [instance <n>]") \
_(ipsec_sa_dump, "[sa_id <n>]") \
_(ipsec_tunnel_if_set_key, "<intfc> <local|remote> <crypto|integ>\n" \
" <alg> <hex>\n") \
_(ipsec_tunnel_if_set_sa, "<intfc> sa_id <n> <inbound|outbound>\n") \
-_(ikev2_profile_add_del, "name <profile_name> [del]") \
-_(ikev2_profile_set_auth, "name <profile_name> auth_method <method>\n" \
- "(auth_data 0x<data> | auth_data <data>)") \
-_(ikev2_profile_set_id, "name <profile_name> id_type <type>\n" \
- "(id_data 0x<data> | id_data <data>) (local|remote)") \
-_(ikev2_profile_set_ts, "name <profile_name> protocol <proto>\n" \
- "start_port <port> end_port <port> start_addr <ip4> end_addr <ip4>\n" \
- "(local|remote)") \
-_(ikev2_set_local_key, "file <absolute_file_path>") \
-_(ikev2_set_responder, "<profile_name> interface <interface> address <addr>") \
-_(ikev2_set_ike_transforms, "<profile_name> <crypto alg> <key size> <integrity alg> <DH group>") \
-_(ikev2_set_esp_transforms, "<profile_name> <crypto alg> <key size> <integrity alg> <DH group>") \
-_(ikev2_set_sa_lifetime, "<profile_name> <seconds> <jitter> <handover> <max bytes>") \
-_(ikev2_initiate_sa_init, "<profile_name>") \
-_(ikev2_initiate_del_ike_sa, "<ispi>") \
-_(ikev2_initiate_del_child_sa, "<ispi>") \
-_(ikev2_initiate_rekey_child_sa, "<ispi>") \
_(delete_loopback,"sw_if_index <nn>") \
_(bd_ip_mac_add_del, "bd_id <bridge-domain-id> <ip4/6-addr> <mac-addr> [del]") \
-_(map_add_domain, \
- "ip4-pfx <ip4pfx> ip6-pfx <ip6pfx> " \
- "ip6-src <ip6addr> " \
- "ea-bits-len <n> psid-offset <n> psid-len <n>") \
-_(map_del_domain, "index <n>") \
-_(map_add_del_rule, \
- "index <n> psid <n> dst <ip6addr> [del]") \
-_(map_domain_dump, "") \
-_(map_rule_dump, "index <map-domain>") \
+_(bd_ip_mac_flush, "bd_id <bridge-domain-id>") \
+_(bd_ip_mac_dump, "[bd_id] <bridge-domain-id>") \
_(want_interface_events, "enable|disable") \
-_(want_stats,"enable|disable") \
_(get_first_msg_id, "client <name>") \
_(cop_interface_enable_disable, "<intfc> | sw_if_index <nn> [disable]") \
_(cop_whitelist_enable_disable, "<intfc> | sw_if_index <nn>\n" \
_(one_add_del_l2_arp_entry, "[del] mac <mac> bd <bd> ip4 <ip4>") \
_(one_l2_arp_bd_get, "") \
_(one_l2_arp_entries_get, "bd <bridge-domain>") \
-_(one_stats_enable_disable, "enable|disalbe") \
+_(one_stats_enable_disable, "enable|disable") \
_(show_one_stats_enable_disable, "") \
_(one_eid_table_vni_dump, "") \
_(one_eid_table_map_dump, "l2|l3") \
_(show_lisp_map_request_mode, "") \
_(af_packet_create, "name <host interface name> [hw_addr <mac>]") \
_(af_packet_delete, "name <host interface name>") \
+_(af_packet_dump, "") \
_(policer_add_del, "name <policer name> <params> [del]") \
_(policer_dump, "[name <policer name>]") \
_(policer_classify_set_interface, \
_(ip_source_and_port_range_check_interface_add_del, \
"<intf> | sw_if_index <nn> [tcp-out-vrf <id>] [tcp-in-vrf <id>]" \
"[udp-in-vrf <id>] [udp-out-vrf <id>]") \
-_(ipsec_gre_add_del_tunnel, \
+_(ipsec_gre_tunnel_add_del, \
"src <addr> dst <addr> local_sa <sa-id> remote_sa <sa-id> [del]") \
_(ipsec_gre_tunnel_dump, "[sw_if_index <nn>]") \
_(delete_subif,"<intfc> | sw_if_index <nn>") \
"<intfc> | sw_if_index <nn> \n" \
"[disable | push | pop | translate_pbb_stag <outer_tag>] \n" \
"dmac <mac> smac <mac> sid <nn> [vlanid <nn>]") \
-_(punt, "protocol <l4-protocol> [ip <ver>] [port <l4-port>] [del]") \
+_(set_punt, "protocol <l4-protocol> [ip <ver>] [port <l4-port>] [del]") \
_(flow_classify_set_interface, \
"<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>] [del]") \
_(flow_classify_dump, "type [ip4|ip6]") \
_(sw_interface_tag_add_del, "<intfc> | sw_if_index <nn> tag <text>" \
"[disable]") \
_(l2_xconnect_dump, "") \
-_(sw_interface_set_mtu, "<intfc> | sw_if_index <nn> mtu <nn>") \
+_(hw_interface_set_mtu, "<intfc> | hw_if_index <nn> mtu <nn>") \
_(ip_neighbor_dump, "[ip6] <intfc> | sw_if_index <nn>") \
_(sw_interface_get_table, "<intfc> | sw_if_index <id> [ipv6]") \
_(p2p_ethernet_add, "<intfc> | sw_if_index <nn> remote_mac <mac-address> sub_id <id>") \
_(sw_interface_set_lldp, "<intfc> | sw_if_index <nn> [port-desc <description>]\n" \
" [mgmt-ip4 <ip4>] [mgmt-ip6 <ip6>] [mgmt-oid <object id>] [disable]") \
_(tcp_configure_src_addresses, "<ip4|6>first-<ip4|6>last [vrf <id>]") \
-_(memfd_segment_create,"size <nnn>") \
+_(sock_init_shm, "size <nnn>") \
_(app_namespace_add_del, "[add] id <ns-id> secret <nn> sw_if_index <nn>")\
_(dns_enable_disable, "[enable][disable]") \
_(dns_name_server_add_del, "<ip-address> [del]") \
"<lcl-port> <rmt-ip>/<plen> <rmt-port> action <nn>") \
_(session_rules_dump, "") \
_(ip_container_proxy_add_del, "[add|del] <address> <sw_if_index>") \
+_(output_acl_set_interface, \
+ "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n" \
+ " [l2-table <nn>] [del]") \
+_(qos_record_enable_disable, "<record-source> <intfc> | sw_if_index <id> [disable]")
/* List of command functions, CLI names map directly to functions */
#define foreach_cli_function \
_(dump_sub_interface_table, "usage: dump_sub_interface_table") \
_(dump_ipv4_table, "usage: dump_ipv4_table") \
_(dump_ipv6_table, "usage: dump_ipv6_table") \
-_(dump_stats_table, "usage: dump_stats_table") \
_(dump_macro_table, "usage: dump_macro_table ") \
_(dump_node_table, "usage: dump_node_table") \
_(dump_msg_api_table, "usage: dump_msg_api_table") \
_(search_node_table, "usage: search_node_table <name>...") \
_(set, "usage: set <variable-name> <value>") \
_(script, "usage: script <file-name>") \
+_(statseg, "usage: statseg"); \
_(unset, "usage: unset <variable-name>")
+
#define _(N,n) \
static void vl_api_##n##_t_handler_uni \
(vl_api_##n##_t * mp) \