#include <vnet/vxlan-gpe/vxlan_gpe.h>
#include <vnet/lisp-gpe/lisp_gpe.h>
-#include <api/vpe_msg_enum.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/mpls-gre/mpls.h>
#if DPDK > 0
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/ikev2.h>
#include <vnet/cop/cop.h>
#include <vnet/ip/ip6_hop_by_hop.h>
#include <vnet/policer/xlate.h>
+#include <vnet/policer/policer.h>
#include "vat/json_format.h"
+#include <sys/stat.h>
+
#define vl_typedefs /* define message structures */
-#include <api/vpe_all_api_h.h>
+#include <vpp-api/vpe_all_api_h.h>
#undef vl_typedefs
/* declare message handlers for each api */
#define vl_endianfun /* define message structures */
-#include <api/vpe_all_api_h.h>
+#include <vpp-api/vpe_all_api_h.h>
#undef vl_endianfun
/* instantiate all the print functions we know about */
#define vl_print(handle, ...)
#define vl_printfun
-#include <api/vpe_all_api_h.h>
+#include <vpp-api/vpe_all_api_h.h>
#undef vl_printfun
uword unformat_sw_if_index (unformat_input_t * input, va_list * args)
return 1;
}
+uword
+unformat_dscp (unformat_input_t * input, va_list * va)
+{
+ u8 * r = va_arg (*va, u8 *);
+
+ if (0) ;
+#define _(v,f,str) else if (unformat (input, str)) *r = VNET_DSCP_##f;
+ foreach_vnet_dscp
+#undef _
+ else
+ return 0;
+ return 1;
+}
+
+uword
+unformat_policer_action_type (unformat_input_t * input, va_list * va)
+{
+ sse2_qos_pol_action_params_st * a
+ = va_arg (*va, sse2_qos_pol_action_params_st *);
+
+ if (unformat (input, "drop"))
+ a->action_type = SSE2_QOS_ACTION_DROP;
+ else if (unformat (input, "transmit"))
+ a->action_type = SSE2_QOS_ACTION_TRANSMIT;
+ else if (unformat (input, "mark-and-transmit %U", unformat_dscp, &a->dscp))
+ a->action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
+ else
+ return 0;
+ return 1;
+}
+
u8 * format_ip4_address (u8 * s, va_list * args)
{
u8 * a = va_arg (*args, u8 *);
u8 * format_ip46_address (u8 * s, va_list * args)
{
ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
- return ip46_address_is_ip4(ip46)?
+ ip46_type_t type = va_arg (*args, ip46_type_t);
+ int is_ip4 = 1;
+
+ switch (type)
+ {
+ case IP46_TYPE_ANY:
+ is_ip4 = ip46_address_is_ip4(ip46);
+ break;
+ case IP46_TYPE_IP4:
+ is_ip4 = 1;
+ break;
+ case IP46_TYPE_IP6:
+ is_ip4 = 0;
+ break;
+ }
+
+ return is_ip4 ?
format(s, "%U", format_ip4_address, &ip46->ip4):
format(s, "%U", format_ip6_address, &ip46->ip6);
}
a->as_u64[1] = clib_net_to_host_u64 (v1);
}
+void increment_mac_address (u64 *mac)
+{
+ u64 tmp = *mac;
+
+ tmp = clib_net_to_host_u64(tmp);
+ tmp += 1<<16; /* skip unused (least significant) octets */
+ tmp = clib_host_to_net_u64 (tmp);
+ *mac = tmp;
+}
static void vl_api_create_loopback_reply_t_handler
(vl_api_create_loopback_reply_t * mp)
i32 retval = ntohl(mp->retval);
vam->retval = retval;
- vam->result_ready = 1;
vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
static void vl_api_create_loopback_reply_t_handler_json
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_af_packet_create_reply_t_handler
+(vl_api_af_packet_create_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ i32 retval = ntohl(mp->retval);
+
+ vam->retval = retval;
+ vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
+}
+
+static void vl_api_af_packet_create_reply_t_handler_json
+(vl_api_af_packet_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);
i32 retval = ntohl(mp->retval);
vam->retval = retval;
- vam->result_ready = 1;
vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
static void vl_api_create_vlan_subif_reply_t_handler_json
i32 retval = ntohl(mp->retval);
vam->retval = retval;
- vam->result_ready = 1;
vam->regenerate_interface_table = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
static void vl_api_create_subif_reply_t_handler_json
i32 retval = ntohl(mp->retval);
vam->retval = retval;
- vam->result_ready = 1;
vam->regenerate_interface_table = 1;
+ vam->result_ready = 1;
}
static void vl_api_interface_name_renumber_reply_t_handler_json
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
- vam->result_ready = 1;
if (retval == 0 &&
((mp->new_table_index != 0xFFFFFFFF) ||
(mp->skip_n_vectors != 0xFFFFFFFF) ||
errmsg ("new index %d, skip_n_vectors %d, match_n_vectors %d\n",
ntohl(mp->new_table_index),
ntohl(mp->skip_n_vectors), ntohl(mp->match_n_vectors));
+ vam->result_ready = 1;
}
}
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
- vam->result_ready = 1;
if (retval == 0)
errmsg ("node index %d\n", ntohl(mp->node_index));
+ vam->result_ready = 1;
}
}
vam->result_ready = 1;
}
+static void vl_api_get_next_index_reply_t_handler
+(vl_api_get_next_index_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;
+ if (retval == 0)
+ errmsg ("next node index %d\n", ntohl(mp->next_index));
+ vam->result_ready = 1;
+ }
+}
+
+static void vl_api_get_next_index_reply_t_handler_json
+(vl_api_get_next_index_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, "next_index", ntohl(mp->next_index));
+
+ vat_json_print(vam->ofp, &node);
+ vat_json_free(&node);
+
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
static void vl_api_add_node_next_reply_t_handler
(vl_api_add_node_next_reply_t * mp)
{
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
- vam->result_ready = 1;
if (retval == 0)
errmsg ("next index %d\n", ntohl(mp->next_index));
+ vam->result_ready = 1;
}
}
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
- vam->result_ready = 1;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
}
+
}
static void vl_api_tap_connect_reply_t_handler_json
vam->retval = ntohl(mp->retval);
vam->result_ready = 1;
+
}
static void vl_api_tap_modify_reply_t_handler
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
vam->async_errors += (retval < 0);
} else {
vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
vam->result_ready = 1;
}
}
{
vat_main_t *vam = &vat_main;
u8 *prefix;
+ u8 * (*format_eid)(u8 *, va_list *) = 0;
+
+ switch (mp->eid_type)
+ {
+ case 0: format_eid = format_ip4_address; break;
+ case 1: format_eid = format_ip6_address; break;
+ case 2: format_eid = format_ethernet_address; break;
+ default:
+ errmsg ("unknown EID type %d!", mp->eid_type);
+ return;
+ }
- prefix = format(0, "%U/%d",
- mp->eid_is_ipv6 ? format_ip6_address : format_ip4_address,
- mp->eid_ip_address,
- mp->eid_prefix_len);
+ prefix = format(0, "[%d] %U/%d",
+ clib_net_to_host_u32 (mp->vni),
+ format_eid, mp->eid, mp->eid_prefix_len);
fformat(vam->ofp, "%=20s%=30s\n",
mp->locator_set_name, prefix);
vec_free(prefix);
}
+static void
+vl_api_lisp_eid_table_map_details_t_handler (
+ vl_api_lisp_eid_table_map_details_t *mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ u8 * line = format(0, "%=10d%=10d",
+ clib_net_to_host_u32 (mp->vni),
+ clib_net_to_host_u32 (mp->vrf));
+ fformat(vam->ofp, "%v\n", line);
+ vec_free(line);
+}
+
+static void
+vl_api_lisp_eid_table_map_details_t_handler_json (
+ vl_api_lisp_eid_table_map_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, "vrf", clib_net_to_host_u32 (mp->vrf));
+ vat_json_object_add_uint(node, "vni", clib_net_to_host_u32 (mp->vni));
+}
+
static void
vl_api_lisp_local_eid_table_details_t_handler_json (
vl_api_lisp_local_eid_table_details_t *mp)
vat_json_node_t *node = NULL;
struct in6_addr ip6;
struct in_addr ip4;
+ u8 * s = 0;
if (VAT_JSON_ARRAY != vam->json_tree.type) {
ASSERT(VAT_JSON_NONE == vam->json_tree.type);
vat_json_init_object(node);
vat_json_object_add_string_copy(node, "locator-set", mp->locator_set_name);
- if (mp->eid_is_ipv6) {
- clib_memcpy(&ip6, mp->eid_ip_address, sizeof(ip6));
- vat_json_object_add_ip6(node, "eid address", ip6);
- } else {
- clib_memcpy(&ip4, mp->eid_ip_address, sizeof(ip4));
- vat_json_object_add_ip4(node, "eid address", ip4);
- }
- vat_json_object_add_uint(node, "eid prefix len", mp->eid_prefix_len);
+ switch (mp->eid_type)
+ {
+ case 0:
+ clib_memcpy(&ip4, mp->eid, sizeof(ip4));
+ vat_json_object_add_ip4(node, "eid-address", ip4);
+ break;
+ case 1:
+ clib_memcpy(&ip6, mp->eid, sizeof(ip6));
+ vat_json_object_add_ip6(node, "eid-address", ip6);
+ break;
+ case 2:
+ s = format (0, "%U", format_ethernet_address, mp->eid);
+ vec_add1(s, 0);
+ vat_json_object_add_string_copy(node, "eid-address", s);
+ vec_free(s);
+ break;
+ default:
+ errmsg ("unknown EID type %d!", mp->eid_type);
+ return;
+ }
+ vat_json_object_add_uint(node, "vni", clib_net_to_host_u32 (mp->vni));
+ vat_json_object_add_uint(node, "eid-prefix-len", mp->eid_prefix_len);
}
static u8 *
gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled");
feature_status = format (0, "%s",
mp->feature_status ? "enabled" : "disabled");
+ vec_add1 (gpe_status, 0);
+ vec_add1 (feature_status, 0);
if (VAT_JSON_ARRAY != vam->json_tree.type) {
ASSERT(VAT_JSON_NONE == vam->json_tree.type);
vec_free (feature_status);
}
-#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
+static void
+vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler (
+ vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ i32 retval = ntohl(mp->retval);
-/*
- * Generate boilerplate reply handlers, which
- * dig the return value out of the xxx_reply_t API message,
- * stick it into vam->retval, and set vam->result_ready
- *
- * Could also do this by pointing N message decode slots at
- * a single function, but that could break in subtle ways.
- */
+ if (retval >= 0) {
+ fformat(vam->ofp, "%=20s\n",
+ mp->locator_set_name);
+ }
-#define foreach_standard_reply_retval_handler \
-_(sw_interface_set_flags_reply) \
-_(sw_interface_add_del_address_reply) \
-_(sw_interface_set_table_reply) \
-_(sw_interface_set_vpath_reply) \
-_(sw_interface_set_l2_bridge_reply) \
-_(bridge_domain_add_del_reply) \
-_(sw_interface_set_l2_xconnect_reply) \
-_(l2fib_add_del_reply) \
-_(ip_add_del_route_reply) \
-_(proxy_arp_add_del_reply) \
-_(proxy_arp_intfc_enable_disable_reply) \
-_(mpls_add_del_encap_reply) \
-_(mpls_add_del_decap_reply) \
-_(mpls_ethernet_add_del_tunnel_2_reply) \
-_(sw_interface_set_unnumbered_reply) \
-_(ip_neighbor_add_del_reply) \
-_(reset_vrf_reply) \
-_(oam_add_del_reply) \
-_(reset_fib_reply) \
-_(dhcp_proxy_config_reply) \
-_(dhcp_proxy_config_2_reply) \
-_(dhcp_proxy_set_vss_reply) \
-_(dhcp_client_config_reply) \
-_(set_ip_flow_hash_reply) \
-_(sw_interface_ip6_enable_disable_reply) \
-_(sw_interface_ip6_set_link_local_address_reply) \
-_(sw_interface_ip6nd_ra_prefix_reply) \
-_(sw_interface_ip6nd_ra_config_reply) \
-_(set_arp_neighbor_limit_reply) \
-_(l2_patch_add_del_reply) \
-_(sr_tunnel_add_del_reply) \
-_(sr_policy_add_del_reply) \
-_(sr_multicast_map_add_del_reply) \
-_(classify_add_del_session_reply) \
-_(classify_set_interface_ip_table_reply) \
-_(classify_set_interface_l2_tables_reply) \
-_(l2tpv3_set_tunnel_cookies_reply) \
-_(l2tpv3_interface_enable_disable_reply) \
-_(l2tpv3_set_lookup_key_reply) \
-_(l2_fib_clear_table_reply) \
-_(l2_interface_efp_filter_reply) \
-_(l2_interface_vlan_tag_rewrite_reply) \
-_(modify_vhost_user_if_reply) \
-_(delete_vhost_user_if_reply) \
-_(want_ip4_arp_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_sa_set_key_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) \
-_(delete_loopback_reply) \
-_(bd_ip_mac_add_del_reply) \
-_(map_del_domain_reply) \
-_(map_add_del_rule_reply) \
-_(want_interface_events_reply) \
-_(want_stats_reply) \
-_(cop_interface_enable_disable_reply) \
-_(cop_whitelist_enable_disable_reply) \
-_(sw_interface_clear_stats_reply) \
-_(trace_profile_add_reply) \
-_(trace_profile_apply_reply) \
-_(trace_profile_del_reply) \
-_(lisp_add_del_locator_set_reply) \
-_(lisp_add_del_locator_reply) \
-_(lisp_add_del_local_eid_reply) \
-_(lisp_gpe_add_del_fwd_entry_reply) \
-_(lisp_add_del_map_resolver_reply) \
-_(lisp_gpe_enable_disable_reply) \
-_(lisp_gpe_add_del_iface_reply) \
-_(lisp_enable_disable_reply) \
-_(vxlan_gpe_add_del_tunnel_reply) \
-_(af_packet_create_reply) \
-_(af_packet_delete_reply) \
-_(policer_add_del_reply) \
-_(netmap_create_reply) \
-_(netmap_delete_reply)
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
-#define _(n) \
- static void vl_api_##n##_t_handler \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = &vat_main; \
- i32 retval = ntohl(mp->retval); \
- if (vam->async_mode) { \
- vam->async_errors += (retval < 0); \
- } else { \
- vam->retval = retval; \
- vam->result_ready = 1; \
- } \
+static void
+vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler_json (
+ vl_api_lisp_get_map_request_itr_rlocs_reply_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);
}
-foreach_standard_reply_retval_handler;
-#undef _
+ node = vat_json_array_add(&vam->json_tree);
-#define _(n) \
- static void vl_api_##n##_t_handler_json \
- (vl_api_##n##_t * mp) \
- { \
- vat_main_t * vam = &vat_main; \
- vat_json_node_t node; \
- vat_json_init_object(&node); \
+ vat_json_init_object(node);
+ vat_json_object_add_string_copy(node, "itr-rlocs", mp->locator_set_name);
+
+ vat_json_print(vam->ofp, node);
+ vat_json_free(node);
+
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+static void
+vl_api_show_lisp_pitr_reply_t_handler (vl_api_show_lisp_pitr_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl(mp->retval);
+
+ if (0 <= retval) {
+ fformat(vam->ofp, "%-20s%-16s\n",
+ mp->status ? "enabled" : "disabled",
+ mp->status ? (char *) mp->locator_set_name : "");
+ }
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void
+vl_api_show_lisp_pitr_reply_t_handler_json (vl_api_show_lisp_pitr_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+ u8 * status = 0;
+
+ status = format (0, "%s", mp->status ? "enabled" : "disabled");
+ vec_add1 (status, 0);
+
+ vat_json_init_object(&node);
+ vat_json_object_add_string_copy(&node, "status", status);
+ if (mp->status) {
+ vat_json_object_add_string_copy(&node, "locator_set", mp->locator_set_name);
+ }
+
+ vec_free (status);
+
+ vat_json_print(vam->ofp, &node);
+ vat_json_free(&node);
+
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+static u8 * format_policer_type (u8 * s, va_list * va)
+{
+ u32 i = va_arg (*va, u32);
+
+ if (i == SSE2_QOS_POLICER_TYPE_1R2C)
+ s = format (s, "1r2c");
+ else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697)
+ s = format (s, "1r3c");
+ else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698)
+ s = format (s, "2r3c-2698");
+ else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115)
+ s = format (s, "2r3c-4115");
+ else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1)
+ s = format (s, "2r3c-mef5cf1");
+ else
+ s = format (s, "ILLEGAL");
+ return s;
+}
+
+static u8 * format_policer_rate_type (u8 * s, va_list * va)
+{
+ u32 i = va_arg (*va, u32);
+
+ if (i == SSE2_QOS_RATE_KBPS)
+ s = format (s, "kbps");
+ else if (i == SSE2_QOS_RATE_PPS)
+ s = format(s, "pps");
+ else
+ s = format (s, "ILLEGAL");
+ return s;
+}
+
+static u8 * format_policer_round_type (u8 * s, va_list * va)
+{
+ u32 i = va_arg (*va, u32);
+
+ if (i == SSE2_QOS_ROUND_TO_CLOSEST)
+ s = format(s, "closest");
+ else if (i == SSE2_QOS_ROUND_TO_UP)
+ s = format (s, "up");
+ else if (i == SSE2_QOS_ROUND_TO_DOWN)
+ s = format (s, "down");
+ else
+ s = format (s, "ILLEGAL");
+ return s;
+}
+
+static u8 * format_policer_action_type (u8 * s, va_list * va)
+{
+ u32 i = va_arg (*va, u32);
+
+ if (i == SSE2_QOS_ACTION_DROP)
+ s = format (s, "drop");
+ else if (i == SSE2_QOS_ACTION_TRANSMIT)
+ s = format (s, "transmit");
+ else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ s = format (s, "mark-and-transmit");
+ else
+ s = format (s, "ILLEGAL");
+ return s;
+}
+
+static u8 * format_dscp (u8 * s, va_list * va)
+{
+ u32 i = va_arg (*va, u32);
+ char * t = 0;
+
+ switch (i) {
+ #define _(v,f,str) case VNET_DSCP_##f: t = str; break;
+ foreach_vnet_dscp
+ #undef _
+ default:
+ return format (s, "ILLEGAL");
+ }
+ s = format (s, "%s", t);
+ return s;
+}
+
+static void vl_api_policer_details_t_handler
+(vl_api_policer_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str;
+
+ if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ conform_dscp_str = format(0, "%U", format_dscp, mp->conform_dscp);
+ else
+ conform_dscp_str = format(0, "");
+
+ if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ exceed_dscp_str = format(0, "%U", format_dscp, mp->exceed_dscp);
+ else
+ exceed_dscp_str = format(0, "");
+
+ if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT)
+ violate_dscp_str = format(0, "%U", format_dscp, mp->violate_dscp);
+ else
+ violate_dscp_str = format(0, "");
+
+ fformat (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, "
+ "rate type %U, round type %U, %s rate, %s color-aware, "
+ "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, "
+ "cur bkt %u, ext lim %u, ext bkt %u, last update %llu"
+ "conform action %U%s, exceed action %U%s, violate action %U%s\n",
+ mp->name,
+ format_policer_type, mp->type,
+ ntohl(mp->cir),
+ ntohl(mp->eir),
+ ntohl(mp->cb),
+ ntohl(mp->eb),
+ format_policer_rate_type, mp->rate_type,
+ format_policer_round_type, mp->round_type,
+ mp->single_rate ? "single" : "dual",
+ mp->color_aware ? "is" : "not",
+ ntohl(mp->cir_tokens_per_period),
+ ntohl(mp->pir_tokens_per_period),
+ ntohl(mp->scale),
+ ntohl(mp->current_limit),
+ ntohl(mp->current_bucket),
+ ntohl(mp->extended_limit),
+ ntohl(mp->extended_bucket),
+ clib_net_to_host_u64(mp->last_update_time),
+ format_policer_action_type, mp->conform_action_type,
+ conform_dscp_str,
+ format_policer_action_type, mp->exceed_action_type,
+ exceed_dscp_str,
+ format_policer_action_type, mp->violate_action_type,
+ violate_dscp_str);
+
+ vec_free(conform_dscp_str);
+ vec_free(exceed_dscp_str);
+ vec_free(violate_dscp_str);
+}
+
+static void vl_api_policer_details_t_handler_json
+(vl_api_policer_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t *node;
+ u8 *rate_type_str, *round_type_str, *type_str;
+ u8 *conform_action_str, *exceed_action_str, *violate_action_str;
+
+ rate_type_str = format(0, "%U", format_policer_rate_type, mp->rate_type);
+ round_type_str = format(0, "%U", format_policer_round_type, mp->round_type);
+ type_str = format(0, "%U", format_policer_type, mp->type);
+ conform_action_str = format(0, "%U", format_policer_action_type,
+ mp->conform_action_type);
+ exceed_action_str = format(0, "%U", format_policer_action_type,
+ mp->exceed_action_type);
+ violate_action_str = format(0, "%U", format_policer_action_type,
+ mp->violate_action_type);
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type) {
+ ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array(&vam->json_tree);
+ }
+ node = vat_json_array_add(&vam->json_tree);
+
+ vat_json_init_object(node);
+ vat_json_object_add_string_copy(node, "name", mp->name);
+ vat_json_object_add_uint(node, "cir", ntohl(mp->cir));
+ vat_json_object_add_uint(node, "eir", ntohl(mp->eir));
+ vat_json_object_add_uint(node, "cb", ntohl(mp->cb));
+ vat_json_object_add_uint(node, "eb", ntohl(mp->eb));
+ vat_json_object_add_string_copy(node, "rate_type", rate_type_str);
+ vat_json_object_add_string_copy(node, "round_type", round_type_str);
+ vat_json_object_add_string_copy(node, "type", type_str);
+ vat_json_object_add_uint(node, "single_rate", mp->single_rate);
+ vat_json_object_add_uint(node, "color_aware", mp->color_aware);
+ vat_json_object_add_uint(node, "scale", ntohl(mp->scale));
+ vat_json_object_add_uint(node, "cir_tokens_per_period",
+ ntohl(mp->cir_tokens_per_period));
+ vat_json_object_add_uint(node, "eir_tokens_per_period",
+ ntohl(mp->pir_tokens_per_period));
+ vat_json_object_add_uint(node, "current_limit", ntohl(mp->current_limit));
+ vat_json_object_add_uint(node, "current_bucket", ntohl(mp->current_bucket));
+ vat_json_object_add_uint(node, "extended_limit", ntohl(mp->extended_limit));
+ vat_json_object_add_uint(node, "extended_bucket",
+ ntohl(mp->extended_bucket));
+ vat_json_object_add_uint(node, "last_update_time",
+ ntohl(mp->last_update_time));
+ vat_json_object_add_string_copy(node, "conform_action", conform_action_str);
+ if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) {
+ u8 *dscp_str = format(0, "%U", format_dscp, mp->conform_dscp);
+ vat_json_object_add_string_copy(node, "conform_dscp", dscp_str);
+ vec_free(dscp_str);
+ }
+ vat_json_object_add_string_copy(node, "exceed_action", exceed_action_str);
+ if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) {
+ u8 *dscp_str = format(0, "%U", format_dscp, mp->exceed_dscp);
+ vat_json_object_add_string_copy(node, "exceed_dscp", dscp_str);
+ vec_free(dscp_str);
+ }
+ vat_json_object_add_string_copy(node, "violate_action", violate_action_str);
+ if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) {
+ u8 *dscp_str = format(0, "%U", format_dscp, mp->violate_dscp);
+ vat_json_object_add_string_copy(node, "violate_dscp", dscp_str);
+ vec_free(dscp_str);
+ }
+
+ vec_free(rate_type_str);
+ vec_free(round_type_str);
+ vec_free(type_str);
+ vec_free(conform_action_str);
+ vec_free(exceed_action_str);
+ vec_free(violate_action_str);
+}
+
+static void vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ int i, count = ntohl(mp->count);
+
+ if (count>0)
+ fformat (vam->ofp, "classify table ids (%d) : ", count);
+ for (i = 0; i < count; i++)
+ {
+ fformat (vam->ofp, "%d", ntohl(mp->ids[i]));
+ fformat (vam->ofp, (i<count-1)?",":"\n");
+ }
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_classify_table_ids_reply_t_handler_json (vl_api_classify_table_ids_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ int i, count = ntohl(mp->count);
+
+ if (count>0) {
+ vat_json_node_t node;
+
+ vat_json_init_object(&node);
+ for (i = 0; i < count; i++)
+ {
+ vat_json_object_add_uint(&node, "table_id", ntohl(mp->ids[i]));
+ }
+ vat_json_print(vam->ofp, &node);
+ vat_json_free(&node);
+ }
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_classify_table_by_interface_reply_t_handler (vl_api_classify_table_by_interface_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ u32 table_id;
+
+ table_id = ntohl(mp->l2_table_id);
+ if (table_id != ~0)
+ fformat (vam->ofp, "l2 table id : %d\n", table_id);
+ else
+ fformat (vam->ofp, "l2 table id : No input ACL tables configured\n");
+ table_id = ntohl(mp->ip4_table_id);
+ if (table_id != ~0)
+ fformat (vam->ofp, "ip4 table id : %d\n", table_id);
+ else
+ fformat (vam->ofp, "ip4 table id : No input ACL tables configured\n");
+ table_id = ntohl(mp->ip6_table_id);
+ if (table_id != ~0)
+ fformat (vam->ofp, "ip6 table id : %d\n", table_id);
+ else
+ fformat (vam->ofp, "ip6 table id : No input ACL tables configured\n");
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_classify_table_by_interface_reply_t_handler_json (vl_api_classify_table_by_interface_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, "l2_table_id", ntohl(mp->l2_table_id));
+ vat_json_object_add_int(&node, "ip4_table_id", ntohl(mp->ip4_table_id));
+ vat_json_object_add_int(&node, "ip6_table_id", ntohl(mp->ip6_table_id));
+
+ vat_json_print(vam->ofp, &node);
+ vat_json_free(&node);
+
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+/* Format hex dump. */
+u8 * format_hex_bytes (u8 * s, va_list * va)
+{
+ u8 * bytes = va_arg (*va, u8 *);
+ int n_bytes = va_arg (*va, int);
+ uword i;
+
+ /* Print short or long form depending on byte count. */
+ uword short_form = n_bytes <= 32;
+ uword indent = format_get_indent (s);
+
+ if (n_bytes == 0)
+ return s;
+
+ for (i = 0; i < n_bytes; i++)
+ {
+ if (! short_form && (i % 32) == 0)
+ s = format (s, "%08x: ", i);
+ s = format (s, "%02x", bytes[i]);
+ if (! short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes)
+ s = format (s, "\n%U", format_white_space, indent);
+ }
+
+ return s;
+}
+
+static void vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ i32 retval = ntohl(mp->retval);
+ if (retval == 0) {
+ fformat (vam->ofp, "classify table info :\n");
+ fformat (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d\n", ntohl(mp->active_sessions), ntohl(mp->next_table_index), ntohl(mp->miss_next_index));
+ fformat (vam->ofp, "nbuckets: %d skip: %d match: %d\n", ntohl(mp->nbuckets), ntohl(mp->skip_n_vectors), ntohl(mp->match_n_vectors));
+ fformat (vam->ofp, "mask: %U\n", format_hex_bytes, mp->mask, ntohl(mp->mask_length));
+ }
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void vl_api_classify_table_info_reply_t_handler_json (vl_api_classify_table_info_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t node;
+
+ i32 retval = ntohl(mp->retval);
+ if (retval == 0) {
+ vat_json_init_object(&node);
+
+ vat_json_object_add_int(&node, "sessions", ntohl(mp->active_sessions));
+ vat_json_object_add_int(&node, "nexttbl", ntohl(mp->next_table_index));
+ vat_json_object_add_int(&node, "nextnode", ntohl(mp->miss_next_index));
+ vat_json_object_add_int(&node, "nbuckets", ntohl(mp->nbuckets));
+ vat_json_object_add_int(&node, "skip", ntohl(mp->skip_n_vectors));
+ vat_json_object_add_int(&node, "match", ntohl(mp->match_n_vectors));
+ u8 * s = format (0, "%U%c",format_hex_bytes, mp->mask, ntohl(mp->mask_length), 0);
+ vat_json_object_add_string_copy(&node, "mask", s);
+
+ vat_json_print(vam->ofp, &node);
+ vat_json_free(&node);
+ }
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+
+ fformat (vam->ofp, "next_index: %d advance: %d opaque: %d ", ntohl(mp->hit_next_index), ntohl(mp->advance), ntohl(mp->opaque_index));
+ fformat (vam->ofp, "mask: %U\n", format_hex_bytes, mp->match, ntohl(mp->match_length));
+}
+
+static void vl_api_classify_session_details_t_handler_json (vl_api_classify_session_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_int(node, "next_index", ntohl(mp->hit_next_index));
+ vat_json_object_add_int(node, "advance", ntohl(mp->advance));
+ vat_json_object_add_int(node, "opaque", ntohl(mp->opaque_index));
+ u8 * s = format (0, "%U%c",format_hex_bytes, mp->match, ntohl(mp->match_length), 0);
+ vat_json_object_add_string_copy(node, "match", s);
+}
+
+static void vl_api_pg_create_interface_reply_t_handler
+(vl_api_pg_create_interface_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
+}
+
+static void vl_api_pg_create_interface_reply_t_handler_json
+(vl_api_pg_create_interface_reply_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t node;
+
+ i32 retval = ntohl(mp->retval);
+ if (retval == 0) {
+ vat_json_init_object(&node);
+
+ vat_json_object_add_int(&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;
+}
+
+#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
+
+/*
+ * Generate boilerplate reply handlers, which
+ * dig the return value out of the xxx_reply_t API message,
+ * stick it into vam->retval, and set vam->result_ready
+ *
+ * Could also do this by pointing N message decode slots at
+ * a single function, but that could break in subtle ways.
+ */
+
+#define foreach_standard_reply_retval_handler \
+_(sw_interface_set_flags_reply) \
+_(sw_interface_add_del_address_reply) \
+_(sw_interface_set_table_reply) \
+_(sw_interface_set_vpath_reply) \
+_(sw_interface_set_l2_bridge_reply) \
+_(bridge_domain_add_del_reply) \
+_(sw_interface_set_l2_xconnect_reply) \
+_(l2fib_add_del_reply) \
+_(ip_add_del_route_reply) \
+_(proxy_arp_add_del_reply) \
+_(proxy_arp_intfc_enable_disable_reply) \
+_(mpls_add_del_encap_reply) \
+_(mpls_add_del_decap_reply) \
+_(mpls_ethernet_add_del_tunnel_2_reply) \
+_(sw_interface_set_unnumbered_reply) \
+_(ip_neighbor_add_del_reply) \
+_(reset_vrf_reply) \
+_(oam_add_del_reply) \
+_(reset_fib_reply) \
+_(dhcp_proxy_config_reply) \
+_(dhcp_proxy_config_2_reply) \
+_(dhcp_proxy_set_vss_reply) \
+_(dhcp_client_config_reply) \
+_(set_ip_flow_hash_reply) \
+_(sw_interface_ip6_enable_disable_reply) \
+_(sw_interface_ip6_set_link_local_address_reply) \
+_(sw_interface_ip6nd_ra_prefix_reply) \
+_(sw_interface_ip6nd_ra_config_reply) \
+_(set_arp_neighbor_limit_reply) \
+_(l2_patch_add_del_reply) \
+_(sr_tunnel_add_del_reply) \
+_(sr_policy_add_del_reply) \
+_(sr_multicast_map_add_del_reply) \
+_(classify_add_del_session_reply) \
+_(classify_set_interface_ip_table_reply) \
+_(classify_set_interface_l2_tables_reply) \
+_(l2tpv3_set_tunnel_cookies_reply) \
+_(l2tpv3_interface_enable_disable_reply) \
+_(l2tpv3_set_lookup_key_reply) \
+_(l2_fib_clear_table_reply) \
+_(l2_interface_efp_filter_reply) \
+_(l2_interface_vlan_tag_rewrite_reply) \
+_(modify_vhost_user_if_reply) \
+_(delete_vhost_user_if_reply) \
+_(want_ip4_arp_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_sa_set_key_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) \
+_(delete_loopback_reply) \
+_(bd_ip_mac_add_del_reply) \
+_(map_del_domain_reply) \
+_(map_add_del_rule_reply) \
+_(want_interface_events_reply) \
+_(want_stats_reply) \
+_(cop_interface_enable_disable_reply) \
+_(cop_whitelist_enable_disable_reply) \
+_(sw_interface_clear_stats_reply) \
+_(trace_profile_add_reply) \
+_(trace_profile_apply_reply) \
+_(trace_profile_del_reply) \
+_(lisp_add_del_locator_set_reply) \
+_(lisp_add_del_locator_reply) \
+_(lisp_add_del_local_eid_reply) \
+_(lisp_add_del_remote_mapping_reply) \
+_(lisp_add_del_adjacency_reply) \
+_(lisp_gpe_add_del_fwd_entry_reply) \
+_(lisp_add_del_map_resolver_reply) \
+_(lisp_gpe_enable_disable_reply) \
+_(lisp_gpe_add_del_iface_reply) \
+_(lisp_enable_disable_reply) \
+_(lisp_pitr_set_locator_set_reply) \
+_(lisp_add_del_map_request_itr_rlocs_reply) \
+_(lisp_eid_table_add_del_map_reply) \
+_(vxlan_gpe_add_del_tunnel_reply) \
+_(af_packet_delete_reply) \
+_(policer_add_del_reply) \
+_(netmap_create_reply) \
+_(netmap_delete_reply) \
+_(ipfix_enable_reply) \
+_(pg_capture_reply) \
+_(pg_enable_disable_reply)
+
+#define _(n) \
+ static void vl_api_##n##_t_handler \
+ (vl_api_##n##_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; \
+ } \
+ }
+foreach_standard_reply_retval_handler;
+#undef _
+
+#define _(n) \
+ static void vl_api_##n##_t_handler_json \
+ (vl_api_##n##_t * mp) \
+ { \
+ vat_main_t * vam = &vat_main; \
+ vat_json_node_t node; \
+ vat_json_init_object(&node); \
vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); \
vat_json_print(vam->ofp, &node); \
vam->retval = ntohl(mp->retval); \
_(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \
_(SHOW_VERSION_REPLY, show_version_reply) \
_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry) \
-_(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) \
_(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply) \
_(IP4_ARP_EVENT, ip4_arp_event) \
_(LISP_ADD_DEL_LOCATOR_SET_REPLY, lisp_add_del_locator_set_reply) \
_(LISP_ADD_DEL_LOCATOR_REPLY, lisp_add_del_locator_reply) \
_(LISP_ADD_DEL_LOCAL_EID_REPLY, lisp_add_del_local_eid_reply) \
+_(LISP_ADD_DEL_REMOTE_MAPPING_REPLY, lisp_add_del_remote_mapping_reply) \
+_(LISP_ADD_DEL_ADJACENCY_REPLY, lisp_add_del_adjacency_reply) \
_(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply) \
_(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply) \
_(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply) \
_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply) \
+_(LISP_PITR_SET_LOCATOR_SET_REPLY, lisp_pitr_set_locator_set_reply) \
+_(LISP_EID_TABLE_ADD_DEL_MAP_REPLY, lisp_eid_table_add_del_map_reply) \
_(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply) \
_(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details) \
_(LISP_LOCAL_EID_TABLE_DETAILS, lisp_local_eid_table_details) \
+_(LISP_EID_TABLE_MAP_DETAILS, lisp_eid_table_map_details) \
_(LISP_GPE_TUNNEL_DETAILS, lisp_gpe_tunnel_details) \
_(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details) \
_(LISP_ENABLE_DISABLE_STATUS_DETAILS, \
lisp_enable_disable_status_details) \
+_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY, \
+ lisp_add_del_map_request_itr_rlocs_reply) \
+_(LISP_GET_MAP_REQUEST_ITR_RLOCS_REPLY, \
+ lisp_get_map_request_itr_rlocs_reply) \
+_(SHOW_LISP_PITR_REPLY, show_lisp_pitr_reply) \
_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \
_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \
_(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \
+_(POLICER_DETAILS, policer_details) \
_(NETMAP_CREATE_REPLY, netmap_create_reply) \
-_(NETMAP_DELETE_REPLY, netmap_delete_reply)
+_(NETMAP_DELETE_REPLY, netmap_delete_reply) \
+_(MPLS_GRE_TUNNEL_DETAILS, mpls_gre_tunnel_details) \
+_(MPLS_ETH_TUNNEL_DETAILS, mpls_eth_tunnel_details) \
+_(MPLS_FIB_ENCAP_DETAILS, mpls_fib_encap_details) \
+_(MPLS_FIB_DECAP_DETAILS, mpls_fib_decap_details) \
+_(CLASSIFY_TABLE_IDS_REPLY, classify_table_ids_reply) \
+_(CLASSIFY_TABLE_BY_INTERFACE_REPLY, classify_table_by_interface_reply) \
+_(CLASSIFY_TABLE_INFO_REPLY, classify_table_info_reply) \
+_(CLASSIFY_SESSION_DETAILS, classify_session_details) \
+_(IPFIX_ENABLE_REPLY, ipfix_enable_reply) \
+_(IPFIX_DETAILS, ipfix_details) \
+_(GET_NEXT_INDEX_REPLY, get_next_index_reply) \
+_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply) \
+_(PG_CAPTURE_REPLY, pg_capture_reply) \
+_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply)
/* M: construct, but don't yet send a message */
return -99; \
} while(0);
+/* W2: wait for results, with timeout */
+#define W2(body) \
+do { \
+ timeout = vat_time_now (vam) + 1.0; \
+ \
+ while (vat_time_now (vam) < timeout) { \
+ if (vam->result_ready == 1) { \
+ (body); \
+ return (vam->retval); \
+ } \
+ } \
+ return -99; \
+} while(0);
+
typedef struct {
u8 * name;
u32 value;
strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter)-1);
S;
+
+ /* and vxlan-gpe tunnel interfaces */
+ M(SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "vxlan_gpe", sizeof(mp->name_filter)-1);
+ S;
+
/* and vxlan tunnel interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
u8 is_add = 1;
u8 static_mac = 0;
u8 filter_mac = 0;
+ u8 bvi_mac = 0;
+ int count = 1;
+ f64 before = 0;
+ int j;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
sw_if_index_set = 1;
else if (unformat (i, "sw_if")) {
if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
} else
break;
} else if (unformat (i, "static"))
- static_mac = 1;
+ static_mac = 1;
else if (unformat (i, "filter")) {
- filter_mac = 1;
- static_mac = 1;
+ filter_mac = 1;
+ static_mac = 1;
+ } else if (unformat (i, "bvi")) {
+ bvi_mac = 1;
+ static_mac = 1;
} else if (unformat (i, "del"))
- is_add = 0;
+ is_add = 0;
+ else if (unformat (i, "count %d", &count))
+ ;
else
- break;
+ break;
}
if (mac_set == 0) {
return -99;
}
- M(L2FIB_ADD_DEL, l2fib_add_del);
+ 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++) {
+ M(L2FIB_ADD_DEL, l2fib_add_del);
+
+ mp->mac = mac;
+ mp->bd_id = ntohl(bd_id);
+ mp->is_add = is_add;
+
+ 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;
+ }
+ increment_mac_address (&mac);
+ /* send it... */
+ S;
+ }
- mp->mac = mac;
- mp->bd_id = ntohl(bd_id);
- mp->is_add = is_add;
+ if (count > 1) {
+ vl_api_control_ping_t * mp;
+ f64 after;
- if (is_add) {
- mp->sw_if_index = ntohl(sw_if_index);
- mp->static_mac = static_mac;
- mp->filter_mac = filter_mac;
+ /* Shut off async mode */
+ vam->async_mode = 0;
+
+ M(CONTROL_PING, control_ping);
+ S;
+
+ 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\n");
+
+ if (vam->async_errors > 0) {
+ errmsg ("%d asynchronous errors\n", vam->async_errors);
+ vam->retval = -98;
+ }
+ vam->async_errors = 0;
+ after = vat_time_now(vam);
+
+ fformat(vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
+ count, after - before, count / (after - before));
+ } else {
+ /* Wait for a reply... */
+ W;
}
-
- S; W;
- /* NOTREACHED */
- return 0;
+ /* Return the good/bad news */
+ return (vam->retval);
}
static int api_l2_flags (vat_main_t * vam)
unformat_input_t * i = vam->input;
vl_api_ip_add_del_route_t *mp;
f64 timeout;
- u32 sw_if_index = 0, vrf_id = 0;
+ u32 sw_if_index = ~0, vrf_id = 0;
u8 sw_if_index_set = 0;
u8 is_ipv6 = 0;
u8 is_local = 0, is_drop = 0;
/* 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, "mac %U", unformat_ethernet_address, mac_address)) {
mac_set = 1;
}
else if (unformat (i, "del"))
is_add = 0;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ else if (unformat (i, "%U", 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;
return -99;
}
if (!v4_address_set && !v6_address_set) {
- errmsg ("no addresses set\n");
+ errmsg ("no address set\n");
return -99;
}
f64 timeout;
u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 surpress = 0;
+ u8 suppress = 0;
u8 managed = 0;
u8 other = 0;
u8 ll_option = 0;
;
else if (unformat (i, "interval %d", &initial_interval))
;
- else if (unformat (i, "surpress"))
- surpress = 1;
+ else if (unformat (i, "suppress") || unformat (i, "surpress"))
+ suppress = 1;
else if (unformat (i, "managed"))
managed = 1;
else if (unformat (i, "other"))
mp->lifetime = ntohl(lifetime);
mp->initial_count = ntohl(initial_count);
mp->initial_interval = ntohl(initial_interval);
- mp->surpress = surpress;
+ mp->suppress = suppress;
mp->managed = managed;
mp->other = other;
mp->ll_option = ll_option;
ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
return 0;
- if (tag1 || ignore_tag1 || cos1)
- len = 18;
- if (tag2 || ignore_tag2 || cos2)
- len = 22;
+ if (tag1 || ignore_tag1 || cos1)
+ len = 18;
+ if (tag2 || ignore_tag2 || cos2)
+ len = 22;
+
+ vec_validate_aligned (match, len-1, sizeof(u32x4));
+
+ if (dst)
+ clib_memcpy (match, dst_val, 6);
+
+ if (src)
+ clib_memcpy (match + 6, src_val, 6);
+
+ if (tag2)
+ {
+ /* inner vlan tag */
+ match[19] = tag2_val[1];
+ match[18] = tag2_val[0];
+ if (cos2)
+ match [18] |= (cos2_val & 0x7) << 5;
+ if (proto)
+ {
+ match[21] = proto_val & 0xff;
+ match[20] = proto_val >> 8;
+ }
+ if (tag1)
+ {
+ match [15] = tag1_val[1];
+ match [14] = tag1_val[0];
+ }
+ if (cos1)
+ match [14] |= (cos1_val & 0x7) << 5;
+ *matchp = match;
+ return 1;
+ }
+ if (tag1)
+ {
+ match [15] = tag1_val[1];
+ match [14] = tag1_val[0];
+ if (proto)
+ {
+ match[17] = proto_val & 0xff;
+ match[16] = proto_val >> 8;
+ }
+ if (cos1)
+ match [14] |= (cos1_val & 0x7) << 5;
+
+ *matchp = match;
+ return 1;
+ }
+ if (cos2)
+ match [18] |= (cos2_val & 0x7) << 5;
+ if (cos1)
+ match [14] |= (cos1_val & 0x7) << 5;
+ if (proto)
+ {
+ match[13] = proto_val & 0xff;
+ match[12] = proto_val >> 8;
+ }
+
+ *matchp = match;
+ return 1;
+}
+
+
+uword unformat_classify_match (unformat_input_t * input, va_list * args)
+{
+ u8 ** matchp = va_arg (*args, u8 **);
+ u32 skip_n_vectors = va_arg (*args, u32);
+ u32 match_n_vectors = va_arg (*args, u32);
+
+ u8 * match = 0;
+ u8 * l2 = 0;
+ u8 * l3 = 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (input, "hex %U", unformat_hex_string, &match))
+ ;
+ else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
+ ;
+ else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
+ ;
+ else
+ break;
+ }
+
+ if (match || l2 || l3)
+ {
+ if (l2 || l3)
+ {
+ /* "Win a free Ethernet header in every packet" */
+ if (l2 == 0)
+ vec_validate_aligned (l2, 13, sizeof(u32x4));
+ match = l2;
+ vec_append_aligned (match, l3, sizeof(u32x4));
+ vec_free (l3);
+ }
+
+ /* 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;
+ f64 timeout;
+ u32 skip_n_vectors = 0;
+ u32 match_n_vectors = 0;
+
+ /*
+ * 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", 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", unformat_acl_next_index,
+ &hit_next_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", 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
+ break;
+ }
+
+ if (table_index == ~0) {
+ errmsg ("Table index required\n");
+ return -99;
+ }
+
+ if (is_add && match == 0) {
+ errmsg ("Match value required\n");
+ return -99;
+ }
+
+ M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session,
+ 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);
+ clib_memcpy (mp->match, match, vec_len(match));
+ vec_free(match);
+
+ S; W;
+ /* NOTREACHED */
+}
+
+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;
+ f64 timeout;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 table_index = ~0;
+ u8 is_ipv6 = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "%U", 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\n");
+ return -99;
+ }
+
+
+ M(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
+
+ mp->sw_if_index = ntohl(sw_if_index);
+ mp->table_index = ntohl(table_index);
+ mp->is_ipv6 = is_ipv6;
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
+
+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;
+ f64 timeout;
+ u32 sw_if_index;
+ int sw_if_index_set;
+ u32 ip4_table_index = ~0;
+ u32 ip6_table_index = ~0;
+ u32 other_table_index = ~0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "%U", 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 {
+ 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\n");
+ return -99;
+ }
+
- vec_validate_aligned (match, len-1, sizeof(u32x4));
+ M(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
- if (dst)
- clib_memcpy (match, dst_val, 6);
+ 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);
- if (src)
- clib_memcpy (match + 6, src_val, 6);
-
- if (tag2)
- {
- /* inner vlan tag */
- match[19] = tag2_val[1];
- match[18] = tag2_val[0];
- if (cos2)
- match [18] |= (cos2_val & 0x7) << 5;
- if (proto)
- {
- match[21] = proto_val & 0xff;
- match[20] = proto_val >> 8;
- }
- if (tag1)
- {
- match [15] = tag1_val[1];
- match [14] = tag1_val[0];
- }
- if (cos1)
- match [14] |= (cos1_val & 0x7) << 5;
- *matchp = match;
- return 1;
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
+
+static int api_ipfix_enable (vat_main_t * vam)
+{
+ unformat_input_t * i = vam->input;
+ vl_api_ipfix_enable_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;
+ f64 timeout;
+
+ 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
+ break;
}
- if (tag1)
- {
- match [15] = tag1_val[1];
- match [14] = tag1_val[0];
- if (proto)
- {
- match[17] = proto_val & 0xff;
- match[16] = proto_val >> 8;
- }
- if (cos1)
- match [14] |= (cos1_val & 0x7) << 5;
- *matchp = match;
- return 1;
+ if (collector_address_set == 0) {
+ errmsg ("collector_address required\n");
+ return -99;
}
- if (cos2)
- match [18] |= (cos2_val & 0x7) << 5;
- if (cos1)
- match [14] |= (cos1_val & 0x7) << 5;
- if (proto)
- {
- match[13] = proto_val & 0xff;
- match[12] = proto_val >> 8;
+
+ if (src_address_set == 0) {
+ errmsg ("src_address required\n");
+ return -99;
}
-
- *matchp = match;
- return 1;
-}
+ M (IPFIX_ENABLE, ipfix_enable);
-uword unformat_classify_match (unformat_input_t * input, va_list * args)
+ 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);
+
+ S; W;
+ /* NOTREACHED */
+}
+
+static int api_get_node_index (vat_main_t * vam)
{
- u8 ** matchp = va_arg (*args, u8 **);
- u32 skip_n_vectors = va_arg (*args, u32);
- u32 match_n_vectors = va_arg (*args, u32);
-
- u8 * match = 0;
- u8 * l2 = 0;
- u8 * l3 = 0;
+ unformat_input_t * i = vam->input;
+ vl_api_get_node_index_t * mp;
+ f64 timeout;
+ u8 * name = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "node %s", &name))
+ ;
+ else
+ break;
+ }
+ if (name == 0) {
+ errmsg ("node name required\n");
+ return -99;
+ }
+ if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
+ errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
+ return -99;
+ }
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (input, "hex %U", unformat_hex_string, &match))
- ;
- else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
- ;
- else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
- ;
- else
- break;
- }
+ M(GET_NODE_INDEX, get_node_index);
+ clib_memcpy (mp->node_name, name, vec_len(name));
+ vec_free(name);
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
- if (match || l2 || l3)
- {
- if (l2 || l3)
- {
- /* "Win a free Ethernet header in every packet" */
- if (l2 == 0)
- vec_validate_aligned (l2, 13, sizeof(u32x4));
- match = l2;
- vec_append_aligned (match, l3, sizeof(u32x4));
- vec_free (l3);
- }
+static int api_get_next_index (vat_main_t * vam)
+{
+ unformat_input_t * i = vam->input;
+ vl_api_get_next_index_t * mp;
+ f64 timeout;
+ u8 * node_name = 0, * next_node_name = 0;
- /* 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);
+ 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;
+ }
- *matchp = match;
+ if (node_name == 0) {
+ errmsg ("node name required\n");
+ return -99;
+ }
+ if (vec_len (node_name) >= ARRAY_LEN(mp->node_name)) {
+ errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
+ return -99;
+ }
- return 1;
+ if (next_node_name == 0) {
+ errmsg ("next node name required\n");
+ return -99;
+ }
+ if (vec_len (next_node_name) >= ARRAY_LEN(mp->next_name)) {
+ errmsg ("next node name too long, max %d\n", ARRAY_LEN(mp->next_name));
+ return -99;
}
- return 0;
+ M(GET_NEXT_INDEX, get_next_index);
+ 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; W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_classify_add_del_session (vat_main_t * vam)
+static int api_add_node_next (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;
+ vl_api_add_node_next_t * mp;
f64 timeout;
- u32 skip_n_vectors = 0;
- u32 match_n_vectors = 0;
-
- /*
- * Warning: you have to supply skip_n and match_n
- * because the API client cant simply look at the classify
- * table object.
- */
+ u8 * name = 0;
+ u8 * next = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "hit-next %U", 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", unformat_acl_next_index,
- &hit_next_index))
- ;
- else if (unformat (i, "opaque-index %d", &opaque_index))
+ if (unformat (i, "node %s", &name))
;
- else if (unformat (i, "skip_n %d", &skip_n_vectors))
+ else if (unformat (i, "next %s", &next))
;
- else if (unformat (i, "match_n %d", &match_n_vectors))
+ else
+ break;
+ }
+ if (name == 0) {
+ errmsg ("node name required\n");
+ return -99;
+ }
+ if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
+ errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
+ return -99;
+ }
+ if (next == 0) {
+ errmsg ("next node required\n");
+ return -99;
+ }
+ if (vec_len (next) >= ARRAY_LEN(mp->next_name)) {
+ errmsg ("next name too long, max %d\n", ARRAY_LEN(mp->next_name));
+ return -99;
+ }
+
+ M(ADD_NODE_NEXT, add_node_next);
+ 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; W;
+ /* NOTREACHED */
+ return 0;
+}
+
+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;
+ f64 timeout;
+
+ 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, "match %U", unformat_classify_match,
- &match, skip_n_vectors, match_n_vectors))
+ else if (unformat (i, "remote_session_id %d", &remote_session_id))
;
- else if (unformat (i, "advance %d", &advance))
+ else if (unformat (i, "local_cookie %lld", &local_cookie))
;
- else if (unformat (i, "table-index %d", &table_index))
+ else if (unformat (i, "remote_cookie %lld", &remote_cookie))
;
+ else if (unformat (i, "l2-sublayer-present"))
+ l2_sublayer_present = 1;
else
break;
}
- if (table_index == ~0) {
- errmsg ("Table index required\n");
+ if (client_address_set == 0) {
+ errmsg ("client_address required\n");
return -99;
}
- if (is_add && match == 0) {
- errmsg ("Match value required\n");
+ if (our_address_set == 0) {
+ errmsg ("our_address required\n");
return -99;
}
- M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session,
- vec_len(match));
+ M(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
- 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);
- clib_memcpy (mp->match, match, vec_len(match));
- vec_free(match);
+ 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; W;
/* NOTREACHED */
+ return 0;
}
-static int api_classify_set_interface_ip_table (vat_main_t * vam)
+static int api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- vl_api_classify_set_interface_ip_table_t *mp;
- f64 timeout;
u32 sw_if_index;
- int sw_if_index_set;
- u32 table_index = ~0;
- u8 is_ipv6 = 0;
+ u8 sw_if_index_set = 0;
+ u64 new_local_cookie = 0;
+ u64 new_remote_cookie = 0;
+ vl_api_l2tpv3_set_tunnel_cookies_t *mp;
+ f64 timeout;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ if (unformat (i, "%U", 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;
- }
+ 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\n");
return -99;
}
-
- M(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
+ M(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
mp->sw_if_index = ntohl(sw_if_index);
- mp->table_index = ntohl(table_index);
- mp->is_ipv6 = is_ipv6;
+ 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; W;
/* NOTREACHED */
return 0;
}
-static int api_classify_set_interface_l2_tables (vat_main_t * vam)
+static int api_l2tpv3_interface_enable_disable (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- vl_api_classify_set_interface_l2_tables_t *mp;
+ vl_api_l2tpv3_interface_enable_disable_t *mp;
f64 timeout;
u32 sw_if_index;
- int sw_if_index_set;
- u32 ip4_table_index = ~0;
- u32 ip6_table_index = ~0;
- u32 other_table_index = ~0;
+ u8 sw_if_index_set = 0;
+ u8 enable_disable = 1;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
if (unformat (i, "%U", 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 {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ 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\n");
return -99;
}
+
+ M(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
+ mp->sw_if_index = ntohl(sw_if_index);
+ mp->enable_disable = enable_disable;
- M(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
- 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);
+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;
+ f64 timeout;
+ u8 key = ~0;
+
+ 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\n");
+ return -99;
+ }
+
+ M(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
+ mp->key = key;
S; W;
/* NOTREACHED */
return 0;
}
-static int api_get_node_index (vat_main_t * vam)
+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;
+
+ fformat(vam->ofp, "* %U (our) %U (client) (sw_if_index %d)\n",
+ format_ip6_address, mp->our_address,
+ format_ip6_address, mp->client_address,
+ clib_net_to_host_u32(mp->sw_if_index));
+
+ fformat (vam->ofp, " local cookies %016llx %016llx remote cookie %016llx\n",
+ 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));
+
+ fformat (vam->ofp, " local session-id %d remote session-id %d\n",
+ clib_net_to_host_u32 (mp->local_session_id),
+ clib_net_to_host_u32 (mp->remote_session_id));
+
+ fformat (vam->ofp, " l2 specific sublayer %s\n\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;
+ f64 timeout;
+
+ /* Get list of l2tpv3-tunnel interfaces */
+ M(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+ W;
+}
+
+
+static void vl_api_sw_interface_tap_details_t_handler
+(vl_api_sw_interface_tap_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+
+ fformat(vam->ofp, "%-16s %d\n",
+ 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)
{
- unformat_input_t * i = vam->input;
- vl_api_get_node_index_t * mp;
+ vl_api_sw_interface_tap_dump_t *mp;
f64 timeout;
- u8 * name = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "node %s", &name))
- ;
- else
- break;
- }
- if (name == 0) {
- errmsg ("node name required\n");
- return -99;
- }
- if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
- errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
- return -99;
+
+ fformat(vam->ofp, "\n%-16s %s\n", "dev_name", "sw_if_index");
+ /* Get list of tap interfaces */
+ M(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
+ W;
+}
- M(GET_NODE_INDEX, get_node_index);
- clib_memcpy (mp->node_name, name, vec_len(name));
- vec_free(name);
-
- S; W;
- /* NOTREACHED */
+static uword unformat_vxlan_decap_next
+(unformat_input_t * input, va_list * args)
+{
+ u32 * result = va_arg (*args, u32 *);
+ u32 tmp;
+
+ if (unformat (input, "drop"))
+ *result = VXLAN_INPUT_NEXT_DROP;
+ else if (unformat (input, "ip4"))
+ *result = VXLAN_INPUT_NEXT_IP4_INPUT;
+ else if (unformat (input, "ip6"))
+ *result = VXLAN_INPUT_NEXT_IP6_INPUT;
+ else 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_add_node_next (vat_main_t * vam)
+static int api_vxlan_add_del_tunnel (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_add_node_next_t * mp;
+ unformat_input_t * line_input = vam->input;
+ vl_api_vxlan_add_del_tunnel_t *mp;
f64 timeout;
- u8 * name = 0;
- u8 * next = 0;
+ ip4_address_t src4, dst4;
+ ip6_address_t src6, dst6;
+ u8 is_add = 1;
+ u8 ipv4_set = 0, ipv6_set = 0;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u32 encap_vrf_id = 0;
+ u32 decap_next_index = ~0;
+ u32 vni = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "node %s", &name))
+ 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, &src4))
+ {
+ ipv4_set = 1;
+ src_set = 1;
+ }
+ else if (unformat (line_input, "dst %U",
+ unformat_ip4_address, &dst4))
+ {
+ ipv4_set = 1;
+ dst_set = 1;
+ }
+ else if (unformat (line_input, "src %U",
+ unformat_ip6_address, &src6))
+ {
+ ipv6_set = 1;
+ src_set = 1;
+ }
+ else if (unformat (line_input, "dst %U",
+ unformat_ip6_address, &dst6))
+ {
+ ipv6_set = 1;
+ dst_set = 1;
+ }
+ else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
;
- else if (unformat (i, "next %s", &next))
+ else if (unformat (line_input, "decap-next %U",
+ unformat_vxlan_decap_next, &decap_next_index))
;
- else
- break;
+ else if (unformat (line_input, "vni %d", &vni))
+ ;
+ else {
+ errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+ return -99;
+ }
}
- if (name == 0) {
- errmsg ("node name required\n");
+
+ if (src_set == 0) {
+ errmsg ("tunnel src address not specified\n");
return -99;
}
- if (vec_len (name) >= ARRAY_LEN(mp->node_name)) {
- errmsg ("node name too long, max %d\n", ARRAY_LEN(mp->node_name));
+ if (dst_set == 0) {
+ errmsg ("tunnel dst address not specified\n");
return -99;
}
- if (next == 0) {
- errmsg ("next node required\n");
+
+ if (ipv4_set && ipv6_set) {
+ errmsg ("both IPv4 and IPv6 addresses specified");
return -99;
}
- if (vec_len (next) >= ARRAY_LEN(mp->next_name)) {
- errmsg ("next name too long, max %d\n", ARRAY_LEN(mp->next_name));
+
+ if ((vni == 0) || (vni>>24)) {
+ errmsg ("vni not specified or out of range\n");
return -99;
}
-
- M(ADD_NODE_NEXT, add_node_next);
- clib_memcpy (mp->node_name, name, vec_len(name));
- clib_memcpy (mp->next_name, next, vec_len(next));
- vec_free(name);
- vec_free(next);
-
+
+ M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
+
+ if (ipv6_set) {
+ clib_memcpy(&mp->src_address, &src6, sizeof(src6));
+ clib_memcpy(&mp->dst_address, &dst6, sizeof(dst6));
+ } else {
+ clib_memcpy(&mp->src_address, &src4, sizeof(src4));
+ clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4));
+ }
+ mp->encap_vrf_id = ntohl(encap_vrf_id);
+ mp->decap_next_index = ntohl(decap_next_index);
+ mp->vni = ntohl(vni);
+ mp->is_add = is_add;
+ mp->is_ipv6 = ipv6_set;
+
S; W;
/* NOTREACHED */
return 0;
}
-static int api_l2tpv3_create_tunnel (vat_main_t * vam)
+static void vl_api_vxlan_tunnel_details_t_handler
+(vl_api_vxlan_tunnel_details_t * mp)
{
- 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;
- f64 timeout;
+ vat_main_t * vam = &vat_main;
- 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;
- }
+ fformat(vam->ofp, "%11d%24U%24U%14d%18d%13d\n",
+ ntohl(mp->sw_if_index),
+ format_ip46_address, &(mp->src_address[0]),
+ IP46_TYPE_ANY,
+ format_ip46_address, &(mp->dst_address[0]),
+ IP46_TYPE_ANY,
+ ntohl(mp->encap_vrf_id),
+ ntohl(mp->decap_next_index),
+ ntohl(mp->vni));
+}
- if (client_address_set == 0) {
- errmsg ("client_address required\n");
- return -99;
- }
+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 (our_address_set == 0) {
- errmsg ("our_address required\n");
- return -99;
+ 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);
- M(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel);
-
- 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; W;
- /* NOTREACHED */
- return 0;
+ vat_json_init_object(node);
+ vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+ if (mp->is_ipv6) {
+ clib_memcpy(&ip6, &(mp->src_address[0]), sizeof(ip6));
+ vat_json_object_add_ip6(node, "src_address", ip6);
+ clib_memcpy(&ip6, &(mp->dst_address[0]), sizeof(ip6));
+ vat_json_object_add_ip6(node, "dst_address", ip6);
+ } else {
+ clib_memcpy(&ip4, &(mp->src_address[0]), sizeof(ip4));
+ vat_json_object_add_ip4(node, "src_address", ip4);
+ clib_memcpy(&ip4, &(mp->dst_address[0]), 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);
}
-static int api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
+static int api_vxlan_tunnel_dump (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;
+ vl_api_vxlan_tunnel_dump_t *mp;
f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ 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\n");
- return -99;
+ sw_if_index = ~0;
}
- M(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%11s%24s%24s%14s%18s%13s\n",
+ "sw_if_index", "src_address", "dst_address",
+ "encap_vrf_id", "decap_next_index", "vni");
+ }
- 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);
+ /* Get list of vxlan-tunnel interfaces */
+ M(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
- S; W;
- /* NOTREACHED */
- return 0;
+ mp->sw_if_index = htonl(sw_if_index);
+
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-static int api_l2tpv3_interface_enable_disable (vat_main_t * vam)
+static int api_gre_add_del_tunnel (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_l2tpv3_interface_enable_disable_t *mp;
+ unformat_input_t * line_input = vam->input;
+ vl_api_gre_add_del_tunnel_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 enable_disable = 1;
+ ip4_address_t src4, dst4;
+ u8 is_add = 1;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u32 outer_fib_id = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", 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;
+ 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, &src4))
+ src_set = 1;
+ else if (unformat (line_input, "dst %U",
+ unformat_ip4_address, &dst4))
+ dst_set = 1;
+ else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+ ;
+ else {
+ errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+ return -99;
+ }
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
+ if (src_set == 0) {
+ errmsg ("tunnel src address not specified\n");
+ return -99;
+ }
+ if (dst_set == 0) {
+ errmsg ("tunnel dst address not specified\n");
return -99;
}
-
- M(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable_disable = enable_disable;
+
+ M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
+
+ clib_memcpy(&mp->src_address, &src4, sizeof(src4));
+ clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4));
+ mp->outer_table_id = ntohl(outer_fib_id);
+ mp->is_add = is_add;
S; W;
/* NOTREACHED */
return 0;
}
-static int api_l2tpv3_set_lookup_key (vat_main_t * vam)
+static void vl_api_gre_tunnel_details_t_handler
+(vl_api_gre_tunnel_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+
+ fformat(vam->ofp, "%11d%15U%15U%14d\n",
+ ntohl(mp->sw_if_index),
+ format_ip4_address, &mp->src_address,
+ format_ip4_address, &mp->dst_address,
+ ntohl(mp->outer_table_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;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type) {
+ ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array(&vam->json_tree);
+ }
+ node = vat_json_array_add(&vam->json_tree);
+
+ vat_json_init_object(node);
+ vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+ clib_memcpy(&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, "outer_fib_id", ntohl(mp->outer_table_id));
+}
+
+static int api_gre_tunnel_dump (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- vl_api_l2tpv3_set_lookup_key_t * mp;
+ vl_api_gre_tunnel_dump_t *mp;
f64 timeout;
- u8 key = ~0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ /* Parse args required to build the message */
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;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else
break;
}
- if (key == (u8) ~0) {
- errmsg ("l2tp session lookup key unset\n");
- return -99;
+ if (sw_if_index_set == 0) {
+ sw_if_index = ~0;
}
-
- M(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
- mp->key = key;
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%11s%15s%15s%14s\n",
+ "sw_if_index", "src_address", "dst_address",
+ "outer_fib_id");
+ }
- S; W;
- /* NOTREACHED */
- return 0;
-}
+ /* Get list of gre-tunnel interfaces */
+ M(GRE_TUNNEL_DUMP, gre_tunnel_dump);
-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;
+ mp->sw_if_index = htonl(sw_if_index);
- fformat(vam->ofp, "* %U (our) %U (client) (sw_if_index %d)\n",
- format_ip6_address, mp->our_address,
- format_ip6_address, mp->client_address,
- clib_net_to_host_u32(mp->sw_if_index));
+ S;
- fformat (vam->ofp, " local cookies %016llx %016llx remote cookie %016llx\n",
- 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));
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+ W;
+}
- fformat (vam->ofp, " local session-id %d remote session-id %d\n",
- clib_net_to_host_u32 (mp->local_session_id),
- clib_net_to_host_u32 (mp->remote_session_id));
+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;
+ f64 timeout;
- fformat (vam->ofp, " l2 specific sublayer %s\n\n",
- mp->l2_sublayer_present ? "preset" : "absent");
+ M(L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
+ S; W;
+ /* NOTREACHED */
+ return 0;
}
-static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json
-(vl_api_sw_if_l2tpv3_tunnel_details_t * mp)
+static int api_l2_interface_efp_filter (vat_main_t * vam)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
- struct in6_addr addr;
+ unformat_input_t * i = vam->input;
+ vl_api_l2_interface_efp_filter_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 enable = 1;
+ u8 sw_if_index_set = 0;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "%U", 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 sw_if_index\n");
+ return -99;
}
- 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);
+ M(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
- 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));
+ mp->sw_if_index = ntohl(sw_if_index);
+ mp->enable_disable = enable;
- 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");
+ S; W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam)
+#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)
{
- vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
+ unformat_input_t * i = vam->input;
+ vl_api_l2_interface_vlan_tag_rewrite_t *mp;
f64 timeout;
+ 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;
- /* Get list of l2tpv3-tunnel interfaces */
- M(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump);
- S;
-
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "%U", 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 {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if ((sw_if_index_set == 0)||(vtr_op_set == 0)) {
+ errmsg ("missing vtr operation or sw_if_index\n");
+ return -99;
}
- W;
-}
+ M(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
-static void vl_api_sw_interface_tap_details_t_handler
-(vl_api_sw_interface_tap_details_t * mp)
-{
- vat_main_t * vam = &vat_main;
+ 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);
- fformat(vam->ofp, "%-16s %d\n",
- mp->dev_name,
- clib_net_to_host_u32(mp->sw_if_index));
+ S; W;
+ /* NOTREACHED */
+ return 0;
}
-static void vl_api_sw_interface_tap_details_t_handler_json
-(vl_api_sw_interface_tap_details_t * mp)
+static int api_create_vhost_user_if (vat_main_t * vam)
{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
+ unformat_input_t * i = vam->input;
+ vl_api_create_vhost_user_if_t *mp;
+ f64 timeout;
+ 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;
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ 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
+ 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));
- vat_json_object_add_string_copy(node, "dev_name", mp->dev_name);
-}
+ if (file_name_set == 0) {
+ errmsg ("missing socket file name\n");
+ return -99;
+ }
-static int api_sw_interface_tap_dump (vat_main_t * vam)
-{
- vl_api_sw_interface_tap_dump_t *mp;
- f64 timeout;
+ if (vec_len (file_name) > 255) {
+ errmsg ("socket file name too long\n");
+ return -99;
+ }
+ vec_add1 (file_name, 0);
- fformat(vam->ofp, "\n%-16s %s\n", "dev_name", "sw_if_index");
- /* Get list of tap interfaces */
- M(SW_INTERFACE_TAP_DUMP, sw_interface_tap_dump);
- S;
+ M(CREATE_VHOST_USER_IF, create_vhost_user_if);
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ 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) {
+ mp->renumber = 1;
+ mp->custom_dev_instance = ntohl(custom_dev_instance);
}
- W;
-}
+ mp->use_custom_mac = use_custom_mac;
+ clib_memcpy(mp->mac_address, hwaddr, 6);
-static uword unformat_vxlan_decap_next
-(unformat_input_t * input, va_list * args)
-{
- u32 * result = va_arg (*args, u32 *);
- u32 tmp;
-
- if (unformat (input, "drop"))
- *result = VXLAN_INPUT_NEXT_DROP;
- else if (unformat (input, "ip4"))
- *result = VXLAN_INPUT_NEXT_IP4_INPUT;
- else if (unformat (input, "ip6"))
- *result = VXLAN_INPUT_NEXT_IP6_INPUT;
- else if (unformat (input, "l2"))
- *result = VXLAN_INPUT_NEXT_L2_INPUT;
- else if (unformat (input, "%d", &tmp))
- *result = tmp;
- else
+ S; W;
+ /* NOTREACHED */
return 0;
- return 1;
}
-static int api_vxlan_add_del_tunnel (vat_main_t * vam)
+static int api_modify_vhost_user_if (vat_main_t * vam)
{
- unformat_input_t * line_input = vam->input;
- vl_api_vxlan_add_del_tunnel_t *mp;
+ unformat_input_t * i = vam->input;
+ vl_api_modify_vhost_user_if_t *mp;
f64 timeout;
- ip4_address_t src4, dst4;
- ip6_address_t src6, dst6;
- u8 is_add = 1;
- u8 ipv4_set = 0, ipv6_set = 0;
- u8 src_set = 0;
- u8 dst_set = 0;
- u32 encap_vrf_id = 0;
- u32 decap_next_index = ~0;
- u32 vni = 0;
+ 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;
- 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, &src4))
- {
- ipv4_set = 1;
- src_set = 1;
- }
- else if (unformat (line_input, "dst %U",
- unformat_ip4_address, &dst4))
- {
- ipv4_set = 1;
- dst_set = 1;
- }
- else if (unformat (line_input, "src %U",
- unformat_ip6_address, &src6))
- {
- ipv6_set = 1;
- src_set = 1;
- }
- else if (unformat (line_input, "dst %U",
- unformat_ip6_address, &dst6))
- {
- ipv6_set = 1;
- dst_set = 1;
- }
- 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'\n", format_unformat_error, line_input);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "%U", 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;
+ }
+
+ if (sw_if_index_set == 0) {
+ errmsg ("missing sw_if_index or interface name\n");
+ return -99;
+ }
+
+ if (file_name_set == 0) {
+ errmsg ("missing socket file name\n");
+ return -99;
}
- if (src_set == 0) {
- errmsg ("tunnel src address not specified\n");
- return -99;
+ if (vec_len (file_name) > 255) {
+ errmsg ("socket file name too long\n");
+ return -99;
}
- if (dst_set == 0) {
- errmsg ("tunnel dst address not specified\n");
- return -99;
+ vec_add1 (file_name, 0);
+
+ M(MODIFY_VHOST_USER_IF, modify_vhost_user_if);
+
+ 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) {
+ mp->renumber = 1;
+ mp->custom_dev_instance = ntohl(custom_dev_instance);
}
- if (ipv4_set && ipv6_set) {
- errmsg ("both IPv4 and IPv6 addresses specified");
- return -99;
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
+
+static int api_delete_vhost_user_if (vat_main_t * vam)
+{
+ unformat_input_t * i = vam->input;
+ vl_api_delete_vhost_user_if_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "%U", 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 ((vni == 0) || (vni>>24)) {
- errmsg ("vni not specified or out of range\n");
- return -99;
+ if (sw_if_index_set == 0) {
+ errmsg ("missing sw_if_index or interface name\n");
+ return -99;
}
- M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
- if (ipv6_set) {
- clib_memcpy(&mp->dst_address, &src6, sizeof(src6));
- clib_memcpy(&mp->dst_address, &src6, sizeof(dst6));
- } else {
- clib_memcpy(&mp->src_address, &src4, sizeof(src4));
- clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4));
- }
- mp->encap_vrf_id = ntohl(encap_vrf_id);
- mp->decap_next_index = ntohl(decap_next_index);
- mp->vni = ntohl(vni);
- mp->is_add = is_add;
- mp->is_ipv6 = ipv6_set;
+ M(DELETE_VHOST_USER_IF, delete_vhost_user_if);
+
+ mp->sw_if_index = ntohl(sw_if_index);
S; W;
/* NOTREACHED */
return 0;
}
-static void vl_api_vxlan_tunnel_details_t_handler
-(vl_api_vxlan_tunnel_details_t * mp)
+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;
- fformat(vam->ofp, "%11d%24U%24U%14d%18d%13d\n",
- ntohl(mp->sw_if_index),
- format_ip46_address, &(mp->src_address[0]),
- format_ip46_address, &(mp->dst_address[0]),
- ntohl(mp->encap_vrf_id),
- ntohl(mp->decap_next_index),
- ntohl(mp->vni));
+ fformat(vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s\n",
+ (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);
+ fformat(vam->ofp, " Status: '%s'\n", strerror(ntohl(mp->sock_errno)));
}
-static void vl_api_vxlan_tunnel_details_t_handler_json
-(vl_api_vxlan_tunnel_details_t * mp)
+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;
- 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_object(node);
vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
- if (mp->is_ipv6) {
- clib_memcpy(&ip6, &(mp->src_address[0]), sizeof(ip6));
- vat_json_object_add_ip6(node, "src_address", ip6);
- clib_memcpy(&ip6, &(mp->dst_address[0]), sizeof(ip6));
- vat_json_object_add_ip6(node, "dst_address", ip6);
- } else {
- clib_memcpy(&ip4, &(mp->src_address[0]), sizeof(ip4));
- vat_json_object_add_ip4(node, "src_address", ip4);
- clib_memcpy(&ip4, &(mp->dst_address[0]), 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_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_vxlan_tunnel_dump (vat_main_t * vam)
+static int api_sw_interface_vhost_user_dump (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_vxlan_tunnel_dump_t *mp;
+ vl_api_sw_interface_vhost_user_dump_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
-
- /* 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
- break;
- }
-
- if (sw_if_index_set == 0) {
- sw_if_index = ~0;
- }
-
- if (!vam->json_output) {
- fformat(vam->ofp, "%11s%24s%24s%14s%18s%13s\n",
- "sw_if_index", "src_address", "dst_address",
- "encap_vrf_id", "decap_next_index", "vni");
- }
-
- /* Get list of vxlan-tunnel interfaces */
- M(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
-
- mp->sw_if_index = htonl(sw_if_index);
+ fformat(vam->ofp, "Interface name idx hdr_sz features server regions filename\n");
+ /* Get list of vhost-user interfaces */
+ M(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
S;
/* Use a control ping for synchronization */
W;
}
-static int api_gre_add_del_tunnel (vat_main_t * vam)
+static int api_show_version (vat_main_t * vam)
+{
+ vl_api_show_version_t *mp;
+ f64 timeout;
+
+ M(SHOW_VERSION, show_version);
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
+
+
+static int api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
{
unformat_input_t * line_input = vam->input;
- vl_api_gre_add_del_tunnel_t *mp;
+ vl_api_vxlan_gpe_add_del_tunnel_t *mp;
f64 timeout;
- ip4_address_t src4, dst4;
+ ip4_address_t local4, remote4;
+ ip6_address_t local6, remote6;
u8 is_add = 1;
- u8 src_set = 0;
- u8 dst_set = 0;
- u32 outer_fib_id = 0;
+ u8 ipv4_set = 0, ipv6_set = 0;
+ u8 local_set = 0;
+ u8 remote_set = 0;
+ u32 encap_vrf_id = 0;
+ u32 decap_vrf_id = 0;
+ u8 protocol = ~0;
+ u32 vni;
+ u8 vni_set = 0;
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, &src4))
- src_set = 1;
- else if (unformat (line_input, "dst %U",
- unformat_ip4_address, &dst4))
- dst_set = 1;
- else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+ else if (unformat (line_input, "local %U",
+ unformat_ip4_address, &local4))
+ {
+ local_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "remote %U",
+ unformat_ip4_address, &remote4))
+ {
+ remote_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "local %U",
+ unformat_ip6_address, &local6))
+ {
+ 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, "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, line_input);
return -99;
}
}
- if (src_set == 0) {
- errmsg ("tunnel src address not specified\n");
+ if (local_set == 0) {
+ errmsg ("tunnel local address not specified\n");
return -99;
}
- if (dst_set == 0) {
- errmsg ("tunnel dst address not specified\n");
+ if (remote_set == 0) {
+ errmsg ("tunnel remote address not specified\n");
+ return -99;
+ }
+ if (ipv4_set && ipv6_set) {
+ errmsg ("both IPv4 and IPv6 addresses specified");
+ return -99;
+ }
+
+ if (vni_set == 0) {
+ errmsg ("vni not specified\n");
return -99;
}
+ M(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel);
+
- M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
+ if (ipv6_set) {
+ clib_memcpy(&mp->local, &local6, sizeof(local6));
+ clib_memcpy(&mp->remote, &remote6, sizeof(remote6));
+ } else {
+ clib_memcpy(&mp->local, &local4, sizeof(local4));
+ clib_memcpy(&mp->remote, &remote4, sizeof(remote4));
+ }
- clib_memcpy(&mp->src_address, &src4, sizeof(src4));
- clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4));
- mp->outer_table_id = ntohl(outer_fib_id);
+ mp->encap_vrf_id = ntohl(encap_vrf_id);
+ mp->decap_vrf_id = ntohl(decap_vrf_id);
+ mp->protocol = ntohl(protocol);
+ mp->vni = ntohl(vni);
mp->is_add = is_add;
+ mp->is_ipv6 = ipv6_set;
S; W;
/* NOTREACHED */
return 0;
}
-static void vl_api_gre_tunnel_details_t_handler
-(vl_api_gre_tunnel_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;
- fformat(vam->ofp, "%11d%15U%15U%14d\n",
+ fformat(vam->ofp, "%11d%24U%24U%13d%12d%14d%14d\n",
ntohl(mp->sw_if_index),
- format_ip4_address, &mp->src_address,
- format_ip4_address, &mp->dst_address,
- ntohl(mp->outer_table_id));
+ format_ip46_address, &(mp->local[0]),
+ format_ip46_address, &(mp->remote[0]),
+ ntohl(mp->vni),
+ ntohl(mp->protocol),
+ ntohl(mp->encap_vrf_id),
+ ntohl(mp->decap_vrf_id));
}
-static void vl_api_gre_tunnel_details_t_handler_json
-(vl_api_gre_tunnel_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 ip4;
+ struct in6_addr ip6;
if (VAT_JSON_ARRAY != vam->json_tree.type) {
ASSERT(VAT_JSON_NONE == vam->json_tree.type);
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, "outer_fib_id", ntohl(mp->outer_table_id));
+ 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(&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, "vni", ntohl(mp->vni));
+ vat_json_object_add_uint(node, "protocol", ntohl(mp->protocol));
+ 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_gre_tunnel_dump (vat_main_t * vam)
+static int api_vxlan_gpe_tunnel_dump (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- vl_api_gre_tunnel_dump_t *mp;
+ vl_api_vxlan_gpe_tunnel_dump_t *mp;
f64 timeout;
u32 sw_if_index;
u8 sw_if_index_set = 0;
}
if (!vam->json_output) {
- fformat(vam->ofp, "%11s%15s%15s%14s\n",
- "sw_if_index", "src_address", "dst_address",
- "outer_fib_id");
+ fformat(vam->ofp, "%11s%24s%24s%13s%15s%14s%14s\n",
+ "sw_if_index", "local", "remote", "vni",
+ "protocol","encap_vrf_id", "decap_vrf_id");
}
- /* Get list of gre-tunnel interfaces */
- M(GRE_TUNNEL_DUMP, gre_tunnel_dump);
+ /* Get list of vxlan-tunnel interfaces */
+ M(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump);
mp->sw_if_index = htonl(sw_if_index);
W;
}
-static int api_l2_fib_clear_table (vat_main_t * vam)
+u8 * format_l2_fib_mac_address (u8 * s, va_list * args)
{
-// unformat_input_t * i = vam->input;
- vl_api_l2_fib_clear_table_t *mp;
- f64 timeout;
+ u8 * a = va_arg (*args, u8 *);
- M(L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
+ return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+ a[2], a[3], a[4], a[5], a[6], a[7]);
+}
- S; W;
- /* NOTREACHED */
- return 0;
+static void vl_api_l2_fib_table_entry_t_handler
+(vl_api_l2_fib_table_entry_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+
+ fformat(vam->ofp, "%3" PRIu32 " %U %3" PRIu32
+ " %d %d %d\n",
+ ntohl(mp->bd_id), format_l2_fib_mac_address, &mp->mac,
+ ntohl(mp->sw_if_index), mp->static_mac, mp->filter_mac,
+ mp->bvi_mac);
}
-static int api_l2_interface_efp_filter (vat_main_t * vam)
+static void vl_api_l2_fib_table_entry_t_handler_json
+(vl_api_l2_fib_table_entry_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t *node = NULL;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type) {
+ ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array(&vam->json_tree);
+ }
+ node = vat_json_array_add(&vam->json_tree);
+
+ vat_json_init_object(node);
+ vat_json_object_add_uint(node, "bd_id", ntohl(mp->bd_id));
+ vat_json_object_add_uint(node, "mac", clib_net_to_host_u64(mp->mac));
+ vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index));
+ vat_json_object_add_uint(node, "static_mac", mp->static_mac);
+ vat_json_object_add_uint(node, "filter_mac", mp->filter_mac);
+ vat_json_object_add_uint(node, "bvi_mac", mp->bvi_mac);
+}
+
+static int api_l2_fib_table_dump (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- vl_api_l2_interface_efp_filter_t *mp;
+ vl_api_l2_fib_table_dump_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 enable = 1;
- u8 sw_if_index_set = 0;
+ u32 bd_id;
+ u8 bd_id_set = 0;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", 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 (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
+ else
+ break;
}
-
- if (sw_if_index_set == 0) {
- errmsg ("missing sw_if_index\n");
+
+ if (bd_id_set == 0) {
+ errmsg ("missing bridge domain\n");
return -99;
}
- M(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
+ fformat(vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI\n");
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable_disable = enable;
+ /* Get list of l2 fib entries */
+ M(L2_FIB_TABLE_DUMP, l2_fib_table_dump);
- S; W;
- /* NOTREACHED */
- return 0;
+ mp->bd_id = ntohl(bd_id);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-#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)
+static int
+api_interface_name_renumber (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_l2_interface_vlan_tag_rewrite_t *mp;
+ unformat_input_t * line_input = vam->input;
+ vl_api_interface_name_renumber_t *mp;
+ u32 sw_if_index = ~0;
f64 timeout;
- 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;
+ u32 new_show_dev_instance = ~0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", 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))
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (line_input, "%U", unformat_sw_if_index, vam,
+ &sw_if_index))
;
- else if (unformat (i, "tag1 %d", &tag1))
+ else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
;
- else if (unformat (i, "tag2 %d", &tag2))
+ else if (unformat (line_input, "new_show_dev_instance %d",
+ &new_show_dev_instance))
;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ else
+ break;
}
-
- if ((sw_if_index_set == 0)||(vtr_op_set == 0)) {
- errmsg ("missing vtr operation or sw_if_index\n");
+
+ if (sw_if_index == ~0) {
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
+ if (new_show_dev_instance == ~0) {
+ errmsg ("missing new_show_dev_instance\n");
+ return -99;
+ }
- 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);
+ M(INTERFACE_NAME_RENUMBER, interface_name_renumber);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->new_show_dev_instance = ntohl (new_show_dev_instance);
S; W;
- /* NOTREACHED */
- return 0;
}
-static int api_create_vhost_user_if (vat_main_t * vam)
+static int
+api_want_ip4_arp_events (vat_main_t * vam)
{
- unformat_input_t * i = vam->input;
- vl_api_create_vhost_user_if_t *mp;
+ unformat_input_t * line_input = vam->input;
+ vl_api_want_ip4_arp_events_t * mp;
f64 timeout;
- 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;
+ ip4_address_t address;
+ int address_set = 0;
+ u32 enable_disable = 1;
- 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
- break;
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (line_input, "address %U",
+ unformat_ip4_address, &address))
+ address_set = 1;
+ else if (unformat (line_input, "del"))
+ enable_disable = 0;
+ else
+ break;
+ }
+
+ if (address_set == 0) {
+ errmsg ("missing addresses\n");
+ return -99;
}
+
+ M(WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
+ mp->enable_disable = enable_disable;
+ mp->pid = getpid();
+ mp->address = address.as_u32;
- if (file_name_set == 0) {
- errmsg ("missing socket file name\n");
- return -99;
+ S; W;
+}
+
+static int api_input_acl_set_interface (vat_main_t * vam)
+{
+ unformat_input_t * i = vam->input;
+ vl_api_input_acl_set_interface_t *mp;
+ f64 timeout;
+ 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;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "%U", 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 {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (vec_len (file_name) > 255) {
- errmsg ("socket file name too long\n");
- return -99;
+ if (sw_if_index_set == 0) {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- vec_add1 (file_name, 0);
- M(CREATE_VHOST_USER_IF, create_vhost_user_if);
+ M(INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
- 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) {
- 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);
+ 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; W;
/* NOTREACHED */
return 0;
}
-static int api_modify_vhost_user_if (vat_main_t * vam)
+static int
+api_ip_address_dump (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- vl_api_modify_vhost_user_if_t *mp;
- f64 timeout;
- u8 * file_name;
- u8 is_server = 0;
- u8 file_name_set = 0;
- u32 custom_dev_instance = ~0;
+ vl_api_ip_address_dump_t * mp;
+ u32 sw_if_index = ~0;
u8 sw_if_index_set = 0;
- u32 sw_if_index = (u32)~0;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ f64 timeout;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", 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;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "%U", 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 (sw_if_index_set == 0) {
- errmsg ("missing sw_if_index or interface name\n");
- return -99;
+ if (ipv4_set && ipv6_set) {
+ errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ return -99;
}
- if (file_name_set == 0) {
- errmsg ("missing socket file name\n");
- return -99;
+ if ((!ipv4_set) && (!ipv6_set)) {
+ errmsg ("no ipv4 nor ipv6 flag set\n");
+ return -99;
}
- if (vec_len (file_name) > 255) {
- errmsg ("socket file name too long\n");
- return -99;
+ if (sw_if_index_set == 0) {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- vec_add1 (file_name, 0);
- M(MODIFY_VHOST_USER_IF, modify_vhost_user_if);
+ vam->current_sw_if_index = sw_if_index;
+ vam->is_ipv6 = ipv6_set;
+ M(IP_ADDRESS_DUMP, ip_address_dump);
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) {
- mp->renumber = 1;
- mp->custom_dev_instance = ntohl(custom_dev_instance);
+ mp->is_ipv6 = ipv6_set;
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
+ W;
+}
- S; W;
- /* NOTREACHED */
- return 0;
+static int
+api_ip_dump (vat_main_t * vam)
+{
+ vl_api_ip_dump_t * mp;
+ unformat_input_t * in = vam->input;
+ int ipv4_set = 0;
+ int ipv6_set = 0;
+ int is_ipv6;
+ f64 timeout;
+ int i;
+
+ 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;
+ }
+
+ if (ipv4_set && ipv6_set) {
+ errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ return -99;
+ }
+
+ if ((!ipv4_set) && (!ipv6_set)) {
+ errmsg ("no ipv4 nor ipv6 flag set\n");
+ return -99;
+ }
+
+ is_ipv6 = ipv6_set;
+ vam->is_ipv6 = is_ipv6;
+
+ /* 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, ip_dump);
+ mp->is_ipv6 = ipv6_set;
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+ W;
}
-static int api_delete_vhost_user_if (vat_main_t * vam)
+static int
+api_ipsec_spd_add_del (vat_main_t * vam)
{
+#if DPDK > 0
unformat_input_t * i = vam->input;
- vl_api_delete_vhost_user_if_t *mp;
+ vl_api_ipsec_spd_add_del_t *mp;
f64 timeout;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
+ u32 spd_id = ~0;
+ u8 is_add = 1;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "%U", 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 (unformat (i, "spd_id %d", &spd_id))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
-
- if (sw_if_index_set == 0) {
- errmsg ("missing sw_if_index or interface name\n");
- return -99;
+ if (spd_id == ~0) {
+ errmsg ("spd_id must be set\n");
+ return -99;
}
+ M(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
- M(DELETE_VHOST_USER_IF, delete_vhost_user_if);
-
- mp->sw_if_index = ntohl(sw_if_index);
+ mp->spd_id = ntohl(spd_id);
+ mp->is_add = is_add;
S; W;
/* NOTREACHED */
return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
-static void vl_api_sw_interface_vhost_user_details_t_handler
-(vl_api_sw_interface_vhost_user_details_t * mp)
+static int
+api_ipsec_interface_add_del_spd (vat_main_t * vam)
{
- vat_main_t * vam = &vat_main;
+#if DPDK > 0
+ unformat_input_t * i = vam->input;
+ vl_api_ipsec_interface_add_del_spd_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 spd_id = (u32) ~0;
+ u8 is_add = 1;
- fformat(vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s\n",
- (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);
- fformat(vam->ofp, " Status: '%s'\n", strerror(ntohl(mp->sock_errno)));
-}
+ 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", 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;
+ }
-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 (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (spd_id == (u32) ~0) {
+ errmsg ("spd_id must be set\n");
+ 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));
- 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));
+ if (sw_if_index_set == 0) {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
+
+ M(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
+
+ mp->spd_id = ntohl(spd_id);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
-static int api_sw_interface_vhost_user_dump (vat_main_t * vam)
+static int
+api_ipsec_spd_add_del_entry (vat_main_t * vam)
{
- vl_api_sw_interface_vhost_user_dump_t *mp;
+#if DPDK > 0
+ unformat_input_t * i = vam->input;
+ vl_api_ipsec_spd_add_del_entry_t *mp;
f64 timeout;
- fformat(vam->ofp, "Interface name idx hdr_sz features server regions filename\n");
+ u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
+ u32 spd_id, sa_id, protocol = 0, policy = 0;
+ i32 priority;
+ 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;
- /* Get list of vhost-user interfaces */
- M(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump);
- S;
+ 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 (policy == IPSEC_POLICY_ACTION_RESOLVE) {
+ clib_warning ("unsupported action: 'resolve'");
+ return -99;
+ }
+ }
+ else {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
}
- W;
-}
-static int api_show_version (vat_main_t * vam)
-{
- vl_api_show_version_t *mp;
- f64 timeout;
+ M(IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
- M(SHOW_VERSION, show_version);
+ mp->spd_id = ntohl(spd_id);
+ mp->priority = ntohl(priority);
+ mp->is_outbound = is_outbound;
+ mp->is_ipv6 = is_ipv6;
+ if (is_ipv6 || is_ip_any) {
+ 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));
+ } else {
+ 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->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; W;
/* NOTREACHED */
return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
-
-static int api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
+static int
+api_ipsec_sad_add_del_entry (vat_main_t * vam)
{
- unformat_input_t * line_input = vam->input;
- vl_api_vxlan_gpe_add_del_tunnel_t *mp;
+#if DPDK > 0
+ unformat_input_t * i = vam->input;
+ vl_api_ipsec_sad_add_del_entry_t *mp;
f64 timeout;
- ip4_address_t local, remote;
+ u32 sad_id, spi;
+ u8 * ck, * ik;
u8 is_add = 1;
- u8 local_set = 0;
- u8 remote_set = 0;
- u32 encap_vrf_id = 0;
- u32 decap_vrf_id = 0;
- u8 protocol = ~0;
- u32 vni;
- u8 vni_set = 0;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "del"))
+ 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;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "del"))
is_add = 0;
- else if (unformat (line_input, "local %U",
- unformat_ip4_address, &local))
- local_set = 1;
- else if (unformat (line_input, "remote %U",
- unformat_ip4_address, &remote))
- remote_set = 1;
- else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+ 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_INTEG_ALG_SHA_512_256) {
+ 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 (line_input, "decap-vrf-id %d", &decap_vrf_id))
+ 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_ALG_SHA_512_256) {
+ 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 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, line_input);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
- }
-
- if (local_set == 0) {
- errmsg ("tunnel local address not specified\n");
- return -99;
- }
- if (remote_set == 0) {
- errmsg ("tunnel remote address not specified\n");
- return -99;
- }
- if (vni_set == 0) {
- errmsg ("vni not specified\n");
- return -99;
}
- M(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel);
-
- mp->local = local.as_u32;
- mp->remote = remote.as_u32;
- mp->encap_vrf_id = ntohl(encap_vrf_id);
- mp->decap_vrf_id = ntohl(decap_vrf_id);
- mp->protocol = ntohl(protocol);
- mp->vni = ntohl(vni);
- mp->is_add = is_add;
-
-
- S; W;
- /* NOTREACHED */
- return 0;
-}
-
-u8 * format_l2_fib_mac_address (u8 * s, va_list * args)
-{
- u8 * a = va_arg (*args, u8 *);
+ M(IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
- return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[2], a[3], a[4], a[5], a[6], a[7]);
-}
+ 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);
-static void vl_api_l2_fib_table_entry_t_handler
-(vl_api_l2_fib_table_entry_t * mp)
-{
- vat_main_t * vam = &vat_main;
+ if (mp->crypto_key_length > sizeof(mp->crypto_key))
+ mp->crypto_key_length = sizeof(mp->crypto_key);
- fformat(vam->ofp, "%3" PRIu32 " %U %3" PRIu32
- " %d %d %d\n",
- ntohl(mp->bd_id), format_l2_fib_mac_address, &mp->mac,
- ntohl(mp->sw_if_index), mp->static_mac, mp->filter_mac,
- mp->bvi_mac);
-}
+ if (mp->integrity_key_length > sizeof(mp->integrity_key))
+ mp->integrity_key_length = sizeof(mp->integrity_key);
-static void vl_api_l2_fib_table_entry_t_handler_json
-(vl_api_l2_fib_table_entry_t * mp)
-{
- vat_main_t * vam = &vat_main;
- vat_json_node_t *node = NULL;
+ clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+ clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
- if (VAT_JSON_ARRAY != vam->json_tree.type) {
- ASSERT(VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array(&vam->json_tree);
+ if (is_tunnel) {
+ 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));
+ }
}
- 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, "mac", clib_net_to_host_u64(mp->mac));
- 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);
+ S; W;
+ /* NOTREACHED */
+ return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
-static int api_l2_fib_table_dump (vat_main_t * vam)
+static int
+api_ipsec_sa_set_key (vat_main_t * vam)
{
+#if DPDK > 0
unformat_input_t * i = vam->input;
- vl_api_l2_fib_table_dump_t *mp;
+ vl_api_ipsec_sa_set_key_t *mp;
f64 timeout;
- u32 bd_id;
- u8 bd_id_set = 0;
+ u32 sa_id;
+ u8 * ck, * ik;
- /* 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\n");
- return -99;
- }
-
- fformat(vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI\n");
-
- /* Get list of l2 fib entries */
- M(L2_FIB_TABLE_DUMP, l2_fib_table_dump);
-
- mp->bd_id = ntohl(bd_id);
- S;
-
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
-}
-
-
-static int
-api_interface_name_renumber (vat_main_t * vam)
-{
- unformat_input_t * line_input = vam->input;
- vl_api_interface_name_renumber_t *mp;
- u32 sw_if_index = ~0;
- f64 timeout;
- u32 new_show_dev_instance = ~0;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "%U", unformat_sw_if_index, vam,
- &sw_if_index))
+ if (unformat (i, "sa_id %d", &sa_id))
;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
;
- else if (unformat (line_input, "new_show_dev_instance %d",
- &new_show_dev_instance))
+ else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
;
- else
- break;
+ else {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (sw_if_index == ~0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
- }
+ M(IPSEC_SA_SET_KEY, ipsec_set_sa_key);
- if (new_show_dev_instance == ~0) {
- errmsg ("missing new_show_dev_instance\n");
- return -99;
- }
+ mp->sa_id = ntohl(sa_id);
+ mp->crypto_key_length = vec_len(ck);
+ mp->integrity_key_length = vec_len(ik);
- M(INTERFACE_NAME_RENUMBER, interface_name_renumber);
+ 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);
- mp->new_show_dev_instance = ntohl (new_show_dev_instance);
+ if (mp->integrity_key_length > sizeof(mp->integrity_key))
+ mp->integrity_key_length = sizeof(mp->integrity_key);
+
+ clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+ clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
S; W;
+ /* NOTREACHED */
+ return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
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;
- f64 timeout;
- ip4_address_t address;
- int address_set = 0;
- u32 enable_disable = 1;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "address %U",
- unformat_ip4_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
- else
- break;
- }
-
- if (address_set == 0) {
- errmsg ("missing addresses\n");
- return -99;
- }
-
- M(WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
- mp->enable_disable = enable_disable;
- mp->pid = getpid();
- mp->address = address.as_u32;
-
- S; W;
-}
-
-static int api_input_acl_set_interface (vat_main_t * vam)
+api_ikev2_profile_add_del (vat_main_t * vam)
{
+#if DPDK > 0
unformat_input_t * i = vam->input;
- vl_api_input_acl_set_interface_t *mp;
+ vl_api_ikev2_profile_add_del_t * mp;
f64 timeout;
- 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;
+ 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_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 (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 if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+ vec_add1 (name, 0);
else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ errmsg ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
+ if (!vec_len (name)) {
+ errmsg ("profile name must be specified");
return -99;
}
- M(INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
+ if (vec_len (name) > 64) {
+ errmsg ("profile name too long");
+ return -99;
+ }
- 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(IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
+
+ clib_memcpy(mp->name, name, vec_len (name));
mp->is_add = is_add;
+ vec_free (name);
S; W;
/* NOTREACHED */
return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
static int
-api_ip_address_dump (vat_main_t * vam)
+api_ikev2_profile_set_auth (vat_main_t * vam)
{
+#if DPDK > 0
unformat_input_t * i = vam->input;
- vl_api_ip_address_dump_t * mp;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
- u8 ipv4_set = 0;
- u8 ipv6_set = 0;
+ vl_api_ikev2_profile_set_auth_t * mp;
f64 timeout;
+ u8 * name = 0;
+ u8 * data = 0;
+ u32 auth_method = 0;
+ u8 is_hex = 0;
+
+ const char * valid_chars = "a-zA-Z0-9_";
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", 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 (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))
+ ;
+ else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data))
+ is_hex = 1;
+ else if (unformat (i, "auth_data %v", &data))
+ ;
+ else {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (ipv4_set && ipv6_set) {
- errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ if (!vec_len (name)) {
+ errmsg ("profile name must be specified");
return -99;
}
- if ((!ipv4_set) && (!ipv6_set)) {
- errmsg ("no ipv4 nor ipv6 flag set\n");
+ if (vec_len (name) > 64) {
+ errmsg ("profile name too long");
return -99;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
+ if (!vec_len(data)) {
+ errmsg ("auth_data must be specified");
return -99;
}
- vam->current_sw_if_index = sw_if_index;
- vam->is_ipv6 = ipv6_set;
+ if (!auth_method) {
+ errmsg ("auth_method must be specified");
+ return -99;
+ }
- M(IP_ADDRESS_DUMP, ip_address_dump);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->is_ipv6 = ipv6_set;
- S;
+ M(IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ 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);
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
static int
-api_ip_dump (vat_main_t * vam)
+api_ikev2_profile_set_id (vat_main_t * vam)
{
- vl_api_ip_dump_t * mp;
- unformat_input_t * in = vam->input;
- int ipv4_set = 0;
- int ipv6_set = 0;
- int is_ipv6;
+#if DPDK > 0
+ unformat_input_t * i = vam->input;
+ vl_api_ikev2_profile_set_id_t * mp;
f64 timeout;
- int i;
+ u8 * name = 0;
+ u8 * data = 0;
+ u8 is_local = 0;
+ u32 id_type = 0;
+ ip4_address_t ip4;
- 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;
+ 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, "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;
+ else {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (ipv4_set && ipv6_set) {
- errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ if (!vec_len (name)) {
+ errmsg ("profile name must be specified");
return -99;
}
- if ((!ipv4_set) && (!ipv6_set)) {
- errmsg ("no ipv4 nor ipv6 flag set\n");
+ if (vec_len (name) > 64) {
+ errmsg ("profile name too long");
return -99;
}
- is_ipv6 = ipv6_set;
- vam->is_ipv6 = is_ipv6;
+ if (!vec_len(data)) {
+ errmsg ("id_data must be specified");
+ return -99;
+ }
- /* 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);
+ if (!id_type) {
+ errmsg ("id_type must be specified");
+ return -99;
}
- vec_free(vam->ip_details_by_sw_if_index[is_ipv6]);
- M(IP_DUMP, ip_dump);
- mp->is_ipv6 = ipv6_set;
- S;
+ M(IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
- }
- W;
+ 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);
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+#else
+ clib_warning ("unsupported (no dpdk)");
+ return -99;
+#endif
}
static int
-api_ipsec_spd_add_del (vat_main_t * vam)
+api_ikev2_profile_set_ts (vat_main_t * vam)
{
#if DPDK > 0
unformat_input_t * i = vam->input;
- vl_api_ipsec_spd_add_del_t *mp;
+ vl_api_ikev2_profile_set_ts_t * mp;
f64 timeout;
- u32 spd_id = ~0;
- u8 is_add = 1;
+ 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_";
+
+ start_addr.as_u32 = 0;
+ end_addr.as_u32 = (u32) ~0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "spd_id %d", &spd_id))
+ 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, "del"))
- is_add = 0;
+ else if (unformat (i, "start_port %d", &start_port))
+ ;
+ else if (unformat (i, "end_port %d", &end_port))
+ ;
+ else if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr))
+ ;
+ else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr))
+ ;
+ else if (unformat (i, "local"))
+ is_local = 1;
+ else if (unformat (i, "remote"))
+ is_local = 0;
else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ errmsg ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (spd_id == ~0) {
- errmsg ("spd_id must be set\n");
+
+ if (!vec_len (name)) {
+ errmsg ("profile name must be specified");
return -99;
}
- M(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
+ if (vec_len (name) > 64) {
+ errmsg ("profile name too long");
+ return -99;
+ }
- mp->spd_id = ntohl(spd_id);
- mp->is_add = is_add;
+ M(IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
+
+ 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);
S; W;
/* NOTREACHED */
}
static int
-api_ipsec_interface_add_del_spd (vat_main_t * vam)
+api_ikev2_set_local_key (vat_main_t * vam)
{
#if DPDK > 0
unformat_input_t * i = vam->input;
- vl_api_ipsec_interface_add_del_spd_t *mp;
+ vl_api_ikev2_set_local_key_t * mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 spd_id = (u32) ~0;
- u8 is_add = 1;
+ u8 * file = 0;
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", 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;
+ if (unformat (i, "file %v", &file))
+ vec_add1 (file, 0);
else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ errmsg ("parse error '%U'", format_unformat_error, i);
return -99;
}
-
}
- if (spd_id == (u32) ~0) {
- errmsg ("spd_id must be set\n");
+ if (!vec_len (file)) {
+ errmsg ("RSA key file must be specified");
return -99;
}
- if (sw_if_index_set == 0) {
- errmsg ("missing interface name or sw_if_index\n");
+ if (vec_len (file) > 256) {
+ errmsg ("file name too long");
return -99;
}
- M(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
+ M(IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
- mp->spd_id = ntohl(spd_id);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
+ clib_memcpy (mp->key_file, file, vec_len (file));
+ vec_free (file);
S; W;
/* NOTREACHED */
#endif
}
-static int
-api_ipsec_spd_add_del_entry (vat_main_t * vam)
+/*
+ * MAP
+ */
+static int api_map_add_domain (vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_spd_add_del_entry_t *mp;
- f64 timeout;
- u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
- u32 spd_id, sa_id, protocol = 0, policy = 0;
- i32 priority;
- 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;
+ unformat_input_t *i = vam->input;
+ vl_api_map_add_domain_t *mp;
+ f64 timeout;
- 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;
+ ip4_address_t ip4_prefix;
+ ip6_address_t ip6_prefix;
+ ip6_address_t ip6_src;
+ u32 num_m_args = 0;
+ u32 ip6_prefix_len, ip4_prefix_len, ea_bits_len, psid_offset,
+ psid_length;
+ u8 is_translation = 0;
+ u32 mtu = 0;
+ u8 ip6_src_len = 128;
- 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 (policy == IPSEC_POLICY_ACTION_RESOLVE) {
- clib_warning ("unsupported action: 'resolve'");
- return -99;
- }
- }
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
+ &ip4_prefix, &ip4_prefix_len))
+ num_m_args++;
+ else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
+ &ip6_prefix, &ip6_prefix_len))
+ num_m_args++;
+ else if (unformat (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src, &ip6_src_len))
+ num_m_args++;
+ else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
+ num_m_args++;
+ else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
+ num_m_args++;
+ else if (unformat (i, "psid-offset %d", &psid_offset))
+ num_m_args++;
+ else if (unformat (i, "psid-len %d", &psid_length))
+ num_m_args++;
+ else if (unformat (i, "mtu %d", &mtu))
+ num_m_args++;
+ else if (unformat (i, "map-t"))
+ is_translation = 1;
+ else {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (num_m_args != 6) {
+ errmsg("mandatory argument(s) missing\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M(MAP_ADD_DOMAIN, map_add_domain);
+
+ clib_memcpy(mp->ip4_prefix, &ip4_prefix, sizeof(ip4_prefix));
+ mp->ip4_prefix_len = ip4_prefix_len;
+
+ clib_memcpy(mp->ip6_prefix, &ip6_prefix, sizeof(ip6_prefix));
+ mp->ip6_prefix_len = ip6_prefix_len;
+
+ clib_memcpy(mp->ip6_src, &ip6_src, sizeof(ip6_src));
+ mp->ip6_src_prefix_len = ip6_src_len;
+
+ mp->ea_bits_len = ea_bits_len;
+ mp->psid_offset = psid_offset;
+ mp->psid_length = psid_length;
+ mp->is_translation = is_translation;
+ mp->mtu = htons(mtu);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply, return good/bad news */
+ W;
+}
+
+static int api_map_del_domain (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_map_del_domain_t *mp;
+ f64 timeout;
+
+ u32 num_m_args = 0;
+ u32 index;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "index %d", &index))
+ num_m_args++;
+ else {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (num_m_args != 1) {
+ errmsg("mandatory argument(s) missing\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M(MAP_DEL_DOMAIN, map_del_domain);
+
+ mp->index = ntohl(index);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply, return good/bad news */
+ W;
+}
+
+static int api_map_add_del_rule (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_map_add_del_rule_t *mp;
+ f64 timeout;
+ u8 is_add = 1;
+ ip6_address_t ip6_dst;
+ u32 num_m_args = 0, index, psid;
+ 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;
+ } else {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
}
+ }
+
+ /* Construct the API message */
+ M(MAP_ADD_DEL_RULE, map_add_del_rule);
+
+ 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;
+
+ /* Wait for a reply, return good/bad news */
+ W;
+}
+
+static int api_map_domain_dump (vat_main_t * vam)
+{
+ vl_api_map_domain_dump_t *mp;
+ f64 timeout;
- M(IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
+ /* Construct the API message */
+ M(MAP_DOMAIN_DUMP, map_domain_dump);
- mp->spd_id = ntohl(spd_id);
- mp->priority = ntohl(priority);
- mp->is_outbound = is_outbound;
+ /* send it... */
+ S;
- mp->is_ipv6 = is_ipv6;
- if (is_ipv6 || is_ip_any) {
- 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));
- } else {
- 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));
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
- 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; W;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
+ W;
}
-static int
-api_ipsec_sad_add_del_entry (vat_main_t * vam)
+static int api_map_rule_dump (vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_sad_add_del_entry_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_map_rule_dump_t *mp;
f64 timeout;
- u32 sad_id, spi;
- u8 * ck, * ik;
- 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;
+ u32 domain_index = ~0;
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_INTEG_ALG_SHA_512_256) {
- 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_ALG_SHA_512_256) {
- 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))
+ if (unformat (i, "index %u", &domain_index))
;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
-
+ else
+ break;
}
- M(IPSEC_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
-
- 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);
+ if (domain_index == ~0) {
+ clib_warning("parse error: domain index expected");
+ return -99;
+ }
- if (mp->crypto_key_length > sizeof(mp->crypto_key))
- mp->crypto_key_length = sizeof(mp->crypto_key);
+ /* Construct the API message */
+ M(MAP_RULE_DUMP, map_rule_dump);
- if (mp->integrity_key_length > sizeof(mp->integrity_key))
- mp->integrity_key_length = sizeof(mp->integrity_key);
+ mp->domain_index = htonl(domain_index);
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+ /* send it... */
+ S;
- if (is_tunnel) {
- 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));
- }
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
-
- S; W;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
+ W;
}
-static int
-api_ipsec_sa_set_key (vat_main_t * vam)
+static void vl_api_map_add_domain_reply_t_handler
+(vl_api_map_add_domain_reply_t * mp)
{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ipsec_sa_set_key_t *mp;
- f64 timeout;
- u32 sa_id;
- u8 * ck, * ik;
-
- 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, ipsec_set_sa_key);
+ vat_main_t * vam = &vat_main;
+ i32 retval = ntohl(mp->retval);
- mp->sa_id = ntohl(sa_id);
- mp->crypto_key_length = vec_len(ck);
- mp->integrity_key_length = vec_len(ik);
+ if (vam->async_mode) {
+ vam->async_errors += (retval < 0);
+ } else {
+ vam->retval = retval;
+ vam->result_ready = 1;
+ }
+}
- if (mp->crypto_key_length > sizeof(mp->crypto_key))
- mp->crypto_key_length = sizeof(mp->crypto_key);
+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 (mp->integrity_key_length > sizeof(mp->integrity_key))
- mp->integrity_key_length = sizeof(mp->integrity_key);
+ 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));
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+ vat_json_print(vam->ofp, &node);
+ vat_json_free(&node);
- S; W;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
+ vam->retval = ntohl(mp->retval);
+ vam->result_ready = 1;
}
static int
-api_ikev2_profile_add_del (vat_main_t * vam)
+api_get_first_msg_id (vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_add_del_t * mp;
+ vl_api_get_first_msg_id_t * mp;
f64 timeout;
- u8 is_add = 1;
- u8 * name = 0;
-
- const char * valid_chars = "a-zA-Z0-9_";
-
+ unformat_input_t * i = vam->input;
+ u8 * name;
+ u8 name_set = 0;
+
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);
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
- return -99;
+ if (unformat (i, "client %s", &name))
+ name_set = 1;
+ else
+ break;
}
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
+ if (name_set == 0) {
+ errmsg ("missing client name\n");
return -99;
}
+ vec_add1 (name, 0);
- M(IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
-
- clib_memcpy(mp->name, name, vec_len (name));
- mp->is_add = is_add;
- vec_free (name);
+ if (vec_len (name) > 63) {
+ errmsg ("client name too long\n");
+ return -99;
+ }
+ M(GET_FIRST_MSG_ID, get_first_msg_id);
+ clib_memcpy (mp->name, name, vec_len(name));
S; W;
/* NOTREACHED */
return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
-static int
-api_ikev2_profile_set_auth (vat_main_t * vam)
+static int api_cop_interface_enable_disable (vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_set_auth_t * mp;
+ unformat_input_t * line_input = vam->input;
+ vl_api_cop_interface_enable_disable_t * mp;
f64 timeout;
- u8 * name = 0;
- u8 * data = 0;
- u32 auth_method = 0;
- u8 is_hex = 0;
-
- const char * valid_chars = "a-zA-Z0-9_";
+ u32 sw_if_index = ~0;
+ u8 enable_disable = 1;
- 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))
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (line_input, "disable"))
+ enable_disable = 0;
+ if (unformat (line_input, "enable"))
+ enable_disable = 1;
+ else if (unformat (line_input, "%U", unformat_sw_if_index,
+ vam, &sw_if_index))
;
- 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 (line_input, "sw_if_index %d", &sw_if_index))
;
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ else
+ break;
}
-
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
+
+ if (sw_if_index == ~0) {
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
+ /* Construct the API message */
+ M(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable);
+ mp->sw_if_index = ntohl(sw_if_index);
+ mp->enable_disable = enable_disable;
+
+ /* send it... */
+ S;
+ /* Wait for the reply */
+ W;
+}
+
+static int api_cop_whitelist_enable_disable (vat_main_t * vam)
+{
+ unformat_input_t * line_input = vam->input;
+ vl_api_cop_whitelist_enable_disable_t * mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+ u8 ip4=0, ip6=0, default_cop=0;
+ u32 fib_id;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (line_input, "ip4"))
+ ip4 = 1;
+ else if (unformat (line_input, "ip6"))
+ ip6 = 1;
+ else if (unformat (line_input, "default"))
+ default_cop = 1;
+ else if (unformat (line_input, "%U", unformat_sw_if_index,
+ vam, &sw_if_index))
+ ;
+ else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (line_input, "fib-id %d", &fib_id))
+ ;
+ else
+ break;
+ }
+
+ if (sw_if_index == ~0) {
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (!vec_len(data)) {
- errmsg ("auth_data must be specified");
+ /* Construct the API message */
+ M(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable);
+ mp->sw_if_index = ntohl(sw_if_index);
+ mp->fib_id = ntohl(fib_id);
+ mp->ip4 = ip4;
+ mp->ip6 = ip6;
+ mp->default_cop = default_cop;
+
+ /* send it... */
+ S;
+ /* Wait for the reply */
+ W;
+}
+
+static int api_get_node_graph (vat_main_t * vam)
+{
+ vl_api_get_node_graph_t * mp;
+ f64 timeout;
+
+ M(GET_NODE_GRAPH, get_node_graph);
+
+ /* send it... */
+ S;
+ /* Wait for the reply */
+ W;
+}
+
+static int
+api_lisp_add_del_locator_set(vat_main_t * vam)
+{
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_add_del_locator_set_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 *locator_set_name = NULL;
+ u8 locator_set_name_set = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "del")) {
+ is_add = 0;
+ } else if (unformat(input, "locator-set %s", &locator_set_name)) {
+ locator_set_name_set = 1;
+ } else
+ break;
+ }
+
+ if (locator_set_name_set == 0) {
+ errmsg ("missing locator-set name");
return -99;
}
- if (!auth_method) {
- errmsg ("auth_method must be specified");
+ if (vec_len(locator_set_name) > 64) {
+ errmsg ("locator-set name too long\n");
+ vec_free(locator_set_name);
return -99;
}
+ vec_add1(locator_set_name, 0);
- M(IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
+ /* Construct the API message */
+ M(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set);
- 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);
+ mp->is_add = is_add;
+ clib_memcpy(mp->locator_set_name, locator_set_name,
+ vec_len(locator_set_name));
+ vec_free(locator_set_name);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
- S; W;
/* NOTREACHED */
return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
static int
-api_ikev2_profile_set_id (vat_main_t * vam)
+api_lisp_add_del_locator(vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_set_id_t * mp;
- f64 timeout;
- u8 * name = 0;
- u8 * data = 0;
- u8 is_local = 0;
- u32 id_type = 0;
- ip4_address_t ip4;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_add_del_locator_t *mp;
+ f64 timeout = ~0;
+ u32 tmp_if_index = ~0;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+ u8 sw_if_index_if_name_set = 0;
+ u32 priority = ~0;
+ u8 priority_set = 0;
+ u32 weight = ~0;
+ u8 weight_set = 0;
+ u8 is_add = 1;
+ u8 *locator_set_name = NULL;
+ u8 locator_set_name_set = 0;
- const char * valid_chars = "a-zA-Z0-9_";
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "del")) {
+ is_add = 0;
+ } else if (unformat(input, "locator-set %s", &locator_set_name)) {
+ locator_set_name_set = 1;
+ } else if (unformat(input, "iface %U", unformat_sw_if_index, vam,
+ &tmp_if_index)) {
+ sw_if_index_if_name_set = 1;
+ sw_if_index = tmp_if_index;
+ } else if (unformat(input,"sw_if_index %d", &tmp_if_index)) {
+ sw_if_index_set = 1;
+ sw_if_index = tmp_if_index;
+ } else if (unformat(input, "p %d", &priority)) {
+ priority_set = 1;
+ } else if (unformat(input, "w %d", &weight)) {
+ weight_set = 1;
+ } else
+ break;
+ }
- 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, "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;
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ if (locator_set_name_set == 0) {
+ errmsg ("missing locator-set name");
+ return -99;
}
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
+ if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) {
+ errmsg ("missing sw_if_index");
+ vec_free(locator_set_name);
return -99;
}
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
+ if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) {
+ errmsg ("cannot use both params interface name and sw_if_index");
+ vec_free(locator_set_name);
return -99;
}
- if (!vec_len(data)) {
- errmsg ("id_data must be specified");
+ if (priority_set == 0) {
+ errmsg ("missing locator-set priority\n");
+ vec_free(locator_set_name);
return -99;
}
- if (!id_type) {
- errmsg ("id_type must be specified");
+ if (weight_set == 0) {
+ errmsg ("missing locator-set weight\n");
+ vec_free(locator_set_name);
return -99;
}
- M(IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
+ if (vec_len(locator_set_name) > 64) {
+ errmsg ("locator-set name too long\n");
+ vec_free(locator_set_name);
+ return -99;
+ }
+ vec_add1(locator_set_name, 0);
- 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);
+ /* Construct the API message */
+ M(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
+
+ mp->is_add = is_add;
+ mp->sw_if_index = ntohl(sw_if_index);
+ mp->priority = priority;
+ mp->weight = weight;
+ clib_memcpy(mp->locator_set_name, locator_set_name,
+ vec_len(locator_set_name));
+ vec_free(locator_set_name);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
- S; W;
/* NOTREACHED */
return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
static int
-api_ikev2_profile_set_ts (vat_main_t * vam)
+api_lisp_add_del_local_eid(vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_profile_set_ts_t * mp;
- f64 timeout;
- 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_";
-
- start_addr.as_u32 = 0;
- end_addr.as_u32 = (u32) ~0;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_add_del_local_eid_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 eidv4_set = 0;
+ u8 eidv6_set = 0;
+ u8 eid_type = (u8)~0;
+ ip4_address_t eidv4;
+ ip6_address_t eidv6;
+ u8 mac[6] = {0};
+ u32 tmp_eid_lenght = ~0;
+ u8 eid_lenght = ~0;
+ u8 *locator_set_name = NULL;
+ u8 locator_set_name_set = 0;
+ u32 vni = 0;
- 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, "protocol %d", &proto))
- ;
- else if (unformat (i, "start_port %d", &start_port))
- ;
- else if (unformat (i, "end_port %d", &end_port))
- ;
- else if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr))
- ;
- else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr))
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "del")) {
+ is_add = 0;
+ } else if (unformat(input, "vni %d", &vni)) {
;
- else if (unformat (i, "local"))
- is_local = 1;
- else if (unformat (i, "remote"))
- is_local = 0;
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ } else if (unformat(input, "eid %U/%d", unformat_ip4_address,
+ &eidv4, &tmp_eid_lenght)) {
+ eid_lenght = tmp_eid_lenght;
+ eidv4_set = 1;
+ eid_type = 0; /* ipv4 type */
+ } else if (unformat(input, "eid %U/%d", unformat_ip6_address,
+ &eidv6, &tmp_eid_lenght)) {
+ eid_lenght = tmp_eid_lenght;
+ eidv6_set = 1;
+ eid_type = 1; /* ipv6 type */
+ } else if (unformat(input, "eid %U", unformat_ethernet_address, mac)) {
+ eid_type = 2; /* mac type */
+ } else if (unformat(input, "locator-set %s", &locator_set_name)) {
+ locator_set_name_set = 1;
+ } else
+ break;
}
- if (!vec_len (name)) {
- errmsg ("profile name must be specified");
+ if (locator_set_name_set == 0) {
+ errmsg ("missing locator-set name\n");
return -99;
}
- if (vec_len (name) > 64) {
- errmsg ("profile name too long");
+ if ((u8)~0 == eid_type) {
+ errmsg ("EID address not set!");
+ vec_free(locator_set_name);
return -99;
}
- M(IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
-
- 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);
-
- S; W;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
-}
-
-static int
-api_ikev2_set_local_key (vat_main_t * vam)
-{
-#if DPDK > 0
- unformat_input_t * i = vam->input;
- vl_api_ikev2_set_local_key_t * mp;
- f64 timeout;
- u8 * file = 0;
+ if (vec_len(locator_set_name) > 64) {
+ errmsg ("locator-set name too long\n");
+ vec_free(locator_set_name);
+ return -99;
+ }
+ vec_add1(locator_set_name, 0);
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "file %v", &file))
- vec_add1 (file, 0);
- else {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ if (eidv4_set && eidv6_set) {
+ errmsg ("both eid v4 and v6 addresses set\n");
+ vec_free(locator_set_name);
+ return -99;
}
- if (!vec_len (file)) {
- errmsg ("RSA key file must be specified");
+ if (eidv4_set && eid_lenght > 32) {
+ errmsg ("eid prefix to big\n");
+ vec_free(locator_set_name);
return -99;
}
- if (vec_len (file) > 256) {
- errmsg ("file name too long");
+ if (eidv6_set && eid_lenght > 128) {
+ errmsg ("eid prefix to big\n");
+ vec_free(locator_set_name);
return -99;
}
- M(IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
+ /* Construct the API message */
+ M(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
- clib_memcpy (mp->key_file, file, vec_len (file));
- vec_free (file);
+ mp->is_add = is_add;
+ switch (eid_type) {
+ case 0: /* ipv4 */
+ clib_memcpy (mp->eid, &eidv4, sizeof(eidv4));
+ break;
+ case 1: /* ipv6 */
+ clib_memcpy (mp->eid, &eidv6, sizeof(eidv6));
+ break;
+ case 2: /* mac */
+ clib_memcpy (mp->eid, mac, 6);
+ break;
+ }
+ mp->eid_type = eid_type;
+ mp->prefix_len = eid_lenght;
+ mp->vni = clib_host_to_net_u32(vni);
+ clib_memcpy(mp->locator_set_name, locator_set_name,
+ vec_len(locator_set_name));
+ vec_free(locator_set_name);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
- S; W;
/* NOTREACHED */
return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
-/*
- * MAP
- */
-static int api_map_add_domain (vat_main_t * vam)
+static int
+api_lisp_gpe_add_del_fwd_entry(vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_map_add_domain_t *mp;
- f64 timeout;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 eidv4_set = 0, slocv4_set = 0, dlocv4_set = 0;
+ u8 eidv6_set = 0, slocv6_set = 0, dlocv6_set = 0;
+ ip4_address_t eidv4, slocv4, dlocv4;
+ ip6_address_t eidv6, slocv6, dlocv6;
+ u32 tmp_eid_lenght = ~0;
+ u8 eid_lenght = ~0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "del")) {
+ is_add = 0;
+ } else if (unformat(input, "eid %U/%d", unformat_ip4_address,
+ &eidv4, &tmp_eid_lenght)) {
+ eid_lenght = tmp_eid_lenght;
+ eidv4_set = 1;
+ } else if (unformat(input, "eid %U/%d", unformat_ip6_address,
+ &eidv6, &tmp_eid_lenght)) {
+ eid_lenght = tmp_eid_lenght;
+ eidv6_set = 1;
+ } else if (unformat(input, "sloc %U", unformat_ip4_address, &slocv4)) {
+ slocv4_set = 1;
+ } else if (unformat(input, "sloc %U", unformat_ip6_address, &slocv6)) {
+ slocv6_set = 1;
+ } else if (unformat(input, "dloc %U", unformat_ip4_address, &dlocv4)) {
+ dlocv4_set = 1;
+ } else if (unformat(input, "dloc %U", unformat_ip6_address, &dlocv6)) {
+ dlocv6_set = 1;
+ } else
+ break;
+ }
+
+ if (eidv4_set && eidv6_set) {
+ errmsg ("both eid v4 and v6 addresses set\n");
+ return -99;
+ }
+
+ if (!eidv4_set && !eidv6_set) {
+ errmsg ("eid addresses not set\n");
+ return -99;
+ }
- ip4_address_t ip4_prefix;
- ip6_address_t ip6_prefix;
- ip6_address_t ip6_src;
- u32 num_m_args = 0;
- u32 ip6_prefix_len, ip4_prefix_len, ea_bits_len, psid_offset,
- psid_length;
- u8 is_translation = 0;
- u32 mtu = 0;
- u8 ip6_src_len = 128;
+ if (slocv4_set && slocv6_set) {
+ errmsg ("both source v4 and v6 addresses set\n");
+ return -99;
+ }
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address,
- &ip4_prefix, &ip4_prefix_len))
- num_m_args++;
- else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address,
- &ip6_prefix, &ip6_prefix_len))
- num_m_args++;
- else if (unformat (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src, &ip6_src_len))
- num_m_args++;
- else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src))
- num_m_args++;
- else if (unformat (i, "ea-bits-len %d", &ea_bits_len))
- num_m_args++;
- else if (unformat (i, "psid-offset %d", &psid_offset))
- num_m_args++;
- else if (unformat (i, "psid-len %d", &psid_length))
- num_m_args++;
- else if (unformat (i, "mtu %d", &mtu))
- num_m_args++;
- else if (unformat (i, "map-t"))
- is_translation = 1;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ if (!slocv4_set && !slocv6_set) {
+ errmsg ("source addresses not set\n");
+ return -99;
}
- }
- if (num_m_args != 6) {
- errmsg("mandatory argument(s) missing\n");
- return -99;
- }
+ if (dlocv4_set && dlocv6_set) {
+ errmsg ("both destination v4 and v6 addresses set\n");
+ return -99;
+ }
- /* Construct the API message */
- M(MAP_ADD_DOMAIN, map_add_domain);
+ if (dlocv4_set && dlocv6_set) {
+ errmsg ("destination addresses not set\n");
+ return -99;
+ }
- clib_memcpy(mp->ip4_prefix, &ip4_prefix, sizeof(ip4_prefix));
- mp->ip4_prefix_len = ip4_prefix_len;
+ if (!(slocv4_set == dlocv4_set && slocv6_set == dlocv6_set)) {
+ errmsg ("mixing type of source and destination address\n");
+ return -99;
+ }
- clib_memcpy(mp->ip6_prefix, &ip6_prefix, sizeof(ip6_prefix));
- mp->ip6_prefix_len = ip6_prefix_len;
+ /* Construct the API message */
+ M(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
- clib_memcpy(mp->ip6_src, &ip6_src, sizeof(ip6_src));
- mp->ip6_src_prefix_len = ip6_src_len;
+ mp->is_add = is_add;
+ if (eidv6_set) {
+ mp->eid_is_ipv6 = 1;
+ clib_memcpy(mp->eid_ip_address, &eidv6, sizeof(eidv6));
+ } else {
+ mp->eid_is_ipv6 = 0;
+ clib_memcpy(mp->eid_ip_address, &eidv4, sizeof(eidv4));
+ }
+ mp->eid_prefix_len = eid_lenght;
+ if (slocv6_set) {
+ mp->address_is_ipv6 = 1;
+ clib_memcpy(mp->source_ip_address, &slocv6, sizeof(slocv6));
+ clib_memcpy(mp->destination_ip_address, &dlocv6, sizeof(dlocv6));
+ } else {
+ mp->address_is_ipv6 = 0;
+ clib_memcpy(mp->source_ip_address, &slocv4, sizeof(slocv4));
+ clib_memcpy(mp->destination_ip_address, &dlocv4, sizeof(dlocv4));
+ }
- mp->ea_bits_len = ea_bits_len;
- mp->psid_offset = psid_offset;
- mp->psid_length = psid_length;
- mp->is_translation = is_translation;
- mp->mtu = htons(mtu);
+ /* send it... */
+ S;
- /* send it... */
- S;
+ /* Wait for a reply... */
+ W;
- /* Wait for a reply, return good/bad news */
- W;
+ /* NOTREACHED */
+ return 0;
}
-static int api_map_del_domain (vat_main_t * vam)
+static int
+api_lisp_add_del_map_resolver(vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_map_del_domain_t *mp;
- f64 timeout;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_add_del_map_resolver_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ ip4_address_t ipv4;
+ ip6_address_t ipv6;
- u32 num_m_args = 0;
- u32 index;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "del")) {
+ is_add = 0;
+ } else if (unformat(input, "%U", unformat_ip4_address, &ipv4)) {
+ ipv4_set = 1;
+ } else if (unformat(input, "%U", unformat_ip6_address, &ipv6)) {
+ ipv6_set = 1;
+ } else
+ break;
+ }
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ if (ipv4_set && ipv6_set) {
+ errmsg ("both eid v4 and v6 addresses set\n");
+ return -99;
}
- }
- if (num_m_args != 1) {
- errmsg("mandatory argument(s) missing\n");
- return -99;
- }
+ if (!ipv4_set && !ipv6_set) {
+ errmsg ("eid addresses not set\n");
+ return -99;
+ }
- /* Construct the API message */
- M(MAP_DEL_DOMAIN, map_del_domain);
+ /* Construct the API message */
+ M(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
- mp->index = ntohl(index);
+ mp->is_add = is_add;
+ if (ipv6_set) {
+ mp->is_ipv6 = 1;
+ clib_memcpy(mp->ip_address, &ipv6, sizeof(ipv6));
+ } else {
+ mp->is_ipv6 = 0;
+ clib_memcpy(mp->ip_address, &ipv4, sizeof(ipv4));
+ }
- /* send it... */
- S;
+ /* send it... */
+ S;
- /* Wait for a reply, return good/bad news */
- W;
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
-static int api_map_add_del_rule (vat_main_t * vam)
+static int
+api_lisp_gpe_enable_disable (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_map_add_del_rule_t *mp;
- f64 timeout;
- u8 is_add = 1;
- ip6_address_t ip6_dst;
- u32 num_m_args = 0, index, psid;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_gpe_enable_disable_t *mp;
+ f64 timeout = ~0;
+ u8 is_set = 0;
+ u8 is_en = 1;
- 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;
- } else {
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "enable")) {
+ is_set = 1;
+ is_en = 1;
+ } else if (unformat(input, "disable")) {
+ is_set = 1;
+ is_en = 0;
+ } else
+ break;
+ }
+
+ if (is_set == 0) {
+ errmsg("Value not set\n");
return -99;
- }
}
/* Construct the API message */
- M(MAP_ADD_DEL_RULE, map_add_del_rule);
+ M(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
- mp->index = ntohl(index);
- mp->is_add = is_add;
- clib_memcpy(mp->ip6_dst, &ip6_dst, sizeof(ip6_dst));
- mp->psid = ntohs(psid);
+ mp->is_en = is_en;
/* send it... */
S;
- /* Wait for a reply, return good/bad news */
+ /* Wait for a reply... */
W;
+
+ /* NOTREACHED */
+ return 0;
}
-static int api_map_domain_dump (vat_main_t * vam)
+static int
+api_lisp_enable_disable (vat_main_t * vam)
{
- vl_api_map_domain_dump_t *mp;
- f64 timeout;
-
- /* Construct the API message */
- M(MAP_DOMAIN_DUMP, map_domain_dump);
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_enable_disable_t *mp;
+ f64 timeout = ~0;
+ u8 is_set = 0;
+ u8 is_en = 0;
- /* send it... */
- S;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "enable"))
+ {
+ is_set = 1;
+ is_en = 1;
+ }
+ else if (unformat (input, "disable"))
+ {
+ is_set = 1;
+ }
+ else
+ break;
+ }
- /* Use a control ping for synchronization */
+ if (!is_set)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ errmsg ("Value not set\n");
+ return -99;
}
- W;
-}
-static int api_map_rule_dump (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_map_rule_dump_t *mp;
- f64 timeout;
- u32 domain_index = ~0;
+ /* Construct the API message */
+ M(LISP_ENABLE_DISABLE, lisp_enable_disable);
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "index %u", &domain_index))
- ;
- else
- break;
- }
+ mp->is_en = is_en;
- if (domain_index == ~0) {
- clib_warning("parse error: domain index expected");
- return -99;
- }
+ /* send it... */
+ S;
- /* Construct the API message */
- M(MAP_RULE_DUMP, map_rule_dump);
+ /* Wait for a reply... */
+ W;
- mp->domain_index = htonl(domain_index);
+ /* NOTREACHED */
+ return 0;
+}
- /* send it... */
- S;
+/** Used for transferring locators via VPP API */
+typedef CLIB_PACKED(struct
+{
+ u8 is_ip4; /**< is locator an IPv4 address? */
+ u8 priority; /**< locator priority */
+ u8 weight; /**< locator weight */
+ u8 addr[16]; /**< IPv4/IPv6 address */
+}) rloc_t;
- /* Use a control ping for synchronization */
+/**
+ * Enable/disable LISP proxy ITR.
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
+static int
+api_lisp_pitr_set_locator_set (vat_main_t * vam)
+{
+ f64 timeout = ~0;
+ u8 ls_name_set = 0;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_pitr_set_locator_set_t * mp;
+ u8 is_add = 1;
+ u8 * ls_name = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ if (unformat (input, "del"))
+ is_add = 0;
+ else if (unformat (input, "locator-set %s", &ls_name))
+ ls_name_set = 1;
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- W;
-}
-static void vl_api_map_add_domain_reply_t_handler
-(vl_api_map_add_domain_reply_t * mp)
-{
- vat_main_t * vam = &vat_main;
- i32 retval = ntohl(mp->retval);
+ if (!ls_name_set)
+ {
+ errmsg ("locator-set name not set!");
+ return -99;
+ }
- if (vam->async_mode) {
- vam->async_errors += (retval < 0);
- } else {
- vam->retval = retval;
- vam->result_ready = 1;
- }
-}
+ M(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
-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;
+ mp->is_add = is_add;
+ clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
+ vec_free (ls_name);
- 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));
+ /* send */
+ S;
- vat_json_print(vam->ofp, &node);
- vat_json_free(&node);
+ /* wait for reply */
+ W;
- vam->retval = ntohl(mp->retval);
- vam->result_ready = 1;
+ /* notreached*/
+ return 0;
}
static int
-api_get_first_msg_id (vat_main_t * vam)
+api_show_lisp_pitr (vat_main_t * vam)
{
- vl_api_get_first_msg_id_t * mp;
- f64 timeout;
- unformat_input_t * i = vam->input;
- u8 * name;
- u8 name_set = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "client %s", &name))
- name_set = 1;
- else
- break;
- }
+ vl_api_show_lisp_pitr_t *mp;
+ f64 timeout = ~0;
- if (name_set == 0) {
- errmsg ("missing client name\n");
- return -99;
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%=20s\n",
+ "lisp status:");
}
- vec_add1 (name, 0);
- if (vec_len (name) > 63) {
- errmsg ("client name too long\n");
- return -99;
- }
+ M(SHOW_LISP_PITR, show_lisp_pitr);
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
- M(GET_FIRST_MSG_ID, get_first_msg_id);
- clib_memcpy (mp->name, name, vec_len(name));
- S; W;
/* NOTREACHED */
return 0;
}
-static int api_cop_interface_enable_disable (vat_main_t * vam)
+/**
+ * Add/delete mapping between vni and vrf
+ */
+static int
+api_lisp_eid_table_add_del_map (vat_main_t * vam)
{
- unformat_input_t * line_input = vam->input;
- vl_api_cop_interface_enable_disable_t * mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- u8 enable_disable = 1;
+ f64 timeout = ~0;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_eid_table_add_del_map_t *mp;
+ u8 is_add = 1, vni_set = 0, vrf_set = 0;
+ u32 vni, vrf;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "disable"))
- enable_disable = 0;
- if (unformat (line_input, "enable"))
- enable_disable = 1;
- else if (unformat (line_input, "%U", unformat_sw_if_index,
- vam, &sw_if_index))
- ;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
- ;
- else
- break;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ is_add = 0;
+ else if (unformat(input, "vrf %d", &vrf))
+ vrf_set = 1;
+ else if (unformat(input, "vni %d", &vni))
+ vni_set = 1;
+ else
+ break;
}
-
- if (sw_if_index == ~0) {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
+
+ if (!vni_set || !vrf_set)
+ {
+ errmsg ("missing arguments!");
+ return -99;
}
- /* Construct the API message */
- M(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->enable_disable = enable_disable;
+ M(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
- /* send it... */
- S;
- /* Wait for the reply */
- W;
+ mp->is_add = is_add;
+ mp->vni = htonl (vni);
+ mp->vrf = htonl (vrf);
+
+ /* send */
+ S;
+
+ /* wait for reply */
+ W;
+
+ /* notreached*/
+ return 0;
}
-static int api_cop_whitelist_enable_disable (vat_main_t * vam)
+/**
+ * Add/del remote mapping to/from LISP control plane
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
+static int
+api_lisp_add_del_remote_mapping (vat_main_t * vam)
{
- unformat_input_t * line_input = vam->input;
- vl_api_cop_whitelist_enable_disable_t * mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- u8 ip4=0, ip6=0, default_cop=0;
- u32 fib_id;
+ unformat_input_t * input = vam->input;
+ vl_api_lisp_add_del_remote_mapping_t *mp;
+ f64 timeout = ~0;
+ u32 vni = 0;
+ ip4_address_t seid4, deid4, rloc4;
+ ip6_address_t seid6, deid6, rloc6;
+ u8 deid_mac[6] = {0};
+ u8 seid_mac[6] = {0};
+ u8 deid_type, seid_type;
+ u32 seid_len = 0, deid_len = 0, len;
+ u8 is_add = 1, del_all = 0;
+ u32 action = ~0, p, w;
+ rloc_t * rlocs = 0, rloc, * curr_rloc = 0;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat (line_input, "ip4"))
- ip4 = 1;
- else if (unformat (line_input, "ip6"))
- ip6 = 1;
- else if (unformat (line_input, "default"))
- default_cop = 1;
- else if (unformat (line_input, "%U", unformat_sw_if_index,
- vam, &sw_if_index))
- ;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ seid_type = deid_type = (u8)~0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "del-all")) {
+ del_all = 1;
+ } else if (unformat(input, "del")) {
+ is_add = 0;
+ } else if (unformat(input, "add")) {
+ is_add = 1;
+ } else if (unformat(input, "deid %U/%d", unformat_ip4_address,
+ &deid4, &len)) {
+ deid_type = 0; /* ipv4 */
+ deid_len = len;
+ } else if (unformat(input, "deid %U/%d", unformat_ip6_address,
+ &deid6, &len)) {
+ deid_type = 1; /* ipv6 */
+ deid_len = len;
+ } else if (unformat(input, "deid %U", unformat_ethernet_address,
+ deid_mac)) {
+ deid_type = 2; /* mac */
+ } else if (unformat(input, "seid %U/%d", unformat_ip4_address,
+ &seid4, &len)) {
+ seid_type = 0; /* ipv4 */
+ seid_len = len;
+ } else if (unformat(input, "seid %U/%d", unformat_ip6_address,
+ &seid6, &len)) {
+ seid_type = 1; /* ipv6 */
+ seid_len = len;
+ } else if (unformat(input, "seid %U", unformat_ethernet_address,
+ seid_mac)) {
+ seid_type = 2; /* mac */
+ } else if (unformat(input, "vni %d", &vni)) {
;
- else if (unformat (line_input, "fib-id %d", &fib_id))
+ } else if (unformat(input, "p %d w %d", &p, &w)) {
+ if (!curr_rloc) {
+ errmsg ("No RLOC configured for setting priority/weight!");
+ return -99;
+ }
+ curr_rloc->priority = p;
+ curr_rloc->weight = w;
+ } else if (unformat(input, "rloc %U", unformat_ip4_address, &rloc4)) {
+ rloc.is_ip4 = 1;
+ clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4));
+ vec_add1 (rlocs, rloc);
+ curr_rloc = &rlocs[vec_len (rlocs) - 1];
+ } else if (unformat(input, "rloc %U", unformat_ip6_address, &rloc6)) {
+ rloc.is_ip4 = 0;
+ clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6));
+ vec_add1 (rlocs, rloc);
+ curr_rloc = &rlocs[vec_len (rlocs) - 1];
+ } else if (unformat(input, "action %d", &action)) {
;
- else
- break;
+ } else {
+ clib_warning ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
+ }
+
+ if ((u8)~0 == deid_type) {
+ errmsg ("missing params!");
+ return -99;
}
-
- if (sw_if_index == ~0) {
- errmsg ("missing interface name or sw_if_index\n");
+
+ if (seid_type != deid_type) {
+ errmsg ("source and destination EIDs are of different types!");
return -99;
}
- /* Construct the API message */
- M(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable);
- mp->sw_if_index = ntohl(sw_if_index);
- mp->fib_id = ntohl(fib_id);
- mp->ip4 = ip4;
- mp->ip6 = ip6;
- mp->default_cop = default_cop;
+ if (is_add && (~0 == action)
+ && 0 == vec_len (rlocs)) {
+ errmsg ("no action set for negative map-reply!");
+ return -99;
+ }
- /* send it... */
- S;
- /* Wait for the reply */
- W;
-}
+ M(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping);
+ mp->is_add = is_add;
+ mp->vni = htonl (vni);
+ mp->seid_len = seid_len;
+ mp->action = (u8) action;
+ mp->deid_len = deid_len;
+ mp->del_all = del_all;
+ mp->eid_type = deid_type;
-static int api_get_node_graph (vat_main_t * vam)
-{
- vl_api_get_node_graph_t * mp;
- f64 timeout;
+ switch (mp->eid_type) {
+ case 0:
+ clib_memcpy (mp->seid, &seid4, sizeof (seid4));
+ clib_memcpy (mp->deid, &deid4, sizeof (deid4));
+ break;
+ case 1:
+ clib_memcpy (mp->seid, &seid6, sizeof (seid6));
+ clib_memcpy (mp->deid, &deid6, sizeof (deid6));
+ break;
+ case 2:
+ clib_memcpy (mp->seid, seid_mac, 6);
+ clib_memcpy (mp->deid, deid_mac, 6);
+ break;
+ default:
+ errmsg ("unknown EID type %d!", mp->eid_type);
+ return 0;
+ }
- M(GET_NODE_GRAPH, get_node_graph);
+ mp->rloc_num = vec_len (rlocs);
+ clib_memcpy (mp->rlocs, rlocs, (sizeof (rloc_t) * vec_len (rlocs)));
+ vec_free (rlocs);
/* send it... */
S;
- /* Wait for the reply */
+
+ /* Wait for a reply... */
W;
+
+ /* NOTREACHED */
+ return 0;
}
+/**
+ * Add/del LISP adjacency. Saves mapping in LISP control plane and updates
+ * forwarding entries in data-plane accordingly.
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
static int
-api_lisp_add_del_locator_set(vat_main_t * vam)
+api_lisp_add_del_adjacency (vat_main_t * vam)
{
unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_locator_set_t *mp;
+ vl_api_lisp_add_del_adjacency_t *mp;
f64 timeout = ~0;
- u8 is_add = 1;
- u8 *locator_set_name = NULL;
- u8 locator_set_name_set = 0;
+ u32 vni = 0;
+ ip4_address_t seid4, deid4;
+ ip6_address_t seid6, deid6;
+ u8 deid_mac[6] = {0};
+ u8 seid_mac[6] = {0};
+ u8 deid_type, seid_type;
+ u32 seid_len = 0, deid_len = 0, len;
+ u8 is_add = 1;
+
+ seid_type = deid_type = (u8)~0;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
if (unformat(input, "del")) {
is_add = 0;
- } else if (unformat(input, "locator-set %s", &locator_set_name)) {
- locator_set_name_set = 1;
- } else
- break;
+ } else if (unformat(input, "add")) {
+ is_add = 1;
+ } else if (unformat(input, "deid %U/%d", unformat_ip4_address,
+ &deid4, &len)) {
+ deid_type = 0; /* ipv4 */
+ deid_len = len;
+ } else if (unformat(input, "deid %U/%d", unformat_ip6_address,
+ &deid6, &len)) {
+ deid_type = 1; /* ipv6 */
+ deid_len = len;
+ } else if (unformat(input, "deid %U", unformat_ethernet_address,
+ deid_mac)) {
+ deid_type = 2; /* mac */
+ } else if (unformat(input, "seid %U/%d", unformat_ip4_address,
+ &seid4, &len)) {
+ seid_type = 0; /* ipv4 */
+ seid_len = len;
+ } else if (unformat(input, "seid %U/%d", unformat_ip6_address,
+ &seid6, &len)) {
+ seid_type = 1; /* ipv6 */
+ seid_len = len;
+ } else if (unformat(input, "seid %U", unformat_ethernet_address,
+ seid_mac)) {
+ seid_type = 2; /* mac */
+ } else if (unformat(input, "vni %d", &vni)) {
+ ;
+ } else {
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- if (locator_set_name_set == 0) {
- errmsg ("missing locator-set name");
+ if ((u8)~0 == deid_type) {
+ errmsg ("missing params!");
return -99;
}
- if (vec_len(locator_set_name) > 64) {
- errmsg ("locator-set name too long\n");
- vec_free(locator_set_name);
+ if (seid_type != deid_type) {
+ errmsg ("source and destination EIDs are of different types!");
return -99;
}
- vec_add1(locator_set_name, 0);
-
- /* Construct the API message */
- M(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set);
+ M(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
mp->is_add = is_add;
- clib_memcpy(mp->locator_set_name, locator_set_name,
- vec_len(locator_set_name));
- vec_free(locator_set_name);
+ mp->vni = htonl (vni);
+ mp->seid_len = seid_len;
+ mp->deid_len = deid_len;
+ mp->eid_type = deid_type;
+
+ switch (mp->eid_type) {
+ case 0:
+ clib_memcpy (mp->seid, &seid4, sizeof (seid4));
+ clib_memcpy (mp->deid, &deid4, sizeof (deid4));
+ break;
+ case 1:
+ clib_memcpy (mp->seid, &seid6, sizeof (seid6));
+ clib_memcpy (mp->deid, &deid6, sizeof (deid6));
+ break;
+ case 2:
+ clib_memcpy (mp->seid, seid_mac, 6);
+ clib_memcpy (mp->deid, deid_mac, 6);
+ break;
+ default:
+ errmsg ("unknown EID type %d!", mp->eid_type);
+ return 0;
+ }
/* send it... */
S;
}
static int
-api_lisp_add_del_locator(vat_main_t * vam)
+api_lisp_gpe_add_del_iface(vat_main_t * vam)
{
unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_locator_t *mp;
+ vl_api_lisp_gpe_add_del_iface_t *mp;
f64 timeout = ~0;
- u32 tmp_if_index = ~0;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
- u8 sw_if_index_if_name_set = 0;
- u8 priority = ~0;
- u8 priority_set = 0;
- u8 weight = ~0;
- u8 weight_set = 0;
- u8 is_add = 1;
- u8 *locator_set_name = NULL;
- u8 locator_set_name_set = 0;
+ u8 is_set = 0;
+ u8 is_add = 1;
+ u32 table_id, vni;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
+ if (unformat(input, "up")) {
+ is_set = 1;
+ is_add = 1;
+ } else if (unformat(input, "down")) {
+ is_set = 1;
is_add = 0;
- } else if (unformat(input, "locator-set %s", &locator_set_name)) {
- locator_set_name_set = 1;
- } else if (unformat(input, "iface %U", unformat_sw_if_index, vam,
- &tmp_if_index)) {
- sw_if_index_if_name_set = 1;
- sw_if_index = tmp_if_index;
- } else if (unformat(input,"sw_if_index %d", &tmp_if_index)) {
- sw_if_index_set = 1;
- sw_if_index = tmp_if_index;
- } else if (unformat(input, "p %d", &priority)) {
- priority_set = 1;
- } else if (unformat(input, "w %d", &weight)) {
- weight_set = 1;
+ } else if (unformat(input, "table_id %d", &table_id)) {
+ ;
+ } else if (unformat(input, "vni %d", &vni)) {
+ ;
} else
break;
}
- if (locator_set_name_set == 0) {
- errmsg ("missing locator-set name");
- return -99;
- }
-
- if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) {
- errmsg ("missing sw_if_index");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) {
- errmsg ("cannot use both params interface name and sw_if_index");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (priority_set == 0) {
- errmsg ("missing locator-set priority\n");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (weight_set == 0) {
- errmsg ("missing locator-set weight\n");
- vec_free(locator_set_name);
- return -99;
- }
-
- if (vec_len(locator_set_name) > 64) {
- errmsg ("locator-set name too long\n");
- vec_free(locator_set_name);
+ if (is_set == 0) {
+ errmsg("Value not set\n");
return -99;
}
- vec_add1(locator_set_name, 0);
/* Construct the API message */
- M(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
+ M(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
mp->is_add = is_add;
- mp->sw_if_index = ntohl(sw_if_index);
- mp->priority = priority;
- mp->weight = weight;
- clib_memcpy(mp->locator_set_name, locator_set_name,
- vec_len(locator_set_name));
- vec_free(locator_set_name);
+ mp->table_id = table_id;
+ mp->vni = vni;
/* send it... */
S;
return 0;
}
+/**
+ * Add/del map request itr rlocs from LISP control plane and updates
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
static int
-api_lisp_add_del_local_eid(vat_main_t * vam)
+api_lisp_add_del_map_request_itr_rlocs(vat_main_t * vam)
{
unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_local_eid_t *mp;
+ vl_api_lisp_add_del_map_request_itr_rlocs_t *mp;
f64 timeout = ~0;
- u8 is_add = 1;
- u8 eidv4_set = 0;
- u8 eidv6_set = 0;
- ip4_address_t eidv4;
- ip6_address_t eidv6;
- u8 tmp_eid_lenght = ~0;
- u8 eid_lenght = ~0;
- u8 *locator_set_name = NULL;
- u8 locator_set_name_set = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "eid %U/%d", unformat_ip4_address,
- &eidv4, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv4_set = 1;
- } else if (unformat(input, "eid %U/%d", unformat_ip6_address,
- &eidv6, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv6_set = 1;
- } else if (unformat(input, "locator-set %s", &locator_set_name)) {
- locator_set_name_set = 1;
- } else
- break;
- }
-
- if (locator_set_name_set == 0) {
- errmsg ("missing locator-set name\n");
- return -99;
- }
-
- if (vec_len(locator_set_name) > 64) {
- errmsg ("locator-set name too long\n");
- vec_free(locator_set_name);
- return -99;
- }
- vec_add1(locator_set_name, 0);
-
- if (eidv4_set && eidv6_set) {
- errmsg ("both eid v4 and v6 addresses set\n");
- vec_free(locator_set_name);
- return -99;
- }
+ u8 *locator_set_name = 0;
+ u8 locator_set_name_set = 0;
+ u8 is_add = 1;
- if (!eidv4_set && !eidv6_set) {
- errmsg ("eid addresses not set\n");
- vec_free(locator_set_name);
- return -99;
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat(input, "del")) {
+ is_add = 0;
+ } else if (unformat(input, "%_%v%_", &locator_set_name)) {
+ locator_set_name_set = 1;
+ } else {
+ clib_warning ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- if (eidv4_set && eid_lenght > 32) {
- errmsg ("eid prefix to big\n");
- vec_free(locator_set_name);
+ if (is_add && !locator_set_name_set) {
+ errmsg ("itr-rloc is not set!");
return -99;
}
- if (eidv6_set && eid_lenght > 128) {
- errmsg ("eid prefix to big\n");
+ if (is_add && vec_len(locator_set_name) > 64) {
+ errmsg ("itr-rloc locator-set name too long\n");
vec_free(locator_set_name);
return -99;
}
- /* Construct the API message */
- M(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
-
+ M(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
mp->is_add = is_add;
- if (eidv6_set) {
- mp->is_ipv6 = 1;
- clib_memcpy(mp->ip_address, &eidv6, sizeof(eidv6));
+ if (is_add) {
+ clib_memcpy (mp->locator_set_name , locator_set_name,
+ vec_len(locator_set_name));
} else {
- mp->is_ipv6 = 0;
- clib_memcpy(mp->ip_address, &eidv4, sizeof(eidv4));
+ memset(mp->locator_set_name, 0, sizeof(mp->locator_set_name));
}
- mp->prefix_len = eid_lenght;
- clib_memcpy(mp->locator_set_name, locator_set_name,
- vec_len(locator_set_name));
- vec_free(locator_set_name);
+ vec_free (locator_set_name);
/* send it... */
S;
}
static int
-api_lisp_gpe_add_del_fwd_entry(vat_main_t * vam)
+api_lisp_locator_set_dump(vat_main_t *vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
+ vl_api_lisp_locator_set_dump_t *mp;
f64 timeout = ~0;
- u8 is_add = 1;
- u8 eidv4_set = 0, slocv4_set = 0, dlocv4_set = 0;
- u8 eidv6_set = 0, slocv6_set = 0, dlocv6_set = 0;
- ip4_address_t eidv4, slocv4, dlocv4;
- ip6_address_t eidv6, slocv6, dlocv6;
- u8 tmp_eid_lenght = ~0;
- u8 eid_lenght = ~0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "eid %U/%d", unformat_ip4_address,
- &eidv4, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv4_set = 1;
- } else if (unformat(input, "eid %U/%d", unformat_ip6_address,
- &eidv6, &tmp_eid_lenght)) {
- eid_lenght = tmp_eid_lenght;
- eidv6_set = 1;
- } else if (unformat(input, "sloc %U", unformat_ip4_address, &slocv4)) {
- slocv4_set = 1;
- } else if (unformat(input, "sloc %U", unformat_ip6_address, &slocv6)) {
- slocv6_set = 1;
- } else if (unformat(input, "dloc %U", unformat_ip4_address, &dlocv4)) {
- dlocv4_set = 1;
- } else if (unformat(input, "dloc %U", unformat_ip6_address, &dlocv6)) {
- dlocv6_set = 1;
- } else
- break;
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%=20s%=16s%=16s%=16s\n",
+ "Locator-set", "Locator", "Priority", "Weight");
}
- if (eidv4_set && eidv6_set) {
- errmsg ("both eid v4 and v6 addresses set\n");
- return -99;
+ M(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
+ /* Wait for a reply... */
+ W;
- if (!eidv4_set && !eidv6_set) {
- errmsg ("eid addresses not set\n");
- return -99;
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_lisp_eid_table_map_dump(vat_main_t *vam)
+{
+ vl_api_lisp_eid_table_map_dump_t *mp;
+ f64 timeout = ~0;
+
+ if (!vam->json_output) {
+ fformat (vam->ofp, "%=10s%=10s\n", "VNI", "VRF");
}
- if (slocv4_set && slocv6_set) {
- errmsg ("both source v4 and v6 addresses set\n");
- return -99;
+ M(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
+
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
+ /* Wait for a reply... */
+ W;
- if (!slocv4_set && !slocv6_set) {
- errmsg ("source addresses not set\n");
- return -99;
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_lisp_local_eid_table_dump(vat_main_t *vam)
+{
+ unformat_input_t * i = vam->input;
+ vl_api_lisp_local_eid_table_dump_t *mp;
+ f64 timeout = ~0;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+ u8 mac[6];
+ u8 eid_type = ~0, eid_set;
+ u32 prefix_length = ~0, t, vni = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t)) {
+ eid_set = 1;
+ eid_type = 0;
+ prefix_length = t;
+ } else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t)) {
+ eid_set = 1;
+ eid_type = 1;
+ prefix_length = t;
+ } else if (unformat (i, "eid %U", unformat_ethernet_address, mac)) {
+ eid_set = 1;
+ eid_type = 2;
+ } else if (unformat (i, "vni %d", &t))
+ vni = t;
+ else {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (dlocv4_set && dlocv6_set) {
- errmsg ("both destination v4 and v6 addresses set\n");
- return -99;
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%=20s%=30s\n",
+ "Locator-set", "Eid");
}
- if (dlocv4_set && dlocv6_set) {
- errmsg ("destination addresses not set\n");
- return -99;
+ M(LISP_LOCAL_EID_TABLE_DUMP, lisp_local_eid_table_dump);
+
+ if (eid_set) {
+ mp->eid_set = 1;
+ mp->vni = htonl (vni);
+ mp->eid_type = eid_type;
+ switch (eid_type) {
+ case 0:
+ mp->prefix_length = prefix_length;
+ clib_memcpy (mp->eid, &ip4, sizeof (ip4));
+ break;
+ case 1:
+ mp->prefix_length = prefix_length;
+ clib_memcpy (mp->eid, &ip6, sizeof (ip6));
+ break;
+ case 2:
+ clib_memcpy (mp->eid, mac, sizeof (mac));
+ break;
+ default:
+ errmsg ("unknown EID type %d!", eid_type);
+ return -99;
+ }
}
- if (!(slocv4_set == dlocv4_set && slocv6_set == dlocv6_set)) {
- errmsg ("mixing type of source and destination address\n");
- return -99;
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
+ /* Wait for a reply... */
+ W;
- /* Construct the API message */
- M(LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
+ /* NOTREACHED */
+ return 0;
+}
- mp->is_add = is_add;
- if (eidv6_set) {
- mp->eid_is_ipv6 = 1;
- clib_memcpy(mp->eid_ip_address, &eidv6, sizeof(eidv6));
- } else {
- mp->eid_is_ipv6 = 0;
- clib_memcpy(mp->eid_ip_address, &eidv4, sizeof(eidv4));
+static int
+api_lisp_gpe_tunnel_dump(vat_main_t *vam)
+{
+ vl_api_lisp_gpe_tunnel_dump_t *mp;
+ f64 timeout = ~0;
+
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%=20s%=30s%=16s%=16s%=16s%=16s"
+ "%=16s%=16s%=16s%=16s%=16s\n",
+ "Tunel", "Source", "Destination", "Fib encap", "Fib decap",
+ "Decap next", "Lisp version", "Flags", "Next protocol",
+ "ver_res", "res", "iid");
}
- mp->eid_prefix_len = eid_lenght;
- if (slocv6_set) {
- mp->address_is_ipv6 = 1;
- clib_memcpy(mp->source_ip_address, &slocv6, sizeof(slocv6));
- clib_memcpy(mp->destination_ip_address, &dlocv6, sizeof(dlocv6));
- } else {
- mp->address_is_ipv6 = 0;
- clib_memcpy(mp->source_ip_address, &slocv4, sizeof(slocv4));
- clib_memcpy(mp->destination_ip_address, &dlocv4, sizeof(dlocv4));
+
+ M(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump);
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_lisp_map_resolver_dump(vat_main_t *vam)
+{
+ vl_api_lisp_map_resolver_dump_t *mp;
+ f64 timeout = ~0;
+
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%=20s\n",
+ "Map resolver");
}
+ M(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
/* send it... */
S;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
/* Wait for a reply... */
W;
}
static int
-api_lisp_add_del_map_resolver(vat_main_t * vam)
+api_lisp_enable_disable_status_dump(vat_main_t *vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_map_resolver_t *mp;
+ vl_api_lisp_enable_disable_status_dump_t *mp;
f64 timeout = ~0;
- u8 is_add = 1;
- u8 ipv4_set = 0;
- u8 ipv6_set = 0;
- ip4_address_t ipv4;
- ip6_address_t ipv6;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
- is_add = 0;
- } else if (unformat(input, "%U", unformat_ip4_address, &ipv4)) {
- ipv4_set = 1;
- } else if (unformat(input, "%U", unformat_ip6_address, &ipv6)) {
- ipv6_set = 1;
- } else
- break;
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%-20s%-16s\n",
+ "lisp status", "locator-set");
}
- if (ipv4_set && ipv6_set) {
- errmsg ("both eid v4 and v6 addresses set\n");
- return -99;
+ M(LISP_ENABLE_DISABLE_STATUS_DUMP,
+ lisp_enable_disable_status_dump);
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
+ /* Wait for a reply... */
+ W;
- if (!ipv4_set && !ipv6_set) {
- errmsg ("eid addresses not set\n");
- return -99;
- }
+ /* NOTREACHED */
+ return 0;
+}
- /* Construct the API message */
- M(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
+static int
+api_lisp_get_map_request_itr_rlocs(vat_main_t *vam)
+{
+ vl_api_lisp_get_map_request_itr_rlocs_t *mp;
+ f64 timeout = ~0;
- mp->is_add = is_add;
- if (ipv6_set) {
- mp->is_ipv6 = 1;
- clib_memcpy(mp->ip_address, &ipv6, sizeof(ipv6));
- } else {
- mp->is_ipv6 = 0;
- clib_memcpy(mp->ip_address, &ipv4, sizeof(ipv4));
+ if (!vam->json_output) {
+ fformat(vam->ofp, "%=20s\n",
+ "itr-rlocs:");
}
+ M(LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs);
/* send it... */
S;
-
/* Wait for a reply... */
W;
}
static int
-api_lisp_gpe_enable_disable (vat_main_t * vam)
+api_af_packet_create (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_gpe_enable_disable_t *mp;
- f64 timeout = ~0;
- u8 is_set = 0;
- u8 is_en = 1;
+ unformat_input_t * i = vam->input;
+ vl_api_af_packet_create_t * mp;
+ f64 timeout;
+ u8 * host_if_name = 0;
+ u8 hw_addr[6];
+ u8 random_hw_addr = 1;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "enable")) {
- is_set = 1;
- is_en = 1;
- } else if (unformat(input, "disable")) {
- is_set = 1;
- is_en = 0;
- } else
- break;
- }
+ memset (hw_addr, 0, sizeof (hw_addr));
- if (is_set == 0) {
- errmsg("Value not set\n");
- return -99;
- }
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "name %s", &host_if_name))
+ vec_add1 (host_if_name, 0);
+ else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
+ random_hw_addr = 0;
+ else
+ break;
+ }
- /* Construct the API message */
- M(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
+ if (!vec_len (host_if_name)) {
+ errmsg ("host-interface name must be specified");
+ return -99;
+ }
- mp->is_en = is_en;
+ if (vec_len (host_if_name) > 64) {
+ errmsg ("host-interface name too long");
+ return -99;
+ }
- /* send it... */
- S;
+ M(AF_PACKET_CREATE, af_packet_create);
- /* Wait for a reply... */
- W;
+ clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+ clib_memcpy (mp->hw_addr, hw_addr, 6);
+ mp->use_random_hw_addr = random_hw_addr;
+ vec_free (host_if_name);
- /* NOTREACHED */
- return 0;
+ S; W2(fprintf(vam->ofp," new sw_if_index = %d ", vam->sw_if_index));
+ /* NOTREACHED */
+ return 0;
}
static int
-api_lisp_enable_disable (vat_main_t * vam)
+api_af_packet_delete (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_enable_disable_t *mp;
- f64 timeout = ~0;
- u8 is_set = 0;
- u8 is_en = 0;
+ unformat_input_t * i = vam->input;
+ vl_api_af_packet_delete_t * mp;
+ f64 timeout;
+ u8 * host_if_name = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "enable"))
- {
- is_set = 1;
- is_en = 1;
- }
- else if (unformat (input, "disable"))
- {
- is_set = 1;
- }
- else
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "name %s", &host_if_name))
+ vec_add1 (host_if_name, 0);
+ else
break;
}
- if (!is_set)
- {
- errmsg ("Value not set\n");
- return -99;
+ if (!vec_len (host_if_name)) {
+ errmsg ("host-interface name must be specified");
+ return -99;
}
- /* Construct the API message */
- M(LISP_ENABLE_DISABLE, lisp_enable_disable);
-
- mp->is_en = is_en;
+ if (vec_len (host_if_name) > 64) {
+ errmsg ("host-interface name too long");
+ return -99;
+ }
- /* send it... */
- S;
+ M(AF_PACKET_DELETE, af_packet_delete);
- /* Wait for a reply... */
- W;
+ clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+ vec_free (host_if_name);
- /* NOTREACHED */
- return 0;
+ S; W;
+ /* NOTREACHED */
+ return 0;
}
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
-{
- u8 is_ip4; /**< is locator an IPv4 address? */
- u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
-
-/**
- * Add/del remote mapping from LISP control plane and updates
- * forwarding entries in data-plane accordingly.
- *
- * @param vam vpp API test context
- * @return return code
- */
static int
-api_lisp_add_del_remote_mapping (vat_main_t * vam)
+api_policer_add_del (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_add_del_remote_mapping_t *mp;
- f64 timeout = ~0;
- u32 vni = 0;
- u8 seid_set = 0, deid_set = 0;
- ip4_address_t seid4, deid4, rloc4;
- ip6_address_t seid6, deid6, rloc6;
- u32 seid_len = 0, deid_len = 0, len;
- u8 deid_is_ip4 = 0, seid_is_ip4 = 0;
+ unformat_input_t * i = vam->input;
+ vl_api_policer_add_del_t * mp;
+ f64 timeout;
u8 is_add = 1;
- u32 action = ~0;
- rloc_t * rlocs = 0, rloc;
+ u8 * name = 0;
+ u32 cir = 0;
+ u32 eir = 0;
+ u64 cb = 0;
+ u64 eb = 0;
+ u8 rate_type = 0;
+ u8 round_type = 0;
+ u8 type = 0;
+ sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "del")) {
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "del"))
is_add = 0;
- } else if (unformat(input, "add")) {
- is_add = 1;
- } else if (unformat(input, "deid %U/%d", unformat_ip4_address,
- &deid4, &len)) {
- deid_set = 1;
- deid_is_ip4 = 1;
- deid_len = len;
- } else if (unformat(input, "deid %U/%d", unformat_ip6_address,
- &deid6, &len)) {
- deid_set = 1;
- deid_is_ip4 = 0;
- deid_len = len;
- } else if (unformat(input, "seid %U/%d", unformat_ip4_address,
- &seid4, &len)) {
- seid_set = 1;
- seid_is_ip4 = 1;
- seid_len = len;
- } else if (unformat(input, "seid %U/%d", unformat_ip6_address,
- &seid6, &len)) {
- seid_set = 1;
- seid_is_ip4 = 0;
- seid_len = len;
- } else if (unformat(input, "vni %d", &vni)) {
+ else if (unformat (i, "name %s", &name))
+ vec_add1 (name, 0);
+ else if (unformat (i, "cir %u", &cir))
;
- } else if (unformat(input, "rloc %U", unformat_ip4_address, &rloc4)) {
- rloc.is_ip4 = 1;
- clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4));
- vec_add1 (rlocs, rloc);
- } else if (unformat(input, "rloc %U", unformat_ip6_address, &rloc6)) {
- rloc.is_ip4 = 0;
- clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6));
- vec_add1 (rlocs, rloc);
- } else if (unformat(input, "action %d", &action)) {
+ else if (unformat (i, "eir %u", &eir))
;
- } else {
- clib_warning ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
+ else if (unformat (i, "cb %u", &cb))
+ ;
+ else if (unformat (i, "eb %u", &eb))
+ ;
+ else if (unformat (i, "rate_type %U", unformat_policer_rate_type,
+ &rate_type))
+ ;
+ else if (unformat (i, "round_type %U", unformat_policer_round_type,
+ &round_type))
+ ;
+ else if (unformat (i, "type %U", unformat_policer_type, &type))
+ ;
+ else if (unformat (i, "conform_action %U", unformat_policer_action_type,
+ &conform_action))
+ ;
+ else if (unformat (i, "exceed_action %U", unformat_policer_action_type,
+ &exceed_action))
+ ;
+ else if (unformat (i, "violate_action %U", unformat_policer_action_type,
+ &violate_action))
+ ;
+ else
+ break;
}
- if (!seid_set || !deid_set) {
- errmsg ("missing params!");
+ if (!vec_len (name)) {
+ errmsg ("policer name must be specified");
return -99;
}
- if (seid_is_ip4 != deid_is_ip4) {
- errmsg ("source and destination EIDs are not in " "same IP family!");
+ if (vec_len (name) > 64) {
+ errmsg ("policer name too long");
return -99;
}
- if (is_add && (~0 == action)
- && 0 == vec_len (rlocs)) {
- errmsg ("no action set for negative map-reply!");
- return -99;
- }
+ M(POLICER_ADD_DEL, policer_add_del);
- M(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping);
+ clib_memcpy (mp->name, name, vec_len (name));
+ vec_free (name);
mp->is_add = is_add;
- mp->vni = htonl (vni);
- mp->seid_len = seid_len;
- mp->action = (u8) action;
- mp->deid_len = deid_len;
- if (seid_is_ip4) {
- mp->eid_is_ip4 = 1;
- clib_memcpy (mp->seid, &seid4, sizeof (seid4));
- } else {
- mp->eid_is_ip4 = 0;
- clib_memcpy (mp->seid, &seid6, sizeof (seid6));
- }
+ mp->cir = cir;
+ mp->eir = eir;
+ mp->cb = cb;
+ mp->eb = eb;
+ mp->rate_type = rate_type;
+ mp->round_type = round_type;
+ mp->type = type;
+ mp->conform_action_type = conform_action.action_type;
+ mp->conform_dscp = conform_action.dscp;
+ mp->exceed_action_type = exceed_action.action_type;
+ mp->exceed_dscp = exceed_action.dscp;
+ mp->violate_action_type = violate_action.action_type;
+ mp->violate_dscp = violate_action.dscp;
- if (deid_is_ip4) {
- mp->eid_is_ip4 = 1;
- clib_memcpy (mp->deid, &deid4, sizeof (deid4));
- } else {
- mp->eid_is_ip4 = 0;
- clib_memcpy (mp->deid, &deid6, sizeof (deid6));
- }
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
- mp->rloc_num = vec_len (rlocs);
- clib_memcpy (mp->rlocs, rlocs, (sizeof (rloc_t) * vec_len (rlocs)));
- vec_free (rlocs);
+static int
+api_policer_dump(vat_main_t *vam)
+{
+ unformat_input_t * i = vam->input;
+ vl_api_policer_dump_t *mp;
+ f64 timeout = ~0;
+ u8 *match_name = 0;
+ u8 match_name_valid = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "name %s", &match_name)) {
+ vec_add1 (match_name, 0);
+ match_name_valid = 1;
+ } else
+ break;
+ }
+ M(POLICER_DUMP, policer_dump);
+ mp->match_name_valid = match_name_valid;
+ clib_memcpy (mp->match_name, match_name, vec_len (match_name));
+ vec_free (match_name);
/* send it... */
S;
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
/* Wait for a reply... */
W;
}
static int
-api_lisp_gpe_add_del_iface(vat_main_t * vam)
+api_netmap_create (vat_main_t * vam)
{
- unformat_input_t * input = vam->input;
- vl_api_lisp_gpe_add_del_iface_t *mp;
- f64 timeout = ~0;
- u8 is_set = 0;
- u8 is_add = 1;
- u32 table_id, vni;
+ unformat_input_t * i = vam->input;
+ vl_api_netmap_create_t * mp;
+ f64 timeout;
+ u8 * if_name = 0;
+ u8 hw_addr[6];
+ u8 random_hw_addr = 1;
+ u8 is_pipe = 0;
+ u8 is_master = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(input, "up")) {
- is_set = 1;
- is_add = 1;
- } else if (unformat(input, "down")) {
- is_set = 1;
- is_add = 0;
- } else if (unformat(input, "table_id %d", &table_id)) {
- ;
- } else if (unformat(input, "vni %d", &vni)) {
- ;
- } else
- break;
+ memset (hw_addr, 0, sizeof (hw_addr));
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "name %s", &if_name))
+ vec_add1 (if_name, 0);
+ else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
+ random_hw_addr = 0;
+ else if (unformat (i, "pipe"))
+ is_pipe = 1;
+ else if (unformat (i, "master"))
+ is_master = 1;
+ else if (unformat (i, "slave"))
+ is_master = 0;
+ else
+ break;
}
- if (is_set == 0) {
- errmsg("Value not set\n");
+ if (!vec_len (if_name)) {
+ errmsg ("interface name must be specified");
return -99;
}
- /* Construct the API message */
- M(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
-
- mp->is_add = is_add;
- mp->table_id = table_id;
- mp->vni = vni;
+ if (vec_len (if_name) > 64) {
+ errmsg ("interface name too long");
+ return -99;
+ }
- /* send it... */
- S;
+ M(NETMAP_CREATE, netmap_create);
- /* Wait for a reply... */
- W;
+ clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
+ clib_memcpy (mp->hw_addr, hw_addr, 6);
+ mp->use_random_hw_addr = random_hw_addr;
+ mp->is_pipe = is_pipe;
+ mp->is_master = is_master;
+ vec_free (if_name);
+ S; W;
/* NOTREACHED */
return 0;
}
static int
-api_lisp_locator_set_dump(vat_main_t *vam)
+api_netmap_delete (vat_main_t * vam)
{
- vl_api_lisp_locator_set_dump_t *mp;
- f64 timeout = ~0;
+ unformat_input_t * i = vam->input;
+ vl_api_netmap_delete_t * mp;
+ f64 timeout;
+ u8 * if_name = 0;
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s%=16s%=16s%=16s\n",
- "Locator-set", "Locator", "Priority", "Weight");
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (i, "name %s", &if_name))
+ vec_add1 (if_name, 0);
+ else
+ break;
}
- M(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
- /* send it... */
- S;
+ if (!vec_len (if_name)) {
+ errmsg ("interface name must be specified");
+ return -99;
+ }
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t * mp;
- M(CONTROL_PING, control_ping);
- S;
+ if (vec_len (if_name) > 64) {
+ errmsg ("interface name too long");
+ return -99;
}
- /* Wait for a reply... */
- W;
+ M(NETMAP_DELETE, netmap_delete);
+
+ clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
+ vec_free (if_name);
+
+ S; W;
/* NOTREACHED */
return 0;
}
-static int
-api_lisp_local_eid_table_dump(vat_main_t *vam)
+static void vl_api_mpls_gre_tunnel_details_t_handler
+(vl_api_mpls_gre_tunnel_details_t * mp)
{
- vl_api_lisp_local_eid_table_dump_t *mp;
- f64 timeout = ~0;
+ vat_main_t * vam = &vat_main;
+ i32 i;
+ i32 len = ntohl(mp->nlabels);
+
+ if (mp->l2_only == 0) {
+ fformat(vam->ofp, "[%d]: src %U, dst %U, adj %U/%d, labels ",
+ ntohl(mp->tunnel_index),
+ format_ip4_address, &mp->tunnel_src,
+ format_ip4_address, &mp->tunnel_dst,
+ format_ip4_address, &mp->intfc_address,
+ ntohl(mp->mask_width));
+ for (i = 0; i < len; i++) {
+ fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
+ }
+ fformat(vam->ofp, "\n");
+ fformat(vam->ofp, " inner fib index %d, outer fib index %d\n",
+ ntohl(mp->inner_fib_index), ntohl(mp->outer_fib_index));
+ } else {
+ fformat(vam->ofp, "[%d]: src %U, dst %U, key %U, labels ",
+ ntohl(mp->tunnel_index),
+ format_ip4_address, &mp->tunnel_src,
+ format_ip4_address, &mp->tunnel_dst,
+ format_ip4_address, &mp->intfc_address);
+ for (i = 0; i < len; i++) {
+ fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
+ }
+ fformat(vam->ofp, "\n");
+ fformat(vam->ofp, " l2 interface %d, outer fib index %d\n",
+ ntohl(mp->hw_if_index), ntohl(mp->outer_fib_index));
+ }
+}
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s%=30s\n",
- "Locator-set", "Eid");
+static void vl_api_mpls_gre_tunnel_details_t_handler_json
+(vl_api_mpls_gre_tunnel_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ i32 i;
+ i32 len = ntohl(mp->nlabels);
+
+ 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);
- M(LISP_LOCAL_EID_TABLE_DUMP, lisp_local_eid_table_dump);
- /* send it... */
+ vat_json_init_object(node);
+ vat_json_object_add_uint(node, "tunnel_index", ntohl(mp->tunnel_index));
+ clib_memcpy(&ip4, &(mp->intfc_address), sizeof(ip4));
+ vat_json_object_add_ip4(node, "intfc_address", ip4);
+ vat_json_object_add_uint(node, "inner_fib_index", ntohl(mp->inner_fib_index));
+ vat_json_object_add_uint(node, "mask_width", ntohl(mp->mask_width));
+ vat_json_object_add_uint(node, "encap_index", ntohl(mp->encap_index));
+ vat_json_object_add_uint(node, "hw_if_index", ntohl(mp->hw_if_index));
+ vat_json_object_add_uint(node, "l2_only", ntohl(mp->l2_only));
+ clib_memcpy(&ip4, &(mp->tunnel_src), sizeof(ip4));
+ vat_json_object_add_ip4(node, "tunnel_src", ip4);
+ clib_memcpy(&ip4, &(mp->tunnel_dst), sizeof(ip4));
+ vat_json_object_add_ip4(node, "tunnel_dst", ip4);
+ vat_json_object_add_uint(node, "outer_fib_index", ntohl(mp->outer_fib_index));
+ vat_json_object_add_uint(node, "label_count", len);
+ for (i = 0; i < len; i++) {
+ vat_json_object_add_uint(node, "label", ntohl(mp->labels[i]));
+ }
+}
+
+static int api_mpls_gre_tunnel_dump (vat_main_t * vam)
+{
+ vl_api_mpls_gre_tunnel_dump_t *mp;
+ f64 timeout;
+ i32 index = -1;
+
+ /* 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;
+ }
+ }
+
+ fformat(vam->ofp, " tunnel_index %d\n", index);
+
+ M(MPLS_GRE_TUNNEL_DUMP, mpls_gre_tunnel_dump);
+ mp->tunnel_index = htonl(index);
S;
/* Use a control ping for synchronization */
M(CONTROL_PING, control_ping);
S;
}
- /* Wait for a reply... */
W;
+}
- /* NOTREACHED */
- return 0;
+static void vl_api_mpls_eth_tunnel_details_t_handler
+(vl_api_mpls_eth_tunnel_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ i32 i;
+ i32 len = ntohl(mp->nlabels);
+
+ fformat(vam->ofp, "[%d]: dst %U, adj %U/%d, labels ",
+ ntohl(mp->tunnel_index),
+ format_ethernet_address, &mp->tunnel_dst_mac,
+ format_ip4_address, &mp->intfc_address,
+ ntohl(mp->mask_width));
+ for (i = 0; i < len; i++) {
+ fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
+ }
+ fformat(vam->ofp, "\n");
+ fformat(vam->ofp, " tx on %d, rx fib index %d\n",
+ ntohl(mp->tx_sw_if_index),
+ ntohl(mp->inner_fib_index));
}
-static int
-api_lisp_gpe_tunnel_dump(vat_main_t *vam)
+static void vl_api_mpls_eth_tunnel_details_t_handler_json
+(vl_api_mpls_eth_tunnel_details_t * mp)
{
- vl_api_lisp_gpe_tunnel_dump_t *mp;
- f64 timeout = ~0;
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ i32 i;
+ i32 len = ntohl(mp->nlabels);
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s%=30s%=16s%=16s%=16s%=16s"
- "%=16s%=16s%=16s%=16s%=16s\n",
- "Tunel", "Source", "Destination", "Fib encap", "Fib decap",
- "Decap next", "Lisp version", "Flags", "Next protocol",
- "ver_res", "res", "iid");
+ 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);
- M(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump);
- /* send it... */
+ vat_json_init_object(node);
+ vat_json_object_add_uint(node, "tunnel_index", ntohl(mp->tunnel_index));
+ clib_memcpy(&ip4, &(mp->intfc_address), sizeof(ip4));
+ vat_json_object_add_ip4(node, "intfc_address", ip4);
+ vat_json_object_add_uint(node, "inner_fib_index", ntohl(mp->inner_fib_index));
+ vat_json_object_add_uint(node, "mask_width", ntohl(mp->mask_width));
+ vat_json_object_add_uint(node, "encap_index", ntohl(mp->encap_index));
+ vat_json_object_add_uint(node, "hw_if_index", ntohl(mp->hw_if_index));
+ vat_json_object_add_uint(node, "l2_only", ntohl(mp->l2_only));
+ vat_json_object_add_string_copy(node, "tunnel_dst_mac",
+ format(0, "%U", format_ethernet_address, &mp->tunnel_dst_mac));
+ vat_json_object_add_uint(node, "tx_sw_if_index", ntohl(mp->tx_sw_if_index));
+ vat_json_object_add_uint(node, "label_count", len);
+ for (i = 0; i < len; i++) {
+ vat_json_object_add_uint(node, "label", ntohl(mp->labels[i]));
+ }
+}
+
+static int api_mpls_eth_tunnel_dump (vat_main_t * vam)
+{
+ vl_api_mpls_eth_tunnel_dump_t *mp;
+ f64 timeout;
+ i32 index = -1;
+
+ /* 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;
+ }
+ }
+
+ fformat(vam->ofp, " tunnel_index %d\n", index);
+
+ M(MPLS_ETH_TUNNEL_DUMP, mpls_eth_tunnel_dump);
+ mp->tunnel_index = htonl(index);
S;
/* Use a control ping for synchronization */
M(CONTROL_PING, control_ping);
S;
}
- /* Wait for a reply... */
W;
+}
- /* NOTREACHED */
- return 0;
+static void vl_api_mpls_fib_encap_details_t_handler
+(vl_api_mpls_fib_encap_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ i32 i;
+ i32 len = ntohl(mp->nlabels);
+
+ fformat(vam->ofp, "table %d, dest %U, label ",
+ ntohl(mp->fib_index),
+ format_ip4_address, &mp->dest,
+ len);
+ for (i = 0; i < len; i++) {
+ fformat(vam->ofp, "%u ", ntohl(mp->labels[i]));
+ }
+ fformat(vam->ofp, "\n");
}
-static int
-api_lisp_map_resolver_dump(vat_main_t *vam)
+static void vl_api_mpls_fib_encap_details_t_handler_json
+(vl_api_mpls_fib_encap_details_t * mp)
{
- vl_api_lisp_map_resolver_dump_t *mp;
- f64 timeout = ~0;
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ i32 i;
+ i32 len = ntohl(mp->nlabels);
+ struct in_addr ip4;
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s\n",
- "Map resolver");
+ 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);
- M(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
- /* send it... */
+ vat_json_init_object(node);
+ vat_json_object_add_uint(node, "table", ntohl(mp->fib_index));
+ vat_json_object_add_uint(node, "entry_index", ntohl(mp->entry_index));
+ clib_memcpy(&ip4, &(mp->dest), sizeof(ip4));
+ vat_json_object_add_ip4(node, "dest", ip4);
+ vat_json_object_add_uint(node, "s_bit", ntohl(mp->s_bit));
+ vat_json_object_add_uint(node, "label_count", len);
+ for (i = 0; i < len; i++) {
+ vat_json_object_add_uint(node, "label", ntohl(mp->labels[i]));
+ }
+}
+
+static int api_mpls_fib_encap_dump (vat_main_t * vam)
+{
+ vl_api_mpls_fib_encap_dump_t *mp;
+ f64 timeout;
+
+ M(MPLS_FIB_ENCAP_DUMP, mpls_fib_encap_dump);
S;
/* Use a control ping for synchronization */
M(CONTROL_PING, control_ping);
S;
}
- /* Wait for a reply... */
W;
+}
- /* NOTREACHED */
- return 0;
+static void vl_api_mpls_fib_decap_details_t_handler
+(vl_api_mpls_fib_decap_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+
+ fformat(vam->ofp, "RX table %d, TX table/intfc %u, swif_tag '%s', label %u, s_bit %u\n",
+ ntohl(mp->rx_table_id),
+ ntohl(mp->tx_table_id),
+ mp->swif_tag,
+ ntohl(mp->label),
+ ntohl(mp->s_bit));
+}
+
+static void vl_api_mpls_fib_decap_details_t_handler_json
+(vl_api_mpls_fib_decap_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type) {
+ ASSERT(VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array(&vam->json_tree);
+ }
+ node = vat_json_array_add(&vam->json_tree);
+
+ vat_json_init_object(node);
+ vat_json_object_add_uint(node, "table", ntohl(mp->fib_index));
+ vat_json_object_add_uint(node, "entry_index", ntohl(mp->entry_index));
+ clib_memcpy(&ip4, &(mp->dest), sizeof(ip4));
+ vat_json_object_add_ip4(node, "dest", ip4);
+ vat_json_object_add_uint(node, "s_bit", ntohl(mp->s_bit));
+ vat_json_object_add_uint(node, "label", ntohl(mp->label));
+ vat_json_object_add_uint(node, "rx_table_id", ntohl(mp->rx_table_id));
+ vat_json_object_add_uint(node, "tx_table_id", ntohl(mp->tx_table_id));
+ vat_json_object_add_string_copy(node, "swif_tag", mp->swif_tag);
}
-static int
-api_lisp_enable_disable_status_dump(vat_main_t *vam)
+static int api_mpls_fib_decap_dump (vat_main_t * vam)
{
- vl_api_lisp_enable_disable_status_dump_t *mp;
- f64 timeout = ~0;
-
- if (!vam->json_output) {
- fformat(vam->ofp, "%=20s\n",
- "lisp status:");
- }
+ vl_api_mpls_fib_decap_dump_t *mp;
+ f64 timeout;
- M(LISP_ENABLE_DISABLE_STATUS_DUMP,
- lisp_enable_disable_status_dump);
- /* send it... */
+ M(MPLS_FIB_DECAP_DUMP, mpls_fib_decap_dump);
S;
/* Use a control ping for synchronization */
M(CONTROL_PING, control_ping);
S;
}
- /* Wait for a reply... */
W;
+}
+int api_classify_table_ids (vat_main_t *vam)
+{
+ vl_api_classify_table_ids_t *mp;
+ f64 timeout;
+
+ /* Construct the API message */
+ M(CLASSIFY_TABLE_IDS, classify_table_ids);
+ mp->context = 0;
+
+ S; W;
/* NOTREACHED */
return 0;
}
-static int
-api_af_packet_create (vat_main_t * vam)
+int api_classify_table_by_interface (vat_main_t *vam)
{
- unformat_input_t * i = vam->input;
- vl_api_af_packet_create_t * mp;
+ unformat_input_t * input = vam->input;
+ vl_api_classify_table_by_interface_t *mp;
f64 timeout;
- u8 * host_if_name = 0;
- u8 hw_addr[6];
- u8 random_hw_addr = 1;
-
- memset (hw_addr, 0, sizeof (hw_addr));
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &host_if_name))
- vec_add1 (host_if_name, 0);
- else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
- random_hw_addr = 0;
+ u32 sw_if_index = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (input, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (input, "sw_if_index %d", &sw_if_index))
+ ;
else
- break;
+ break;
}
-
- if (!vec_len (host_if_name)) {
- errmsg ("host-interface name must be specified");
+ if (sw_if_index == ~0) {
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (vec_len (host_if_name) > 64) {
- errmsg ("host-interface name too long");
+ /* Construct the API message */
+ M(CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface);
+ mp->context = 0;
+ mp->sw_if_index = ntohl(sw_if_index);
+
+ S; W;
+ /* NOTREACHED */
+ return 0;
+}
+
+int api_classify_table_info (vat_main_t *vam)
+{
+ unformat_input_t * input = vam->input;
+ vl_api_classify_table_info_t *mp;
+ f64 timeout;
+
+ u32 table_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (input, "table_id %d", &table_id))
+ ;
+ else
+ break;
+ }
+ if (table_id == ~0) {
+ errmsg ("missing table id\n");
return -99;
}
- M(AF_PACKET_CREATE, af_packet_create);
-
- clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
- clib_memcpy (mp->hw_addr, hw_addr, 6);
- mp->use_random_hw_addr = random_hw_addr;
- vec_free (host_if_name);
+ /* Construct the API message */
+ M(CLASSIFY_TABLE_INFO, classify_table_info);
+ mp->context = 0;
+ mp->table_id = ntohl(table_id);
S; W;
/* NOTREACHED */
return 0;
}
-static int
-api_af_packet_delete (vat_main_t * vam)
+int api_classify_session_dump (vat_main_t *vam)
{
- unformat_input_t * i = vam->input;
- vl_api_af_packet_delete_t * mp;
+ unformat_input_t * input = vam->input;
+ vl_api_classify_session_dump_t *mp;
f64 timeout;
- u8 * host_if_name = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &host_if_name))
- vec_add1 (host_if_name, 0);
+ u32 table_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (input, "table_id %d", &table_id))
+ ;
else
- break;
+ break;
}
-
- if (!vec_len (host_if_name)) {
- errmsg ("host-interface name must be specified");
+ if (table_id == ~0) {
+ errmsg ("missing table id\n");
return -99;
}
- if (vec_len (host_if_name) > 64) {
- errmsg ("host-interface name too long");
- return -99;
+ /* Construct the API message */
+ M(CLASSIFY_SESSION_DUMP, classify_session_dump);
+ mp->context = 0;
+ mp->table_id = ntohl(table_id);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
}
+ W;
+ /* NOTREACHED */
+ return 0;
+}
- M(AF_PACKET_DELETE, af_packet_delete);
+static void vl_api_ipfix_details_t_handler (vl_api_ipfix_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
- clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
- vec_free (host_if_name);
+ fformat(vam->ofp, "collector_address %U, collector_port %d, "
+ "src_address %U, fib_index %u, path_mtu %u, "
+ "template_interval %u\n",
+ format_ip4_address, mp->collector_address,
+ ntohs(mp->collector_port),
+ format_ip4_address, mp->src_address,
+ ntohl(mp->fib_index),
+ ntohl(mp->path_mtu),
+ ntohl(mp->template_interval));
+
+ vam->retval = 0;
+ vam->result_ready = 1;
+}
+
+static void vl_api_ipfix_details_t_handler_json
+(vl_api_ipfix_details_t * mp)
+{
+ vat_main_t * vam = &vat_main;
+ vat_json_node_t node;
+ struct in_addr collector_address;
+ struct in_addr src_address;
+
+ vat_json_init_object(&node);
+ clib_memcpy(&collector_address, &mp->collector_address,
+ sizeof(collector_address));
+ vat_json_object_add_ip4(&node, "collector_address", collector_address);
+ vat_json_object_add_uint(&node, "collector_port",
+ ntohs(mp->collector_port));
+ clib_memcpy(&src_address, &mp->src_address, sizeof(src_address));
+ vat_json_object_add_ip4(&node, "src_address", src_address);
+ vat_json_object_add_uint(&node, "fib_index", ntohl(mp->fib_index));
+ vat_json_object_add_uint(&node, "path_mtu", ntohl(mp->path_mtu));
+ vat_json_object_add_uint(&node, "template_interval",
+ ntohl(mp->template_interval));
+
+ vat_json_print(vam->ofp, &node);
+ vat_json_free(&node);
+ vam->retval = 0;
+ vam->result_ready = 1;
+}
+
+int api_ipfix_dump (vat_main_t *vam)
+{
+ vl_api_ipfix_dump_t *mp;
+ f64 timeout;
+
+ /* Construct the API message */
+ M(IPFIX_DUMP, ipfix_dump);
+ mp->context = 0;
S; W;
/* NOTREACHED */
return 0;
}
-static int
-api_policer_add_del (vat_main_t * vam)
+int api_pg_create_interface (vat_main_t *vam)
{
- unformat_input_t * i = vam->input;
- vl_api_policer_add_del_t * mp;
+ unformat_input_t * input = vam->input;
+ vl_api_pg_create_interface_t *mp;
f64 timeout;
- u8 is_add = 1;
- u8 * name = 0;
- u32 cir = 0;
- u32 eir = 0;
- u64 cb = 0;
- u64 eb = 0;
- u8 rate_type = 0;
- u8 round_type = 0;
- u8 type = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "name %s", &name))
- vec_add1 (name, 0);
- else if (unformat (i, "cir %u", &cir))
- ;
- else if (unformat (i, "eir %u", &eir))
- ;
- else if (unformat (i, "cb %u", &cb))
- ;
- else if (unformat (i, "eb %u", &eb))
- ;
- else if (unformat (i, "rate_type %U", unformat_policer_rate_type,
- &rate_type))
- ;
- else if (unformat (i, "round_type %U", unformat_policer_round_type,
- &round_type))
- ;
- else if (unformat (i, "type %U", unformat_policer_type, &type))
+ u32 if_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (input, "if_id %d", &if_id))
;
else
- break;
- }
-
- if (!vec_len (name)) {
- errmsg ("policer name must be specified");
- return -99;
+ break;
}
-
- if (vec_len (name) > 64) {
- errmsg ("policer name too long");
+ if (if_id == ~0) {
+ errmsg ("missing pg interface index\n");
return -99;
}
- M(POLICER_ADD_DEL, policer_add_del);
-
- clib_memcpy (mp->name, name, vec_len (name));
- vec_free (name);
- mp->is_add = is_add;
- mp->cir = cir;
- mp->eir = eir;
- mp->cb = cb;
- mp->eb = eb;
- mp->rate_type = rate_type;
- mp->round_type = round_type;
- mp->type = type;
+ /* Construct the API message */
+ M(PG_CREATE_INTERFACE, pg_create_interface);
+ mp->context = 0;
+ mp->interface_id = ntohl(if_id);
S; W;
/* NOTREACHED */
return 0;
}
-static int
-api_netmap_create (vat_main_t * vam)
+int api_pg_capture (vat_main_t *vam)
{
- unformat_input_t * i = vam->input;
- vl_api_netmap_create_t * mp;
+ unformat_input_t * input = vam->input;
+ vl_api_pg_capture_t *mp;
f64 timeout;
- u8 * if_name = 0;
- u8 hw_addr[6];
- u8 random_hw_addr = 1;
- u8 is_pipe = 0;
- u8 is_master = 0;
- memset (hw_addr, 0, sizeof (hw_addr));
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &if_name))
- vec_add1 (if_name, 0);
- else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
- random_hw_addr = 0;
- else if (unformat (i, "pipe"))
- is_pipe = 1;
- else if (unformat (i, "master"))
- is_master = 1;
- else if (unformat (i, "slave"))
- is_master = 0;
+ u32 if_id = ~0;
+ u8 enable = 1;
+ u32 count = 1;
+ u8 pcap_file_set = 0;
+ u8 * pcap_file = 0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (input, "if_id %d", &if_id))
+ ;
+ else if (unformat (input, "pcap %s", &pcap_file))
+ pcap_file_set = 1;
+ else if (unformat (input, "count %d", &count))
+ ;
+ else if (unformat (input, "disable"))
+ enable = 0;
else
- break;
+ break;
}
-
- if (!vec_len (if_name)) {
- errmsg ("interface name must be specified");
+ if (if_id == ~0) {
+ errmsg ("missing pg interface index\n");
return -99;
}
-
- if (vec_len (if_name) > 64) {
- errmsg ("interface name too long");
- return -99;
+ if (pcap_file_set>0) {
+ if (vec_len (pcap_file) > 255) {
+ errmsg ("pcap file name is too long\n");
+ return -99;
+ }
}
- M(NETMAP_CREATE, netmap_create);
-
- clib_memcpy (mp->if_name, if_name, vec_len (if_name));
- clib_memcpy (mp->hw_addr, hw_addr, 6);
- mp->use_random_hw_addr = random_hw_addr;
- mp->is_pipe = is_pipe;
- mp->is_master = is_master;
- vec_free (if_name);
+ u32 name_len = vec_len(pcap_file);
+ /* Construct the API message */
+ M(PG_CAPTURE, pg_capture);
+ mp->context = 0;
+ mp->interface_id = ntohl(if_id);
+ mp->is_enabled = enable;
+ mp->count = ntohl(count);
+ mp->pcap_name_length = ntohl(name_len);
+ if (pcap_file_set != 0) {
+ clib_memcpy(mp->pcap_file_name, pcap_file, name_len);
+ }
+ vec_free(pcap_file);
S; W;
/* NOTREACHED */
return 0;
}
-static int
-api_netmap_delete (vat_main_t * vam)
+int api_pg_enable_disable (vat_main_t *vam)
{
- unformat_input_t * i = vam->input;
- vl_api_netmap_delete_t * mp;
+ unformat_input_t * input = vam->input;
+ vl_api_pg_enable_disable_t *mp;
f64 timeout;
- u8 * if_name = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) {
- if (unformat (i, "name %s", &if_name))
- vec_add1 (if_name, 0);
+ u8 enable = 1;
+ u8 stream_name_set = 0;
+ u8 * stream_name = 0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) {
+ if (unformat (input, "stream %s", &stream_name))
+ stream_name_set = 1;
+ else if (unformat (input, "disable"))
+ enable = 0;
else
break;
}
- if (!vec_len (if_name)) {
- errmsg ("interface name must be specified");
- return -99;
+ if (stream_name_set>0) {
+ if (vec_len (stream_name) > 255) {
+ errmsg ("stream name too long\n");
+ return -99;
+ }
}
- if (vec_len (if_name) > 64) {
- errmsg ("interface name too long");
- return -99;
+ u32 name_len = vec_len(stream_name);
+ /* Construct the API message */
+ M(PG_ENABLE_DISABLE, pg_enable_disable);
+ mp->context = 0;
+ mp->is_enabled = enable;
+ if (stream_name_set != 0) {
+ mp->stream_name_length = ntohl(name_len);
+ clib_memcpy(mp->stream_name, stream_name, name_len);
}
-
- M(NETMAP_DELETE, netmap_delete);
-
- clib_memcpy (mp->if_name, if_name, vec_len (if_name));
- vec_free (if_name);
+ vec_free(stream_name);
S; W;
/* NOTREACHED */
"bd_id <bridge-domain-id> [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [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]\n") \
+ "mac <mac-addr> bd_id <bridge-domain-id> [del] | sw_if <intfc> | sw_if_index <id> [static] [filter] [bvi] [count <nn>]\n") \
_(l2_flags, \
"sw_if <intfc> | sw_if_index <id> [learn] [forward] [uu-flood] [flood]\n") \
_(bridge_flags, \
_(sw_interface_set_unnumbered, \
"<intfc> | sw_if_index <id> unnum_if_index <id> [del]") \
_(ip_neighbor_add_del, \
- "<intfc> | sw_if_index <id> dst <ip46-address> mac <mac-addr>") \
+ "(<intfc> | sw_if_index <id>) dst <ip46-address> " \
+ "[mac <mac-addr>] [vrf <vrf-id>] [is_static] [del]") \
_(reset_vrf, "vrf <id> [ipv6]") \
_(create_vlan_subif, "<intfc> | sw_if_index <id> vlan <n>") \
_(create_subif, "<intfc> | sw_if_index <id> sub_id <n>\n" \
"[nolink] [isno]") \
_(sw_interface_ip6nd_ra_config, \
"<intfc> | sw_if_index <id> [maxint <n>] [minint <n>]\n" \
- "[life <n>] [count <n>] [interval <n>] [surpress]\n" \
+ "[life <n>] [count <n>] [interval <n>] [suppress]\n" \
"[managed] [other] [ll] [send] [cease] [isno] [def]") \
_(set_arp_neighbor_limit, "arp_nbr_limit <n> [ipv6]") \
_(l2_patch_add_del, \
"lookup_v6_src | lookup_v6_dst | lookup_session_id") \
_(sw_if_l2tpv3_tunnel_dump, "") \
_(vxlan_add_del_tunnel, \
- "src <ip4-addr> dst <ip4-addr> vni <vni> [encap-vrf-id <nn>]\n" \
+ "src <ip-addr> dst <ip-addr> vni <vni> [encap-vrf-id <nn>]\n" \
" [decap-next l2|ip4|ip6] [del]") \
_(vxlan_tunnel_dump, "[<intfc> | sw_if_index <nn>]") \
_(gre_add_del_tunnel, \
_(delete_vhost_user_if, "<intfc> | sw_if_index <nn>") \
_(sw_interface_vhost_user_dump, "") \
_(show_version, "") \
-_(vxlan_gpe_add_del_tunnel, \
- "local <ip4-addr> remote <ip4-addr> vni <nn>\n" \
- "[encap-vrf-id <nn>] [decap-vrf-id <nn>] [next-ip4][next-ip6]" \
- "[next-ethernet] [next-nsh]\n") \
+_(vxlan_gpe_add_del_tunnel, \
+ "local <addr> remote <addr> vni <nn>\n" \
+ "[encap-vrf-id <nn>] [decap-vrf-id <nn>] [next-ip4][next-ip6]" \
+ "[next-ethernet] [next-nsh]\n") \
+_(vxlan_gpe_tunnel_dump, "[<intfc> | sw_if_index <nn>]") \
_(l2_fib_table_dump, "bd_id <bridge-domain-id>") \
_(interface_name_renumber, \
"<intfc> | sw_if_index <nn> new_show_dev_instance <nn>") \
_(lisp_enable_disable, "enable|disable") \
_(lisp_gpe_add_del_iface, "up|down") \
_(lisp_add_del_remote_mapping, "add|del vni <vni> deid <dest-eid> seid" \
- " <src-eid> rloc <locator> " \
- "[rloc <loc> ... ]") \
+ " <src-eid> rloc <locator> p <prio> " \
+ "w <weight> [rloc <loc> ... ] " \
+ "action <action>") \
+_(lisp_add_del_adjacency, "add|del vni <vni> deid <dest-eid> seid " \
+ "<src-eid> rloc <locator> p <prio> w <weight>"\
+ "[rloc <loc> ... ] action <action>") \
+_(lisp_pitr_set_locator_set, "locator-set <loc-set-name> | del") \
+_(lisp_add_del_map_request_itr_rlocs, "<loc-set-name> [del]") \
+_(lisp_eid_table_add_del_map, "[del] vni <vni> vrf <vrf>") \
_(lisp_locator_set_dump, "") \
_(lisp_local_eid_table_dump, "") \
+_(lisp_eid_table_map_dump, "") \
_(lisp_gpe_tunnel_dump, "") \
_(lisp_map_resolver_dump, "") \
_(lisp_enable_disable_status_dump, "") \
+_(lisp_get_map_request_itr_rlocs, "") \
+_(show_lisp_pitr, "") \
_(af_packet_create, "name <host interface name> [hw_addr <mac>]") \
_(af_packet_delete, "name <host interface name>") \
_(policer_add_del, "name <policer name> <params> [del]") \
+_(policer_dump, "[name <policer name>]") \
_(netmap_create, "name <interface name> [hw-addr <mac>] [pipe] " \
"[master|slave]") \
-_(netmap_delete, "name <interface name>")
+_(netmap_delete, "name <interface name>") \
+_(mpls_gre_tunnel_dump, "tunnel_index <tunnel-id>") \
+_(mpls_eth_tunnel_dump, "tunnel_index <tunnel-id>") \
+_(mpls_fib_encap_dump, "") \
+_(mpls_fib_decap_dump, "") \
+_(classify_table_ids, "") \
+_(classify_table_by_interface, "sw_if_index <sw_if_index>") \
+_(classify_table_info, "table_id <nn>") \
+_(classify_session_dump, "table_id <nn>") \
+_(ipfix_enable, "collector_address <ip4> [collector_port <nn>] " \
+ "src_address <ip4> [fib_id <nn>] [path_mtu <nn>] " \
+ "[template_interval <nn>]") \
+_(ipfix_dump, "") \
+_(get_next_index, "node-name <node-name> next-node-name <node-name>") \
+_(pg_create_interface, "if_id <nn>") \
+_(pg_capture, "if_id <nnn> pcap <file_name> count <nnn> [disable]") \
+_(pg_enable_disable, "[stream <id>] disable")
/* List of command functions, CLI names map directly to functions */
#define foreach_cli_function \
#undef vl_api_version
#define vl_api_version(n,v) static u32 vpe_api_version = v;
-#include <api/vpe.api.h>
+#include <vpp-api/vpe.api.h>
#undef vl_api_version
void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp)