*------------------------------------------------------------------
* api_format.c
*
- * Copyright (c) 2014 Cisco and/or its affiliates.
+ * Copyright (c) 2014-2016 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
#include <vnet/l2/l2_vtr.h>
#include <vnet/classify/input_acl.h>
#include <vnet/classify/policer_classify.h>
+#include <vnet/classify/flow_classify.h>
#include <vnet/mpls/mpls.h>
-#if DPDK > 0
#include <vnet/ipsec/ipsec.h>
#include <vnet/ipsec/ikev2.h>
-#else
#include <inttypes.h>
-#endif
#include <vnet/map/map.h>
#include <vnet/cop/cop.h>
#include <vnet/ip/ip6_hop_by_hop.h>
#include <vnet/ip/ip_source_and_port_range_check.h>
#include <vnet/policer/xlate.h>
+#include <vnet/span/span.h>
#include <vnet/policer/policer.h>
#include <vnet/policer/police.h>
#include "vat/json_format.h"
+#include <inttypes.h>
#include <sys/stat.h>
#define vl_typedefs /* define message structures */
uword
unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
{
-#if DPDK > 0
u32 *r = va_arg (*args, u32 *);
if (0);
else
return 0;
return 1;
-#else
- return 0;
-#endif
}
uword
unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
{
-#if DPDK > 0
u32 *r = va_arg (*args, u32 *);
if (0);
else
return 0;
return 1;
-#else
- return 0;
-#endif
}
u8 *
format_ipsec_crypto_alg (u8 * s, va_list * args)
{
-#if DPDK > 0
u32 i = va_arg (*args, u32);
u8 *t = 0;
return format (s, "unknown");
}
return format (s, "%s", t);
-#else
- return format (s, "Unimplemented");
-#endif
}
uword
unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
{
-#if DPDK > 0
u32 *r = va_arg (*args, u32 *);
if (0);
else
return 0;
return 1;
-#else
- return 0;
-#endif
}
u8 *
format_ipsec_integ_alg (u8 * s, va_list * args)
{
-#if DPDK > 0
u32 i = va_arg (*args, u32);
u8 *t = 0;
return format (s, "unknown");
}
return format (s, "%s", t);
-#else
- return format (s, "Unsupported");
-#endif
}
uword
unformat_ikev2_auth_method (unformat_input_t * input, va_list * args)
{
-#if DPDK > 0
u32 *r = va_arg (*args, u32 *);
if (0);
else
return 0;
return 1;
-#else
- return 0;
-#endif
}
uword
unformat_ikev2_id_type (unformat_input_t * input, va_list * args)
{
-#if DPDK > 0
u32 *r = va_arg (*args, u32 *);
if (0);
else
return 0;
return 1;
-#else
- return 0;
-#endif
}
uword
}
uword
-unformat_classify_table_type (unformat_input_t * input, va_list * va)
+unformat_policer_classify_table_type (unformat_input_t * input, va_list * va)
{
u32 *r = va_arg (*va, u32 *);
u32 tid;
return 1;
}
+uword
+unformat_flow_classify_table_type (unformat_input_t * input, va_list * va)
+{
+ u32 *r = va_arg (*va, u32 *);
+ u32 tid;
+
+ if (unformat (input, "ip4"))
+ tid = FLOW_CLASSIFY_TABLE_IP4;
+ else if (unformat (input, "ip6"))
+ tid = FLOW_CLASSIFY_TABLE_IP6;
+ else
+ return 0;
+
+ *r = tid;
+ return 1;
+}
+
u8 *
format_ip4_address (u8 * s, va_list * args)
{
vam->result_ready = 1;
}
-static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler
- (vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl (mp->retval);
- u32 sw_if_index = ntohl (mp->tunnel_sw_if_index);
-
- if (retval >= 0 && sw_if_index != (u32) ~ 0)
- {
- errmsg ("tunnel_sw_if_index %d\n", sw_if_index);
- }
- vam->retval = retval;
- vam->result_ready = 1;
-}
-
-static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler_json
- (vl_api_mpls_gre_add_del_tunnel_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
-
- vat_json_init_object (&node);
- vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
- vat_json_object_add_uint (&node, "tunnel_sw_if_index",
- ntohl (mp->tunnel_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_show_version_reply_t_handler
(vl_api_show_version_reply_t * mp)
{
vam->result_ready = 1;
}
-static void vl_api_mpls_ethernet_add_del_tunnel_reply_t_handler
- (vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
+static void vl_api_mpls_tunnel_add_del_reply_t_handler
+ (vl_api_mpls_tunnel_add_del_reply_t * mp)
{
vat_main_t *vam = &vat_main;
i32 retval = ntohl (mp->retval);
}
}
-static void vl_api_mpls_ethernet_add_del_tunnel_reply_t_handler_json
- (vl_api_mpls_ethernet_add_del_tunnel_reply_t * mp)
+static void vl_api_mpls_tunnel_add_del_reply_t_handler_json
+ (vl_api_mpls_tunnel_add_del_reply_t * mp)
{
vat_main_t *vam = &vat_main;
vat_json_node_t node;
vat_json_init_object (&node);
vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
vat_json_object_add_uint (&node, "tunnel_sw_if_index",
- ntohl (mp->tunnel_sw_if_index));
+ ntohl (mp->sw_if_index));
vat_json_print (vam->ofp, &node);
vat_json_free (&node);
mp->seid, mp->seid_prefix_len, mp->is_src_dst);
vec_add1 (eid, 0);
- fformat (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-d\n",
+ fformat (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-20d%-10d%-20s\n",
clib_net_to_host_u32 (mp->vni),
eid,
mp->is_local ? "local" : "remote",
- s, clib_net_to_host_u32 (mp->ttl), mp->authoritative);
+ s, clib_net_to_host_u32 (mp->ttl), mp->authoritative,
+ clib_net_to_host_u16 (mp->key_id), mp->key);
+
vec_free (s);
vec_free (eid);
}
vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni));
vat_json_object_add_uint (node, "ttl", clib_net_to_host_u32 (mp->ttl));
vat_json_object_add_uint (node, "authoritative", (mp->authoritative));
+
+ if (mp->key_id)
+ {
+ vat_json_object_add_uint (node, "key_id",
+ clib_net_to_host_u16 (mp->key_id));
+ vat_json_object_add_string_copy (node, "key", mp->key);
+ }
vec_free (eid);
}
vec_free (next_decap_str);
}
+static void
+ vl_api_show_lisp_map_register_state_reply_t_handler
+ (vl_api_show_lisp_map_register_state_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ int retval = clib_net_to_host_u32 (mp->retval);
+
+ fformat (vam->ofp, "%s\n", mp->is_enabled ? "enabled" : "disabled");
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void
+ vl_api_show_lisp_map_register_state_reply_t_handler_json
+ (vl_api_show_lisp_map_register_state_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t _node, *node = &_node;
+ int retval = clib_net_to_host_u32 (mp->retval);
+
+ u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled");
+
+ vat_json_init_object (node);
+ vat_json_object_add_string_copy (node, "state", s);
+
+ vat_json_print (vam->ofp, node);
+ vat_json_free (node);
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+ vec_free (s);
+}
+
+static void
+ vl_api_show_lisp_rloc_probe_state_reply_t_handler
+ (vl_api_show_lisp_rloc_probe_state_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ int retval = clib_net_to_host_u32 (mp->retval);
+
+ if (retval)
+ goto end;
+
+ fformat (vam->ofp, "%s\n", mp->is_enabled ? "enabled" : "disabled");
+end:
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void
+ vl_api_show_lisp_rloc_probe_state_reply_t_handler_json
+ (vl_api_show_lisp_rloc_probe_state_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t _node, *node = &_node;
+ int retval = clib_net_to_host_u32 (mp->retval);
+
+ u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled");
+ vat_json_init_object (node);
+ vat_json_object_add_string_copy (node, "state", s);
+
+ vat_json_print (vam->ofp, node);
+ vat_json_free (node);
+
+ vam->retval = retval;
+ vam->result_ready = 1;
+ vec_free (s);
+}
+
+static void
+ vl_api_lisp_adjacencies_get_reply_t_handler
+ (vl_api_lisp_adjacencies_get_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ u32 i, n;
+ int retval = clib_net_to_host_u32 (mp->retval);
+ vl_api_lisp_adjacency_t *a;
+
+ if (retval)
+ goto end;
+
+ n = clib_net_to_host_u32 (mp->count);
+
+ for (i = 0; i < n; i++)
+ {
+ a = &mp->adjacencies[i];
+ fformat (vam->ofp, "%U %40U\n",
+ format_lisp_flat_eid, a->eid_type, a->leid, a->leid_prefix_len,
+ format_lisp_flat_eid, a->eid_type, a->reid,
+ a->reid_prefix_len);
+ }
+
+end:
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void
+ vl_api_lisp_adjacencies_get_reply_t_handler_json
+ (vl_api_lisp_adjacencies_get_reply_t * mp)
+{
+ u8 *s = 0;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *e = 0, root;
+ u32 i, n;
+ int retval = clib_net_to_host_u32 (mp->retval);
+ vl_api_lisp_adjacency_t *a;
+
+ if (retval)
+ goto end;
+
+ n = clib_net_to_host_u32 (mp->count);
+ vat_json_init_array (&root);
+
+ for (i = 0; i < n; i++)
+ {
+ e = vat_json_array_add (&root);
+ a = &mp->adjacencies[i];
+
+ vat_json_init_object (e);
+ s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->leid,
+ a->leid_prefix_len);
+ vec_add1 (s, 0);
+ vat_json_object_add_string_copy (e, "leid", s);
+ vec_free (s);
+
+ s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->reid,
+ a->reid_prefix_len);
+ vec_add1 (s, 0);
+ vat_json_object_add_string_copy (e, "reid", s);
+ vec_free (s);
+ }
+
+ vat_json_print (vam->ofp, &root);
+ vat_json_free (&root);
+
+end:
+ vam->retval = retval;
+ vam->result_ready = 1;
+}
+
+static void
+vl_api_lisp_map_server_details_t_handler (vl_api_lisp_map_server_details_t
+ * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ fformat (vam->ofp, "%=20U\n",
+ mp->is_ipv6 ? format_ip6_address : format_ip4_address,
+ mp->ip_address);
+}
+
+static void
+ vl_api_lisp_map_server_details_t_handler_json
+ (vl_api_lisp_map_server_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in6_addr ip6;
+ struct in_addr ip4;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "map-server", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "map-server", ip4);
+ }
+}
+
static void
vl_api_lisp_map_resolver_details_t_handler (vl_api_lisp_map_resolver_details_t
* mp)
vam->result_ready = 1;
}
+static void vl_api_flow_classify_details_t_handler
+ (vl_api_flow_classify_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ fformat (vam->ofp, "%10d%20d\n", ntohl (mp->sw_if_index),
+ ntohl (mp->table_index));
+}
+
+static void vl_api_flow_classify_details_t_handler_json
+ (vl_api_flow_classify_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index));
+}
+
+
+
#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler
#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler
#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler
#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler
+#define vl_api_lisp_adjacencies_get_reply_t_endian vl_noop_handler
+#define vl_api_lisp_adjacencies_get_reply_t_print vl_noop_handler
/*
* Generate boilerplate reply handlers, which
_(sw_interface_set_flags_reply) \
_(sw_interface_add_del_address_reply) \
_(sw_interface_set_table_reply) \
+_(sw_interface_set_mpls_enable_reply) \
_(sw_interface_set_vpath_reply) \
+_(sw_interface_set_vxlan_bypass_reply) \
_(sw_interface_set_l2_bridge_reply) \
+_(sw_interface_set_dpdk_hqos_pipe_reply) \
+_(sw_interface_set_dpdk_hqos_subport_reply) \
+_(sw_interface_set_dpdk_hqos_tctbl_reply) \
_(bridge_domain_add_del_reply) \
_(sw_interface_set_l2_xconnect_reply) \
_(l2fib_add_del_reply) \
_(ip_add_del_route_reply) \
+_(mpls_route_add_del_reply) \
+_(mpls_ip_bind_unbind_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) \
_(lisp_add_del_adjacency_reply) \
_(lisp_gpe_add_del_fwd_entry_reply) \
_(lisp_add_del_map_resolver_reply) \
+_(lisp_add_del_map_server_reply) \
_(lisp_gpe_enable_disable_reply) \
_(lisp_gpe_add_del_iface_reply) \
_(lisp_enable_disable_reply) \
+_(lisp_rloc_probe_enable_disable_reply) \
+_(lisp_map_register_enable_disable_reply) \
_(lisp_pitr_set_locator_set_reply) \
_(lisp_map_request_mode_reply) \
_(lisp_add_del_map_request_itr_rlocs_reply) \
_(set_ipfix_exporter_reply) \
_(set_ipfix_classify_stream_reply) \
_(ipfix_classify_table_add_del_reply) \
+_(flow_classify_set_interface_reply) \
+_(sw_interface_span_enable_disable_reply) \
_(pg_capture_reply) \
_(pg_enable_disable_reply) \
_(ip_source_and_port_range_check_add_del_reply) \
_(ip_source_and_port_range_check_interface_add_del_reply)\
-_(delete_subif_reply)
+_(delete_subif_reply) \
+_(l2_interface_pbb_tag_rewrite_reply) \
+_(punt_reply) \
+_(feature_enable_disable_reply) \
+_(sw_interface_tag_add_del_reply) \
+_(sw_interface_set_mtu_reply)
#define _(n) \
static void vl_api_##n##_t_handler \
_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \
sw_interface_add_del_address_reply) \
_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \
+_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \
_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \
+_(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \
_(SW_INTERFACE_SET_L2_XCONNECT_REPLY, \
sw_interface_set_l2_xconnect_reply) \
_(SW_INTERFACE_SET_L2_BRIDGE_REPLY, \
sw_interface_set_l2_bridge_reply) \
+_(SW_INTERFACE_SET_DPDK_HQOS_PIPE_REPLY, \
+ sw_interface_set_dpdk_hqos_pipe_reply) \
+_(SW_INTERFACE_SET_DPDK_HQOS_SUBPORT_REPLY, \
+ sw_interface_set_dpdk_hqos_subport_reply) \
+_(SW_INTERFACE_SET_DPDK_HQOS_TCTBL_REPLY, \
+ sw_interface_set_dpdk_hqos_tctbl_reply) \
_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply) \
_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \
_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details) \
_(TAP_DELETE_REPLY, tap_delete_reply) \
_(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_details) \
_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply) \
+_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \
+_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \
_(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply) \
_(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY, \
proxy_arp_intfc_enable_disable_reply) \
-_(MPLS_ADD_DEL_ENCAP_REPLY, mpls_add_del_encap_reply) \
-_(MPLS_ADD_DEL_DECAP_REPLY, mpls_add_del_decap_reply) \
-_(MPLS_GRE_ADD_DEL_TUNNEL_REPLY, mpls_gre_add_del_tunnel_reply) \
-_(MPLS_ETHERNET_ADD_DEL_TUNNEL_REPLY, \
- mpls_ethernet_add_del_tunnel_reply) \
-_(MPLS_ETHERNET_ADD_DEL_TUNNEL_2_REPLY, \
- mpls_ethernet_add_del_tunnel_2_reply) \
+_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \
_(SW_INTERFACE_SET_UNNUMBERED_REPLY, \
sw_interface_set_unnumbered_reply) \
_(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply) \
_(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_ADD_DEL_MAP_SERVER_REPLY, lisp_add_del_map_server_reply) \
_(LISP_GPE_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply) \
_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_reply) \
+_(LISP_MAP_REGISTER_ENABLE_DISABLE_REPLY, \
+ lisp_map_register_enable_disable_reply) \
+_(LISP_RLOC_PROBE_ENABLE_DISABLE_REPLY, \
+ lisp_rloc_probe_enable_disable_reply) \
_(LISP_PITR_SET_LOCATOR_SET_REPLY, lisp_pitr_set_locator_set_reply) \
_(LISP_MAP_REQUEST_MODE_REPLY, lisp_map_request_mode_reply) \
_(LISP_EID_TABLE_ADD_DEL_MAP_REPLY, lisp_eid_table_add_del_map_reply) \
_(LISP_EID_TABLE_VNI_DETAILS, lisp_eid_table_vni_details) \
_(LISP_GPE_TUNNEL_DETAILS, lisp_gpe_tunnel_details) \
_(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details) \
+_(LISP_MAP_SERVER_DETAILS, lisp_map_server_details) \
+_(LISP_ADJACENCIES_GET_REPLY, lisp_adjacencies_get_reply) \
_(SHOW_LISP_STATUS_REPLY, show_lisp_status_reply) \
_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY, \
lisp_add_del_map_request_itr_rlocs_reply) \
lisp_get_map_request_itr_rlocs_reply) \
_(SHOW_LISP_PITR_REPLY, show_lisp_pitr_reply) \
_(SHOW_LISP_MAP_REQUEST_MODE_REPLY, show_lisp_map_request_mode_reply) \
+_(SHOW_LISP_RLOC_PROBE_STATE_REPLY, show_lisp_rloc_probe_state_reply) \
+_(SHOW_LISP_MAP_REGISTER_STATE_REPLY, \
+ show_lisp_map_register_state_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_CLASSIFY_DETAILS, policer_classify_details) \
_(NETMAP_CREATE_REPLY, netmap_create_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) \
+_(MPLS_TUNNEL_DETAILS, mpls_tunnel_details) \
+_(MPLS_FIB_DETAILS, mpls_fib_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) \
_(IPFIX_CLASSIFY_STREAM_DETAILS, ipfix_classify_stream_details) \
_(IPFIX_CLASSIFY_TABLE_ADD_DEL_REPLY, ipfix_classify_table_add_del_reply) \
_(IPFIX_CLASSIFY_TABLE_DETAILS, ipfix_classify_table_details) \
+_(FLOW_CLASSIFY_SET_INTERFACE_REPLY, flow_classify_set_interface_reply) \
+_(FLOW_CLASSIFY_DETAILS, flow_classify_details) \
+_(SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY, sw_interface_span_enable_disable_reply) \
+_(SW_INTERFACE_SPAN_DETAILS, sw_interface_span_details) \
_(GET_NEXT_INDEX_REPLY, get_next_index_reply) \
_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply) \
_(PG_CAPTURE_REPLY, pg_capture_reply) \
ip_source_and_port_range_check_interface_add_del_reply) \
_(IPSEC_GRE_ADD_DEL_TUNNEL_REPLY, ipsec_gre_add_del_tunnel_reply) \
_(IPSEC_GRE_TUNNEL_DETAILS, ipsec_gre_tunnel_details) \
-_(DELETE_SUBIF_REPLY, delete_subif_reply)
+_(DELETE_SUBIF_REPLY, delete_subif_reply) \
+_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \
+_(PUNT_REPLY, punt_reply) \
+_(IP_FIB_DETAILS, ip_fib_details) \
+_(IP6_FIB_DETAILS, ip6_fib_details) \
+_(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \
+_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \
+_(L2_XCONNECT_DETAILS, l2_xconnect_details) \
+_(SW_INTERFACE_SET_MTU_REPLY, sw_interface_set_mtu_reply) \
+_(IP_NEIGHBOR_DETAILS, ip_neighbor_details)
/* M: construct, but don't yet send a message */
strncpy ((char *) mp->name_filter, "lo", sizeof (mp->name_filter) - 1);
S;
+ /* and packet-generator interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "pg", sizeof (mp->name_filter) - 1);
+ S;
/* and vxlan-gpe tunnel interfaces */
M (SW_INTERFACE_DUMP, sw_interface_dump);
}
static int
-api_sw_interface_add_del_address (vat_main_t * vam)
+api_sw_interface_set_dpdk_hqos_pipe (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_add_del_address_t *mp;
+ vl_api_sw_interface_set_dpdk_hqos_pipe_t *mp;
f64 timeout;
u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 is_add = 1, del_all = 0;
- u32 address_length = 0;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
+ u32 subport;
+ u8 subport_set = 0;
+ u32 pipe;
+ u8 pipe_set = 0;
+ u32 profile;
+ u8 profile_set = 0;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del-all"))
- del_all = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ if (unformat (i, "rx %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))
+ else if (unformat (i, "sw_if_index %u", &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "%U/%d",
- unformat_ip4_address, &v4address, &address_length))
- v4_address_set = 1;
- else if (unformat (i, "%U/%d",
- unformat_ip6_address, &v6address, &address_length))
- v6_address_set = 1;
+ else if (unformat (i, "subport %u", &subport))
+ subport_set = 1;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "pipe %u", &pipe))
+ pipe_set = 1;
+ else if (unformat (i, "profile %u", &profile))
+ profile_set = 1;
else
break;
}
errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (v4_address_set && v6_address_set)
+
+ if (subport_set == 0)
{
- errmsg ("both v4 and v6 addresses set\n");
+ errmsg ("missing subport \n");
return -99;
}
- if (!v4_address_set && !v6_address_set && !del_all)
+
+ if (pipe_set == 0)
{
- errmsg ("no addresses set\n");
+ errmsg ("missing pipe\n");
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->del_all = del_all;
- if (v6_address_set)
+ if (profile_set == 0)
{
- mp->is_ipv6 = 1;
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
- }
- else
- {
- clib_memcpy (mp->address, &v4address, sizeof (v4address));
+ errmsg ("missing profile\n");
+ return -99;
}
- mp->address_length = address_length;
- /* send it... */
- S;
+ M (SW_INTERFACE_SET_DPDK_HQOS_PIPE, sw_interface_set_dpdk_hqos_pipe);
- /* Wait for a reply, return good/bad news */
- W;
-}
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->subport = ntohl (subport);
+ mp->pipe = ntohl (pipe);
+ mp->profile = ntohl (profile);
-static int
-api_sw_interface_set_table (vat_main_t * vam)
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_sw_interface_set_dpdk_hqos_subport (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_table_t *mp;
+ vl_api_sw_interface_set_dpdk_hqos_subport_t *mp;
f64 timeout;
- u32 sw_if_index, vrf_id = 0;
+ u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 is_ipv6 = 0;
+ u32 subport;
+ u8 subport_set = 0;
+ u32 tb_rate = 1250000000; /* 10GbE */
+ u32 tb_size = 1000000;
+ u32 tc_rate[] = { 1250000000, 1250000000, 1250000000, 1250000000 };
+ u32 tc_period = 10;
/* 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))
+ if (unformat (i, "rx %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))
+ else if (unformat (i, "sw_if_index %u", &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "vrf %d", &vrf_id))
+ else if (unformat (i, "subport %u", &subport))
+ subport_set = 1;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "rate %u", &tb_rate))
+ {
+ u32 tc_id;
+
+ for (tc_id = 0; tc_id < (sizeof (tc_rate) / sizeof (tc_rate[0]));
+ tc_id++)
+ tc_rate[tc_id] = tb_rate;
+ }
+ else if (unformat (i, "bktsize %u", &tb_size))
+ ;
+ else if (unformat (i, "tc0 %u", &tc_rate[0]))
+ ;
+ else if (unformat (i, "tc1 %u", &tc_rate[1]))
+ ;
+ else if (unformat (i, "tc2 %u", &tc_rate[2]))
+ ;
+ else if (unformat (i, "tc3 %u", &tc_rate[3]))
+ ;
+ else if (unformat (i, "period %u", &tc_period))
;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
else
break;
}
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_SET_TABLE, sw_interface_set_table);
+ if (subport_set == 0)
+ {
+ errmsg ("missing subport \n");
+ return -99;
+ }
+
+ M (SW_INTERFACE_SET_DPDK_HQOS_SUBPORT, sw_interface_set_dpdk_hqos_subport);
mp->sw_if_index = ntohl (sw_if_index);
- mp->is_ipv6 = is_ipv6;
- mp->vrf_id = ntohl (vrf_id);
+ mp->subport = ntohl (subport);
+ mp->tb_rate = ntohl (tb_rate);
+ mp->tb_size = ntohl (tb_size);
+ mp->tc_rate[0] = ntohl (tc_rate[0]);
+ mp->tc_rate[1] = ntohl (tc_rate[1]);
+ mp->tc_rate[2] = ntohl (tc_rate[2]);
+ mp->tc_rate[3] = ntohl (tc_rate[3]);
+ mp->tc_period = ntohl (tc_period);
- /* send it... */
S;
-
- /* Wait for a reply... */
W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_sw_interface_set_vpath (vat_main_t * vam)
+api_sw_interface_set_dpdk_hqos_tctbl (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_vpath_t *mp;
+ vl_api_sw_interface_set_dpdk_hqos_tctbl_t *mp;
f64 timeout;
- u32 sw_if_index = 0;
+ u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 is_enable = 0;
+ u8 entry_set = 0;
+ u8 tc_set = 0;
+ u8 queue_set = 0;
+ u32 entry, tc, queue;
/* 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))
+ if (unformat (i, "rx %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))
+ else if (unformat (i, "sw_if_index %u", &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "enable"))
- is_enable = 1;
- else if (unformat (i, "disable"))
- is_enable = 0;
+ else if (unformat (i, "entry %d", &entry))
+ entry_set = 1;
+ else if (unformat (i, "tc %d", &tc))
+ tc_set = 1;
+ else if (unformat (i, "queue %d", &queue))
+ queue_set = 1;
else
break;
}
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
+ if (entry_set == 0)
+ {
+ errmsg ("missing entry \n");
+ return -99;
+ }
+
+ if (tc_set == 0)
+ {
+ errmsg ("missing traffic class \n");
+ return -99;
+ }
+
+ if (queue_set == 0)
+ {
+ errmsg ("missing queue \n");
+ return -99;
+ }
+
+ M (SW_INTERFACE_SET_DPDK_HQOS_TCTBL, sw_interface_set_dpdk_hqos_tctbl);
mp->sw_if_index = ntohl (sw_if_index);
- mp->enable = is_enable;
+ mp->entry = ntohl (entry);
+ mp->tc = ntohl (tc);
+ mp->queue = ntohl (queue);
- /* send it... */
S;
-
- /* Wait for a reply... */
W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_sw_interface_set_l2_xconnect (vat_main_t * vam)
+api_sw_interface_add_del_address (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_l2_xconnect_t *mp;
+ vl_api_sw_interface_add_del_address_t *mp;
f64 timeout;
- u32 rx_sw_if_index;
- u8 rx_sw_if_index_set = 0;
- u32 tx_sw_if_index;
- u8 tx_sw_if_index_set = 0;
- u8 enable = 1;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 is_add = 1, del_all = 0;
+ u32 address_length = 0;
+ u8 v4_address_set = 0;
+ u8 v6_address_set = 0;
+ ip4_address_t v4address;
+ ip6_address_t v6address;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "rx"))
- {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- }
- else
- break;
- }
- else if (unformat (i, "tx"))
- {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- }
- else
- break;
- }
- else if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
+ if (unformat (i, "del-all"))
+ del_all = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ 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 if (unformat (i, "%U/%d",
+ unformat_ip4_address, &v4address, &address_length))
+ v4_address_set = 1;
+ else if (unformat (i, "%U/%d",
+ unformat_ip6_address, &v6address, &address_length))
+ v6_address_set = 1;
else
break;
}
- if (rx_sw_if_index_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing rx interface name or rx_sw_if_index\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
-
- if (enable && (tx_sw_if_index_set == 0))
+ if (v4_address_set && v6_address_set)
{
- errmsg ("missing tx interface name or tx_sw_if_index\n");
+ errmsg ("both v4 and v6 addresses set\n");
+ return -99;
+ }
+ if (!v4_address_set && !v6_address_set && !del_all)
+ {
+ errmsg ("no addresses set\n");
return -99;
}
- M (SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
+ /* Construct the API message */
+ M (SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address);
- mp->rx_sw_if_index = ntohl (rx_sw_if_index);
- mp->tx_sw_if_index = ntohl (tx_sw_if_index);
- mp->enable = enable;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+ mp->del_all = del_all;
+ if (v6_address_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->address, &v6address, sizeof (v6address));
+ }
+ else
+ {
+ clib_memcpy (mp->address, &v4address, sizeof (v4address));
+ }
+ mp->address_length = address_length;
+ /* send it... */
S;
+
+ /* Wait for a reply, return good/bad news */
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_sw_interface_set_l2_bridge (vat_main_t * vam)
+api_sw_interface_set_mpls_enable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_l2_bridge_t *mp;
+ vl_api_sw_interface_set_mpls_enable_t *mp;
f64 timeout;
- u32 rx_sw_if_index;
- u8 rx_sw_if_index_set = 0;
- u32 bd_id;
- u8 bd_id_set = 0;
- u8 bvi = 0;
- u32 shg = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
u8 enable = 1;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "bd_id %d", &bd_id))
- bd_id_set = 1;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "shg %d", &shg))
- ;
- else if (unformat (i, "bvi"))
- bvi = 1;
- else if (unformat (i, "enable"))
- enable = 1;
+ 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, "disable"))
enable = 0;
+ else if (unformat (i, "dis"))
+ enable = 0;
else
break;
}
- if (rx_sw_if_index_set == 0)
- {
- errmsg ("missing rx interface name or sw_if_index\n");
- return -99;
- }
-
- if (enable && (bd_id_set == 0))
+ if (sw_if_index_set == 0)
{
- errmsg ("missing bridge domain\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_MPLS_ENABLE, sw_interface_set_mpls_enable);
- mp->rx_sw_if_index = ntohl (rx_sw_if_index);
- mp->bd_id = ntohl (bd_id);
- mp->shg = (u8) shg;
- mp->bvi = bvi;
+ mp->sw_if_index = ntohl (sw_if_index);
mp->enable = enable;
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_bridge_domain_dump (vat_main_t * vam)
+api_sw_interface_set_table (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_bridge_domain_dump_t *mp;
+ vl_api_sw_interface_set_table_t *mp;
f64 timeout;
- u32 bd_id = ~0;
+ u32 sw_if_index, vrf_id = 0;
+ u8 sw_if_index_set = 0;
+ u8 is_ipv6 = 0;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "bd_id %d", &bd_id))
+ 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, "vrf %d", &vrf_id))
;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
else
break;
}
- M (BRIDGE_DOMAIN_DUMP, bridge_domain_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;
- }
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
- W;
- /* NOTREACHED */
- return 0;
-}
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_TABLE, sw_interface_set_table);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_ipv6 = is_ipv6;
+ mp->vrf_id = ntohl (vrf_id);
+
+ /* send it... */
+ S;
+
+ /* Wait for a reply... */
+ W;
+}
static int
-api_bridge_domain_add_del (vat_main_t * vam)
+api_sw_interface_set_vpath (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_bridge_domain_add_del_t *mp;
+ vl_api_sw_interface_set_vpath_t *mp;
f64 timeout;
- u32 bd_id = ~0;
- u8 is_add = 1;
- u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0;
+ u32 sw_if_index = 0;
+ u8 sw_if_index_set = 0;
+ u8 is_enable = 0;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "bd_id %d", &bd_id))
- ;
- else if (unformat (i, "flood %d", &flood))
- ;
- else if (unformat (i, "uu-flood %d", &uu_flood))
- ;
- else if (unformat (i, "forward %d", &forward))
- ;
- else if (unformat (i, "learn %d", &learn))
- ;
- else if (unformat (i, "arp-term %d", &arp_term))
- ;
- else if (unformat (i, "del"))
- {
- is_add = 0;
- flood = uu_flood = forward = learn = 0;
- }
+ 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"))
+ is_enable = 1;
+ else if (unformat (i, "disable"))
+ is_enable = 0;
else
break;
}
- if (bd_id == ~0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing bridge domain\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_VPATH, sw_interface_set_vpath);
- mp->bd_id = ntohl (bd_id);
- mp->flood = flood;
- mp->uu_flood = uu_flood;
- mp->forward = forward;
- mp->learn = learn;
- mp->arp_term = arp_term;
- mp->is_add = is_add;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable = is_enable;
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_l2fib_add_del (vat_main_t * vam)
+api_sw_interface_set_vxlan_bypass (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2fib_add_del_t *mp;
+ vl_api_sw_interface_set_vxlan_bypass_t *mp;
f64 timeout;
- u64 mac = 0;
- u8 mac_set = 0;
- u32 bd_id;
- u8 bd_id_set = 0;
- u32 sw_if_index;
+ u32 sw_if_index = 0;
u8 sw_if_index_set = 0;
- u8 is_add = 1;
- u8 static_mac = 0;
- u8 filter_mac = 0;
- u8 bvi_mac = 0;
- int count = 1;
- f64 before = 0;
- int j;
+ u8 is_enable = 0;
+ u8 is_ipv6 = 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))
- mac_set = 1;
- else if (unformat (i, "bd_id %d", &bd_id))
- bd_id_set = 1;
+ 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, "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;
- }
- else
- break;
- }
- else if (unformat (i, "static"))
- static_mac = 1;
- else if (unformat (i, "filter"))
- {
- 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;
- else if (unformat (i, "count %d", &count))
- ;
+ else if (unformat (i, "enable"))
+ is_enable = 1;
+ else if (unformat (i, "disable"))
+ is_enable = 0;
+ else if (unformat (i, "ip4"))
+ is_ipv6 = 0;
+ else if (unformat (i, "ip6"))
+ is_ipv6 = 1;
else
break;
}
- if (mac_set == 0)
- {
- errmsg ("missing mac address\n");
- return -99;
- }
-
- if (bd_id_set == 0)
- {
- errmsg ("missing bridge domain\n");
- return -99;
- }
-
- if (is_add && (sw_if_index_set == 0))
+ if (sw_if_index_set == 0)
{
errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- 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;
- }
-
- if (count > 1)
- {
- vl_api_control_ping_t *mp;
- f64 after;
-
- /* 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;
+ /* Construct the API message */
+ M (SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass);
- out:
- if (vam->retval == -99)
- errmsg ("timeout\n");
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable = is_enable;
+ mp->is_ipv6 = is_ipv6;
- 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);
+ /* send it... */
+ S;
- fformat (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
- count, after - before, count / (after - before));
- }
- else
- {
- /* Wait for a reply... */
- W;
- }
- /* Return the good/bad news */
- return (vam->retval);
+ /* Wait for a reply... */
+ W;
}
static int
-api_l2_flags (vat_main_t * vam)
+api_sw_interface_set_l2_xconnect (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2_flags_t *mp;
+ vl_api_sw_interface_set_l2_xconnect_t *mp;
f64 timeout;
- u32 sw_if_index;
- u32 feature_bitmap = 0;
- u8 sw_if_index_set = 0;
+ u32 rx_sw_if_index;
+ u8 rx_sw_if_index_set = 0;
+ u32 tx_sw_if_index;
+ u8 tx_sw_if_index_set = 0;
+ u8 enable = 1;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sw_if"))
+ if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ else if (unformat (i, "rx"))
{
if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
}
else
break;
}
- else if (unformat (i, "learn"))
- feature_bitmap |= L2INPUT_FEAT_LEARN;
- else if (unformat (i, "forward"))
- feature_bitmap |= L2INPUT_FEAT_FWD;
- else if (unformat (i, "flood"))
- feature_bitmap |= L2INPUT_FEAT_FLOOD;
- else if (unformat (i, "uu-flood"))
- feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
+ else if (unformat (i, "tx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
else
break;
}
- if (sw_if_index_set == 0)
+ if (rx_sw_if_index_set == 0)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("missing rx interface name or rx_sw_if_index\n");
return -99;
}
- M (L2_FLAGS, l2_flags);
+ if (enable && (tx_sw_if_index_set == 0))
+ {
+ errmsg ("missing tx interface name or tx_sw_if_index\n");
+ return -99;
+ }
- mp->sw_if_index = ntohl (sw_if_index);
- mp->feature_bitmap = ntohl (feature_bitmap);
+ M (SW_INTERFACE_SET_L2_XCONNECT, sw_interface_set_l2_xconnect);
+
+ mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+ mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+ mp->enable = enable;
S;
W;
}
static int
-api_bridge_flags (vat_main_t * vam)
+api_sw_interface_set_l2_bridge (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_bridge_flags_t *mp;
+ vl_api_sw_interface_set_l2_bridge_t *mp;
f64 timeout;
+ u32 rx_sw_if_index;
+ u8 rx_sw_if_index_set = 0;
u32 bd_id;
u8 bd_id_set = 0;
- u8 is_set = 1;
- u32 flags = 0;
+ u8 bvi = 0;
+ u32 shg = 0;
+ u8 enable = 1;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "bd_id %d", &bd_id))
+ if (unformat (i, "sw_if_index %d", &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "bd_id %d", &bd_id))
bd_id_set = 1;
- else if (unformat (i, "learn"))
- flags |= L2_LEARN;
- else if (unformat (i, "forward"))
- flags |= L2_FWD;
- else if (unformat (i, "flood"))
- flags |= L2_FLOOD;
- else if (unformat (i, "uu-flood"))
- flags |= L2_UU_FLOOD;
- else if (unformat (i, "arp-term"))
- flags |= L2_ARP_TERM;
- else if (unformat (i, "off"))
- is_set = 0;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "shg %d", &shg))
+ ;
+ else if (unformat (i, "bvi"))
+ bvi = 1;
+ else if (unformat (i, "enable"))
+ enable = 1;
else if (unformat (i, "disable"))
- is_set = 0;
+ enable = 0;
else
break;
}
- if (bd_id_set == 0)
+ if (rx_sw_if_index_set == 0)
+ {
+ errmsg ("missing rx interface name or sw_if_index\n");
+ return -99;
+ }
+
+ if (enable && (bd_id_set == 0))
{
errmsg ("missing bridge domain\n");
return -99;
}
- M (BRIDGE_FLAGS, bridge_flags);
+ M (SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge);
+ mp->rx_sw_if_index = ntohl (rx_sw_if_index);
mp->bd_id = ntohl (bd_id);
- mp->feature_bitmap = ntohl (flags);
- mp->is_set = is_set;
+ mp->shg = (u8) shg;
+ mp->bvi = bvi;
+ mp->enable = enable;
S;
W;
}
static int
-api_bd_ip_mac_add_del (vat_main_t * vam)
+api_bridge_domain_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_bd_ip_mac_add_del_t *mp;
+ vl_api_bridge_domain_dump_t *mp;
f64 timeout;
- u32 bd_id;
- u8 is_ipv6 = 0;
- u8 is_add = 1;
- u8 bd_id_set = 0;
- u8 ip_set = 0;
- u8 mac_set = 0;
- ip4_address_t v4addr;
- ip6_address_t v6addr;
- u8 macaddr[6];
-
+ u32 bd_id = ~0;
/* 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++;
- }
- else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
- {
- ip_set++;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
- {
- ip_set++;
- is_ipv6++;
- }
- else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
- {
- mac_set++;
- }
- else if (unformat (i, "del"))
- is_add = 0;
+ ;
else
break;
}
- if (bd_id_set == 0)
- {
- errmsg ("missing bridge domain\n");
- return -99;
- }
- else if (ip_set == 0)
- {
- errmsg ("missing IP address\n");
- return -99;
- }
- else if (mac_set == 0)
- {
- errmsg ("missing MAC address\n");
- return -99;
- }
-
- M (BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
-
+ M (BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
mp->bd_id = ntohl (bd_id);
- mp->is_ipv6 = is_ipv6;
- mp->is_add = is_add;
- if (is_ipv6)
- clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
- else
- clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
- clib_memcpy (mp->mac_address, macaddr, 6);
S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+
W;
/* NOTREACHED */
return 0;
}
static int
-api_tap_connect (vat_main_t * vam)
+api_bridge_domain_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_tap_connect_t *mp;
+ vl_api_bridge_domain_add_del_t *mp;
f64 timeout;
- u8 mac_address[6];
- u8 random_mac = 1;
- u8 name_set = 0;
- u8 *tap_name;
-
- memset (mac_address, 0, sizeof (mac_address));
+ u32 bd_id = ~0;
+ u8 is_add = 1;
+ u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 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, "bd_id %d", &bd_id))
+ ;
+ else if (unformat (i, "flood %d", &flood))
+ ;
+ else if (unformat (i, "uu-flood %d", &uu_flood))
+ ;
+ else if (unformat (i, "forward %d", &forward))
+ ;
+ else if (unformat (i, "learn %d", &learn))
+ ;
+ else if (unformat (i, "arp-term %d", &arp_term))
+ ;
+ else if (unformat (i, "del"))
{
- random_mac = 0;
+ is_add = 0;
+ flood = uu_flood = forward = learn = 0;
}
- else if (unformat (i, "random-mac"))
- random_mac = 1;
- else if (unformat (i, "tapname %s", &tap_name))
- name_set = 1;
else
break;
}
- if (name_set == 0)
+ if (bd_id == ~0)
{
- errmsg ("missing tap name\n");
+ errmsg ("missing bridge domain\n");
return -99;
}
- if (vec_len (tap_name) > 63)
- {
- errmsg ("tap name too long\n");
- }
- vec_add1 (tap_name, 0);
- /* Construct the API message */
- M (TAP_CONNECT, tap_connect);
+ M (BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del);
- mp->use_random_mac = random_mac;
- clib_memcpy (mp->mac_address, mac_address, 6);
- clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
- vec_free (tap_name);
+ mp->bd_id = ntohl (bd_id);
+ mp->flood = flood;
+ mp->uu_flood = uu_flood;
+ mp->forward = forward;
+ mp->learn = learn;
+ mp->arp_term = arp_term;
+ mp->is_add = is_add;
- /* send it... */
S;
-
- /* Wait for a reply... */
W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_tap_modify (vat_main_t * vam)
+api_l2fib_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_tap_modify_t *mp;
+ vl_api_l2fib_add_del_t *mp;
f64 timeout;
- u8 mac_address[6];
- u8 random_mac = 1;
- u8 name_set = 0;
- u8 *tap_name;
+ u64 mac = 0;
+ u8 mac_set = 0;
+ u32 bd_id;
+ u8 bd_id_set = 0;
u32 sw_if_index = ~0;
u8 sw_if_index_set = 0;
-
- memset (mac_address, 0, sizeof (mac_address));
+ 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)
{
- if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
+ if (unformat (i, "mac %U", unformat_ethernet_address, &mac))
+ mac_set = 1;
+ else if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+ else if (unformat (i, "sw_if"))
{
- random_mac = 0;
+ 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;
+ }
+ else
+ break;
}
- else if (unformat (i, "random-mac"))
- random_mac = 1;
- else if (unformat (i, "tapname %s", &tap_name))
- name_set = 1;
- else
- break;
- }
-
- if (sw_if_index_set == 0)
- {
- errmsg ("missing vpp interface name");
- return -99;
- }
- if (name_set == 0)
- {
- errmsg ("missing tap name\n");
- return -99;
- }
- if (vec_len (tap_name) > 63)
- {
- errmsg ("tap name too long\n");
- }
- vec_add1 (tap_name, 0);
-
- /* Construct the API message */
- M (TAP_MODIFY, tap_modify);
-
- mp->use_random_mac = random_mac;
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->mac_address, mac_address, 6);
- clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
- vec_free (tap_name);
-
- /* send it... */
- S;
-
- /* Wait for a reply... */
- W;
-}
-
-static int
-api_tap_delete (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_tap_delete_t *mp;
- f64 timeout;
- u32 sw_if_index = ~0;
- 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))
- sw_if_index_set = 1;
- else
- break;
- }
-
- if (sw_if_index_set == 0)
- {
- errmsg ("missing vpp interface name");
- return -99;
- }
-
- /* Construct the API message */
- M (TAP_DELETE, tap_delete);
-
- mp->sw_if_index = ntohl (sw_if_index);
-
- /* send it... */
- S;
-
- /* Wait for a reply... */
- W;
-}
-
-static int
-api_ip_add_del_route (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_ip_add_del_route_t *mp;
- f64 timeout;
- 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;
- u8 create_vrf_if_needed = 0;
- u8 is_add = 1;
- u8 next_hop_weight = 1;
- u8 not_last = 0;
- u8 is_multipath = 0;
- u8 address_set = 0;
- u8 address_length_set = 0;
- u32 lookup_in_vrf = 0;
- u32 resolve_attempts = 0;
- u32 dst_address_length = 0;
- u8 next_hop_set = 0;
- ip4_address_t v4_dst_address, v4_next_hop_address;
- ip6_address_t v6_dst_address, v6_next_hop_address;
- int count = 1;
- int j;
- f64 before = 0;
- u32 random_add_del = 0;
- u32 *random_vector = 0;
- uword *random_hash;
- u32 random_seed = 0xdeaddabe;
- u32 classify_table_index = ~0;
- u8 is_classify = 0;
- u8 resolve_host, resolve_attached;
-
- /* 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, "%U", unformat_ip4_address, &v4_dst_address))
- {
- address_set = 1;
- is_ipv6 = 0;
- }
- else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address))
- {
- address_set = 1;
- is_ipv6 = 1;
- }
- else if (unformat (i, "/%d", &dst_address_length))
- {
- address_length_set = 1;
- }
-
- else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
- &v4_next_hop_address))
- {
- next_hop_set = 1;
- }
- else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
- &v6_next_hop_address))
- {
- next_hop_set = 1;
- }
- else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
- ;
- else if (unformat (i, "weight %d", &next_hop_weight))
- ;
- else if (unformat (i, "drop"))
- {
- is_drop = 1;
- }
- else if (unformat (i, "local"))
+ else if (unformat (i, "static"))
+ static_mac = 1;
+ else if (unformat (i, "filter"))
{
- is_local = 1;
+ filter_mac = 1;
+ static_mac = 1;
}
- else if (unformat (i, "classify %d", &classify_table_index))
+ else if (unformat (i, "bvi"))
{
- is_classify = 1;
+ bvi_mac = 1;
+ static_mac = 1;
}
else if (unformat (i, "del"))
is_add = 0;
- else if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "not-last"))
- not_last = 1;
- else if (unformat (i, "resolve-via-host"))
- resolve_host = 1;
- else if (unformat (i, "resolve-via-attached"))
- resolve_attached = 1;
- else if (unformat (i, "multipath"))
- is_multipath = 1;
- else if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "create-vrf"))
- create_vrf_if_needed = 1;
else if (unformat (i, "count %d", &count))
;
- else if (unformat (i, "lookup-in-vrf %d", &lookup_in_vrf))
- ;
- else if (unformat (i, "random"))
- random_add_del = 1;
- else if (unformat (i, "seed %d", &random_seed))
- ;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (resolve_attempts > 0 && sw_if_index_set == 0)
- {
- errmsg ("ARP resolution needs explicit interface or sw_if_index\n");
- return -99;
+ break;
}
- if (!next_hop_set && !is_drop && !is_local && !is_classify)
+ if (mac_set == 0)
{
- errmsg ("next hop / local / drop / classify not set\n");
+ errmsg ("missing mac address\n");
return -99;
}
- if (address_set == 0)
+ if (bd_id_set == 0)
{
- errmsg ("missing addresses\n");
+ errmsg ("missing bridge domain\n");
return -99;
}
- if (address_length_set == 0)
+ if (is_add && sw_if_index_set == 0 && filter_mac == 0)
{
- errmsg ("missing address length\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- /* Generate a pile of unique, random routes */
- if (random_add_del)
- {
- u32 this_random_address;
- random_hash = hash_create (count, sizeof (uword));
-
- hash_set (random_hash, v4_next_hop_address.as_u32, 1);
- for (j = 0; j <= count; j++)
- {
- do
- {
- this_random_address = random_u32 (&random_seed);
- this_random_address =
- clib_host_to_net_u32 (this_random_address);
- }
- while (hash_get (random_hash, this_random_address));
- vec_add1 (random_vector, this_random_address);
- hash_set (random_hash, this_random_address, 1);
- }
- hash_free (random_hash);
- v4_dst_address.as_u32 = random_vector[0];
- }
-
if (count > 1)
{
/* Turn on async mode */
for (j = 0; j < count; j++)
{
- /* Construct the API message */
- M (IP_ADD_DEL_ROUTE, ip_add_del_route);
-
- mp->next_hop_sw_if_index = ntohl (sw_if_index);
- mp->vrf_id = ntohl (vrf_id);
- if (resolve_attempts > 0)
- {
- mp->resolve_attempts = ntohl (resolve_attempts);
- mp->resolve_if_needed = 1;
- }
- mp->create_vrf_if_needed = create_vrf_if_needed;
+ M (L2FIB_ADD_DEL, l2fib_add_del);
+ mp->mac = mac;
+ mp->bd_id = ntohl (bd_id);
mp->is_add = is_add;
- mp->is_drop = is_drop;
- mp->is_ipv6 = is_ipv6;
- mp->is_local = is_local;
- mp->is_classify = is_classify;
- mp->is_multipath = is_multipath;
- mp->is_resolve_host = resolve_host;
- mp->is_resolve_attached = resolve_attached;
- mp->not_last = not_last;
- mp->next_hop_weight = next_hop_weight;
- mp->dst_address_length = dst_address_length;
- mp->lookup_in_vrf = ntohl (lookup_in_vrf);
- mp->classify_table_index = ntohl (classify_table_index);
- if (is_ipv6)
- {
- clib_memcpy (mp->dst_address, &v6_dst_address,
- sizeof (v6_dst_address));
- if (next_hop_set)
- clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
- sizeof (v6_next_hop_address));
- increment_v6_address (&v6_dst_address);
- }
- else
+ if (is_add)
{
- clib_memcpy (mp->dst_address, &v4_dst_address,
- sizeof (v4_dst_address));
- if (next_hop_set)
- clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
- sizeof (v4_next_hop_address));
- if (random_add_del)
- v4_dst_address.as_u32 = random_vector[j + 1];
- else
- increment_v4_address (&v4_dst_address);
+ 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;
}
- /* When testing multiple add/del ops, use a control-ping to sync */
if (count > 1)
{
vl_api_control_ping_t *mp;
/* Wait for a reply... */
W;
}
-
/* Return the good/bad news */
return (vam->retval);
}
static int
-api_proxy_arp_add_del (vat_main_t * vam)
+api_l2_flags (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_proxy_arp_add_del_t *mp;
+ vl_api_l2_flags_t *mp;
f64 timeout;
- u32 vrf_id = 0;
- u8 is_add = 1;
- ip4_address_t lo, hi;
- u8 range_set = 0;
+ u32 sw_if_index;
+ u32 feature_bitmap = 0;
+ 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, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "%U - %U", unformat_ip4_address, &lo,
- unformat_ip4_address, &hi))
- range_set = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else if (unformat (i, "sw_if"))
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ 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;
+ }
+ else
+ break;
}
+ else if (unformat (i, "learn"))
+ feature_bitmap |= L2INPUT_FEAT_LEARN;
+ else if (unformat (i, "forward"))
+ feature_bitmap |= L2INPUT_FEAT_FWD;
+ else if (unformat (i, "flood"))
+ feature_bitmap |= L2INPUT_FEAT_FLOOD;
+ else if (unformat (i, "uu-flood"))
+ feature_bitmap |= L2INPUT_FEAT_UU_FLOOD;
+ else
+ break;
}
- if (range_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("address range not set\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (PROXY_ARP_ADD_DEL, proxy_arp_add_del);
+ M (L2_FLAGS, l2_flags);
- mp->vrf_id = ntohl (vrf_id);
- mp->is_add = is_add;
- clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address));
- clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address));
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->feature_bitmap = ntohl (feature_bitmap);
S;
W;
}
static int
-api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
+api_bridge_flags (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_proxy_arp_intfc_enable_disable_t *mp;
+ vl_api_bridge_flags_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;
+ u8 is_set = 1;
+ u32 flags = 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;
+ if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
+ else if (unformat (i, "learn"))
+ flags |= L2_LEARN;
+ else if (unformat (i, "forward"))
+ flags |= L2_FWD;
+ else if (unformat (i, "flood"))
+ flags |= L2_FLOOD;
+ else if (unformat (i, "uu-flood"))
+ flags |= L2_UU_FLOOD;
+ else if (unformat (i, "arp-term"))
+ flags |= L2_ARP_TERM;
+ else if (unformat (i, "off"))
+ is_set = 0;
else if (unformat (i, "disable"))
- enable = 0;
+ is_set = 0;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (sw_if_index_set == 0)
+ if (bd_id_set == 0)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("missing bridge domain\n");
return -99;
}
- M (PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
+ M (BRIDGE_FLAGS, bridge_flags);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable_disable = enable;
+ mp->bd_id = ntohl (bd_id);
+ mp->feature_bitmap = ntohl (flags);
+ mp->is_set = is_set;
S;
W;
}
static int
-api_mpls_add_del_decap (vat_main_t * vam)
+api_bd_ip_mac_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_mpls_add_del_decap_t *mp;
+ vl_api_bd_ip_mac_add_del_t *mp;
f64 timeout;
- u32 rx_vrf_id = 0;
- u32 tx_vrf_id = 0;
- u32 label = 0;
+ u32 bd_id;
+ u8 is_ipv6 = 0;
u8 is_add = 1;
- u8 s_bit = 1;
- u32 next_index = 1;
+ u8 bd_id_set = 0;
+ u8 ip_set = 0;
+ u8 mac_set = 0;
+ ip4_address_t v4addr;
+ ip6_address_t v6addr;
+ u8 macaddr[6];
+
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
- ;
- else if (unformat (i, "tx_vrf_id %d", &tx_vrf_id))
- ;
- else if (unformat (i, "label %d", &label))
- ;
- else if (unformat (i, "next-index %d", &next_index))
- ;
+ if (unformat (i, "bd_id %d", &bd_id))
+ {
+ bd_id_set++;
+ }
+ else if (unformat (i, "%U", unformat_ip4_address, &v4addr))
+ {
+ ip_set++;
+ }
+ else if (unformat (i, "%U", unformat_ip6_address, &v6addr))
+ {
+ ip_set++;
+ is_ipv6++;
+ }
+ else if (unformat (i, "%U", unformat_ethernet_address, macaddr))
+ {
+ mac_set++;
+ }
else if (unformat (i, "del"))
is_add = 0;
- else if (unformat (i, "s-bit-clear"))
- s_bit = 0;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
+ }
+
+ if (bd_id_set == 0)
+ {
+ errmsg ("missing bridge domain\n");
+ return -99;
+ }
+ else if (ip_set == 0)
+ {
+ errmsg ("missing IP address\n");
+ return -99;
+ }
+ else if (mac_set == 0)
+ {
+ errmsg ("missing MAC address\n");
+ return -99;
}
- M (MPLS_ADD_DEL_DECAP, mpls_add_del_decap);
+ M (BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del);
- mp->rx_vrf_id = ntohl (rx_vrf_id);
- mp->tx_vrf_id = ntohl (tx_vrf_id);
- mp->label = ntohl (label);
- mp->next_index = ntohl (next_index);
- mp->s_bit = s_bit;
+ mp->bd_id = ntohl (bd_id);
+ mp->is_ipv6 = is_ipv6;
mp->is_add = is_add;
-
+ if (is_ipv6)
+ clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr));
+ else
+ clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr));
+ clib_memcpy (mp->mac_address, macaddr, 6);
S;
W;
/* NOTREACHED */
}
static int
-api_mpls_add_del_encap (vat_main_t * vam)
+api_tap_connect (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_mpls_add_del_encap_t *mp;
+ vl_api_tap_connect_t *mp;
f64 timeout;
- u32 vrf_id = 0;
- u32 *labels = 0;
- u32 label;
- ip4_address_t dst_address;
- u8 is_add = 1;
+ u8 mac_address[6];
+ u8 random_mac = 1;
+ u8 name_set = 0;
+ u8 *tap_name;
+ u8 *tag = 0;
+
+ memset (mac_address, 0, sizeof (mac_address));
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "vrf %d", &vrf_id))
- ;
- else if (unformat (i, "label %d", &label))
- vec_add1 (labels, ntohl (label));
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
- ;
- else if (unformat (i, "del"))
- is_add = 0;
- else
+ if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ random_mac = 0;
}
+ else if (unformat (i, "random-mac"))
+ random_mac = 1;
+ else if (unformat (i, "tapname %s", &tap_name))
+ name_set = 1;
+ else if (unformat (i, "tag %s", &tag))
+ ;
+ else
+ break;
}
- if (vec_len (labels) == 0)
+ if (name_set == 0)
+ {
+ errmsg ("missing tap name\n");
+ return -99;
+ }
+ if (vec_len (tap_name) > 63)
{
- errmsg ("missing encap label stack\n");
+ errmsg ("tap name too long\n");
return -99;
}
+ vec_add1 (tap_name, 0);
- M2 (MPLS_ADD_DEL_ENCAP, mpls_add_del_encap,
- sizeof (u32) * vec_len (labels));
+ if (vec_len (tag) > 63)
+ {
+ errmsg ("tag too long\n");
+ return -99;
+ }
- mp->vrf_id = ntohl (vrf_id);
- clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
- mp->is_add = is_add;
- mp->nlabels = vec_len (labels);
- clib_memcpy (mp->labels, labels, sizeof (u32) * mp->nlabels);
+ /* Construct the API message */
+ M (TAP_CONNECT, tap_connect);
- vec_free (labels);
+ mp->use_random_mac = random_mac;
+ clib_memcpy (mp->mac_address, mac_address, 6);
+ clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+ if (tag)
+ clib_memcpy (mp->tag, tag, vec_len (tag));
+
+ vec_free (tap_name);
+ vec_free (tag);
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_mpls_gre_add_del_tunnel (vat_main_t * vam)
+api_tap_modify (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_mpls_gre_add_del_tunnel_t *mp;
+ vl_api_tap_modify_t *mp;
f64 timeout;
- u32 inner_vrf_id = 0;
- u32 outer_vrf_id = 0;
- ip4_address_t src_address;
- ip4_address_t dst_address;
- ip4_address_t intfc_address;
- u32 tmp;
- u8 intfc_address_length = 0;
- u8 is_add = 1;
- u8 l2_only = 0;
+ u8 mac_address[6];
+ u8 random_mac = 1;
+ u8 name_set = 0;
+ u8 *tap_name;
+ u32 sw_if_index = ~0;
+ u8 sw_if_index_set = 0;
+
+ memset (mac_address, 0, sizeof (mac_address));
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
- ;
- else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
- ;
- else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
- ;
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
- ;
- else if (unformat (i, "adj %U/%d", unformat_ip4_address,
- &intfc_address, &tmp))
- intfc_address_length = tmp;
- else if (unformat (i, "l2-only"))
- l2_only = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- 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 if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ random_mac = 0;
}
- }
-
- M (MPLS_GRE_ADD_DEL_TUNNEL, mpls_gre_add_del_tunnel);
-
- mp->inner_vrf_id = ntohl (inner_vrf_id);
- mp->outer_vrf_id = ntohl (outer_vrf_id);
- clib_memcpy (mp->src_address, &src_address, sizeof (src_address));
- clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
- clib_memcpy (mp->intfc_address, &intfc_address, sizeof (intfc_address));
- mp->intfc_address_length = intfc_address_length;
- mp->l2_only = l2_only;
- mp->is_add = is_add;
-
- S;
- W;
- /* NOTREACHED */
- return 0;
-}
-
-static int
-api_mpls_ethernet_add_del_tunnel (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_mpls_ethernet_add_del_tunnel_t *mp;
- f64 timeout;
- u32 inner_vrf_id = 0;
- ip4_address_t intfc_address;
- u8 dst_mac_address[6];
- int dst_set = 1;
- u32 tmp;
- u8 intfc_address_length = 0;
- u8 is_add = 1;
- u8 l2_only = 0;
- u32 tx_sw_if_index;
- int tx_sw_if_index_set = 0;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "vrf %d", &inner_vrf_id))
- ;
- else if (unformat (i, "adj %U/%d", unformat_ip4_address,
- &intfc_address, &tmp))
- intfc_address_length = tmp;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "dst %U", unformat_ethernet_address,
- dst_mac_address))
- dst_set = 1;
- else if (unformat (i, "l2-only"))
- l2_only = 1;
- else if (unformat (i, "del"))
- is_add = 0;
+ else if (unformat (i, "random-mac"))
+ random_mac = 1;
+ else if (unformat (i, "tapname %s", &tap_name))
+ name_set = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (!dst_set)
- {
- errmsg ("dst (mac address) not set\n");
- return -99;
- }
- if (!tx_sw_if_index_set)
+ if (sw_if_index_set == 0)
{
- errmsg ("tx-intfc not set\n");
+ errmsg ("missing vpp interface name");
return -99;
}
-
- M (MPLS_ETHERNET_ADD_DEL_TUNNEL, mpls_ethernet_add_del_tunnel);
-
- mp->vrf_id = ntohl (inner_vrf_id);
- clib_memcpy (mp->adj_address, &intfc_address, sizeof (intfc_address));
- mp->adj_address_length = intfc_address_length;
- clib_memcpy (mp->dst_mac_address, dst_mac_address,
- sizeof (dst_mac_address));
- mp->tx_sw_if_index = ntohl (tx_sw_if_index);
- mp->l2_only = l2_only;
- mp->is_add = is_add;
-
- S;
- W;
- /* NOTREACHED */
- return 0;
-}
-
-static int
-api_mpls_ethernet_add_del_tunnel_2 (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_mpls_ethernet_add_del_tunnel_2_t *mp;
- f64 timeout;
- u32 inner_vrf_id = 0;
- u32 outer_vrf_id = 0;
- ip4_address_t adj_address;
- int adj_address_set = 0;
- ip4_address_t next_hop_address;
- int next_hop_address_set = 0;
- u32 tmp;
- u8 adj_address_length = 0;
- u8 l2_only = 0;
- u8 is_add = 1;
- u32 resolve_attempts = 5;
- u8 resolve_if_needed = 1;
-
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "inner_vrf_id %d", &inner_vrf_id))
- ;
- else if (unformat (i, "outer_vrf_id %d", &outer_vrf_id))
- ;
- else if (unformat (i, "adj %U/%d", unformat_ip4_address,
- &adj_address, &tmp))
- {
- adj_address_length = tmp;
- adj_address_set = 1;
- }
- else if (unformat (i, "next-hop %U", unformat_ip4_address,
- &next_hop_address))
- next_hop_address_set = 1;
- else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
- ;
- else if (unformat (i, "resolve-if-needed %d", &tmp))
- resolve_if_needed = tmp;
- else if (unformat (i, "l2-only"))
- l2_only = 1;
- else if (unformat (i, "del"))
- is_add = 0;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
- }
-
- if (!adj_address_set)
+ if (name_set == 0)
{
- errmsg ("adjacency address/mask not set\n");
+ errmsg ("missing tap name\n");
return -99;
}
- if (!next_hop_address_set)
+ if (vec_len (tap_name) > 63)
{
- errmsg ("ip4 next hop address (in outer fib) not set\n");
- return -99;
+ errmsg ("tap name too long\n");
}
+ vec_add1 (tap_name, 0);
- M (MPLS_ETHERNET_ADD_DEL_TUNNEL_2, mpls_ethernet_add_del_tunnel_2);
+ /* Construct the API message */
+ M (TAP_MODIFY, tap_modify);
- mp->inner_vrf_id = ntohl (inner_vrf_id);
- mp->outer_vrf_id = ntohl (outer_vrf_id);
- mp->resolve_attempts = ntohl (resolve_attempts);
- mp->resolve_if_needed = resolve_if_needed;
- mp->is_add = is_add;
- mp->l2_only = l2_only;
- clib_memcpy (mp->adj_address, &adj_address, sizeof (adj_address));
- mp->adj_address_length = adj_address_length;
- clib_memcpy (mp->next_hop_ip4_address_in_outer_vrf, &next_hop_address,
- sizeof (next_hop_address));
+ mp->use_random_mac = random_mac;
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->mac_address, mac_address, 6);
+ clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name));
+ vec_free (tap_name);
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_sw_interface_set_unnumbered (vat_main_t * vam)
+api_tap_delete (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_set_unnumbered_t *mp;
+ vl_api_tap_delete_t *mp;
f64 timeout;
- u32 sw_if_index;
- u32 unnum_sw_index = ~0;
- u8 is_add = 1;
+ u32 sw_if_index = ~0;
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))
sw_if_index_set = 1;
- else if (unformat (i, "unnum_if_index %d", &unnum_sw_index))
- ;
- else if (unformat (i, "del"))
- is_add = 0;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
if (sw_if_index_set == 0)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("missing vpp interface name");
return -99;
}
- M (SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
+ /* Construct the API message */
+ M (TAP_DELETE, tap_delete);
mp->sw_if_index = ntohl (sw_if_index);
- mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
- mp->is_add = is_add;
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_ip_neighbor_add_del (vat_main_t * vam)
+api_ip_add_del_route (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ip_neighbor_add_del_t *mp;
+ vl_api_ip_add_del_route_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 vrf_id = 0;
+ u32 sw_if_index = ~0, vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 is_local = 0, is_drop = 0;
+ u8 is_unreach = 0, is_prohibit = 0;
+ u8 create_vrf_if_needed = 0;
u8 is_add = 1;
- u8 is_static = 0;
- u8 mac_address[6];
- u8 mac_set = 0;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
-
- memset (mac_address, 0, sizeof (mac_address));
+ u32 next_hop_weight = 1;
+ u8 not_last = 0;
+ u8 is_multipath = 0;
+ u8 address_set = 0;
+ u8 address_length_set = 0;
+ u32 next_hop_table_id = 0;
+ u32 resolve_attempts = 0;
+ u32 dst_address_length = 0;
+ u8 next_hop_set = 0;
+ ip4_address_t v4_dst_address, v4_next_hop_address;
+ ip6_address_t v6_dst_address, v6_next_hop_address;
+ int count = 1;
+ int j;
+ f64 before = 0;
+ u32 random_add_del = 0;
+ u32 *random_vector = 0;
+ uword *random_hash;
+ u32 random_seed = 0xdeaddabe;
+ u32 classify_table_index = ~0;
+ u8 is_classify = 0;
+ u8 resolve_host = 0, resolve_attached = 0;
+ mpls_label_t *next_hop_out_label_stack = NULL;
+ mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
+ mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "%U", unformat_ip4_address, &v4_dst_address))
{
- mac_set = 1;
+ address_set = 1;
+ is_ipv6 = 0;
+ }
+ else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address))
+ {
+ address_set = 1;
+ is_ipv6 = 1;
+ }
+ else if (unformat (i, "/%d", &dst_address_length))
+ {
+ address_length_set = 1;
+ }
+
+ else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address,
+ &v4_next_hop_address))
+ {
+ next_hop_set = 1;
+ }
+ else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address,
+ &v6_next_hop_address))
+ {
+ next_hop_set = 1;
+ }
+ else if (unformat (i, "resolve-attempts %d", &resolve_attempts))
+ ;
+ else if (unformat (i, "weight %d", &next_hop_weight))
+ ;
+ else if (unformat (i, "drop"))
+ {
+ is_drop = 1;
+ }
+ else if (unformat (i, "null-send-unreach"))
+ {
+ is_unreach = 1;
+ }
+ else if (unformat (i, "null-send-prohibit"))
+ {
+ is_prohibit = 1;
+ }
+ else if (unformat (i, "local"))
+ {
+ is_local = 1;
+ }
+ else if (unformat (i, "classify %d", &classify_table_index))
+ {
+ is_classify = 1;
}
else if (unformat (i, "del"))
is_add = 0;
- else if (unformat (i, "%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, "is_static"))
- is_static = 1;
+ else if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "not-last"))
+ not_last = 1;
+ else if (unformat (i, "resolve-via-host"))
+ resolve_host = 1;
+ else if (unformat (i, "resolve-via-attached"))
+ resolve_attached = 1;
+ else if (unformat (i, "multipath"))
+ is_multipath = 1;
else if (unformat (i, "vrf %d", &vrf_id))
;
- else if (unformat (i, "dst %U", unformat_ip4_address, &v4address))
- v4_address_set = 1;
- else if (unformat (i, "dst %U", unformat_ip6_address, &v6address))
- v6_address_set = 1;
+ else if (unformat (i, "create-vrf"))
+ create_vrf_if_needed = 1;
+ else if (unformat (i, "count %d", &count))
+ ;
+ else if (unformat (i, "lookup-in-vrf %d", &next_hop_table_id))
+ ;
+ else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+ ;
+ else if (unformat (i, "out-label %d", &next_hop_out_label))
+ vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
+ else if (unformat (i, "via-label %d", &next_hop_via_label))
+ ;
+ else if (unformat (i, "random"))
+ random_add_del = 1;
+ else if (unformat (i, "seed %d", &random_seed))
+ ;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (sw_if_index_set == 0)
+ if (!next_hop_set && !is_drop && !is_local &&
+ !is_classify && !is_unreach && !is_prohibit &&
+ MPLS_LABEL_INVALID == next_hop_via_label)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg
+ ("next hop / local / drop / unreach / prohibit / classify not set\n");
return -99;
}
- if (v4_address_set && v6_address_set)
+
+ if (next_hop_set && MPLS_LABEL_INVALID != next_hop_via_label)
{
- errmsg ("both v4 and v6 addresses set\n");
+ errmsg ("next hop and next-hop via label set\n");
return -99;
}
- if (!v4_address_set && !v6_address_set)
+ if (address_set == 0)
{
- errmsg ("no address set\n");
+ errmsg ("missing addresses\n");
return -99;
}
- /* Construct the API message */
- M (IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->vrf_id = ntohl (vrf_id);
- mp->is_static = is_static;
- if (mac_set)
- clib_memcpy (mp->mac_address, mac_address, 6);
- if (v6_address_set)
+ if (address_length_set == 0)
{
- mp->is_ipv6 = 1;
- clib_memcpy (mp->dst_address, &v6address, sizeof (v6address));
+ errmsg ("missing address length\n");
+ return -99;
}
- else
+
+ /* Generate a pile of unique, random routes */
+ if (random_add_del)
{
- /* mp->is_ipv6 = 0; via memset in M macro above */
- clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
+ u32 this_random_address;
+ random_hash = hash_create (count, sizeof (uword));
+
+ hash_set (random_hash, v4_next_hop_address.as_u32, 1);
+ for (j = 0; j <= count; j++)
+ {
+ do
+ {
+ this_random_address = random_u32 (&random_seed);
+ this_random_address =
+ clib_host_to_net_u32 (this_random_address);
+ }
+ while (hash_get (random_hash, this_random_address));
+ vec_add1 (random_vector, this_random_address);
+ hash_set (random_hash, this_random_address, 1);
+ }
+ hash_free (random_hash);
+ v4_dst_address.as_u32 = random_vector[0];
}
- /* send it... */
- S;
+ if (count > 1)
+ {
+ /* Turn on async mode */
+ vam->async_mode = 1;
+ vam->async_errors = 0;
+ before = vat_time_now (vam);
+ }
- /* Wait for a reply, return good/bad news */
- W;
+ for (j = 0; j < count; j++)
+ {
+ /* Construct the API message */
+ M2 (IP_ADD_DEL_ROUTE, ip_add_del_route,
+ sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
- /* NOTREACHED */
- return 0;
-}
+ mp->next_hop_sw_if_index = ntohl (sw_if_index);
+ mp->table_id = ntohl (vrf_id);
+ mp->create_vrf_if_needed = create_vrf_if_needed;
-static int
-api_reset_vrf (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_reset_vrf_t *mp;
- f64 timeout;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
+ mp->is_add = is_add;
+ mp->is_drop = is_drop;
+ mp->is_unreach = is_unreach;
+ mp->is_prohibit = is_prohibit;
+ mp->is_ipv6 = is_ipv6;
+ mp->is_local = is_local;
+ mp->is_classify = is_classify;
+ mp->is_multipath = is_multipath;
+ mp->is_resolve_host = resolve_host;
+ mp->is_resolve_attached = resolve_attached;
+ mp->not_last = not_last;
+ mp->next_hop_weight = next_hop_weight;
+ mp->dst_address_length = dst_address_length;
+ mp->next_hop_table_id = ntohl (next_hop_table_id);
+ mp->classify_table_index = ntohl (classify_table_index);
+ mp->next_hop_via_label = ntohl (next_hop_via_label);
+ mp->next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
+ if (0 != mp->next_hop_n_out_labels)
+ {
+ memcpy (mp->next_hop_out_label_stack,
+ next_hop_out_label_stack,
+ vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
+ vec_free (next_hop_out_label_stack);
+ }
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
+ if (is_ipv6)
+ {
+ clib_memcpy (mp->dst_address, &v6_dst_address,
+ sizeof (v6_dst_address));
+ if (next_hop_set)
+ clib_memcpy (mp->next_hop_address, &v6_next_hop_address,
+ sizeof (v6_next_hop_address));
+ increment_v6_address (&v6_dst_address);
+ }
else
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ clib_memcpy (mp->dst_address, &v4_dst_address,
+ sizeof (v4_dst_address));
+ if (next_hop_set)
+ clib_memcpy (mp->next_hop_address, &v4_next_hop_address,
+ sizeof (v4_next_hop_address));
+ if (random_add_del)
+ v4_dst_address.as_u32 = random_vector[j + 1];
+ else
+ increment_v4_address (&v4_dst_address);
}
+ /* send it... */
+ S;
+ /* If we receive SIGTERM, stop now... */
+ if (vam->do_exit)
+ break;
}
- if (vrf_id_set == 0)
+ /* When testing multiple add/del ops, use a control-ping to sync */
+ if (count > 1)
{
- errmsg ("missing vrf id\n");
- return -99;
- }
+ vl_api_control_ping_t *mp;
+ f64 after;
- M (RESET_VRF, reset_vrf);
+ /* Shut off async mode */
+ vam->async_mode = 0;
- mp->vrf_id = ntohl (vrf_id);
- mp->is_ipv6 = is_ipv6;
+ M (CONTROL_PING, control_ping);
+ S;
- S;
- W;
- /* NOTREACHED */
- return 0;
+ 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);
+
+ /* slim chance, but we might have eaten SIGTERM on the first iteration */
+ if (j > 0)
+ count = j;
+
+ fformat (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
+ count, after - before, count / (after - before));
+ }
+ else
+ {
+ /* Wait for a reply... */
+ W;
+ }
+
+ /* Return the good/bad news */
+ return (vam->retval);
}
static int
-api_create_vlan_subif (vat_main_t * vam)
+api_mpls_route_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_create_vlan_subif_t *mp;
+ vl_api_mpls_route_add_del_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 vlan_id;
- u8 vlan_id_set = 0;
+ u32 sw_if_index = ~0, table_id = 0;
+ u8 create_table_if_needed = 0;
+ u8 is_add = 1;
+ u32 next_hop_weight = 1;
+ u8 is_multipath = 0;
+ u32 next_hop_table_id = 0;
+ u8 next_hop_set = 0;
+ ip4_address_t v4_next_hop_address = {
+ .as_u32 = 0,
+ };
+ ip6_address_t v6_next_hop_address = { {0} };
+ int count = 1;
+ int j;
+ f64 before = 0;
+ u32 classify_table_index = ~0;
+ u8 is_classify = 0;
+ u8 resolve_host = 0, resolve_attached = 0;
+ mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID;
+ mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID;
+ mpls_label_t *next_hop_out_label_stack = NULL;
+ mpls_label_t local_label = MPLS_LABEL_INVALID;
+ u8 is_eos = 0;
+ u8 next_hop_proto_is_ip4 = 1;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "vlan %d", &vlan_id))
- vlan_id_set = 1;
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "%d", &local_label))
+ ;
+ else if (unformat (i, "eos"))
+ is_eos = 1;
+ else if (unformat (i, "non-eos"))
+ is_eos = 0;
+ else if (unformat (i, "via %U", unformat_ip4_address,
+ &v4_next_hop_address))
+ {
+ next_hop_set = 1;
+ next_hop_proto_is_ip4 = 1;
+ }
+ else if (unformat (i, "via %U", unformat_ip6_address,
+ &v6_next_hop_address))
+ {
+ next_hop_set = 1;
+ next_hop_proto_is_ip4 = 0;
+ }
+ else if (unformat (i, "weight %d", &next_hop_weight))
+ ;
+ else if (unformat (i, "create-table"))
+ create_table_if_needed = 1;
+ else if (unformat (i, "classify %d", &classify_table_index))
+ {
+ is_classify = 1;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "resolve-via-host"))
+ resolve_host = 1;
+ else if (unformat (i, "resolve-via-attached"))
+ resolve_attached = 1;
+ else if (unformat (i, "multipath"))
+ is_multipath = 1;
+ else if (unformat (i, "count %d", &count))
+ ;
+ else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id))
+ {
+ next_hop_set = 1;
+ next_hop_proto_is_ip4 = 1;
+ }
+ else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id))
+ {
+ next_hop_set = 1;
+ next_hop_proto_is_ip4 = 0;
+ }
+ else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
+ ;
+ else if (unformat (i, "via-label %d", &next_hop_via_label))
+ ;
+ else if (unformat (i, "out-label %d", &next_hop_out_label))
+ vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label));
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (sw_if_index_set == 0)
+ if (!next_hop_set && !is_classify)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("next hop / classify not set\n");
return -99;
}
- if (vlan_id_set == 0)
+ if (MPLS_LABEL_INVALID == local_label)
{
- errmsg ("missing vlan_id\n");
+ errmsg ("missing label\n");
return -99;
}
- M (CREATE_VLAN_SUBIF, create_vlan_subif);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->vlan_id = ntohl (vlan_id);
-
- S;
- W;
- /* NOTREACHED */
- return 0;
-}
+ if (count > 1)
+ {
+ /* Turn on async mode */
+ vam->async_mode = 1;
+ vam->async_errors = 0;
+ before = vat_time_now (vam);
+ }
-#define foreach_create_subif_bit \
-_(no_tags) \
-_(one_tag) \
-_(two_tags) \
-_(dot1ad) \
-_(exact_match) \
-_(default_sub) \
-_(outer_vlan_id_any) \
-_(inner_vlan_id_any)
+ for (j = 0; j < count; j++)
+ {
+ /* Construct the API message */
+ M2 (MPLS_ROUTE_ADD_DEL, mpls_route_add_del,
+ sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack));
+
+ mp->mr_next_hop_sw_if_index = ntohl (sw_if_index);
+ mp->mr_table_id = ntohl (table_id);
+ mp->mr_create_table_if_needed = create_table_if_needed;
+
+ mp->mr_is_add = is_add;
+ mp->mr_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
+ mp->mr_is_classify = is_classify;
+ mp->mr_is_multipath = is_multipath;
+ mp->mr_is_resolve_host = resolve_host;
+ mp->mr_is_resolve_attached = resolve_attached;
+ mp->mr_next_hop_weight = next_hop_weight;
+ mp->mr_next_hop_table_id = ntohl (next_hop_table_id);
+ mp->mr_classify_table_index = ntohl (classify_table_index);
+ mp->mr_next_hop_via_label = ntohl (next_hop_via_label);
+ mp->mr_label = ntohl (local_label);
+ mp->mr_eos = is_eos;
+
+ mp->mr_next_hop_n_out_labels = vec_len (next_hop_out_label_stack);
+ if (0 != mp->mr_next_hop_n_out_labels)
+ {
+ memcpy (mp->mr_next_hop_out_label_stack,
+ next_hop_out_label_stack,
+ vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t));
+ vec_free (next_hop_out_label_stack);
+ }
-static int
-api_create_subif (vat_main_t * vam)
-{
+ if (next_hop_set)
+ {
+ if (next_hop_proto_is_ip4)
+ {
+ clib_memcpy (mp->mr_next_hop,
+ &v4_next_hop_address,
+ sizeof (v4_next_hop_address));
+ }
+ else
+ {
+ clib_memcpy (mp->mr_next_hop,
+ &v6_next_hop_address,
+ sizeof (v6_next_hop_address));
+ }
+ }
+ local_label++;
+
+ /* send it... */
+ S;
+ /* If we receive SIGTERM, stop now... */
+ if (vam->do_exit)
+ break;
+ }
+
+ /* When testing multiple add/del ops, use a control-ping to sync */
+ if (count > 1)
+ {
+ vl_api_control_ping_t *mp;
+ f64 after;
+
+ /* 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);
+
+ /* slim chance, but we might have eaten SIGTERM on the first iteration */
+ if (j > 0)
+ count = j;
+
+ fformat (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec\n",
+ count, after - before, count / (after - before));
+ }
+ else
+ {
+ /* Wait for a reply... */
+ W;
+ }
+
+ /* Return the good/bad news */
+ return (vam->retval);
+}
+
+static int
+api_mpls_ip_bind_unbind (vat_main_t * vam)
+{
unformat_input_t *i = vam->input;
- vl_api_create_subif_t *mp;
+ vl_api_mpls_ip_bind_unbind_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 sub_id;
- u8 sub_id_set = 0;
- u32 no_tags = 0;
- u32 one_tag = 0;
- u32 two_tags = 0;
- u32 dot1ad = 0;
- u32 exact_match = 0;
- u32 default_sub = 0;
- u32 outer_vlan_id_any = 0;
- u32 inner_vlan_id_any = 0;
- u32 tmp;
- u16 outer_vlan_id = 0;
- u16 inner_vlan_id = 0;
+ u32 ip_table_id = 0;
+ u8 create_table_if_needed = 0;
+ u8 is_bind = 1;
+ u8 is_ip4 = 1;
+ ip4_address_t v4_address;
+ ip6_address_t v6_address;
+ u32 address_length;
+ u8 address_set = 0;
+ mpls_label_t local_label = MPLS_LABEL_INVALID;
+ /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
- sw_if_index_set = 1;
- else if (unformat (i, "sub_id %d", &sub_id))
- sub_id_set = 1;
- else if (unformat (i, "outer_vlan_id %d", &tmp))
- outer_vlan_id = tmp;
- else if (unformat (i, "inner_vlan_id %d", &tmp))
- inner_vlan_id = tmp;
-
-#define _(a) else if (unformat (i, #a)) a = 1 ;
- foreach_create_subif_bit
-#undef _
- else
+ if (unformat (i, "%U/%d", unformat_ip4_address,
+ &v4_address, &address_length))
+ {
+ is_ip4 = 1;
+ address_set = 1;
+ }
+ else if (unformat (i, "%U/%d", unformat_ip6_address,
+ &v6_address, &address_length))
+ {
+ is_ip4 = 0;
+ address_set = 1;
+ }
+ else if (unformat (i, "%d", &local_label))
+ ;
+ else if (unformat (i, "create-table"))
+ create_table_if_needed = 1;
+ else if (unformat (i, "table-id %d", &ip_table_id))
+ ;
+ else if (unformat (i, "unbind"))
+ is_bind = 0;
+ else if (unformat (i, "bind"))
+ is_bind = 1;
+ else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (sw_if_index_set == 0)
+ if (!address_set)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("IP addres not set\n");
return -99;
}
- if (sub_id_set == 0)
+ if (MPLS_LABEL_INVALID == local_label)
{
- errmsg ("missing sub_id\n");
+ errmsg ("missing label\n");
return -99;
}
- M (CREATE_SUBIF, create_subif);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->sub_id = ntohl (sub_id);
-
-#define _(a) mp->a = a;
- foreach_create_subif_bit;
-#undef _
- mp->outer_vlan_id = ntohs (outer_vlan_id);
- mp->inner_vlan_id = ntohs (inner_vlan_id);
+ /* Construct the API message */
+ M (MPLS_IP_BIND_UNBIND, mpls_ip_bind_unbind);
+
+ mp->mb_create_table_if_needed = create_table_if_needed;
+ mp->mb_is_bind = is_bind;
+ mp->mb_is_ip4 = is_ip4;
+ mp->mb_ip_table_id = ntohl (ip_table_id);
+ mp->mb_mpls_table_id = 0;
+ mp->mb_label = ntohl (local_label);
+ mp->mb_address_length = address_length;
+
+ if (is_ip4)
+ clib_memcpy (mp->mb_address, &v4_address, sizeof (v4_address));
+ else
+ clib_memcpy (mp->mb_address, &v6_address, sizeof (v6_address));
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_oam_add_del (vat_main_t * vam)
+api_proxy_arp_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_oam_add_del_t *mp;
+ vl_api_proxy_arp_add_del_t *mp;
f64 timeout;
u32 vrf_id = 0;
u8 is_add = 1;
- ip4_address_t src, dst;
- u8 src_set = 0;
- u8 dst_set = 0;
+ ip4_address_t lo, hi;
+ u8 range_set = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
if (unformat (i, "vrf %d", &vrf_id))
;
- else if (unformat (i, "src %U", unformat_ip4_address, &src))
- src_set = 1;
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
- dst_set = 1;
+ else if (unformat (i, "%U - %U", unformat_ip4_address, &lo,
+ unformat_ip4_address, &hi))
+ range_set = 1;
else if (unformat (i, "del"))
is_add = 0;
else
}
}
- if (src_set == 0)
- {
- errmsg ("missing src addr\n");
- return -99;
- }
-
- if (dst_set == 0)
+ if (range_set == 0)
{
- errmsg ("missing dst addr\n");
+ errmsg ("address range not set\n");
return -99;
}
- M (OAM_ADD_DEL, oam_add_del);
+ M (PROXY_ARP_ADD_DEL, proxy_arp_add_del);
mp->vrf_id = ntohl (vrf_id);
mp->is_add = is_add;
- clib_memcpy (mp->src_address, &src, sizeof (mp->src_address));
- clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address));
+ clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address));
+ clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address));
S;
W;
}
static int
-api_reset_fib (vat_main_t * vam)
+api_proxy_arp_intfc_enable_disable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_reset_fib_t *mp;
+ vl_api_proxy_arp_intfc_enable_disable_t *mp;
f64 timeout;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
+ u32 sw_if_index;
+ u8 enable = 1;
+ u8 sw_if_index_set = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
+ if (unformat (i, "%U", 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);
}
}
- if (vrf_id_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing vrf id\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (RESET_FIB, reset_fib);
+ M (PROXY_ARP_INTFC_ENABLE_DISABLE, proxy_arp_intfc_enable_disable);
- mp->vrf_id = ntohl (vrf_id);
- mp->is_ipv6 = is_ipv6;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable_disable = enable;
S;
W;
}
static int
-api_dhcp_proxy_config (vat_main_t * vam)
+api_mpls_tunnel_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_dhcp_proxy_config_t *mp;
+ vl_api_mpls_tunnel_add_del_t *mp;
f64 timeout;
- u32 vrf_id = 0;
+
u8 is_add = 1;
- u8 insert_cid = 1;
- u8 v4_address_set = 0;
- u8 v6_address_set = 0;
- ip4_address_t v4address;
- ip6_address_t v6address;
- u8 v4_src_address_set = 0;
- u8 v6_src_address_set = 0;
- ip4_address_t v4srcaddress;
- ip6_address_t v6srcaddress;
+ u8 l2_only = 0;
+ u32 sw_if_index = ~0;
+ u32 next_hop_sw_if_index = ~0;
+ u32 next_hop_proto_is_ip4 = 1;
+
+ u32 next_hop_table_id = 0;
+ ip4_address_t v4_next_hop_address = {
+ .as_u32 = 0,
+ };
+ ip6_address_t v6_next_hop_address = { {0} };
+ mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID, *labels = NULL;
- /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
+ if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "del sw_if_index %d", &sw_if_index))
is_add = 0;
- else if (unformat (i, "vrf %d", &vrf_id))
+ else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index))
;
- else if (unformat (i, "insert-cid %d", &insert_cid))
+ else if (unformat (i, "via %U",
+ unformat_ip4_address, &v4_next_hop_address))
+ {
+ next_hop_proto_is_ip4 = 1;
+ }
+ else if (unformat (i, "via %U",
+ unformat_ip6_address, &v6_next_hop_address))
+ {
+ next_hop_proto_is_ip4 = 0;
+ }
+ else if (unformat (i, "l2-only"))
+ l2_only = 1;
+ else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
;
- else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
- v4_address_set = 1;
- else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
- v6_address_set = 1;
- else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
- v4_src_address_set = 1;
- else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
- v6_src_address_set = 1;
+ else if (unformat (i, "out-label %d", &next_hop_out_label))
+ vec_add1 (labels, ntohl (next_hop_out_label));
else
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (v4_address_set && v6_address_set)
- {
- errmsg ("both v4 and v6 server addresses set\n");
- return -99;
- }
- if (!v4_address_set && !v6_address_set)
+ M2 (MPLS_TUNNEL_ADD_DEL, mpls_tunnel_add_del,
+ sizeof (mpls_label_t) * vec_len (labels));
+
+ mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index);
+ mp->mt_sw_if_index = ntohl (sw_if_index);
+ mp->mt_is_add = is_add;
+ mp->mt_l2_only = l2_only;
+ mp->mt_next_hop_table_id = ntohl (next_hop_table_id);
+ mp->mt_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
+
+ mp->mt_next_hop_n_out_labels = vec_len (labels);
+
+ if (0 != mp->mt_next_hop_n_out_labels)
{
- errmsg ("no server addresses set\n");
- return -99;
+ clib_memcpy (mp->mt_next_hop_out_label_stack, labels,
+ sizeof (mpls_label_t) * mp->mt_next_hop_n_out_labels);
+ vec_free (labels);
}
- if (v4_src_address_set && v6_src_address_set)
+ if (next_hop_proto_is_ip4)
{
- errmsg ("both v4 and v6 src addresses set\n");
- return -99;
+ clib_memcpy (mp->mt_next_hop,
+ &v4_next_hop_address, sizeof (v4_next_hop_address));
}
- if (!v4_src_address_set && !v6_src_address_set)
+ else
{
- errmsg ("no src addresses set\n");
- return -99;
+ clib_memcpy (mp->mt_next_hop,
+ &v6_next_hop_address, sizeof (v6_next_hop_address));
}
- if (!(v4_src_address_set && v4_address_set) &&
- !(v6_src_address_set && v6_address_set))
- {
- errmsg ("no matching server and src addresses set\n");
- return -99;
- }
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
- /* Construct the API message */
- M (DHCP_PROXY_CONFIG, dhcp_proxy_config);
+static int
+api_sw_interface_set_unnumbered (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_set_unnumbered_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u32 unnum_sw_index = ~0;
+ u8 is_add = 1;
+ u8 sw_if_index_set = 0;
- mp->insert_circuit_id = insert_cid;
- mp->is_add = is_add;
- mp->vrf_id = ntohl (vrf_id);
- if (v6_address_set)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- mp->is_ipv6 = 1;
- clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
- clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+ 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, "unnum_if_index %d", &unnum_sw_index))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- else
+
+ if (sw_if_index_set == 0)
{
- clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
- clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- /* send it... */
- S;
+ M (SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered);
- /* Wait for a reply, return good/bad news */
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->unnumbered_sw_if_index = ntohl (unnum_sw_index);
+ mp->is_add = is_add;
+
+ S;
W;
/* NOTREACHED */
return 0;
}
static int
-api_dhcp_proxy_config_2 (vat_main_t * vam)
+api_ip_neighbor_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_dhcp_proxy_config_2_t *mp;
+ vl_api_ip_neighbor_add_del_t *mp;
f64 timeout;
- u32 rx_vrf_id = 0;
- u32 server_vrf_id = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 vrf_id = 0;
u8 is_add = 1;
- u8 insert_cid = 1;
+ u8 is_static = 0;
+ u8 mac_address[6];
+ u8 mac_set = 0;
u8 v4_address_set = 0;
u8 v6_address_set = 0;
ip4_address_t v4address;
ip6_address_t v6address;
- u8 v4_src_address_set = 0;
- u8 v6_src_address_set = 0;
- ip4_address_t v4srcaddress;
- ip6_address_t v6srcaddress;
+
+ memset (mac_address, 0, sizeof (mac_address));
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
+ if (unformat (i, "mac %U", unformat_ethernet_address, mac_address))
+ {
+ mac_set = 1;
+ }
+ else if (unformat (i, "del"))
is_add = 0;
- else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
- ;
- else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
- ;
- else if (unformat (i, "insert-cid %d", &insert_cid))
+ 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 if (unformat (i, "is_static"))
+ is_static = 1;
+ else if (unformat (i, "vrf %d", &vrf_id))
;
- else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
+ else if (unformat (i, "dst %U", unformat_ip4_address, &v4address))
v4_address_set = 1;
- else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
+ else if (unformat (i, "dst %U", unformat_ip6_address, &v6address))
v6_address_set = 1;
- else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
- v4_src_address_set = 1;
- else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
- v6_src_address_set = 1;
else
- break;
- }
-
- if (v4_address_set && v6_address_set)
- {
- errmsg ("both v4 and v6 server addresses set\n");
- return -99;
- }
- if (!v4_address_set && !v6_address_set)
- {
- errmsg ("no server addresses set\n");
- return -99;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (v4_src_address_set && v6_src_address_set)
+ if (sw_if_index_set == 0)
{
- errmsg ("both v4 and v6 src addresses set\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (!v4_src_address_set && !v6_src_address_set)
+ if (v4_address_set && v6_address_set)
{
- errmsg ("no src addresses set\n");
+ errmsg ("both v4 and v6 addresses set\n");
return -99;
}
-
- if (!(v4_src_address_set && v4_address_set) &&
- !(v6_src_address_set && v6_address_set))
+ if (!v4_address_set && !v6_address_set)
{
- errmsg ("no matching server and src addresses set\n");
+ errmsg ("no address set\n");
return -99;
}
/* Construct the API message */
- M (DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
+ M (IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del);
- mp->insert_circuit_id = insert_cid;
+ mp->sw_if_index = ntohl (sw_if_index);
mp->is_add = is_add;
- mp->rx_vrf_id = ntohl (rx_vrf_id);
- mp->server_vrf_id = ntohl (server_vrf_id);
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_static = is_static;
+ if (mac_set)
+ clib_memcpy (mp->mac_address, mac_address, 6);
if (v6_address_set)
{
mp->is_ipv6 = 1;
- clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
- clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+ clib_memcpy (mp->dst_address, &v6address, sizeof (v6address));
}
else
{
- clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
- clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+ /* mp->is_ipv6 = 0; via memset in M macro above */
+ clib_memcpy (mp->dst_address, &v4address, sizeof (v4address));
}
/* send it... */
/* Wait for a reply, return good/bad news */
W;
+
/* NOTREACHED */
return 0;
}
static int
-api_dhcp_proxy_set_vss (vat_main_t * vam)
+api_reset_vrf (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_dhcp_proxy_set_vss_t *mp;
+ vl_api_reset_vrf_t *mp;
f64 timeout;
+ u32 vrf_id = 0;
u8 is_ipv6 = 0;
- u8 is_add = 1;
- u32 tbl_id;
- u8 tbl_id_set = 0;
- u32 oui;
- u8 oui_set = 0;
- u32 fib_id;
- u8 fib_id_set = 0;
+ u8 vrf_id_set = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "tbl_id %d", &tbl_id))
- tbl_id_set = 1;
- if (unformat (i, "fib_id %d", &fib_id))
- fib_id_set = 1;
- if (unformat (i, "oui %d", &oui))
- oui_set = 1;
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
else if (unformat (i, "ipv6"))
is_ipv6 = 1;
- else if (unformat (i, "del"))
- is_add = 0;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (tbl_id_set == 0)
+ if (vrf_id_set == 0)
{
- errmsg ("missing tbl id\n");
+ errmsg ("missing vrf id\n");
return -99;
}
- if (fib_id_set == 0)
- {
- errmsg ("missing fib id\n");
- return -99;
- }
- if (oui_set == 0)
- {
- errmsg ("missing oui\n");
- return -99;
- }
+ M (RESET_VRF, reset_vrf);
- M (DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
- mp->tbl_id = ntohl (tbl_id);
- mp->fib_id = ntohl (fib_id);
- mp->oui = ntohl (oui);
+ mp->vrf_id = ntohl (vrf_id);
mp->is_ipv6 = is_ipv6;
- mp->is_add = is_add;
S;
W;
}
static int
-api_dhcp_client_config (vat_main_t * vam)
+api_create_vlan_subif (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_dhcp_client_config_t *mp;
+ vl_api_create_vlan_subif_t *mp;
f64 timeout;
u32 sw_if_index;
u8 sw_if_index_set = 0;
- u8 is_add = 1;
- u8 *hostname = 0;
- u8 disable_event = 0;
+ u32 vlan_id;
+ u8 vlan_id_set = 0;
- /* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "hostname %s", &hostname))
- ;
- else if (unformat (i, "disable_event"))
- disable_event = 1;
+ else if (unformat (i, "vlan %d", &vlan_id))
+ vlan_id_set = 1;
else
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
if (sw_if_index_set == 0)
return -99;
}
- if (vec_len (hostname) > 63)
+ if (vlan_id_set == 0)
{
- errmsg ("hostname too long\n");
+ errmsg ("missing vlan_id\n");
+ return -99;
}
- vec_add1 (hostname, 0);
-
- /* Construct the API message */
- M (DHCP_CLIENT_CONFIG, dhcp_client_config);
+ M (CREATE_VLAN_SUBIF, create_vlan_subif);
mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->hostname, hostname, vec_len (hostname));
- vec_free (hostname);
- mp->is_add = is_add;
- mp->want_dhcp_event = disable_event ? 0 : 1;
- mp->pid = getpid ();
+ mp->vlan_id = ntohl (vlan_id);
- /* send it... */
S;
-
- /* Wait for a reply, return good/bad news */
W;
/* NOTREACHED */
return 0;
}
+#define foreach_create_subif_bit \
+_(no_tags) \
+_(one_tag) \
+_(two_tags) \
+_(dot1ad) \
+_(exact_match) \
+_(default_sub) \
+_(outer_vlan_id_any) \
+_(inner_vlan_id_any)
+
static int
-api_set_ip_flow_hash (vat_main_t * vam)
+api_create_subif (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_set_ip_flow_hash_t *mp;
+ vl_api_create_subif_t *mp;
f64 timeout;
- u32 vrf_id = 0;
- u8 is_ipv6 = 0;
- u8 vrf_id_set = 0;
- u8 src = 0;
- u8 dst = 0;
- u8 sport = 0;
- u8 dport = 0;
- u8 proto = 0;
- u8 reverse = 0;
-
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 sub_id;
+ u8 sub_id_set = 0;
+ u32 no_tags = 0;
+ u32 one_tag = 0;
+ u32 two_tags = 0;
+ u32 dot1ad = 0;
+ u32 exact_match = 0;
+ u32 default_sub = 0;
+ u32 outer_vlan_id_any = 0;
+ u32 inner_vlan_id_any = 0;
+ u32 tmp;
+ u16 outer_vlan_id = 0;
+ u16 inner_vlan_id = 0;
+
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "vrf %d", &vrf_id))
- vrf_id_set = 1;
- else if (unformat (i, "ipv6"))
- is_ipv6 = 1;
- else if (unformat (i, "src"))
- src = 1;
- else if (unformat (i, "dst"))
- dst = 1;
- else if (unformat (i, "sport"))
- sport = 1;
- else if (unformat (i, "dport"))
- dport = 1;
- else if (unformat (i, "proto"))
- proto = 1;
- else if (unformat (i, "reverse"))
- reverse = 1;
+ if (unformat (i, "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, "sub_id %d", &sub_id))
+ sub_id_set = 1;
+ else if (unformat (i, "outer_vlan_id %d", &tmp))
+ outer_vlan_id = tmp;
+ else if (unformat (i, "inner_vlan_id %d", &tmp))
+ inner_vlan_id = tmp;
- else
+#define _(a) else if (unformat (i, #a)) a = 1 ;
+ foreach_create_subif_bit
+#undef _
+ else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (vrf_id_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing vrf id\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (SET_IP_FLOW_HASH, set_ip_flow_hash);
- mp->src = src;
- mp->dst = dst;
- mp->sport = sport;
- mp->dport = dport;
- mp->proto = proto;
- mp->reverse = reverse;
- mp->vrf_id = ntohl (vrf_id);
- mp->is_ipv6 = is_ipv6;
+ if (sub_id_set == 0)
+ {
+ errmsg ("missing sub_id\n");
+ return -99;
+ }
+ M (CREATE_SUBIF, create_subif);
+
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->sub_id = ntohl (sub_id);
+
+#define _(a) mp->a = a;
+ foreach_create_subif_bit;
+#undef _
+
+ mp->outer_vlan_id = ntohs (outer_vlan_id);
+ mp->inner_vlan_id = ntohs (inner_vlan_id);
S;
W;
}
static int
-api_sw_interface_ip6_enable_disable (vat_main_t * vam)
+api_oam_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6_enable_disable_t *mp;
+ vl_api_oam_add_del_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 enable = 0;
+ u32 vrf_id = 0;
+ u8 is_add = 1;
+ ip4_address_t src, dst;
+ u8 src_set = 0;
+ u8 dst_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 if (unformat (i, "enable"))
- enable = 1;
- else if (unformat (i, "disable"))
- enable = 0;
+ if (unformat (i, "vrf %d", &vrf_id))
+ ;
+ else if (unformat (i, "src %U", unformat_ip4_address, &src))
+ src_set = 1;
+ else if (unformat (i, "dst %U", unformat_ip4_address, &dst))
+ dst_set = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (sw_if_index_set == 0)
+ if (src_set == 0)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("missing src addr\n");
return -99;
}
- M (SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
+ if (dst_set == 0)
+ {
+ errmsg ("missing dst addr\n");
+ return -99;
+ }
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable = enable;
+ M (OAM_ADD_DEL, oam_add_del);
+
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_add = is_add;
+ clib_memcpy (mp->src_address, &src, sizeof (mp->src_address));
+ clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address));
S;
W;
}
static int
-api_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
+api_reset_fib (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6_set_link_local_address_t *mp;
+ vl_api_reset_fib_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 address_length = 0;
- u8 v6_address_set = 0;
- ip6_address_t v6address;
+ u32 vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 vrf_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, "%U/%d",
- unformat_ip6_address, &v6address, &address_length))
- v6_address_set = 1;
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
else
- break;
+ {
+ 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;
- }
- if (!v6_address_set)
+ if (vrf_id_set == 0)
{
- errmsg ("no address set\n");
+ errmsg ("missing vrf id\n");
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,
- sw_interface_ip6_set_link_local_address);
+ M (RESET_FIB, reset_fib);
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
- mp->address_length = address_length;
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_ipv6 = is_ipv6;
- /* send it... */
S;
-
- /* Wait for a reply, return good/bad news */
W;
-
/* NOTREACHED */
return 0;
}
-
static int
-api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
+api_dhcp_proxy_config (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
+ vl_api_dhcp_proxy_config_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 address_length = 0;
+ u32 vrf_id = 0;
+ u8 is_add = 1;
+ u8 insert_cid = 1;
+ u8 v4_address_set = 0;
u8 v6_address_set = 0;
+ ip4_address_t v4address;
ip6_address_t v6address;
- u8 use_default = 0;
- u8 no_advertise = 0;
- u8 off_link = 0;
- u8 no_autoconfig = 0;
- u8 no_onlink = 0;
- u8 is_no = 0;
- u32 val_lifetime = 0;
- u32 pref_lifetime = 0;
+ u8 v4_src_address_set = 0;
+ u8 v6_src_address_set = 0;
+ ip4_address_t v4srcaddress;
+ ip6_address_t v6srcaddress;
/* 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, "%U/%d",
- unformat_ip6_address, &v6address, &address_length))
- v6_address_set = 1;
- else if (unformat (i, "val_life %d", &val_lifetime))
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "vrf %d", &vrf_id))
;
- else if (unformat (i, "pref_life %d", &pref_lifetime))
+ else if (unformat (i, "insert-cid %d", &insert_cid))
;
- else if (unformat (i, "def"))
- use_default = 1;
- else if (unformat (i, "noadv"))
- no_advertise = 1;
- else if (unformat (i, "offl"))
- off_link = 1;
- else if (unformat (i, "noauto"))
- no_autoconfig = 1;
- else if (unformat (i, "nolink"))
- no_onlink = 1;
- else if (unformat (i, "isno"))
- is_no = 1;
+ else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
+ v4_address_set = 1;
+ else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
+ v6_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
+ v4_src_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
+ v6_src_address_set = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (sw_if_index_set == 0)
+ if (v4_address_set && v6_address_set)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("both v4 and v6 server addresses set\n");
return -99;
}
- if (!v6_address_set)
+ if (!v4_address_set && !v6_address_set)
{
- errmsg ("no address set\n");
+ errmsg ("no server addresses set\n");
return -99;
}
- /* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
+ if (v4_src_address_set && v6_src_address_set)
+ {
+ errmsg ("both v4 and v6 src addresses set\n");
+ return -99;
+ }
+ if (!v4_src_address_set && !v6_src_address_set)
+ {
+ errmsg ("no src addresses set\n");
+ return -99;
+ }
- mp->sw_if_index = ntohl (sw_if_index);
- clib_memcpy (mp->address, &v6address, sizeof (v6address));
- mp->address_length = address_length;
- mp->use_default = use_default;
- mp->no_advertise = no_advertise;
- mp->off_link = off_link;
- mp->no_autoconfig = no_autoconfig;
- mp->no_onlink = no_onlink;
- mp->is_no = is_no;
- mp->val_lifetime = ntohl (val_lifetime);
- mp->pref_lifetime = ntohl (pref_lifetime);
+ if (!(v4_src_address_set && v4_address_set) &&
+ !(v6_src_address_set && v6_address_set))
+ {
+ errmsg ("no matching server and src addresses set\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (DHCP_PROXY_CONFIG, dhcp_proxy_config);
+
+ mp->insert_circuit_id = insert_cid;
+ mp->is_add = is_add;
+ mp->vrf_id = ntohl (vrf_id);
+ if (v6_address_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+ clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+ }
+ else
+ {
+ clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+ clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+ }
/* send it... */
S;
/* Wait for a reply, return good/bad news */
W;
-
/* NOTREACHED */
return 0;
}
static int
-api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
+api_dhcp_proxy_config_2 (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sw_interface_ip6nd_ra_config_t *mp;
+ vl_api_dhcp_proxy_config_2_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u8 suppress = 0;
- u8 managed = 0;
- u8 other = 0;
- u8 ll_option = 0;
- u8 send_unicast = 0;
- u8 cease = 0;
- u8 is_no = 0;
- u8 default_router = 0;
- u32 max_interval = 0;
- u32 min_interval = 0;
- u32 lifetime = 0;
- u32 initial_count = 0;
- u32 initial_interval = 0;
-
+ u32 rx_vrf_id = 0;
+ u32 server_vrf_id = 0;
+ u8 is_add = 1;
+ u8 insert_cid = 1;
+ u8 v4_address_set = 0;
+ u8 v6_address_set = 0;
+ ip4_address_t v4address;
+ ip6_address_t v6address;
+ u8 v4_src_address_set = 0;
+ u8 v6_src_address_set = 0;
+ ip4_address_t v4srcaddress;
+ ip6_address_t v6srcaddress;
/* 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, "maxint %d", &max_interval))
- ;
- else if (unformat (i, "minint %d", &min_interval))
- ;
- else if (unformat (i, "life %d", &lifetime))
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id))
;
- else if (unformat (i, "count %d", &initial_count))
+ else if (unformat (i, "server_vrf_id %d", &server_vrf_id))
;
- else if (unformat (i, "interval %d", &initial_interval))
+ else if (unformat (i, "insert-cid %d", &insert_cid))
;
- else if (unformat (i, "suppress") || unformat (i, "surpress"))
- suppress = 1;
- else if (unformat (i, "managed"))
- managed = 1;
- else if (unformat (i, "other"))
- other = 1;
- else if (unformat (i, "ll"))
- ll_option = 1;
- else if (unformat (i, "send"))
- send_unicast = 1;
- else if (unformat (i, "cease"))
- cease = 1;
- else if (unformat (i, "isno"))
- is_no = 1;
- else if (unformat (i, "def"))
- default_router = 1;
+ else if (unformat (i, "svr %U", unformat_ip4_address, &v4address))
+ v4_address_set = 1;
+ else if (unformat (i, "svr %U", unformat_ip6_address, &v6address))
+ v6_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress))
+ v4_src_address_set = 1;
+ else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress))
+ v6_src_address_set = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (sw_if_index_set == 0)
+ if (v4_address_set && v6_address_set)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("both v4 and v6 server addresses set\n");
+ return -99;
+ }
+ if (!v4_address_set && !v6_address_set)
+ {
+ errmsg ("no server addresses set\n");
+ return -99;
+ }
+
+ if (v4_src_address_set && v6_src_address_set)
+ {
+ errmsg ("both v4 and v6 src addresses set\n");
+ return -99;
+ }
+ if (!v4_src_address_set && !v6_src_address_set)
+ {
+ errmsg ("no src addresses set\n");
+ return -99;
+ }
+
+ if (!(v4_src_address_set && v4_address_set) &&
+ !(v6_src_address_set && v6_address_set))
+ {
+ errmsg ("no matching server and src addresses set\n");
return -99;
}
/* Construct the API message */
- M (SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
+ M (DHCP_PROXY_CONFIG_2, dhcp_proxy_config_2);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->max_interval = ntohl (max_interval);
- mp->min_interval = ntohl (min_interval);
- mp->lifetime = ntohl (lifetime);
- mp->initial_count = ntohl (initial_count);
- mp->initial_interval = ntohl (initial_interval);
- mp->suppress = suppress;
- mp->managed = managed;
- mp->other = other;
- mp->ll_option = ll_option;
- mp->send_unicast = send_unicast;
- mp->cease = cease;
- mp->is_no = is_no;
- mp->default_router = default_router;
+ mp->insert_circuit_id = insert_cid;
+ mp->is_add = is_add;
+ mp->rx_vrf_id = ntohl (rx_vrf_id);
+ mp->server_vrf_id = ntohl (server_vrf_id);
+ if (v6_address_set)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address));
+ clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address));
+ }
+ else
+ {
+ clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address));
+ clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address));
+ }
/* send it... */
S;
/* Wait for a reply, return good/bad news */
W;
-
/* NOTREACHED */
return 0;
}
static int
-api_set_arp_neighbor_limit (vat_main_t * vam)
+api_dhcp_proxy_set_vss (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_set_arp_neighbor_limit_t *mp;
+ vl_api_dhcp_proxy_set_vss_t *mp;
f64 timeout;
- u32 arp_nbr_limit;
- u8 limit_set = 0;
u8 is_ipv6 = 0;
+ u8 is_add = 1;
+ u32 tbl_id;
+ u8 tbl_id_set = 0;
+ u32 oui;
+ u8 oui_set = 0;
+ u32 fib_id;
+ u8 fib_id_set = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
- limit_set = 1;
+ if (unformat (i, "tbl_id %d", &tbl_id))
+ tbl_id_set = 1;
+ if (unformat (i, "fib_id %d", &fib_id))
+ fib_id_set = 1;
+ if (unformat (i, "oui %d", &oui))
+ oui_set = 1;
else if (unformat (i, "ipv6"))
is_ipv6 = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
else
{
clib_warning ("parse error '%U'", format_unformat_error, i);
}
}
- if (limit_set == 0)
+ if (tbl_id_set == 0)
{
- errmsg ("missing limit value\n");
+ errmsg ("missing tbl id\n");
return -99;
}
- M (SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
+ if (fib_id_set == 0)
+ {
+ errmsg ("missing fib id\n");
+ return -99;
+ }
+ if (oui_set == 0)
+ {
+ errmsg ("missing oui\n");
+ return -99;
+ }
- mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
+ M (DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss);
+ mp->tbl_id = ntohl (tbl_id);
+ mp->fib_id = ntohl (fib_id);
+ mp->oui = ntohl (oui);
mp->is_ipv6 = is_ipv6;
+ mp->is_add = is_add;
S;
W;
}
static int
-api_l2_patch_add_del (vat_main_t * vam)
+api_dhcp_client_config (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2_patch_add_del_t *mp;
+ vl_api_dhcp_client_config_t *mp;
f64 timeout;
- u32 rx_sw_if_index;
- u8 rx_sw_if_index_set = 0;
- u32 tx_sw_if_index;
- u8 tx_sw_if_index_set = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
u8 is_add = 1;
+ u8 *hostname = 0;
+ u8 disable_event = 0;
/* Parse args required to build the message */
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- else if (unformat (i, "rx"))
- {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &rx_sw_if_index))
- rx_sw_if_index_set = 1;
- }
- else
- break;
- }
- else if (unformat (i, "tx"))
- {
- if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (i, "%U", unformat_sw_if_index, vam,
- &tx_sw_if_index))
- tx_sw_if_index_set = 1;
- }
- else
- break;
- }
- else if (unformat (i, "del"))
+ if (unformat (i, "del"))
is_add = 0;
+ 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 if (unformat (i, "hostname %s", &hostname))
+ ;
+ else if (unformat (i, "disable_event"))
+ disable_event = 1;
else
break;
}
- if (rx_sw_if_index_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("missing rx interface name or rx_sw_if_index\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (tx_sw_if_index_set == 0)
+ if (vec_len (hostname) > 63)
{
- errmsg ("missing tx interface name or tx_sw_if_index\n");
- return -99;
+ errmsg ("hostname too long\n");
}
+ vec_add1 (hostname, 0);
- M (L2_PATCH_ADD_DEL, l2_patch_add_del);
+ /* Construct the API message */
+ M (DHCP_CLIENT_CONFIG, dhcp_client_config);
- mp->rx_sw_if_index = ntohl (rx_sw_if_index);
- mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->hostname, hostname, vec_len (hostname));
+ vec_free (hostname);
mp->is_add = is_add;
+ mp->want_dhcp_event = disable_event ? 0 : 1;
+ mp->pid = getpid ();
+ /* send it... */
S;
+
+ /* Wait for a reply, return good/bad news */
W;
/* NOTREACHED */
return 0;
}
static int
-api_ioam_enable (vat_main_t * vam)
+api_set_ip_flow_hash (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_ioam_enable_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_set_ip_flow_hash_t *mp;
f64 timeout;
- u32 id = 0;
- int has_trace_option = 0;
- int has_pow_option = 0;
- int has_ppc_option = 0;
+ u32 vrf_id = 0;
+ u8 is_ipv6 = 0;
+ u8 vrf_id_set = 0;
+ u8 src = 0;
+ u8 dst = 0;
+ u8 sport = 0;
+ u8 dport = 0;
+ u8 proto = 0;
+ u8 reverse = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "trace"))
- has_trace_option = 1;
- else if (unformat (input, "pow"))
- has_pow_option = 1;
- else if (unformat (input, "ppc encap"))
- has_ppc_option = PPC_ENCAP;
- else if (unformat (input, "ppc decap"))
- has_ppc_option = PPC_DECAP;
- else if (unformat (input, "ppc none"))
- has_ppc_option = PPC_NONE;
+ if (unformat (i, "vrf %d", &vrf_id))
+ vrf_id_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else if (unformat (i, "src"))
+ src = 1;
+ else if (unformat (i, "dst"))
+ dst = 1;
+ else if (unformat (i, "sport"))
+ sport = 1;
+ else if (unformat (i, "dport"))
+ dport = 1;
+ else if (unformat (i, "proto"))
+ proto = 1;
+ else if (unformat (i, "reverse"))
+ reverse = 1;
+
else
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- M (IOAM_ENABLE, ioam_enable);
- mp->id = htons (id);
- mp->trace_ppc = has_ppc_option;
- mp->pow_enable = has_pow_option;
- mp->trace_enable = has_trace_option;
-
- S;
- W;
-
- return (0);
-
-}
+ if (vrf_id_set == 0)
+ {
+ errmsg ("missing vrf id\n");
+ return -99;
+ }
-static int
-api_ioam_disable (vat_main_t * vam)
-{
- vl_api_ioam_disable_t *mp;
- f64 timeout;
+ M (SET_IP_FLOW_HASH, set_ip_flow_hash);
+ mp->src = src;
+ mp->dst = dst;
+ mp->sport = sport;
+ mp->dport = dport;
+ mp->proto = proto;
+ mp->reverse = reverse;
+ mp->vrf_id = ntohl (vrf_id);
+ mp->is_ipv6 = is_ipv6;
- M (IOAM_DISABLE, ioam_disable);
S;
W;
+ /* NOTREACHED */
return 0;
}
static int
-api_sr_tunnel_add_del (vat_main_t * vam)
+api_sw_interface_ip6_enable_disable (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_sr_tunnel_add_del_t *mp;
+ vl_api_sw_interface_ip6_enable_disable_t *mp;
f64 timeout;
- int is_del = 0;
- int pl_index;
- ip6_address_t src_address;
- int src_address_set = 0;
- ip6_address_t dst_address;
- u32 dst_mask_width;
- int dst_address_set = 0;
- u16 flags = 0;
- u32 rx_table_id = 0;
- u32 tx_table_id = 0;
- ip6_address_t *segments = 0;
- ip6_address_t *this_seg;
- ip6_address_t *tags = 0;
- ip6_address_t *this_tag;
- ip6_address_t next_address, tag;
- u8 *name = 0;
- u8 *policy_name = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 enable = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
- is_del = 1;
- else if (unformat (i, "name %s", &name))
- ;
- else if (unformat (i, "policy %s", &policy_name))
- ;
- else if (unformat (i, "rx_fib_id %d", &rx_table_id))
- ;
- else if (unformat (i, "tx_fib_id %d", &tx_table_id))
- ;
- else if (unformat (i, "src %U", unformat_ip6_address, &src_address))
- src_address_set = 1;
- else if (unformat (i, "dst %U/%d",
- unformat_ip6_address, &dst_address, &dst_mask_width))
- dst_address_set = 1;
- else if (unformat (i, "next %U", unformat_ip6_address, &next_address))
- {
- vec_add2 (segments, this_seg, 1);
- clib_memcpy (this_seg->as_u8, next_address.as_u8,
- sizeof (*this_seg));
- }
- else if (unformat (i, "tag %U", unformat_ip6_address, &tag))
- {
- vec_add2 (tags, this_tag, 1);
- clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
- }
- else if (unformat (i, "clean"))
- flags |= IP6_SR_HEADER_FLAG_CLEANUP;
- else if (unformat (i, "protected"))
- flags |= IP6_SR_HEADER_FLAG_PROTECTED;
- else if (unformat (i, "InPE %d", &pl_index))
- {
- if (pl_index <= 0 || pl_index > 4)
- {
- pl_index_range_error:
- errmsg ("pl index %d out of range\n", pl_index);
- return -99;
- }
- flags |=
- IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE << (3 * (pl_index - 1));
- }
- else if (unformat (i, "EgPE %d", &pl_index))
- {
- if (pl_index <= 0 || pl_index > 4)
- goto pl_index_range_error;
- flags |=
- IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE << (3 * (pl_index - 1));
- }
- else if (unformat (i, "OrgSrc %d", &pl_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, "enable"))
+ enable = 1;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
{
- if (pl_index <= 0 || pl_index > 4)
- goto pl_index_range_error;
- flags |=
- IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR << (3 * (pl_index - 1));
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
}
- else
- break;
- }
-
- if (!src_address_set)
- {
- errmsg ("src address required\n");
- return -99;
- }
-
- if (!dst_address_set)
- {
- errmsg ("dst address required\n");
- return -99;
}
- if (!segments)
+ if (sw_if_index_set == 0)
{
- errmsg ("at least one sr segment required\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M2 (SR_TUNNEL_ADD_DEL, sr_tunnel_add_del,
- vec_len (segments) * sizeof (ip6_address_t)
- + vec_len (tags) * sizeof (ip6_address_t));
-
- clib_memcpy (mp->src_address, &src_address, sizeof (mp->src_address));
- clib_memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address));
- mp->dst_mask_width = dst_mask_width;
- mp->flags_net_byte_order = clib_host_to_net_u16 (flags);
- mp->n_segments = vec_len (segments);
- mp->n_tags = vec_len (tags);
- mp->is_add = is_del == 0;
- clib_memcpy (mp->segs_and_tags, segments,
- vec_len (segments) * sizeof (ip6_address_t));
- clib_memcpy (mp->segs_and_tags +
- vec_len (segments) * sizeof (ip6_address_t), tags,
- vec_len (tags) * sizeof (ip6_address_t));
-
- mp->outer_vrf_id = ntohl (rx_table_id);
- mp->inner_vrf_id = ntohl (tx_table_id);
- memcpy (mp->name, name, vec_len (name));
- memcpy (mp->policy_name, policy_name, vec_len (policy_name));
+ M (SW_INTERFACE_IP6_ENABLE_DISABLE, sw_interface_ip6_enable_disable);
- vec_free (segments);
- vec_free (tags);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->enable = enable;
S;
W;
/* NOTREACHED */
+ return 0;
}
static int
-api_sr_policy_add_del (vat_main_t * vam)
+api_sw_interface_ip6_set_link_local_address (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_sr_policy_add_del_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6_set_link_local_address_t *mp;
f64 timeout;
- int is_del = 0;
- u8 *name = 0;
- u8 *tunnel_name = 0;
- u8 **tunnel_names = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 address_length = 0;
+ u8 v6_address_set = 0;
+ ip6_address_t v6address;
- int name_set = 0;
- int tunnel_set = 0;
- int j = 0;
- int tunnel_names_length = 1; // Init to 1 to offset the #tunnel_names counter byte
- int tun_name_len = 0; // Different naming convention used as confusing these would be "bad" (TM)
-
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "del"))
- is_del = 1;
- else if (unformat (input, "name %s", &name))
- name_set = 1;
- else if (unformat (input, "tunnel %s", &tunnel_name))
- {
- if (tunnel_name)
- {
- vec_add1 (tunnel_names, tunnel_name);
- /* For serializer:
- - length = #bytes to store in serial vector
- - +1 = byte to store that length
- */
- tunnel_names_length += (vec_len (tunnel_name) + 1);
- tunnel_set = 1;
- tunnel_name = 0;
- }
- }
+ 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, "%U/%d",
+ unformat_ip6_address, &v6address, &address_length))
+ v6_address_set = 1;
else
break;
}
- if (!name_set)
+ if (sw_if_index_set == 0)
{
- errmsg ("policy name required\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
-
- if ((!tunnel_set) && (!is_del))
+ if (!v6_address_set)
{
- errmsg ("tunnel name required\n");
+ errmsg ("no address set\n");
return -99;
}
- M2 (SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length);
-
-
-
- mp->is_add = !is_del;
-
- memcpy (mp->name, name, vec_len (name));
- // Since mp->tunnel_names is of type u8[0] and not a u8 *, u8 ** needs to be serialized
- u8 *serial_orig = 0;
- vec_validate (serial_orig, tunnel_names_length);
- *serial_orig = vec_len (tunnel_names); // Store the number of tunnels as length in first byte of serialized vector
- serial_orig += 1; // Move along one byte to store the length of first tunnel_name
-
- for (j = 0; j < vec_len (tunnel_names); j++)
- {
- tun_name_len = vec_len (tunnel_names[j]);
- *serial_orig = tun_name_len; // Store length of tunnel name in first byte of Length/Value pair
- serial_orig += 1; // Move along one byte to store the actual tunnel name
- memcpy (serial_orig, tunnel_names[j], tun_name_len);
- serial_orig += tun_name_len; // Advance past the copy
- }
- memcpy (mp->tunnel_names, serial_orig - tunnel_names_length, tunnel_names_length); // Regress serial_orig to head then copy fwd
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS,
+ sw_interface_ip6_set_link_local_address);
- vec_free (tunnel_names);
- vec_free (tunnel_name);
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->address, &v6address, sizeof (v6address));
+ mp->address_length = address_length;
+ /* send it... */
S;
+
+ /* Wait for a reply, return good/bad news */
W;
+
/* NOTREACHED */
+ return 0;
}
+
static int
-api_sr_multicast_map_add_del (vat_main_t * vam)
+api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_sr_multicast_map_add_del_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6nd_ra_prefix_t *mp;
f64 timeout;
- int is_del = 0;
- ip6_address_t multicast_address;
- u8 *policy_name = 0;
- int multicast_address_set = 0;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u32 address_length = 0;
+ u8 v6_address_set = 0;
+ ip6_address_t v6address;
+ u8 use_default = 0;
+ u8 no_advertise = 0;
+ u8 off_link = 0;
+ u8 no_autoconfig = 0;
+ u8 no_onlink = 0;
+ u8 is_no = 0;
+ u32 val_lifetime = 0;
+ u32 pref_lifetime = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "del"))
- is_del = 1;
- else
- if (unformat
- (input, "address %U", unformat_ip6_address, &multicast_address))
- multicast_address_set = 1;
- else if (unformat (input, "sr-policy %s", &policy_name))
+ 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, "%U/%d",
+ unformat_ip6_address, &v6address, &address_length))
+ v6_address_set = 1;
+ else if (unformat (i, "val_life %d", &val_lifetime))
+ ;
+ else if (unformat (i, "pref_life %d", &pref_lifetime))
;
+ else if (unformat (i, "def"))
+ use_default = 1;
+ else if (unformat (i, "noadv"))
+ no_advertise = 1;
+ else if (unformat (i, "offl"))
+ off_link = 1;
+ else if (unformat (i, "noauto"))
+ no_autoconfig = 1;
+ else if (unformat (i, "nolink"))
+ no_onlink = 1;
+ else if (unformat (i, "isno"))
+ is_no = 1;
else
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (!is_del && !policy_name)
+ if (sw_if_index_set == 0)
{
- errmsg ("sr-policy name required\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
-
-
- if (!multicast_address_set)
+ if (!v6_address_set)
{
- errmsg ("address required\n");
+ errmsg ("no address set\n");
return -99;
}
- M (SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del);
-
- mp->is_add = !is_del;
- memcpy (mp->policy_name, policy_name, vec_len (policy_name));
- clib_memcpy (mp->multicast_address, &multicast_address,
- sizeof (mp->multicast_address));
-
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix);
- vec_free (policy_name);
+ mp->sw_if_index = ntohl (sw_if_index);
+ clib_memcpy (mp->address, &v6address, sizeof (v6address));
+ mp->address_length = address_length;
+ mp->use_default = use_default;
+ mp->no_advertise = no_advertise;
+ mp->off_link = off_link;
+ mp->no_autoconfig = no_autoconfig;
+ mp->no_onlink = no_onlink;
+ mp->is_no = is_no;
+ mp->val_lifetime = ntohl (val_lifetime);
+ mp->pref_lifetime = ntohl (pref_lifetime);
+ /* send it... */
S;
+
+ /* Wait for a reply, return good/bad news */
W;
+
/* NOTREACHED */
+ return 0;
}
-
-#define foreach_ip4_proto_field \
-_(src_address) \
-_(dst_address) \
-_(tos) \
-_(length) \
-_(fragment_id) \
-_(ttl) \
-_(protocol) \
-_(checksum)
-
-uword
-unformat_ip4_mask (unformat_input_t * input, va_list * args)
+static int
+api_sw_interface_ip6nd_ra_config (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
- u8 *mask = 0;
- u8 found_something = 0;
- ip4_header_t *ip;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_ip6nd_ra_config_t *mp;
+ f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ u8 suppress = 0;
+ u8 managed = 0;
+ u8 other = 0;
+ u8 ll_option = 0;
+ u8 send_unicast = 0;
+ u8 cease = 0;
+ u8 is_no = 0;
+ u8 default_router = 0;
+ u32 max_interval = 0;
+ u32 min_interval = 0;
+ u32 lifetime = 0;
+ u32 initial_count = 0;
+ u32 initial_interval = 0;
-#define _(a) u8 a=0;
- foreach_ip4_proto_field;
-#undef _
- u8 version = 0;
- u8 hdr_length = 0;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%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, "maxint %d", &max_interval))
+ ;
+ else if (unformat (i, "minint %d", &min_interval))
+ ;
+ else if (unformat (i, "life %d", &lifetime))
+ ;
+ else if (unformat (i, "count %d", &initial_count))
+ ;
+ else if (unformat (i, "interval %d", &initial_interval))
+ ;
+ else if (unformat (i, "suppress") || unformat (i, "surpress"))
+ suppress = 1;
+ else if (unformat (i, "managed"))
+ managed = 1;
+ else if (unformat (i, "other"))
+ other = 1;
+ else if (unformat (i, "ll"))
+ ll_option = 1;
+ else if (unformat (i, "send"))
+ send_unicast = 1;
+ else if (unformat (i, "cease"))
+ cease = 1;
+ else if (unformat (i, "isno"))
+ is_no = 1;
+ else if (unformat (i, "def"))
+ default_router = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ if (sw_if_index_set == 0)
{
- if (unformat (input, "version"))
- version = 1;
- else if (unformat (input, "hdr_length"))
- hdr_length = 1;
- else if (unformat (input, "src"))
- src_address = 1;
- else if (unformat (input, "dst"))
- dst_address = 1;
- else if (unformat (input, "proto"))
- protocol = 1;
-
-#define _(a) else if (unformat (input, #a)) a=1;
- foreach_ip4_proto_field
-#undef _
- else
- break;
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
-#define _(a) found_something += a;
- foreach_ip4_proto_field;
-#undef _
-
- if (found_something == 0)
- return 0;
-
- vec_validate (mask, sizeof (*ip) - 1);
-
- ip = (ip4_header_t *) mask;
-
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
- foreach_ip4_proto_field;
-#undef _
+ /* Construct the API message */
+ M (SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config);
- ip->ip_version_and_header_length = 0;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->max_interval = ntohl (max_interval);
+ mp->min_interval = ntohl (min_interval);
+ mp->lifetime = ntohl (lifetime);
+ mp->initial_count = ntohl (initial_count);
+ mp->initial_interval = ntohl (initial_interval);
+ mp->suppress = suppress;
+ mp->managed = managed;
+ mp->other = other;
+ mp->ll_option = ll_option;
+ mp->send_unicast = send_unicast;
+ mp->cease = cease;
+ mp->is_no = is_no;
+ mp->default_router = default_router;
- if (version)
- ip->ip_version_and_header_length |= 0xF0;
+ /* send it... */
+ S;
- if (hdr_length)
- ip->ip_version_and_header_length |= 0x0F;
+ /* Wait for a reply, return good/bad news */
+ W;
- *maskp = mask;
- return 1;
+ /* NOTREACHED */
+ return 0;
}
-#define foreach_ip6_proto_field \
-_(src_address) \
-_(dst_address) \
-_(payload_length) \
-_(hop_limit) \
-_(protocol)
-
-uword
-unformat_ip6_mask (unformat_input_t * input, va_list * args)
+static int
+api_set_arp_neighbor_limit (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
- u8 *mask = 0;
- u8 found_something = 0;
- ip6_header_t *ip;
- u32 ip_version_traffic_class_and_flow_label;
-
-#define _(a) u8 a=0;
- foreach_ip6_proto_field;
-#undef _
- u8 version = 0;
- u8 traffic_class = 0;
- u8 flow_label = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_set_arp_neighbor_limit_t *mp;
+ f64 timeout;
+ u32 arp_nbr_limit;
+ u8 limit_set = 0;
+ u8 is_ipv6 = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "version"))
- version = 1;
- else if (unformat (input, "traffic-class"))
- traffic_class = 1;
- else if (unformat (input, "flow-label"))
- flow_label = 1;
- else if (unformat (input, "src"))
- src_address = 1;
- else if (unformat (input, "dst"))
- dst_address = 1;
- else if (unformat (input, "proto"))
- protocol = 1;
-
-#define _(a) else if (unformat (input, #a)) a=1;
- foreach_ip6_proto_field
-#undef _
- else
- break;
+ if (unformat (i, "arp_nbr_limit %d", &arp_nbr_limit))
+ limit_set = 1;
+ else if (unformat (i, "ipv6"))
+ is_ipv6 = 1;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
-#define _(a) found_something += a;
- foreach_ip6_proto_field;
-#undef _
+ if (limit_set == 0)
+ {
+ errmsg ("missing limit value\n");
+ return -99;
+ }
- if (found_something == 0)
- return 0;
+ M (SET_ARP_NEIGHBOR_LIMIT, set_arp_neighbor_limit);
- vec_validate (mask, sizeof (*ip) - 1);
+ mp->arp_neighbor_limit = ntohl (arp_nbr_limit);
+ mp->is_ipv6 = is_ipv6;
- ip = (ip6_header_t *) mask;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
-#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
- foreach_ip6_proto_field;
-#undef _
+static int
+api_l2_patch_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_l2_patch_add_del_t *mp;
+ f64 timeout;
+ u32 rx_sw_if_index;
+ u8 rx_sw_if_index_set = 0;
+ u32 tx_sw_if_index;
+ u8 tx_sw_if_index_set = 0;
+ u8 is_add = 1;
- ip_version_traffic_class_and_flow_label = 0;
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ else if (unformat (i, "rx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &rx_sw_if_index))
+ rx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "tx"))
+ {
+ if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "%U", unformat_sw_if_index, vam,
+ &tx_sw_if_index))
+ tx_sw_if_index_set = 1;
+ }
+ else
+ break;
+ }
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ break;
+ }
- if (version)
- ip_version_traffic_class_and_flow_label |= 0xF0000000;
+ if (rx_sw_if_index_set == 0)
+ {
+ errmsg ("missing rx interface name or rx_sw_if_index\n");
+ return -99;
+ }
- if (traffic_class)
- ip_version_traffic_class_and_flow_label |= 0x0FF00000;
+ if (tx_sw_if_index_set == 0)
+ {
+ errmsg ("missing tx interface name or tx_sw_if_index\n");
+ return -99;
+ }
- if (flow_label)
- ip_version_traffic_class_and_flow_label |= 0x000FFFFF;
+ M (L2_PATCH_ADD_DEL, l2_patch_add_del);
- ip->ip_version_traffic_class_and_flow_label =
- clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+ mp->rx_sw_if_index = ntohl (rx_sw_if_index);
+ mp->tx_sw_if_index = ntohl (tx_sw_if_index);
+ mp->is_add = is_add;
- *maskp = mask;
- return 1;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-uword
-unformat_l3_mask (unformat_input_t * input, va_list * args)
+static int
+api_ioam_enable (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
+ unformat_input_t *input = vam->input;
+ vl_api_ioam_enable_t *mp;
+ f64 timeout;
+ u32 id = 0;
+ int has_trace_option = 0;
+ int has_pot_option = 0;
+ int has_seqno_option = 0;
+ int has_analyse_option = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
- return 1;
- else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
- return 1;
+ if (unformat (input, "trace"))
+ has_trace_option = 1;
+ else if (unformat (input, "pot"))
+ has_pot_option = 1;
+ else if (unformat (input, "seqno"))
+ has_seqno_option = 1;
+ else if (unformat (input, "analyse"))
+ has_analyse_option = 1;
else
break;
}
+ M (IOAM_ENABLE, ioam_enable);
+ mp->id = htons (id);
+ mp->seqno = has_seqno_option;
+ mp->analyse = has_analyse_option;
+ mp->pot_enable = has_pot_option;
+ mp->trace_enable = has_trace_option;
+
+ S;
+ W;
+
+ return (0);
+
+}
+
+
+static int
+api_ioam_disable (vat_main_t * vam)
+{
+ vl_api_ioam_disable_t *mp;
+ f64 timeout;
+
+ M (IOAM_DISABLE, ioam_disable);
+ S;
+ W;
return 0;
}
-uword
-unformat_l2_mask (unformat_input_t * input, va_list * args)
+static int
+api_sr_tunnel_add_del (vat_main_t * vam)
{
- u8 **maskp = va_arg (*args, u8 **);
+ unformat_input_t *i = vam->input;
+ vl_api_sr_tunnel_add_del_t *mp;
+ f64 timeout;
+ int is_del = 0;
+ int pl_index;
+ ip6_address_t src_address;
+ int src_address_set = 0;
+ ip6_address_t dst_address;
+ u32 dst_mask_width;
+ int dst_address_set = 0;
+ u16 flags = 0;
+ u32 rx_table_id = 0;
+ u32 tx_table_id = 0;
+ ip6_address_t *segments = 0;
+ ip6_address_t *this_seg;
+ ip6_address_t *tags = 0;
+ ip6_address_t *this_tag;
+ ip6_address_t next_address, tag;
+ u8 *name = 0;
+ u8 *policy_name = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_del = 1;
+ else if (unformat (i, "name %s", &name))
+ ;
+ else if (unformat (i, "policy %s", &policy_name))
+ ;
+ else if (unformat (i, "rx_fib_id %d", &rx_table_id))
+ ;
+ else if (unformat (i, "tx_fib_id %d", &tx_table_id))
+ ;
+ else if (unformat (i, "src %U", unformat_ip6_address, &src_address))
+ src_address_set = 1;
+ else if (unformat (i, "dst %U/%d",
+ unformat_ip6_address, &dst_address, &dst_mask_width))
+ dst_address_set = 1;
+ else if (unformat (i, "next %U", unformat_ip6_address, &next_address))
+ {
+ vec_add2 (segments, this_seg, 1);
+ clib_memcpy (this_seg->as_u8, next_address.as_u8,
+ sizeof (*this_seg));
+ }
+ else if (unformat (i, "tag %U", unformat_ip6_address, &tag))
+ {
+ vec_add2 (tags, this_tag, 1);
+ clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag));
+ }
+ else if (unformat (i, "clean"))
+ flags |= IP6_SR_HEADER_FLAG_CLEANUP;
+ else if (unformat (i, "protected"))
+ flags |= IP6_SR_HEADER_FLAG_PROTECTED;
+ else if (unformat (i, "InPE %d", &pl_index))
+ {
+ if (pl_index <= 0 || pl_index > 4)
+ {
+ pl_index_range_error:
+ errmsg ("pl index %d out of range\n", pl_index);
+ return -99;
+ }
+ flags |=
+ IP6_SR_HEADER_FLAG_PL_ELT_INGRESS_PE << (3 * (pl_index - 1));
+ }
+ else if (unformat (i, "EgPE %d", &pl_index))
+ {
+ if (pl_index <= 0 || pl_index > 4)
+ goto pl_index_range_error;
+ flags |=
+ IP6_SR_HEADER_FLAG_PL_ELT_EGRESS_PE << (3 * (pl_index - 1));
+ }
+ else if (unformat (i, "OrgSrc %d", &pl_index))
+ {
+ if (pl_index <= 0 || pl_index > 4)
+ goto pl_index_range_error;
+ flags |=
+ IP6_SR_HEADER_FLAG_PL_ELT_ORIG_SRC_ADDR << (3 * (pl_index - 1));
+ }
+ else
+ break;
+ }
+
+ if (!src_address_set)
+ {
+ errmsg ("src address required\n");
+ return -99;
+ }
+
+ if (!dst_address_set)
+ {
+ errmsg ("dst address required\n");
+ return -99;
+ }
+
+ if (!segments)
+ {
+ errmsg ("at least one sr segment required\n");
+ return -99;
+ }
+
+ M2 (SR_TUNNEL_ADD_DEL, sr_tunnel_add_del,
+ vec_len (segments) * sizeof (ip6_address_t)
+ + vec_len (tags) * sizeof (ip6_address_t));
+
+ clib_memcpy (mp->src_address, &src_address, sizeof (mp->src_address));
+ clib_memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address));
+ mp->dst_mask_width = dst_mask_width;
+ mp->flags_net_byte_order = clib_host_to_net_u16 (flags);
+ mp->n_segments = vec_len (segments);
+ mp->n_tags = vec_len (tags);
+ mp->is_add = is_del == 0;
+ clib_memcpy (mp->segs_and_tags, segments,
+ vec_len (segments) * sizeof (ip6_address_t));
+ clib_memcpy (mp->segs_and_tags +
+ vec_len (segments) * sizeof (ip6_address_t), tags,
+ vec_len (tags) * sizeof (ip6_address_t));
+
+ mp->outer_vrf_id = ntohl (rx_table_id);
+ mp->inner_vrf_id = ntohl (tx_table_id);
+ memcpy (mp->name, name, vec_len (name));
+ memcpy (mp->policy_name, policy_name, vec_len (policy_name));
+
+ vec_free (segments);
+ vec_free (tags);
+
+ S;
+ W;
+ /* NOTREACHED */
+}
+
+static int
+api_sr_policy_add_del (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_sr_policy_add_del_t *mp;
+ f64 timeout;
+ int is_del = 0;
+ u8 *name = 0;
+ u8 *tunnel_name = 0;
+ u8 **tunnel_names = 0;
+
+ int name_set = 0;
+ int tunnel_set = 0;
+ int j = 0;
+ int tunnel_names_length = 1; // Init to 1 to offset the #tunnel_names counter byte
+ int tun_name_len = 0; // Different naming convention used as confusing these would be "bad" (TM)
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ is_del = 1;
+ else if (unformat (input, "name %s", &name))
+ name_set = 1;
+ else if (unformat (input, "tunnel %s", &tunnel_name))
+ {
+ if (tunnel_name)
+ {
+ vec_add1 (tunnel_names, tunnel_name);
+ /* For serializer:
+ - length = #bytes to store in serial vector
+ - +1 = byte to store that length
+ */
+ tunnel_names_length += (vec_len (tunnel_name) + 1);
+ tunnel_set = 1;
+ tunnel_name = 0;
+ }
+ }
+ else
+ break;
+ }
+
+ if (!name_set)
+ {
+ errmsg ("policy name required\n");
+ return -99;
+ }
+
+ if ((!tunnel_set) && (!is_del))
+ {
+ errmsg ("tunnel name required\n");
+ return -99;
+ }
+
+ M2 (SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length);
+
+
+
+ mp->is_add = !is_del;
+
+ memcpy (mp->name, name, vec_len (name));
+ // Since mp->tunnel_names is of type u8[0] and not a u8 *, u8 ** needs to be serialized
+ u8 *serial_orig = 0;
+ vec_validate (serial_orig, tunnel_names_length);
+ *serial_orig = vec_len (tunnel_names); // Store the number of tunnels as length in first byte of serialized vector
+ serial_orig += 1; // Move along one byte to store the length of first tunnel_name
+
+ for (j = 0; j < vec_len (tunnel_names); j++)
+ {
+ tun_name_len = vec_len (tunnel_names[j]);
+ *serial_orig = tun_name_len; // Store length of tunnel name in first byte of Length/Value pair
+ serial_orig += 1; // Move along one byte to store the actual tunnel name
+ memcpy (serial_orig, tunnel_names[j], tun_name_len);
+ serial_orig += tun_name_len; // Advance past the copy
+ }
+ memcpy (mp->tunnel_names, serial_orig - tunnel_names_length, tunnel_names_length); // Regress serial_orig to head then copy fwd
+
+ vec_free (tunnel_names);
+ vec_free (tunnel_name);
+
+ S;
+ W;
+ /* NOTREACHED */
+}
+
+static int
+api_sr_multicast_map_add_del (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_sr_multicast_map_add_del_t *mp;
+ f64 timeout;
+ int is_del = 0;
+ ip6_address_t multicast_address;
+ u8 *policy_name = 0;
+ int multicast_address_set = 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "del"))
+ is_del = 1;
+ else
+ if (unformat
+ (input, "address %U", unformat_ip6_address, &multicast_address))
+ multicast_address_set = 1;
+ else if (unformat (input, "sr-policy %s", &policy_name))
+ ;
+ else
+ break;
+ }
+
+ if (!is_del && !policy_name)
+ {
+ errmsg ("sr-policy name required\n");
+ return -99;
+ }
+
+
+ if (!multicast_address_set)
+ {
+ errmsg ("address required\n");
+ return -99;
+ }
+
+ M (SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del);
+
+ mp->is_add = !is_del;
+ memcpy (mp->policy_name, policy_name, vec_len (policy_name));
+ clib_memcpy (mp->multicast_address, &multicast_address,
+ sizeof (mp->multicast_address));
+
+
+ vec_free (policy_name);
+
+ S;
+ W;
+ /* NOTREACHED */
+}
+
+
+#define foreach_tcp_proto_field \
+_(src_port) \
+_(dst_port)
+
+#define foreach_udp_proto_field \
+_(src_port) \
+_(dst_port)
+
+#define foreach_ip4_proto_field \
+_(src_address) \
+_(dst_address) \
+_(tos) \
+_(length) \
+_(fragment_id) \
+_(ttl) \
+_(protocol) \
+_(checksum)
+
+uword
+unformat_tcp_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 found_something = 0;
+ tcp_header_t *tcp;
+
+#define _(a) u8 a=0;
+ foreach_tcp_proto_field;
+#undef _
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (0);
+#define _(a) else if (unformat (input, #a)) a=1;
+ foreach_tcp_proto_field
+#undef _
+ else
+ break;
+ }
+
+#define _(a) found_something += a;
+ foreach_tcp_proto_field;
+#undef _
+
+ if (found_something == 0)
+ return 0;
+
+ vec_validate (mask, sizeof (*tcp) - 1);
+
+ tcp = (tcp_header_t *) mask;
+
+#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a));
+ foreach_tcp_proto_field;
+#undef _
+
+ *maskp = mask;
+ return 1;
+}
+
+uword
+unformat_udp_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 found_something = 0;
+ udp_header_t *udp;
+
+#define _(a) u8 a=0;
+ foreach_udp_proto_field;
+#undef _
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (0);
+#define _(a) else if (unformat (input, #a)) a=1;
+ foreach_udp_proto_field
+#undef _
+ else
+ break;
+ }
+
+#define _(a) found_something += a;
+ foreach_udp_proto_field;
+#undef _
+
+ if (found_something == 0)
+ return 0;
+
+ vec_validate (mask, sizeof (*udp) - 1);
+
+ udp = (udp_header_t *) mask;
+
+#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a));
+ foreach_udp_proto_field;
+#undef _
+
+ *maskp = mask;
+ return 1;
+}
+
+typedef struct
+{
+ u16 src_port, dst_port;
+} tcpudp_header_t;
+
+uword
+unformat_l4_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u16 src_port = 0, dst_port = 0;
+ tcpudp_header_t *tcpudp;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "tcp %U", unformat_tcp_mask, maskp))
+ return 1;
+ else if (unformat (input, "udp %U", unformat_udp_mask, maskp))
+ return 1;
+ else if (unformat (input, "src_port"))
+ src_port = 0xFFFF;
+ else if (unformat (input, "dst_port"))
+ dst_port = 0xFFFF;
+ else
+ return 0;
+ }
+
+ if (!src_port && !dst_port)
+ return 0;
+
+ u8 *mask = 0;
+ vec_validate (mask, sizeof (tcpudp_header_t) - 1);
+
+ tcpudp = (tcpudp_header_t *) mask;
+ tcpudp->src_port = src_port;
+ tcpudp->dst_port = dst_port;
+
+ *maskp = mask;
+
+ return 1;
+}
+
+uword
+unformat_ip4_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 found_something = 0;
+ ip4_header_t *ip;
+
+#define _(a) u8 a=0;
+ foreach_ip4_proto_field;
+#undef _
+ u8 version = 0;
+ u8 hdr_length = 0;
+
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "version"))
+ version = 1;
+ else if (unformat (input, "hdr_length"))
+ hdr_length = 1;
+ else if (unformat (input, "src"))
+ src_address = 1;
+ else if (unformat (input, "dst"))
+ dst_address = 1;
+ else if (unformat (input, "proto"))
+ protocol = 1;
+
+#define _(a) else if (unformat (input, #a)) a=1;
+ foreach_ip4_proto_field
+#undef _
+ else
+ break;
+ }
+
+#define _(a) found_something += a;
+ foreach_ip4_proto_field;
+#undef _
+
+ if (found_something == 0)
+ return 0;
+
+ vec_validate (mask, sizeof (*ip) - 1);
+
+ ip = (ip4_header_t *) mask;
+
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+ foreach_ip4_proto_field;
+#undef _
+
+ ip->ip_version_and_header_length = 0;
+
+ if (version)
+ ip->ip_version_and_header_length |= 0xF0;
+
+ if (hdr_length)
+ ip->ip_version_and_header_length |= 0x0F;
+
+ *maskp = mask;
+ return 1;
+}
+
+#define foreach_ip6_proto_field \
+_(src_address) \
+_(dst_address) \
+_(payload_length) \
+_(hop_limit) \
+_(protocol)
+
+uword
+unformat_ip6_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 found_something = 0;
+ ip6_header_t *ip;
+ u32 ip_version_traffic_class_and_flow_label;
+
+#define _(a) u8 a=0;
+ foreach_ip6_proto_field;
+#undef _
+ u8 version = 0;
+ u8 traffic_class = 0;
+ u8 flow_label = 0;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "version"))
+ version = 1;
+ else if (unformat (input, "traffic-class"))
+ traffic_class = 1;
+ else if (unformat (input, "flow-label"))
+ flow_label = 1;
+ else if (unformat (input, "src"))
+ src_address = 1;
+ else if (unformat (input, "dst"))
+ dst_address = 1;
+ else if (unformat (input, "proto"))
+ protocol = 1;
+
+#define _(a) else if (unformat (input, #a)) a=1;
+ foreach_ip6_proto_field
+#undef _
+ else
+ break;
+ }
+
+#define _(a) found_something += a;
+ foreach_ip6_proto_field;
+#undef _
+
+ if (found_something == 0)
+ return 0;
+
+ vec_validate (mask, sizeof (*ip) - 1);
+
+ ip = (ip6_header_t *) mask;
+
+#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a));
+ foreach_ip6_proto_field;
+#undef _
+
+ ip_version_traffic_class_and_flow_label = 0;
+
+ if (version)
+ ip_version_traffic_class_and_flow_label |= 0xF0000000;
+
+ if (traffic_class)
+ ip_version_traffic_class_and_flow_label |= 0x0FF00000;
+
+ if (flow_label)
+ ip_version_traffic_class_and_flow_label |= 0x000FFFFF;
+
+ ip->ip_version_traffic_class_and_flow_label =
+ clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+
+ *maskp = mask;
+ return 1;
+}
+
+uword
+unformat_l3_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp))
+ return 1;
+ else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp))
+ return 1;
+ else
+ break;
+ }
+ return 0;
+}
+
+uword
+unformat_l2_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u8 *mask = 0;
+ u8 src = 0;
+ u8 dst = 0;
+ u8 proto = 0;
+ u8 tag1 = 0;
+ u8 tag2 = 0;
+ u8 ignore_tag1 = 0;
+ u8 ignore_tag2 = 0;
+ u8 cos1 = 0;
+ u8 cos2 = 0;
+ u8 dot1q = 0;
+ u8 dot1ad = 0;
+ int len = 14;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "src"))
+ src = 1;
+ else if (unformat (input, "dst"))
+ dst = 1;
+ else if (unformat (input, "proto"))
+ proto = 1;
+ else if (unformat (input, "tag1"))
+ tag1 = 1;
+ else if (unformat (input, "tag2"))
+ tag2 = 1;
+ else if (unformat (input, "ignore-tag1"))
+ ignore_tag1 = 1;
+ else if (unformat (input, "ignore-tag2"))
+ ignore_tag2 = 1;
+ else if (unformat (input, "cos1"))
+ cos1 = 1;
+ else if (unformat (input, "cos2"))
+ cos2 = 1;
+ else if (unformat (input, "dot1q"))
+ dot1q = 1;
+ else if (unformat (input, "dot1ad"))
+ dot1ad = 1;
+ else
+ break;
+ }
+ if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
+ ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
+ return 0;
+
+ if (tag1 || ignore_tag1 || cos1 || dot1q)
+ len = 18;
+ if (tag2 || ignore_tag2 || cos2 || dot1ad)
+ len = 22;
+
+ vec_validate (mask, len - 1);
+
+ if (dst)
+ memset (mask, 0xff, 6);
+
+ if (src)
+ memset (mask + 6, 0xff, 6);
+
+ if (tag2 || dot1ad)
+ {
+ /* inner vlan tag */
+ if (tag2)
+ {
+ mask[19] = 0xff;
+ mask[18] = 0x0f;
+ }
+ if (cos2)
+ mask[18] |= 0xe0;
+ if (proto)
+ mask[21] = mask[20] = 0xff;
+ if (tag1)
+ {
+ mask[15] = 0xff;
+ mask[14] = 0x0f;
+ }
+ if (cos1)
+ mask[14] |= 0xe0;
+ *maskp = mask;
+ return 1;
+ }
+ if (tag1 | dot1q)
+ {
+ if (tag1)
+ {
+ mask[15] = 0xff;
+ mask[14] = 0x0f;
+ }
+ if (cos1)
+ mask[14] |= 0xe0;
+ if (proto)
+ mask[16] = mask[17] = 0xff;
+
+ *maskp = mask;
+ return 1;
+ }
+ if (cos2)
+ mask[18] |= 0xe0;
+ if (cos1)
+ mask[14] |= 0xe0;
+ if (proto)
+ mask[12] = mask[13] = 0xff;
+
+ *maskp = mask;
+ return 1;
+}
+
+uword
+unformat_classify_mask (unformat_input_t * input, va_list * args)
+{
+ u8 **maskp = va_arg (*args, u8 **);
+ u32 *skipp = va_arg (*args, u32 *);
+ u32 *matchp = va_arg (*args, u32 *);
+ u32 match;
+ u8 *mask = 0;
+ u8 *l2 = 0;
+ u8 *l3 = 0;
+ u8 *l4 = 0;
+ int i;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "hex %U", unformat_hex_string, &mask))
+ ;
+ else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
+ ;
+ else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
+ ;
+ else if (unformat (input, "l4 %U", unformat_l4_mask, &l4))
+ ;
+ else
+ break;
+ }
+
+ if (l4 && !l3)
+ {
+ vec_free (mask);
+ vec_free (l2);
+ vec_free (l4);
+ return 0;
+ }
+
+ if (mask || l2 || l3 || l4)
+ {
+ if (l2 || l3 || l4)
+ {
+ /* "With a free Ethernet header in every package" */
+ if (l2 == 0)
+ vec_validate (l2, 13);
+ mask = l2;
+ if (vec_len (l3))
+ {
+ vec_append (mask, l3);
+ vec_free (l3);
+ }
+ if (vec_len (l4))
+ {
+ vec_append (mask, l4);
+ vec_free (l4);
+ }
+ }
+
+ /* Scan forward looking for the first significant mask octet */
+ for (i = 0; i < vec_len (mask); i++)
+ if (mask[i])
+ break;
+
+ /* compute (skip, match) params */
+ *skipp = i / sizeof (u32x4);
+ vec_delete (mask, *skipp * sizeof (u32x4), 0);
+
+ /* Pad mask to an even multiple of the vector size */
+ while (vec_len (mask) % sizeof (u32x4))
+ vec_add1 (mask, 0);
+
+ match = vec_len (mask) / sizeof (u32x4);
+
+ for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4))
+ {
+ u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4)));
+ if (*tmp || *(tmp + 1))
+ break;
+ match--;
+ }
+ if (match == 0)
+ clib_warning ("BUG: match 0");
+
+ _vec_len (mask) = match * sizeof (u32x4);
+
+ *matchp = match;
+ *maskp = mask;
+
+ return 1;
+ }
+
+ return 0;
+}
+
+#define foreach_l2_next \
+_(drop, DROP) \
+_(ethernet, ETHERNET_INPUT) \
+_(ip4, IP4_INPUT) \
+_(ip6, IP6_INPUT)
+
+uword
+unformat_l2_next_index (unformat_input_t * input, va_list * args)
+{
+ u32 *miss_next_indexp = va_arg (*args, u32 *);
+ u32 next_index = 0;
+ u32 tmp;
+
+#define _(n,N) \
+ if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;}
+ foreach_l2_next;
+#undef _
+
+ if (unformat (input, "%d", &tmp))
+ {
+ next_index = tmp;
+ goto out;
+ }
+
+ return 0;
+
+out:
+ *miss_next_indexp = next_index;
+ return 1;
+}
+
+#define foreach_ip_next \
+_(drop, DROP) \
+_(local, LOCAL) \
+_(rewrite, REWRITE)
+
+uword
+unformat_ip_next_index (unformat_input_t * input, va_list * args)
+{
+ u32 *miss_next_indexp = va_arg (*args, u32 *);
+ u32 next_index = 0;
+ u32 tmp;
+
+#define _(n,N) \
+ if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;}
+ foreach_ip_next;
+#undef _
+
+ if (unformat (input, "%d", &tmp))
+ {
+ next_index = tmp;
+ goto out;
+ }
+
+ return 0;
+
+out:
+ *miss_next_indexp = next_index;
+ return 1;
+}
+
+#define foreach_acl_next \
+_(deny, DENY)
+
+uword
+unformat_acl_next_index (unformat_input_t * input, va_list * args)
+{
+ u32 *miss_next_indexp = va_arg (*args, u32 *);
+ u32 next_index = 0;
+ u32 tmp;
+
+#define _(n,N) \
+ if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;}
+ foreach_acl_next;
+#undef _
+
+ if (unformat (input, "permit"))
+ {
+ next_index = ~0;
+ goto out;
+ }
+ else if (unformat (input, "%d", &tmp))
+ {
+ next_index = tmp;
+ goto out;
+ }
+
+ return 0;
+
+out:
+ *miss_next_indexp = next_index;
+ return 1;
+}
+
+uword
+unformat_policer_precolor (unformat_input_t * input, va_list * args)
+{
+ u32 *r = va_arg (*args, u32 *);
+
+ if (unformat (input, "conform-color"))
+ *r = POLICE_CONFORM;
+ else if (unformat (input, "exceed-color"))
+ *r = POLICE_EXCEED;
+ else
+ return 0;
+
+ return 1;
+}
+
+static int
+api_classify_add_del_table (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_classify_add_del_table_t *mp;
+
+ u32 nbuckets = 2;
+ u32 skip = ~0;
+ u32 match = ~0;
+ int is_add = 1;
+ u32 table_index = ~0;
+ u32 next_table_index = ~0;
+ u32 miss_next_index = ~0;
+ u32 memory_size = 32 << 20;
u8 *mask = 0;
+ f64 timeout;
+ u32 current_data_flag = 0;
+ int current_data_offset = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "buckets %d", &nbuckets))
+ ;
+ else if (unformat (i, "memory_size %d", &memory_size))
+ ;
+ else if (unformat (i, "skip %d", &skip))
+ ;
+ else if (unformat (i, "match %d", &match))
+ ;
+ else if (unformat (i, "table %d", &table_index))
+ ;
+ else if (unformat (i, "mask %U", unformat_classify_mask,
+ &mask, &skip, &match))
+ ;
+ else if (unformat (i, "next-table %d", &next_table_index))
+ ;
+ else if (unformat (i, "miss-next %U", unformat_ip_next_index,
+ &miss_next_index))
+ ;
+ else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index,
+ &miss_next_index))
+ ;
+ else if (unformat (i, "acl-miss-next %U", unformat_acl_next_index,
+ &miss_next_index))
+ ;
+ else if (unformat (i, "current-data-flag %d", ¤t_data_flag))
+ ;
+ else if (unformat (i, "current-data-offset %d", ¤t_data_offset))
+ ;
+ else
+ break;
+ }
+
+ if (is_add && mask == 0)
+ {
+ errmsg ("Mask required\n");
+ return -99;
+ }
+
+ if (is_add && skip == ~0)
+ {
+ errmsg ("skip count required\n");
+ return -99;
+ }
+
+ if (is_add && match == ~0)
+ {
+ errmsg ("match count required\n");
+ return -99;
+ }
+
+ if (!is_add && table_index == ~0)
+ {
+ errmsg ("table index required for delete\n");
+ return -99;
+ }
+
+ M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table, vec_len (mask));
+
+ mp->is_add = is_add;
+ mp->table_index = ntohl (table_index);
+ mp->nbuckets = ntohl (nbuckets);
+ mp->memory_size = ntohl (memory_size);
+ mp->skip_n_vectors = ntohl (skip);
+ mp->match_n_vectors = ntohl (match);
+ mp->next_table_index = ntohl (next_table_index);
+ mp->miss_next_index = ntohl (miss_next_index);
+ mp->current_data_flag = ntohl (current_data_flag);
+ mp->current_data_offset = ntohl (current_data_offset);
+ clib_memcpy (mp->mask, mask, vec_len (mask));
+
+ vec_free (mask);
+
+ S;
+ W;
+ /* NOTREACHED */
+}
+
+uword
+unformat_l4_match (unformat_input_t * input, va_list * args)
+{
+ u8 **matchp = va_arg (*args, u8 **);
+
+ u8 *proto_header = 0;
+ int src_port = 0;
+ int dst_port = 0;
+
+ tcpudp_header_t h;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "src_port %d", &src_port))
+ ;
+ else if (unformat (input, "dst_port %d", &dst_port))
+ ;
+ else
+ return 0;
+ }
+
+ h.src_port = clib_host_to_net_u16 (src_port);
+ h.dst_port = clib_host_to_net_u16 (dst_port);
+ vec_validate (proto_header, sizeof (h) - 1);
+ memcpy (proto_header, &h, sizeof (h));
+
+ *matchp = proto_header;
+
+ return 1;
+}
+
+uword
+unformat_ip4_match (unformat_input_t * input, va_list * args)
+{
+ u8 **matchp = va_arg (*args, u8 **);
+ u8 *match = 0;
+ ip4_header_t *ip;
+ int version = 0;
+ u32 version_val;
+ int hdr_length = 0;
+ u32 hdr_length_val;
+ int src = 0, dst = 0;
+ ip4_address_t src_val, dst_val;
+ int proto = 0;
+ u32 proto_val;
+ int tos = 0;
+ u32 tos_val;
+ int length = 0;
+ u32 length_val;
+ int fragment_id = 0;
+ u32 fragment_id_val;
+ int ttl = 0;
+ int ttl_val;
+ int checksum = 0;
+ u32 checksum_val;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "version %d", &version_val))
+ version = 1;
+ else if (unformat (input, "hdr_length %d", &hdr_length_val))
+ hdr_length = 1;
+ else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
+ src = 1;
+ else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
+ dst = 1;
+ else if (unformat (input, "proto %d", &proto_val))
+ proto = 1;
+ else if (unformat (input, "tos %d", &tos_val))
+ tos = 1;
+ else if (unformat (input, "length %d", &length_val))
+ length = 1;
+ else if (unformat (input, "fragment_id %d", &fragment_id_val))
+ fragment_id = 1;
+ else if (unformat (input, "ttl %d", &ttl_val))
+ ttl = 1;
+ else if (unformat (input, "checksum %d", &checksum_val))
+ checksum = 1;
+ else
+ break;
+ }
+
+ if (version + hdr_length + src + dst + proto + tos + length + fragment_id
+ + ttl + checksum == 0)
+ return 0;
+
+ /*
+ * Aligned because we use the real comparison functions
+ */
+ vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
+
+ ip = (ip4_header_t *) match;
+
+ /* These are realistically matched in practice */
+ if (src)
+ ip->src_address.as_u32 = src_val.as_u32;
+
+ if (dst)
+ ip->dst_address.as_u32 = dst_val.as_u32;
+
+ if (proto)
+ ip->protocol = proto_val;
+
+
+ /* These are not, but they're included for completeness */
+ if (version)
+ ip->ip_version_and_header_length |= (version_val & 0xF) << 4;
+
+ if (hdr_length)
+ ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
+
+ if (tos)
+ ip->tos = tos_val;
+
+ if (length)
+ ip->length = clib_host_to_net_u16 (length_val);
+
+ if (ttl)
+ ip->ttl = ttl_val;
+
+ if (checksum)
+ ip->checksum = clib_host_to_net_u16 (checksum_val);
+
+ *matchp = match;
+ return 1;
+}
+
+uword
+unformat_ip6_match (unformat_input_t * input, va_list * args)
+{
+ u8 **matchp = va_arg (*args, u8 **);
+ u8 *match = 0;
+ ip6_header_t *ip;
+ int version = 0;
+ u32 version_val;
+ u8 traffic_class = 0;
+ u32 traffic_class_val = 0;
+ u8 flow_label = 0;
+ u8 flow_label_val;
+ int src = 0, dst = 0;
+ ip6_address_t src_val, dst_val;
+ int proto = 0;
+ u32 proto_val;
+ int payload_length = 0;
+ u32 payload_length_val;
+ int hop_limit = 0;
+ int hop_limit_val;
+ u32 ip_version_traffic_class_and_flow_label;
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "version %d", &version_val))
+ version = 1;
+ else if (unformat (input, "traffic_class %d", &traffic_class_val))
+ traffic_class = 1;
+ else if (unformat (input, "flow_label %d", &flow_label_val))
+ flow_label = 1;
+ else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
+ src = 1;
+ else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
+ dst = 1;
+ else if (unformat (input, "proto %d", &proto_val))
+ proto = 1;
+ else if (unformat (input, "payload_length %d", &payload_length_val))
+ payload_length = 1;
+ else if (unformat (input, "hop_limit %d", &hop_limit_val))
+ hop_limit = 1;
+ else
+ break;
+ }
+
+ if (version + traffic_class + flow_label + src + dst + proto +
+ payload_length + hop_limit == 0)
+ return 0;
+
+ /*
+ * Aligned because we use the real comparison functions
+ */
+ vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
+
+ ip = (ip6_header_t *) match;
+
+ if (src)
+ clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address));
+
+ if (dst)
+ clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address));
+
+ if (proto)
+ ip->protocol = proto_val;
+
+ ip_version_traffic_class_and_flow_label = 0;
+
+ if (version)
+ ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
+
+ if (traffic_class)
+ ip_version_traffic_class_and_flow_label |=
+ (traffic_class_val & 0xFF) << 20;
+
+ if (flow_label)
+ ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
+
+ ip->ip_version_traffic_class_and_flow_label =
+ clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+
+ if (payload_length)
+ ip->payload_length = clib_host_to_net_u16 (payload_length_val);
+
+ if (hop_limit)
+ ip->hop_limit = hop_limit_val;
+
+ *matchp = match;
+ return 1;
+}
+
+uword
+unformat_l3_match (unformat_input_t * input, va_list * args)
+{
+ u8 **matchp = va_arg (*args, u8 **);
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
+ return 1;
+ else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
+ return 1;
+ else
+ break;
+ }
+ return 0;
+}
+
+uword
+unformat_vlan_tag (unformat_input_t * input, va_list * args)
+{
+ u8 *tagp = va_arg (*args, u8 *);
+ u32 tag;
+
+ if (unformat (input, "%d", &tag))
+ {
+ tagp[0] = (tag >> 8) & 0x0F;
+ tagp[1] = tag & 0xFF;
+ return 1;
+ }
+
+ return 0;
+}
+
+uword
+unformat_l2_match (unformat_input_t * input, va_list * args)
+{
+ u8 **matchp = va_arg (*args, u8 **);
+ u8 *match = 0;
u8 src = 0;
+ u8 src_val[6];
u8 dst = 0;
+ u8 dst_val[6];
u8 proto = 0;
+ u16 proto_val;
u8 tag1 = 0;
+ u8 tag1_val[2];
u8 tag2 = 0;
+ u8 tag2_val[2];
+ int len = 14;
u8 ignore_tag1 = 0;
u8 ignore_tag2 = 0;
u8 cos1 = 0;
u8 cos2 = 0;
- u8 dot1q = 0;
- u8 dot1ad = 0;
- int len = 14;
+ u32 cos1_val = 0;
+ u32 cos2_val = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "src"))
+ if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
src = 1;
- else if (unformat (input, "dst"))
+ else
+ if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
dst = 1;
- else if (unformat (input, "proto"))
+ else if (unformat (input, "proto %U",
+ unformat_ethernet_type_host_byte_order, &proto_val))
proto = 1;
- else if (unformat (input, "tag1"))
+ else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
tag1 = 1;
- else if (unformat (input, "tag2"))
+ else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
tag2 = 1;
else if (unformat (input, "ignore-tag1"))
ignore_tag1 = 1;
else if (unformat (input, "ignore-tag2"))
ignore_tag2 = 1;
- else if (unformat (input, "cos1"))
+ else if (unformat (input, "cos1 %d", &cos1_val))
cos1 = 1;
- else if (unformat (input, "cos2"))
+ else if (unformat (input, "cos2 %d", &cos2_val))
cos2 = 1;
- else if (unformat (input, "dot1q"))
- dot1q = 1;
- else if (unformat (input, "dot1ad"))
- dot1ad = 1;
else
break;
}
- if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad +
+ if ((src + dst + proto + tag1 + tag2 +
ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
return 0;
- if (tag1 || ignore_tag1 || cos1 || dot1q)
+ if (tag1 || ignore_tag1 || cos1)
len = 18;
- if (tag2 || ignore_tag2 || cos2 || dot1ad)
+ if (tag2 || ignore_tag2 || cos2)
len = 22;
- vec_validate (mask, len - 1);
+ vec_validate_aligned (match, len - 1, sizeof (u32x4));
if (dst)
- memset (mask, 0xff, 6);
+ clib_memcpy (match, dst_val, 6);
if (src)
- memset (mask + 6, 0xff, 6);
+ clib_memcpy (match + 6, src_val, 6);
- if (tag2 || dot1ad)
+ if (tag2)
{
/* inner vlan tag */
- if (tag2)
- {
- mask[19] = 0xff;
- mask[18] = 0x0f;
- }
+ match[19] = tag2_val[1];
+ match[18] = tag2_val[0];
if (cos2)
- mask[18] |= 0xe0;
+ match[18] |= (cos2_val & 0x7) << 5;
if (proto)
- mask[21] = mask[20] = 0xff;
+ {
+ match[21] = proto_val & 0xff;
+ match[20] = proto_val >> 8;
+ }
if (tag1)
{
- mask[15] = 0xff;
- mask[14] = 0x0f;
+ match[15] = tag1_val[1];
+ match[14] = tag1_val[0];
}
if (cos1)
- mask[14] |= 0xe0;
- *maskp = mask;
+ match[14] |= (cos1_val & 0x7) << 5;
+ *matchp = match;
return 1;
}
- if (tag1 | dot1q)
+ if (tag1)
{
- if (tag1)
+ match[15] = tag1_val[1];
+ match[14] = tag1_val[0];
+ if (proto)
{
- mask[15] = 0xff;
- mask[14] = 0x0f;
+ match[17] = proto_val & 0xff;
+ match[16] = proto_val >> 8;
}
if (cos1)
- mask[14] |= 0xe0;
- if (proto)
- mask[16] = mask[17] = 0xff;
+ match[14] |= (cos1_val & 0x7) << 5;
- *maskp = mask;
+ *matchp = match;
return 1;
}
if (cos2)
- mask[18] |= 0xe0;
+ match[18] |= (cos2_val & 0x7) << 5;
if (cos1)
- mask[14] |= 0xe0;
+ match[14] |= (cos1_val & 0x7) << 5;
if (proto)
- mask[12] = mask[13] = 0xff;
+ {
+ match[13] = proto_val & 0xff;
+ match[12] = proto_val >> 8;
+ }
- *maskp = mask;
+ *matchp = match;
return 1;
}
+
uword
-unformat_classify_mask (unformat_input_t * input, va_list * args)
+unformat_classify_match (unformat_input_t * input, va_list * args)
{
- u8 **maskp = va_arg (*args, u8 **);
- u32 *skipp = va_arg (*args, u32 *);
- u32 *matchp = va_arg (*args, u32 *);
- u32 match;
- u8 *mask = 0;
+ 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;
- int i;
+ u8 *l4 = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "hex %U", unformat_hex_string, &mask))
+ if (unformat (input, "hex %U", unformat_hex_string, &match))
;
- else if (unformat (input, "l2 %U", unformat_l2_mask, &l2))
+ else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
;
- else if (unformat (input, "l3 %U", unformat_l3_mask, &l3))
+ else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
+ ;
+ else if (unformat (input, "l4 %U", unformat_l4_match, &l4))
;
else
break;
}
- if (mask || l2 || l3)
- {
- if (l2 || l3)
- {
- /* "With a free Ethernet header in every package" */
- if (l2 == 0)
- vec_validate (l2, 13);
- mask = l2;
- if (vec_len (l3))
- {
- vec_append (mask, l3);
- vec_free (l3);
- }
- }
-
- /* Scan forward looking for the first significant mask octet */
- for (i = 0; i < vec_len (mask); i++)
- if (mask[i])
- break;
-
- /* compute (skip, match) params */
- *skipp = i / sizeof (u32x4);
- vec_delete (mask, *skipp * sizeof (u32x4), 0);
-
- /* Pad mask to an even multiple of the vector size */
- while (vec_len (mask) % sizeof (u32x4))
- vec_add1 (mask, 0);
-
- match = vec_len (mask) / sizeof (u32x4);
-
- for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4))
- {
- u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4)));
- if (*tmp || *(tmp + 1))
- break;
- match--;
- }
- if (match == 0)
- clib_warning ("BUG: match 0");
-
- _vec_len (mask) = match * sizeof (u32x4);
-
- *matchp = match;
- *maskp = mask;
-
- return 1;
- }
-
- return 0;
-}
-
-#define foreach_l2_next \
-_(drop, DROP) \
-_(ethernet, ETHERNET_INPUT) \
-_(ip4, IP4_INPUT) \
-_(ip6, IP6_INPUT)
-
-uword
-unformat_l2_next_index (unformat_input_t * input, va_list * args)
-{
- u32 *miss_next_indexp = va_arg (*args, u32 *);
- u32 next_index = 0;
- u32 tmp;
-
-#define _(n,N) \
- if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;}
- foreach_l2_next;
-#undef _
-
- if (unformat (input, "%d", &tmp))
- {
- next_index = tmp;
- goto out;
- }
-
- return 0;
-
-out:
- *miss_next_indexp = next_index;
- return 1;
-}
-
-#define foreach_ip_next \
-_(drop, DROP) \
-_(local, LOCAL) \
-_(rewrite, REWRITE)
-
-uword
-unformat_ip_next_index (unformat_input_t * input, va_list * args)
-{
- u32 *miss_next_indexp = va_arg (*args, u32 *);
- u32 next_index = 0;
- u32 tmp;
-
-#define _(n,N) \
- if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;}
- foreach_ip_next;
-#undef _
-
- if (unformat (input, "%d", &tmp))
+ if (l4 && !l3)
{
- next_index = tmp;
- goto out;
+ vec_free (match);
+ vec_free (l2);
+ vec_free (l4);
+ return 0;
}
- return 0;
-
-out:
- *miss_next_indexp = next_index;
- return 1;
-}
-
-#define foreach_acl_next \
-_(deny, DENY)
-
-uword
-unformat_acl_next_index (unformat_input_t * input, va_list * args)
-{
- u32 *miss_next_indexp = va_arg (*args, u32 *);
- u32 next_index = 0;
- u32 tmp;
-
-#define _(n,N) \
- if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;}
- foreach_acl_next;
-#undef _
-
- if (unformat (input, "permit"))
- {
- next_index = ~0;
- goto out;
- }
- else if (unformat (input, "%d", &tmp))
+ if (match || l2 || l3 || l4)
{
- next_index = tmp;
- goto out;
- }
+ if (l2 || l3 || l4)
+ {
+ /* "Win a free Ethernet header in every packet" */
+ if (l2 == 0)
+ vec_validate_aligned (l2, 13, sizeof (u32x4));
+ match = l2;
+ if (vec_len (l3))
+ {
+ vec_append_aligned (match, l3, sizeof (u32x4));
+ vec_free (l3);
+ }
+ if (vec_len (l4))
+ {
+ vec_append_aligned (match, l4, sizeof (u32x4));
+ vec_free (l4);
+ }
+ }
- return 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));
-out:
- *miss_next_indexp = next_index;
- return 1;
-}
+ /* Set size, include skipped vectors */
+ _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4);
-uword
-unformat_policer_precolor (unformat_input_t * input, va_list * args)
-{
- u32 *r = va_arg (*args, u32 *);
+ *matchp = match;
- if (unformat (input, "conform-color"))
- *r = POLICE_CONFORM;
- else if (unformat (input, "exceed-color"))
- *r = POLICE_EXCEED;
- else
- return 0;
+ return 1;
+ }
- return 1;
+ return 0;
}
static int
-api_classify_add_del_table (vat_main_t * vam)
+api_classify_add_del_session (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_classify_add_del_table_t *mp;
-
- u32 nbuckets = 2;
- u32 skip = ~0;
- u32 match = ~0;
+ vl_api_classify_add_del_session_t *mp;
int is_add = 1;
u32 table_index = ~0;
- u32 next_table_index = ~0;
- u32 miss_next_index = ~0;
- u32 memory_size = 32 << 20;
- u8 *mask = 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;
+ u32 action = 0;
+ u32 metadata = 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, "buckets %d", &nbuckets))
+ else if (unformat (i, "hit-next %U", unformat_ip_next_index,
+ &hit_next_index))
;
- else if (unformat (i, "memory_size %d", &memory_size))
+ else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index,
+ &hit_next_index))
;
- else if (unformat (i, "skip %d", &skip))
+ else if (unformat (i, "acl-hit-next %U", unformat_acl_next_index,
+ &hit_next_index))
;
- else if (unformat (i, "match %d", &match))
+ else if (unformat (i, "policer-hit-next %d", &hit_next_index))
;
- else if (unformat (i, "table %d", &table_index))
+ else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
;
- else if (unformat (i, "mask %U", unformat_classify_mask,
- &mask, &skip, &match))
+ else if (unformat (i, "opaque-index %d", &opaque_index))
;
- else if (unformat (i, "next-table %d", &next_table_index))
+ else if (unformat (i, "skip_n %d", &skip_n_vectors))
;
- else if (unformat (i, "miss-next %U", unformat_ip_next_index,
- &miss_next_index))
+ else if (unformat (i, "match_n %d", &match_n_vectors))
;
- else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index,
- &miss_next_index))
+ else if (unformat (i, "match %U", unformat_classify_match,
+ &match, skip_n_vectors, match_n_vectors))
;
- else if (unformat (i, "acl-miss-next %U", unformat_acl_next_index,
- &miss_next_index))
+ else if (unformat (i, "advance %d", &advance))
+ ;
+ else if (unformat (i, "table-index %d", &table_index))
+ ;
+ else if (unformat (i, "action set-ip4-fib-id %d", &metadata))
+ action = 1;
+ else if (unformat (i, "action set-ip6-fib-id %d", &metadata))
+ action = 2;
+ else if (unformat (i, "action %d", &action))
+ ;
+ else if (unformat (i, "metadata %d", &metadata))
;
else
break;
}
- if (is_add && mask == 0)
- {
- errmsg ("Mask required\n");
- return -99;
- }
-
- if (is_add && skip == ~0)
- {
- errmsg ("skip count required\n");
- return -99;
- }
-
- if (is_add && match == ~0)
+ if (table_index == ~0)
{
- errmsg ("match count required\n");
+ errmsg ("Table index required\n");
return -99;
}
- if (!is_add && table_index == ~0)
+ if (is_add && match == 0)
{
- errmsg ("table index required for delete\n");
+ errmsg ("Match value required\n");
return -99;
}
- M2 (CLASSIFY_ADD_DEL_TABLE, classify_add_del_table, vec_len (mask));
+ M2 (CLASSIFY_ADD_DEL_SESSION, classify_add_del_session, vec_len (match));
mp->is_add = is_add;
mp->table_index = ntohl (table_index);
- mp->nbuckets = ntohl (nbuckets);
- mp->memory_size = ntohl (memory_size);
- mp->skip_n_vectors = ntohl (skip);
- mp->match_n_vectors = ntohl (match);
- mp->next_table_index = ntohl (next_table_index);
- mp->miss_next_index = ntohl (miss_next_index);
- clib_memcpy (mp->mask, mask, vec_len (mask));
-
- vec_free (mask);
+ mp->hit_next_index = ntohl (hit_next_index);
+ mp->opaque_index = ntohl (opaque_index);
+ mp->advance = ntohl (advance);
+ mp->action = action;
+ mp->metadata = ntohl (metadata);
+ clib_memcpy (mp->match, match, vec_len (match));
+ vec_free (match);
S;
W;
/* NOTREACHED */
}
-uword
-unformat_ip4_match (unformat_input_t * input, va_list * args)
+static int
+api_classify_set_interface_ip_table (vat_main_t * vam)
{
- u8 **matchp = va_arg (*args, u8 **);
- u8 *match = 0;
- ip4_header_t *ip;
- int version = 0;
- u32 version_val;
- int hdr_length = 0;
- u32 hdr_length_val;
- int src = 0, dst = 0;
- ip4_address_t src_val, dst_val;
- int proto = 0;
- u32 proto_val;
- int tos = 0;
- u32 tos_val;
- int length = 0;
- u32 length_val;
- int fragment_id = 0;
- u32 fragment_id_val;
- int ttl = 0;
- int ttl_val;
- int checksum = 0;
- u32 checksum_val;
+ 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 (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "version %d", &version_val))
- version = 1;
- else if (unformat (input, "hdr_length %d", &hdr_length_val))
- hdr_length = 1;
- else if (unformat (input, "src %U", unformat_ip4_address, &src_val))
- src = 1;
- else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val))
- dst = 1;
- else if (unformat (input, "proto %d", &proto_val))
- proto = 1;
- else if (unformat (input, "tos %d", &tos_val))
- tos = 1;
- else if (unformat (input, "length %d", &length_val))
- length = 1;
- else if (unformat (input, "fragment_id %d", &fragment_id_val))
- fragment_id = 1;
- else if (unformat (input, "ttl %d", &ttl_val))
- ttl = 1;
- else if (unformat (input, "checksum %d", &checksum_val))
- checksum = 1;
+ 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
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (version + hdr_length + src + dst + proto + tos + length + fragment_id
- + ttl + checksum == 0)
- return 0;
-
- /*
- * Aligned because we use the real comparison functions
- */
- vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
-
- ip = (ip4_header_t *) match;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
- /* These are realistically matched in practice */
- if (src)
- ip->src_address.as_u32 = src_val.as_u32;
- if (dst)
- ip->dst_address.as_u32 = dst_val.as_u32;
+ M (CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table);
- if (proto)
- ip->protocol = proto_val;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->table_index = ntohl (table_index);
+ mp->is_ipv6 = is_ipv6;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
- /* These are not, but they're included for completeness */
- if (version)
- ip->ip_version_and_header_length |= (version_val & 0xF) << 4;
+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;
+ u32 is_input = 1;
- if (hdr_length)
- ip->ip_version_and_header_length |= (hdr_length_val & 0xF);
+ 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 if (unformat (i, "is-input %d", &is_input))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- if (tos)
- ip->tos = tos_val;
+ if (sw_if_index_set == 0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
- if (length)
- ip->length = length_val;
- if (ttl)
- ip->ttl = ttl_val;
+ M (CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
- if (checksum)
- ip->checksum = checksum_val;
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->ip4_table_index = ntohl (ip4_table_index);
+ mp->ip6_table_index = ntohl (ip6_table_index);
+ mp->other_table_index = ntohl (other_table_index);
+ mp->is_input = (u8) is_input;
- *matchp = match;
- return 1;
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-uword
-unformat_ip6_match (unformat_input_t * input, va_list * args)
+static int
+api_set_ipfix_exporter (vat_main_t * vam)
{
- u8 **matchp = va_arg (*args, u8 **);
- u8 *match = 0;
- ip6_header_t *ip;
- int version = 0;
- u32 version_val;
- u8 traffic_class = 0;
- u32 traffic_class_val = 0;
- u8 flow_label = 0;
- u8 flow_label_val;
- int src = 0, dst = 0;
- ip6_address_t src_val, dst_val;
- int proto = 0;
- u32 proto_val;
- int payload_length = 0;
- u32 payload_length_val;
- int hop_limit = 0;
- int hop_limit_val;
- u32 ip_version_traffic_class_and_flow_label;
+ unformat_input_t *i = vam->input;
+ vl_api_set_ipfix_exporter_t *mp;
+ ip4_address_t collector_address;
+ u8 collector_address_set = 0;
+ u32 collector_port = ~0;
+ ip4_address_t src_address;
+ u8 src_address_set = 0;
+ u32 vrf_id = ~0;
+ u32 path_mtu = ~0;
+ u32 template_interval = ~0;
+ u8 udp_checksum = 0;
+ f64 timeout;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "version %d", &version_val))
- version = 1;
- else if (unformat (input, "traffic_class %d", &traffic_class_val))
- traffic_class = 1;
- else if (unformat (input, "flow_label %d", &flow_label_val))
- flow_label = 1;
- else if (unformat (input, "src %U", unformat_ip6_address, &src_val))
- src = 1;
- else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val))
- dst = 1;
- else if (unformat (input, "proto %d", &proto_val))
- proto = 1;
- else if (unformat (input, "payload_length %d", &payload_length_val))
- payload_length = 1;
- else if (unformat (input, "hop_limit %d", &hop_limit_val))
- hop_limit = 1;
+ if (unformat (i, "collector_address %U", unformat_ip4_address,
+ &collector_address))
+ collector_address_set = 1;
+ else if (unformat (i, "collector_port %d", &collector_port))
+ ;
+ else if (unformat (i, "src_address %U", unformat_ip4_address,
+ &src_address))
+ src_address_set = 1;
+ else if (unformat (i, "vrf_id %d", &vrf_id))
+ ;
+ else if (unformat (i, "path_mtu %d", &path_mtu))
+ ;
+ else if (unformat (i, "template_interval %d", &template_interval))
+ ;
+ else if (unformat (i, "udp_checksum"))
+ udp_checksum = 1;
else
break;
}
- if (version + traffic_class + flow_label + src + dst + proto +
- payload_length + hop_limit == 0)
- return 0;
+ if (collector_address_set == 0)
+ {
+ errmsg ("collector_address required\n");
+ return -99;
+ }
- /*
- * Aligned because we use the real comparison functions
- */
- vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4));
+ if (src_address_set == 0)
+ {
+ errmsg ("src_address required\n");
+ return -99;
+ }
- ip = (ip6_header_t *) match;
+ M (SET_IPFIX_EXPORTER, set_ipfix_exporter);
- if (src)
- clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address));
+ memcpy (mp->collector_address, collector_address.data,
+ sizeof (collector_address.data));
+ mp->collector_port = htons ((u16) collector_port);
+ memcpy (mp->src_address, src_address.data, sizeof (src_address.data));
+ mp->vrf_id = htonl (vrf_id);
+ mp->path_mtu = htonl (path_mtu);
+ mp->template_interval = htonl (template_interval);
+ mp->udp_checksum = udp_checksum;
- if (dst)
- clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address));
+ S;
+ W;
+ /* NOTREACHED */
+}
- if (proto)
- ip->protocol = proto_val;
+static int
+api_set_ipfix_classify_stream (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_set_ipfix_classify_stream_t *mp;
+ u32 domain_id = 0;
+ u32 src_port = UDP_DST_PORT_ipfix;
+ f64 timeout;
- ip_version_traffic_class_and_flow_label = 0;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "domain %d", &domain_id))
+ ;
+ else if (unformat (i, "src_port %d", &src_port))
+ ;
+ else
+ {
+ errmsg ("unknown input `%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- if (version)
- ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28;
+ M (SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream);
- if (traffic_class)
- ip_version_traffic_class_and_flow_label |=
- (traffic_class_val & 0xFF) << 20;
+ mp->domain_id = htonl (domain_id);
+ mp->src_port = htons ((u16) src_port);
- if (flow_label)
- ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF);
+ S;
+ W;
+ /* NOTREACHED */
+}
- ip->ip_version_traffic_class_and_flow_label =
- clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label);
+static int
+api_ipfix_classify_table_add_del (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_ipfix_classify_table_add_del_t *mp;
+ int is_add = -1;
+ u32 classify_table_index = ~0;
+ u8 ip_version = 0;
+ u8 transport_protocol = 255;
+ f64 timeout;
- if (payload_length)
- ip->payload_length = clib_host_to_net_u16 (payload_length_val);
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "table %d", &classify_table_index))
+ ;
+ else if (unformat (i, "ip4"))
+ ip_version = 4;
+ else if (unformat (i, "ip6"))
+ ip_version = 6;
+ else if (unformat (i, "tcp"))
+ transport_protocol = 6;
+ else if (unformat (i, "udp"))
+ transport_protocol = 17;
+ else
+ {
+ errmsg ("unknown input `%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- if (hop_limit)
- ip->hop_limit = hop_limit_val;
+ if (is_add == -1)
+ {
+ errmsg ("expecting: add|del");
+ return -99;
+ }
+ if (classify_table_index == ~0)
+ {
+ errmsg ("classifier table not specified");
+ return -99;
+ }
+ if (ip_version == 0)
+ {
+ errmsg ("IP version not specified");
+ return -99;
+ }
- *matchp = match;
- return 1;
+ M (IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del);
+
+ mp->is_add = is_add;
+ mp->table_id = htonl (classify_table_index);
+ mp->ip_version = ip_version;
+ mp->transport_protocol = transport_protocol;
+
+ S;
+ W;
+ /* NOTREACHED */
}
-uword
-unformat_l3_match (unformat_input_t * input, va_list * args)
+static int
+api_get_node_index (vat_main_t * vam)
{
- u8 **matchp = va_arg (*args, u8 **);
+ unformat_input_t *i = vam->input;
+ vl_api_get_node_index_t *mp;
+ f64 timeout;
+ u8 *name = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "ip4 %U", unformat_ip4_match, matchp))
- return 1;
- else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp))
- return 1;
+ if (unformat (i, "node %s", &name))
+ ;
else
break;
}
- return 0;
-}
-
-uword
-unformat_vlan_tag (unformat_input_t * input, va_list * args)
-{
- u8 *tagp = va_arg (*args, u8 *);
- u32 tag;
-
- if (unformat (input, "%d", &tag))
+ if (name == 0)
+ {
+ errmsg ("node name required\n");
+ return -99;
+ }
+ if (vec_len (name) >= ARRAY_LEN (mp->node_name))
{
- tagp[0] = (tag >> 8) & 0x0F;
- tagp[1] = tag & 0xFF;
- return 1;
+ errmsg ("node name too long, max %d\n", ARRAY_LEN (mp->node_name));
+ return -99;
}
+ M (GET_NODE_INDEX, get_node_index);
+ clib_memcpy (mp->node_name, name, vec_len (name));
+ vec_free (name);
+
+ S;
+ W;
+ /* NOTREACHED */
return 0;
}
-uword
-unformat_l2_match (unformat_input_t * input, va_list * args)
+static int
+api_get_next_index (vat_main_t * vam)
{
- u8 **matchp = va_arg (*args, u8 **);
- u8 *match = 0;
- u8 src = 0;
- u8 src_val[6];
- u8 dst = 0;
- u8 dst_val[6];
- u8 proto = 0;
- u16 proto_val;
- u8 tag1 = 0;
- u8 tag1_val[2];
- u8 tag2 = 0;
- u8 tag2_val[2];
- int len = 14;
- u8 ignore_tag1 = 0;
- u8 ignore_tag2 = 0;
- u8 cos1 = 0;
- u8 cos2 = 0;
- u32 cos1_val = 0;
- u32 cos2_val = 0;
+ unformat_input_t *i = vam->input;
+ vl_api_get_next_index_t *mp;
+ f64 timeout;
+ u8 *node_name = 0, *next_node_name = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "src %U", unformat_ethernet_address, &src_val))
- src = 1;
- else
- if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val))
- dst = 1;
- else if (unformat (input, "proto %U",
- unformat_ethernet_type_host_byte_order, &proto_val))
- proto = 1;
- else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val))
- tag1 = 1;
- else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val))
- tag2 = 1;
- else if (unformat (input, "ignore-tag1"))
- ignore_tag1 = 1;
- else if (unformat (input, "ignore-tag2"))
- ignore_tag2 = 1;
- else if (unformat (input, "cos1 %d", &cos1_val))
- cos1 = 1;
- else if (unformat (input, "cos2 %d", &cos2_val))
- cos2 = 1;
- else
+ if (unformat (i, "node-name %s", &node_name))
+ ;
+ else if (unformat (i, "next-node-name %s", &next_node_name))
break;
}
- if ((src + dst + proto + tag1 + tag2 +
- ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0)
- return 0;
-
- 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)
+ if (node_name == 0)
{
- /* 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;
+ errmsg ("node name required\n");
+ return -99;
}
- if (tag1)
+ if (vec_len (node_name) >= ARRAY_LEN (mp->node_name))
{
- 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;
+ errmsg ("node name too long, max %d\n", ARRAY_LEN (mp->node_name));
+ return -99;
+ }
- *matchp = match;
- return 1;
+ if (next_node_name == 0)
+ {
+ errmsg ("next node name required\n");
+ return -99;
}
- if (cos2)
- match[18] |= (cos2_val & 0x7) << 5;
- if (cos1)
- match[14] |= (cos1_val & 0x7) << 5;
- if (proto)
+ if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name))
{
- match[13] = proto_val & 0xff;
- match[12] = proto_val >> 8;
+ errmsg ("next node name too long, max %d\n", ARRAY_LEN (mp->next_name));
+ return -99;
}
- *matchp = match;
- return 1;
-}
+ 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;
+}
-uword
-unformat_classify_match (unformat_input_t * input, va_list * args)
+static int
+api_add_node_next (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_add_node_next_t *mp;
+ f64 timeout;
+ u8 *name = 0;
+ u8 *next = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "hex %U", unformat_hex_string, &match))
- ;
- else if (unformat (input, "l2 %U", unformat_l2_match, &l2))
+ if (unformat (i, "node %s", &name))
;
- else if (unformat (input, "l3 %U", unformat_l3_match, &l3))
+ else if (unformat (i, "next %s", &next))
;
else
break;
}
-
- if (match || l2 || l3)
+ if (name == 0)
{
- if (l2 || l3)
- {
- /* "Win a free Ethernet header in every packet" */
- if (l2 == 0)
- vec_validate_aligned (l2, 13, sizeof (u32x4));
- match = l2;
- if (vec_len (l3))
- {
- vec_append_aligned (match, l3, sizeof (u32x4));
- vec_free (l3);
- }
- }
-
- /* 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;
+ 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_classify_add_del_session (vat_main_t * vam)
+api_l2tpv3_create_tunnel (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.
- */
+ 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, "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, "policer-hit-next %d", &hit_next_index))
- ;
- else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index))
- ;
- else if (unformat (i, "opaque-index %d", &opaque_index))
- ;
- else if (unformat (i, "skip_n %d", &skip_n_vectors))
- ;
- else if (unformat (i, "match_n %d", &match_n_vectors))
+ 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)
+ if (client_address_set == 0)
{
- errmsg ("Table index required\n");
+ errmsg ("client_address required\n");
return -99;
}
- if (is_add && match == 0)
+ if (our_address_set == 0)
{
- errmsg ("Match value required\n");
+ 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)
+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)
{
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 if (unformat (i, "new_local_cookie %lld", &new_local_cookie))
+ ;
+ else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie))
;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
if (sw_if_index_set == 0)
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;
}
static int
-api_classify_set_interface_l2_tables (vat_main_t * vam)
+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;
- u32 is_input = 1;
+ u8 sw_if_index_set = 0;
+ u8 enable_disable = 1;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
sw_if_index_set = 1;
else if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
- else if (unformat (i, "ip4-table %d", &ip4_table_index))
- ;
- else if (unformat (i, "ip6-table %d", &ip6_table_index))
- ;
- else if (unformat (i, "other-table %d", &other_table_index))
- ;
- else if (unformat (i, "is-input %d", &is_input))
- ;
+ else if (unformat (i, "enable"))
+ enable_disable = 1;
+ else if (unformat (i, "disable"))
+ enable_disable = 0;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
if (sw_if_index_set == 0)
return -99;
}
-
- M (CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables);
+ M (L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
mp->sw_if_index = ntohl (sw_if_index);
- mp->ip4_table_index = ntohl (ip4_table_index);
- mp->ip6_table_index = ntohl (ip6_table_index);
- mp->other_table_index = ntohl (other_table_index);
- mp->is_input = (u8) is_input;
+ mp->enable_disable = enable_disable;
S;
W;
}
static int
-api_set_ipfix_exporter (vat_main_t * vam)
+api_l2tpv3_set_lookup_key (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_set_ipfix_exporter_t *mp;
- ip4_address_t collector_address;
- u8 collector_address_set = 0;
- u32 collector_port = ~0;
- ip4_address_t src_address;
- u8 src_address_set = 0;
- u32 vrf_id = ~0;
- u32 path_mtu = ~0;
- u32 template_interval = ~0;
- u8 udp_checksum = 0;
+ 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, "collector_address %U", unformat_ip4_address,
- &collector_address))
- collector_address_set = 1;
- else if (unformat (i, "collector_port %d", &collector_port))
- ;
- else if (unformat (i, "src_address %U", unformat_ip4_address,
- &src_address))
- src_address_set = 1;
- else if (unformat (i, "vrf_id %d", &vrf_id))
- ;
- else if (unformat (i, "path_mtu %d", &path_mtu))
- ;
- else if (unformat (i, "template_interval %d", &template_interval))
- ;
- else if (unformat (i, "udp_checksum"))
- udp_checksum = 1;
+ 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 (collector_address_set == 0)
+ if (key == (u8) ~ 0)
{
- errmsg ("collector_address required\n");
+ errmsg ("l2tp session lookup key unset\n");
return -99;
}
- if (src_address_set == 0)
- {
- errmsg ("src_address required\n");
- return -99;
- }
+ M (L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
+
+ mp->key = key;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
+
+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;
+}
- M (SET_IPFIX_EXPORTER, set_ipfix_exporter);
- memcpy (mp->collector_address, collector_address.data,
- sizeof (collector_address.data));
- mp->collector_port = htons ((u16) collector_port);
- memcpy (mp->src_address, src_address.data, sizeof (src_address.data));
- mp->vrf_id = htonl (vrf_id);
- mp->path_mtu = htonl (path_mtu);
- mp->template_interval = htonl (template_interval);
- mp->udp_checksum = udp_checksum;
+static void vl_api_sw_interface_tap_details_t_handler
+ (vl_api_sw_interface_tap_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
- S;
- W;
- /* NOTREACHED */
+ fformat (vam->ofp, "%-16s %d\n",
+ mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index));
}
-static int
-api_set_ipfix_classify_stream (vat_main_t * vam)
+static void vl_api_sw_interface_tap_details_t_handler_json
+ (vl_api_sw_interface_tap_details_t * mp)
{
- unformat_input_t *i = vam->input;
- vl_api_set_ipfix_classify_stream_t *mp;
- u32 domain_id = 0;
- u32 src_port = UDP_DST_PORT_ipfix;
- f64 timeout;
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- if (unformat (i, "domain %d", &domain_id))
- ;
- else if (unformat (i, "src_port %d", &src_port))
- ;
- else
- {
- errmsg ("unknown input `%U'", format_unformat_error, i);
- return -99;
- }
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- M (SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream);
+ 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);
+}
- mp->domain_id = htonl (domain_id);
- mp->src_port = htons ((u16) src_port);
+static int
+api_sw_interface_tap_dump (vat_main_t * vam)
+{
+ vl_api_sw_interface_tap_dump_t *mp;
+ f64 timeout;
+ 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;
- /* 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, "l2"))
+ *result = VXLAN_INPUT_NEXT_L2_INPUT;
+ else if (unformat (input, "%d", &tmp))
+ *result = tmp;
+ else
+ return 0;
+ return 1;
}
static int
-api_ipfix_classify_table_add_del (vat_main_t * vam)
+api_vxlan_add_del_tunnel (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ipfix_classify_table_add_del_t *mp;
- int is_add = -1;
- u32 classify_table_index = ~0;
- u8 ip_version = 0;
- u8 transport_protocol = 255;
+ unformat_input_t *line_input = vam->input;
+ vl_api_vxlan_add_del_tunnel_t *mp;
f64 timeout;
+ ip46_address_t src, dst;
+ u8 is_add = 1;
+ u8 ipv4_set = 0, ipv6_set = 0;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u8 grp_set = 0;
+ u32 mcast_sw_if_index = ~0;
+ u32 encap_vrf_id = 0;
+ u32 decap_next_index = ~0;
+ u32 vni = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
+ memset (&src, 0, sizeof src);
+ memset (&dst, 0, sizeof dst);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "add"))
- is_add = 1;
- else if (unformat (i, "del"))
+ if (unformat (line_input, "del"))
is_add = 0;
- else if (unformat (i, "table %d", &classify_table_index))
+ else
+ if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
+ {
+ ipv4_set = 1;
+ src_set = 1;
+ }
+ else
+ if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
+ {
+ ipv4_set = 1;
+ dst_set = 1;
+ }
+ else
+ if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
+ {
+ ipv6_set = 1;
+ src_set = 1;
+ }
+ else
+ if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
+ {
+ ipv6_set = 1;
+ dst_set = 1;
+ }
+ else if (unformat (line_input, "group %U %U",
+ unformat_ip4_address, &dst.ip4,
+ unformat_sw_if_index, vam, &mcast_sw_if_index))
+ {
+ grp_set = dst_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "group %U",
+ unformat_ip4_address, &dst.ip4))
+ {
+ grp_set = dst_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "group %U %U",
+ unformat_ip6_address, &dst.ip6,
+ unformat_sw_if_index, vam, &mcast_sw_if_index))
+ {
+ grp_set = dst_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "group %U",
+ unformat_ip6_address, &dst.ip6))
+ {
+ grp_set = dst_set = 1;
+ ipv6_set = 1;
+ }
+ else
+ if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index))
+ ;
+ else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id))
+ ;
+ else if (unformat (line_input, "decap-next %U",
+ unformat_vxlan_decap_next, &decap_next_index))
+ ;
+ else if (unformat (line_input, "vni %d", &vni))
;
- else if (unformat (i, "ip4"))
- ip_version = 4;
- else if (unformat (i, "ip6"))
- ip_version = 6;
- else if (unformat (i, "tcp"))
- transport_protocol = 6;
- else if (unformat (i, "udp"))
- transport_protocol = 17;
else
{
- errmsg ("unknown input `%U'", format_unformat_error, i);
+ errmsg ("parse error '%U'\n", format_unformat_error, line_input);
return -99;
}
}
- if (is_add == -1)
+ if (src_set == 0)
{
- errmsg ("expecting: add|del");
+ errmsg ("tunnel src address not specified\n");
return -99;
}
- if (classify_table_index == ~0)
+ if (dst_set == 0)
{
- errmsg ("classifier table not specified");
+ errmsg ("tunnel dst address not specified\n");
return -99;
}
- if (ip_version == 0)
+
+ if (grp_set && !ip46_address_is_multicast (&dst))
{
- errmsg ("IP version not specified");
+ errmsg ("tunnel group address not multicast\n");
return -99;
}
-
- M (IPFIX_CLASSIFY_TABLE_ADD_DEL, ipfix_classify_table_add_del);
-
- mp->is_add = is_add;
- mp->table_id = htonl (classify_table_index);
- mp->ip_version = ip_version;
- mp->transport_protocol = transport_protocol;
-
- S;
- W;
- /* NOTREACHED */
-}
-
-static int
-api_get_node_index (vat_main_t * vam)
-{
- 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 (grp_set && mcast_sw_if_index == ~0)
{
- if (unformat (i, "node %s", &name))
- ;
- else
- break;
+ errmsg ("tunnel nonexistent multicast device\n");
+ return -99;
}
- if (name == 0)
+
+
+ if (ipv4_set && ipv6_set)
{
- errmsg ("node name required\n");
+ errmsg ("both IPv4 and IPv6 addresses specified");
return -99;
}
- if (vec_len (name) >= ARRAY_LEN (mp->node_name))
+
+ if ((vni == 0) || (vni >> 24))
{
- errmsg ("node name too long, max %d\n", ARRAY_LEN (mp->node_name));
+ errmsg ("vni not specified or out of range\n");
return -99;
}
- M (GET_NODE_INDEX, get_node_index);
- clib_memcpy (mp->node_name, name, vec_len (name));
- vec_free (name);
+ M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
+
+ if (ipv6_set)
+ {
+ clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6));
+ clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6));
+ }
+ else
+ {
+ clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4));
+ clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4));
+ }
+ mp->encap_vrf_id = ntohl (encap_vrf_id);
+ mp->decap_next_index = ntohl (decap_next_index);
+ mp->mcast_sw_if_index = ntohl (mcast_sw_if_index);
+ mp->vni = ntohl (vni);
+ mp->is_add = is_add;
+ mp->is_ipv6 = ipv6_set;
S;
W;
return 0;
}
-static int
-api_get_next_index (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;
- vl_api_get_next_index_t *mp;
- f64 timeout;
- u8 *node_name = 0, *next_node_name = 0;
+ vat_main_t *vam = &vat_main;
+ ip46_address_t src, dst;
- 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;
- }
+ ip46_from_addr_buf (mp->is_ipv6, mp->src_address, &src);
+ ip46_from_addr_buf (mp->is_ipv6, mp->dst_address, &dst);
+
+ fformat (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d\n",
+ ntohl (mp->sw_if_index),
+ format_ip46_address, &src, IP46_TYPE_ANY,
+ format_ip46_address, &dst, IP46_TYPE_ANY,
+ ntohl (mp->encap_vrf_id),
+ ntohl (mp->decap_next_index), ntohl (mp->vni),
+ ntohl (mp->mcast_sw_if_index));
+}
+
+static void vl_api_vxlan_tunnel_details_t_handler_json
+ (vl_api_vxlan_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
- if (node_name == 0)
- {
- errmsg ("node name required\n");
- return -99;
- }
- if (vec_len (node_name) >= ARRAY_LEN (mp->node_name))
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- errmsg ("node name too long, max %d\n", ARRAY_LEN (mp->node_name));
- return -99;
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- if (next_node_name == 0)
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ if (mp->is_ipv6)
{
- errmsg ("next node name required\n");
- return -99;
+ struct in6_addr ip6;
+
+ clib_memcpy (&ip6, mp->src_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "src_address", ip6);
+ clib_memcpy (&ip6, mp->dst_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "dst_address", ip6);
}
- if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name))
+ else
{
- errmsg ("next node name too long, max %d\n", ARRAY_LEN (mp->next_name));
- return -99;
- }
-
- 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);
+ struct in_addr ip4;
- S;
- W;
- /* NOTREACHED */
- return 0;
+ clib_memcpy (&ip4, mp->src_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "src_address", ip4);
+ clib_memcpy (&ip4, mp->dst_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "dst_address", ip4);
+ }
+ vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id));
+ vat_json_object_add_uint (node, "decap_next_index",
+ ntohl (mp->decap_next_index));
+ vat_json_object_add_uint (node, "vni", ntohl (mp->vni));
+ vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0);
+ vat_json_object_add_uint (node, "mcast_sw_if_index",
+ ntohl (mp->mcast_sw_if_index));
}
static int
-api_add_node_next (vat_main_t * vam)
+api_vxlan_tunnel_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_add_node_next_t *mp;
+ vl_api_vxlan_tunnel_dump_t *mp;
f64 timeout;
- u8 *name = 0;
- u8 *next = 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, "node %s", &name))
- ;
- else if (unformat (i, "next %s", &next))
- ;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
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)
+
+ if (sw_if_index_set == 0)
{
- errmsg ("next node required\n");
- return -99;
+ sw_if_index = ~0;
}
- if (vec_len (next) >= ARRAY_LEN (mp->next_name))
+
+ if (!vam->json_output)
{
- errmsg ("next name too long, max %d\n", ARRAY_LEN (mp->next_name));
- return -99;
+ fformat (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s\n",
+ "sw_if_index", "src_address", "dst_address",
+ "encap_vrf_id", "decap_next_index", "vni",
+ "mcast_sw_if_index");
}
- 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);
+ /* Get list of vxlan-tunnel interfaces */
+ M (VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump);
+
+ 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;
- /* NOTREACHED */
- return 0;
}
static int
-api_l2tpv3_create_tunnel (vat_main_t * vam)
+api_gre_add_del_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;
+ unformat_input_t *line_input = vam->input;
+ vl_api_gre_add_del_tunnel_t *mp;
f64 timeout;
+ ip4_address_t src4, dst4;
+ u8 is_add = 1;
+ u8 teb = 0;
+ u8 src_set = 0;
+ u8 dst_set = 0;
+ u32 outer_fib_id = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != 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))
+ 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 (i, "l2-sublayer-present"))
- l2_sublayer_present = 1;
+ else if (unformat (line_input, "teb"))
+ teb = 1;
else
- break;
+ {
+ errmsg ("parse error '%U'\n", format_unformat_error, line_input);
+ return -99;
+ }
}
- if (client_address_set == 0)
+ if (src_set == 0)
{
- errmsg ("client_address required\n");
+ errmsg ("tunnel src address not specified\n");
return -99;
}
-
- if (our_address_set == 0)
+ if (dst_set == 0)
{
- errmsg ("our_address required\n");
+ errmsg ("tunnel dst address not specified\n");
return -99;
}
- 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));
+ M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel);
- 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;
+ clib_memcpy (&mp->src_address, &src4, sizeof (src4));
+ clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
+ mp->outer_fib_id = ntohl (outer_fib_id);
+ mp->is_add = is_add;
+ mp->teb = teb;
S;
W;
return 0;
}
+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%6d%14d\n",
+ ntohl (mp->sw_if_index),
+ format_ip4_address, &mp->src_address,
+ format_ip4_address, &mp->dst_address,
+ mp->teb, ntohl (mp->outer_fib_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, "teb", mp->teb);
+ vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_id));
+}
+
static int
-api_l2tpv3_set_tunnel_cookies (vat_main_t * vam)
+api_gre_tunnel_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
+ vl_api_gre_tunnel_dump_t *mp;
+ f64 timeout;
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;
- f64 timeout;
+ /* 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;
+ }
+
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%11s%15s%15s%6s%14s\n",
+ "sw_if_index", "src_address", "dst_address", "teb",
+ "outer_fib_id");
}
- M (L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies);
+ /* Get list of gre-tunnel interfaces */
+ M (GRE_TUNNEL_DUMP, gre_tunnel_dump);
+
+ 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_l2_fib_clear_table (vat_main_t * vam)
+{
+// unformat_input_t * i = vam->input;
+ vl_api_l2_fib_clear_table_t *mp;
+ f64 timeout;
- 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);
+ M (L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
S;
W;
}
static int
-api_l2tpv3_interface_enable_disable (vat_main_t * vam)
+api_l2_interface_efp_filter (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2tpv3_interface_enable_disable_t *mp;
+ vl_api_l2_interface_efp_filter_t *mp;
f64 timeout;
u32 sw_if_index;
+ u8 enable = 1;
u8 sw_if_index_set = 0;
- u8 enable_disable = 1;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
else if (unformat (i, "sw_if_index %d", &sw_if_index))
sw_if_index_set = 1;
else if (unformat (i, "enable"))
- enable_disable = 1;
+ enable = 1;
else if (unformat (i, "disable"))
- enable_disable = 0;
+ enable = 0;
else
- break;
+ {
+ 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");
+ errmsg ("missing sw_if_index\n");
return -99;
}
- M (L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable);
+ M (L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
mp->sw_if_index = ntohl (sw_if_index);
- mp->enable_disable = enable_disable;
+ mp->enable_disable = enable;
S;
W;
return 0;
}
+#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_l2tpv3_set_lookup_key (vat_main_t * vam)
+api_l2_interface_vlan_tag_rewrite (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2tpv3_set_lookup_key_t *mp;
+ vl_api_l2_interface_vlan_tag_rewrite_t *mp;
f64 timeout;
- u8 key = ~0;
+ 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;
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, "%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
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (key == (u8) ~ 0)
+ if ((sw_if_index_set == 0) || (vtr_op_set == 0))
{
- errmsg ("l2tp session lookup key unset\n");
+ errmsg ("missing vtr operation or sw_if_index\n");
return -99;
}
- M (L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key);
-
- mp->key = key;
+ M (L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->vtr_op = ntohl (vtr_op);
+ mp->push_dot1q = ntohl (push_dot1q);
+ mp->tag1 = ntohl (tag1);
+ mp->tag2 = ntohl (tag2);
S;
W;
return 0;
}
-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)
+api_create_vhost_user_if (vat_main_t * vam)
{
- vl_api_sw_if_l2tpv3_tunnel_dump_t *mp;
+ 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;
+ u8 *tag = 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;
- }
- 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;
+ /* Shut up coverity */
+ memset (hwaddr, 0, sizeof (hwaddr));
- if (VAT_JSON_ARRAY != vam->json_tree.type)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ if (unformat (i, "socket %s", &file_name))
+ {
+ file_name_set = 1;
+ }
+ else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
+ ;
+ else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr))
+ use_custom_mac = 1;
+ else if (unformat (i, "server"))
+ is_server = 1;
+ else if (unformat (i, "tag %s", &tag))
+ ;
+ 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);
-}
-
-static int
-api_sw_interface_tap_dump (vat_main_t * vam)
-{
- vl_api_sw_interface_tap_dump_t *mp;
- f64 timeout;
- 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;
+ if (file_name_set == 0)
+ {
+ errmsg ("missing socket file name\n");
+ return -99;
+ }
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
- W;
-}
+ if (vec_len (file_name) > 255)
+ {
+ errmsg ("socket file name too long\n");
+ return -99;
+ }
+ vec_add1 (file_name, 0);
-static uword unformat_vxlan_decap_next
- (unformat_input_t * input, va_list * args)
-{
- u32 *result = va_arg (*args, u32 *);
- u32 tmp;
+ M (CREATE_VHOST_USER_IF, create_vhost_user_if);
- 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;
+ 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);
+ if (tag)
+ strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
+ vec_free (tag);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_vxlan_add_del_tunnel (vat_main_t * vam)
+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)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "del"))
- is_add = 0;
- else if (unformat (line_input, "src %U", unformat_ip4_address, &src4))
- {
- 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))
+ 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))
{
- ipv6_set = 1;
- dst_set = 1;
+ file_name_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 if (unformat (i, "renumber %" PRIu32, &custom_dev_instance))
;
+ else if (unformat (i, "server"))
+ is_server = 1;
else
- {
- errmsg ("parse error '%U'\n", format_unformat_error, line_input);
- return -99;
- }
+ break;
}
- if (src_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("tunnel src address not specified\n");
+ errmsg ("missing sw_if_index or interface name\n");
return -99;
}
- if (dst_set == 0)
+
+ if (file_name_set == 0)
{
- errmsg ("tunnel dst address not specified\n");
+ errmsg ("missing socket file name\n");
return -99;
}
- if (ipv4_set && ipv6_set)
+ if (vec_len (file_name) > 255)
{
- errmsg ("both IPv4 and IPv6 addresses specified");
+ errmsg ("socket file name too long\n");
return -99;
}
+ vec_add1 (file_name, 0);
- if ((vni == 0) || (vni >> 24))
+ 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)
{
- errmsg ("vni not specified or out of range\n");
- return -99;
+ mp->renumber = 1;
+ mp->custom_dev_instance = ntohl (custom_dev_instance);
}
- M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel);
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
- if (ipv6_set)
+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)
{
- clib_memcpy (&mp->src_address, &src6, sizeof (src6));
- clib_memcpy (&mp->dst_address, &dst6, sizeof (dst6));
+ 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;
}
- else
+
+ if (sw_if_index_set == 0)
{
- clib_memcpy (&mp->src_address, &src4, sizeof (src4));
- clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
+ errmsg ("missing sw_if_index or interface name\n");
+ return -99;
}
- 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;
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]),
- 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));
+ 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)
{
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)
+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 */
}
static int
-api_gre_add_del_tunnel (vat_main_t * vam)
+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 teb = 0;
- 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, "teb"))
- teb = 1;
+ 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);
}
}
- if (src_set == 0)
+ if (local_set == 0)
{
- errmsg ("tunnel src address not specified\n");
+ errmsg ("tunnel local address not specified\n");
return -99;
}
- if (dst_set == 0)
+ if (remote_set == 0)
{
- errmsg ("tunnel dst address not specified\n");
+ 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);
- clib_memcpy (&mp->src_address, &src4, sizeof (src4));
- clib_memcpy (&mp->dst_address, &dst4, sizeof (dst4));
- mp->outer_fib_id = ntohl (outer_fib_id);
+ 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));
+ }
+
+ 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->teb = teb;
+ mp->is_ipv6 = ipv6_set;
S;
W;
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%6d%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,
- mp->teb, ntohl (mp->outer_fib_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)
{
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, "teb", mp->teb);
- vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_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)
+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%6s%14s\n",
- "sw_if_index", "src_address", "dst_address", "teb",
- "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)
-{
-// unformat_input_t * i = vam->input;
- vl_api_l2_fib_clear_table_t *mp;
- f64 timeout;
-
- M (L2_FIB_CLEAR_TABLE, l2_fib_clear_table);
-
- S;
- W;
- /* NOTREACHED */
- return 0;
-}
-
-static int
-api_l2_interface_efp_filter (vat_main_t * vam)
-{
- unformat_input_t *i = vam->input;
- vl_api_l2_interface_efp_filter_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 enable = 1;
- 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 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;
- }
-
- M (L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter);
-
- mp->sw_if_index = ntohl (sw_if_index);
- mp->enable_disable = enable;
-
- S;
- W;
- /* NOTREACHED */
- return 0;
-}
-
-#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)
+u8 *
+format_l2_fib_mac_address (u8 * s, va_list * args)
{
- 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;
+ u8 *a = va_arg (*args, u8 *);
- 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;
- }
- }
+ return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+ a[2], a[3], a[4], a[5], a[6], a[7]);
+}
- if ((sw_if_index_set == 0) || (vtr_op_set == 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 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)
{
- errmsg ("missing vtr operation or sw_if_index\n");
- return -99;
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- M (L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite)
- mp->sw_if_index = ntohl (sw_if_index);
- mp->vtr_op = ntohl (vtr_op);
- mp->push_dot1q = ntohl (push_dot1q);
- mp->tag1 = ntohl (tag1);
- mp->tag2 = ntohl (tag2);
-
- S;
- W;
- /* NOTREACHED */
- return 0;
+ 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_create_vhost_user_if (vat_main_t * vam)
+api_l2_fib_table_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_create_vhost_user_if_t *mp;
+ vl_api_l2_fib_table_dump_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;
+ 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, "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;
+ if (unformat (i, "bd_id %d", &bd_id))
+ bd_id_set = 1;
else
break;
}
- if (file_name_set == 0)
- {
- errmsg ("missing socket file name\n");
- return -99;
- }
-
- if (vec_len (file_name) > 255)
+ if (bd_id_set == 0)
{
- errmsg ("socket file name too long\n");
+ errmsg ("missing bridge domain\n");
return -99;
}
- vec_add1 (file_name, 0);
- M (CREATE_VHOST_USER_IF, create_vhost_user_if);
+ fformat (vam->ofp,
+ "BD-ID Mac Address sw-ndx Static Filter BVI\n");
- 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);
+ /* 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;
- /* NOTREACHED */
- return 0;
}
+
static int
-api_modify_vhost_user_if (vat_main_t * vam)
+api_interface_name_renumber (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_modify_vhost_user_if_t *mp;
+ unformat_input_t *line_input = vam->input;
+ vl_api_interface_name_renumber_t *mp;
+ u32 sw_if_index = ~0;
f64 timeout;
- 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;
+ u32 new_show_dev_instance = ~0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != 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))
+ 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, "new_show_dev_instance %d",
+ &new_show_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)
+ if (sw_if_index == ~0)
{
- errmsg ("missing socket file name\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (vec_len (file_name) > 255)
+ if (new_show_dev_instance == ~0)
{
- errmsg ("socket file name too long\n");
+ errmsg ("missing new_show_dev_instance\n");
return -99;
}
- vec_add1 (file_name, 0);
- M (MODIFY_VHOST_USER_IF, modify_vhost_user_if);
+ M (INTERFACE_NAME_RENUMBER, interface_name_renumber);
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->new_show_dev_instance = ntohl (new_show_dev_instance);
S;
W;
- /* NOTREACHED */
- return 0;
}
static int
-api_delete_vhost_user_if (vat_main_t * vam)
+api_want_ip4_arp_events (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_delete_vhost_user_if_t *mp;
+ unformat_input_t *line_input = vam->input;
+ vl_api_want_ip4_arp_events_t *mp;
f64 timeout;
- u32 sw_if_index = ~0;
- u8 sw_if_index_set = 0;
+ ip4_address_t address;
+ int address_set = 0;
+ u32 enable_disable = 1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != 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;
+ 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 (sw_if_index_set == 0)
+ if (address_set == 0)
{
- errmsg ("missing sw_if_index or interface name\n");
+ 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;
- 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_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, "%-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_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);
- }
- 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));
-}
-
-static int
-api_sw_interface_vhost_user_dump (vat_main_t * vam)
-{
- vl_api_sw_interface_vhost_user_dump_t *mp;
- f64 timeout;
- 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 */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
W;
}
static int
-api_show_version (vat_main_t * vam)
+api_want_ip6_nd_events (vat_main_t * vam)
{
- vl_api_show_version_t *mp;
+ unformat_input_t *line_input = vam->input;
+ vl_api_want_ip6_nd_events_t *mp;
f64 timeout;
+ ip6_address_t address;
+ int address_set = 0;
+ u32 enable_disable = 1;
- M (SHOW_VERSION, show_version);
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "address %U", unformat_ip6_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_IP6_ND_EVENTS, want_ip6_nd_events);
+ mp->enable_disable = enable_disable;
+ mp->pid = getpid ();
+ clib_memcpy (mp->address, &address, sizeof (ip6_address_t));
S;
W;
- /* NOTREACHED */
- return 0;
}
-
static int
-api_vxlan_gpe_add_del_tunnel (vat_main_t * vam)
+api_input_acl_set_interface (vat_main_t * vam)
{
- unformat_input_t *line_input = vam->input;
- vl_api_vxlan_gpe_add_del_tunnel_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_input_acl_set_interface_t *mp;
f64 timeout;
- ip4_address_t local4, remote4;
- ip6_address_t local6, remote6;
+ 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 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)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "del"))
+ 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 (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 (i, "ip4-table %d", &ip4_table_index))
;
- else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+ else if (unformat (i, "ip6-table %d", &ip6_table_index))
+ ;
+ else if (unformat (i, "l2-table %d", &l2_table_index))
;
- else if (unformat (line_input, "vni %d", &vni))
- vni_set = 1;
- else if (unformat (line_input, "next-ip4"))
- protocol = 1;
- else if (unformat (line_input, "next-ip6"))
- protocol = 2;
- else if (unformat (line_input, "next-ethernet"))
- protocol = 3;
- else if (unformat (line_input, "next-nsh"))
- protocol = 4;
else
{
- errmsg ("parse error '%U'\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 (ipv4_set && ipv6_set)
- {
- errmsg ("both IPv4 and IPv6 addresses specified");
- return -99;
- }
-
- if (vni_set == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("vni not specified\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_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));
- }
+ M (INPUT_ACL_SET_INTERFACE, input_acl_set_interface);
- 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->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;
- mp->is_ipv6 = ipv6_set;
S;
W;
return 0;
}
-static void vl_api_vxlan_gpe_tunnel_details_t_handler
- (vl_api_vxlan_gpe_tunnel_details_t * mp)
+static int
+api_ip_address_dump (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
-
- fformat (vam->ofp, "%11d%24U%24U%13d%12d%14d%14d\n",
- ntohl (mp->sw_if_index),
- 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));
-}
+ 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;
+ f64 timeout;
-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;
+ 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 (VAT_JSON_ARRAY != vam->json_tree.type)
+ if (ipv4_set && ipv6_set)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ errmsg ("ipv4 and ipv6 flags cannot be both 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));
- if (mp->is_ipv6)
+ if ((!ipv4_set) && (!ipv6_set))
{
- 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);
+ errmsg ("no ipv4 nor ipv6 flag set\n");
+ return -99;
}
- else
+
+ if (sw_if_index_set == 0)
{
- 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);
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- 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);
+
+ 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_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_vxlan_gpe_tunnel_dump (vat_main_t * vam)
+api_ip_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_vxlan_gpe_tunnel_dump_t *mp;
- f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
+ 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;
- /* Parse args required to build the message */
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
- sw_if_index_set = 1;
+ if (unformat (in, "ipv4"))
+ ipv4_set = 1;
+ else if (unformat (in, "ipv6"))
+ ipv6_set = 1;
else
break;
}
- if (sw_if_index_set == 0)
+ if (ipv4_set && ipv6_set)
{
- sw_if_index = ~0;
+ errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ return -99;
}
- if (!vam->json_output)
+ if ((!ipv4_set) && (!ipv6_set))
{
- fformat (vam->ofp, "%11s%24s%24s%13s%15s%14s%14s\n",
- "sw_if_index", "local", "remote", "vni",
- "protocol", "encap_vrf_id", "decap_vrf_id");
+ errmsg ("no ipv4 nor ipv6 flag set\n");
+ return -99;
}
- /* Get list of vxlan-tunnel interfaces */
- M (VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump);
+ is_ipv6 = ipv6_set;
+ vam->is_ipv6 = is_ipv6;
- mp->sw_if_index = htonl (sw_if_index);
+ /* 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 */
W;
}
-u8 *
-format_l2_fib_mac_address (u8 * s, va_list * args)
+static int
+api_ipsec_spd_add_del (vat_main_t * vam)
{
- u8 *a = va_arg (*args, u8 *);
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_spd_add_del_t *mp;
+ f64 timeout;
+ u32 spd_id = ~0;
+ u8 is_add = 1;
- return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[2], a[3], a[4], a[5], a[6], a[7]);
-}
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ 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 (spd_id == ~0)
+ {
+ errmsg ("spd_id must be set\n");
+ return -99;
+ }
-static void vl_api_l2_fib_table_entry_t_handler
- (vl_api_l2_fib_table_entry_t * mp)
-{
- vat_main_t *vam = &vat_main;
+ M (IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
- 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);
+ mp->spd_id = ntohl (spd_id);
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
-static void vl_api_l2_fib_table_entry_t_handler_json
- (vl_api_l2_fib_table_entry_t * mp)
+static int
+api_ipsec_interface_add_del_spd (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
- vat_json_node_t *node = NULL;
+ 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;
- if (VAT_JSON_ARRAY != vam->json_tree.type)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ if (unformat (i, "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;
+ }
+
}
- 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);
+ if (spd_id == (u32) ~ 0)
+ {
+ errmsg ("spd_id must be set\n");
+ return -99;
+ }
+
+ 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;
}
static int
-api_l2_fib_table_dump (vat_main_t * vam)
+api_ipsec_spd_add_del_entry (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_l2_fib_table_dump_t *mp;
+ vl_api_ipsec_spd_add_del_entry_t *mp;
f64 timeout;
- u32 bd_id;
- u8 bd_id_set = 0;
+ u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
+ u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0;
+ i32 priority = 0;
+ u32 rport_start = 0, rport_stop = (u32) ~ 0;
+ u32 lport_start = 0, lport_stop = (u32) ~ 0;
+ ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
+ ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
+
+ 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;
- /* 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;
+ 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
- break;
- }
+ 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;
+ }
- 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");
+ M (IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
- /* Get list of l2 fib entries */
- M (L2_FIB_TABLE_DUMP, l2_fib_table_dump);
+ mp->spd_id = ntohl (spd_id);
+ mp->priority = ntohl (priority);
+ mp->is_outbound = is_outbound;
- mp->bd_id = ntohl (bd_id);
+ 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;
-
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
W;
+ /* NOTREACHED */
+ return 0;
}
-
static int
-api_interface_name_renumber (vat_main_t * vam)
+api_ipsec_sad_add_del_entry (vat_main_t * vam)
{
- unformat_input_t *line_input = vam->input;
- vl_api_interface_name_renumber_t *mp;
- u32 sw_if_index = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_sad_add_del_entry_t *mp;
f64 timeout;
- u32 new_show_dev_instance = ~0;
+ u32 sad_id = 0, spi = 0;
+ u8 *ck = 0, *ik = 0;
+ u8 is_add = 1;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ 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 (line_input, "%U", unformat_sw_if_index, vam,
- &sw_if_index))
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "sad_id %d", &sad_id))
;
- else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
+ else if (unformat (i, "spi %d", &spi))
;
- else if (unformat (line_input, "new_show_dev_instance %d",
- &new_show_dev_instance))
+ else if (unformat (i, "esp"))
+ protocol = IPSEC_PROTOCOL_ESP;
+ else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 0;
+ }
+ else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 0;
+ }
+ else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 1;
+ }
+ else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6))
+ {
+ is_tunnel = 1;
+ is_tunnel_ipv6 = 1;
+ }
+ else
+ if (unformat
+ (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
+ {
+ if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 ||
+ crypto_alg >= IPSEC_CRYPTO_N_ALG)
+ {
+ clib_warning ("unsupported crypto-alg: '%U'",
+ format_ipsec_crypto_alg, crypto_alg);
+ return -99;
+ }
+ }
+ else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
;
else
- break;
+ if (unformat
+ (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
+ {
+#if DPDK_CRYPTO==1
+ if (integ_alg < IPSEC_INTEG_ALG_NONE ||
+#else
+ if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 ||
+#endif
+ integ_alg >= IPSEC_INTEG_N_ALG)
+ {
+ clib_warning ("unsupported integ-alg: '%U'",
+ format_ipsec_integ_alg, integ_alg);
+ return -99;
+ }
+ }
+ else if (unformat (i, "integ_key %U", unformat_hex_string, &ik))
+ ;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+
}
- if (sw_if_index == ~0)
+#if DPDK_CRYPTO==1
+ /*Special cases, aes-gcm-128 encryption */
+ if (crypto_alg == IPSEC_CRYPTO_ALG_AES_GCM_128)
{
- errmsg ("missing interface name or sw_if_index\n");
+ if (integ_alg != IPSEC_INTEG_ALG_NONE
+ && integ_alg != IPSEC_INTEG_ALG_AES_GCM_128)
+ {
+ clib_warning
+ ("unsupported: aes-gcm-128 crypto-alg needs none as integ-alg");
+ return -99;
+ }
+ else /*set integ-alg internally to aes-gcm-128 */
+ integ_alg = IPSEC_INTEG_ALG_AES_GCM_128;
+ }
+ else if (integ_alg == IPSEC_INTEG_ALG_AES_GCM_128)
+ {
+ clib_warning ("unsupported integ-alg: aes-gcm-128");
return -99;
}
-
- if (new_show_dev_instance == ~0)
+ else if (integ_alg == IPSEC_INTEG_ALG_NONE)
{
- errmsg ("missing new_show_dev_instance\n");
+ clib_warning ("unsupported integ-alg: none");
return -99;
}
+#endif
- 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);
+ 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 (mp->crypto_key_length > sizeof (mp->crypto_key))
+ mp->crypto_key_length = sizeof (mp->crypto_key);
+
+ if (mp->integrity_key_length > sizeof (mp->integrity_key))
+ mp->integrity_key_length = sizeof (mp->integrity_key);
+
+ if (ck)
+ clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+ if (ik)
+ clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+
+ 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));
+ }
+ }
S;
W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_want_ip4_arp_events (vat_main_t * vam)
+api_ipsec_sa_set_key (vat_main_t * vam)
{
- unformat_input_t *line_input = vam->input;
- vl_api_want_ip4_arp_events_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_sa_set_key_t *mp;
f64 timeout;
- ip4_address_t address;
- int address_set = 0;
- u32 enable_disable = 1;
+ u32 sa_id;
+ u8 *ck = 0, *ik = 0;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "address %U", unformat_ip4_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
+ if (unformat (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
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (address_set == 0)
- {
- errmsg ("missing addresses\n");
- return -99;
- }
+ M (IPSEC_SA_SET_KEY, ipsec_set_sa_key);
- M (WANT_IP4_ARP_EVENTS, want_ip4_arp_events);
- mp->enable_disable = enable_disable;
- mp->pid = getpid ();
- mp->address = address.as_u32;
+ mp->sa_id = ntohl (sa_id);
+ mp->crypto_key_length = vec_len (ck);
+ mp->integrity_key_length = vec_len (ik);
+
+ if (mp->crypto_key_length > sizeof (mp->crypto_key))
+ mp->crypto_key_length = sizeof (mp->crypto_key);
+
+ if (mp->integrity_key_length > sizeof (mp->integrity_key))
+ mp->integrity_key_length = sizeof (mp->integrity_key);
+
+ if (ck)
+ clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
+ if (ik)
+ clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
S;
W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_want_ip6_nd_events (vat_main_t * vam)
+api_ikev2_profile_add_del (vat_main_t * vam)
{
- unformat_input_t *line_input = vam->input;
- vl_api_want_ip6_nd_events_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_profile_add_del_t *mp;
f64 timeout;
- ip6_address_t address;
- int address_set = 0;
- u32 enable_disable = 1;
+ u8 is_add = 1;
+ u8 *name = 0;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ const char *valid_chars = "a-zA-Z0-9_";
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (line_input, "address %U", unformat_ip6_address, &address))
- address_set = 1;
- else if (unformat (line_input, "del"))
- enable_disable = 0;
+ if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "name %U", unformat_token, valid_chars, &name))
+ vec_add1 (name, 0);
else
- break;
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (address_set == 0)
+ if (!vec_len (name))
{
- errmsg ("missing addresses\n");
+ errmsg ("profile name must be specified");
return -99;
}
- M (WANT_IP6_ND_EVENTS, want_ip6_nd_events);
- mp->enable_disable = enable_disable;
- mp->pid = getpid ();
- clib_memcpy (mp->address, &address, sizeof (ip6_address_t));
+ if (vec_len (name) > 64)
+ {
+ errmsg ("profile name too long");
+ return -99;
+ }
+
+ 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;
}
static int
-api_input_acl_set_interface (vat_main_t * vam)
+api_ikev2_profile_set_auth (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_input_acl_set_interface_t *mp;
+ vl_api_ikev2_profile_set_auth_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;
+ 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, "%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))
+ 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, "l2-table %d", &l2_table_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
{
- 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)
+ if (!vec_len (name))
{
- errmsg ("missing interface name or sw_if_index\n");
+ 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);
- mp->is_add = is_add;
+ if (!vec_len (data))
+ {
+ errmsg ("auth_data must be specified");
+ return -99;
+ }
+
+ if (!auth_method)
+ {
+ errmsg ("auth_method must be specified");
+ return -99;
+ }
+
+ M (IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
+
+ 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;
}
static int
-api_ip_address_dump (vat_main_t * vam)
+api_ikev2_profile_set_id (vat_main_t * vam)
{
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_id_t *mp;
f64 timeout;
+ u8 *name = 0;
+ u8 *data = 0;
+ u8 is_local = 0;
+ u32 id_type = 0;
+ ip4_address_t ip4;
+
+ 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;
+ 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
- break;
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (ipv4_set && ipv6_set)
+ if (!vec_len (name))
{
- errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ errmsg ("profile name must be specified");
return -99;
}
- if ((!ipv4_set) && (!ipv6_set))
+ if (vec_len (name) > 64)
{
- errmsg ("no ipv4 nor ipv6 flag set\n");
+ errmsg ("profile name too long");
return -99;
}
- if (sw_if_index_set == 0)
+ if (!vec_len (data))
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("id_data must be specified");
return -99;
}
- vam->current_sw_if_index = sw_if_index;
- vam->is_ipv6 = ipv6_set;
+ if (!id_type)
+ {
+ errmsg ("id_type 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_ID, ikev2_profile_set_id);
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
+ 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;
}
static int
-api_ip_dump (vat_main_t * vam)
+api_ikev2_profile_set_ts (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;
+ unformat_input_t *i = vam->input;
+ vl_api_ikev2_profile_set_ts_t *mp;
f64 timeout;
- int i;
+ u8 *name = 0;
+ u8 is_local = 0;
+ u32 proto = 0, start_port = 0, end_port = (u32) ~ 0;
+ ip4_address_t start_addr, end_addr;
- while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT)
+ 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 (in, "ipv4"))
- ipv4_set = 1;
- else if (unformat (in, "ipv6"))
- ipv6_set = 1;
+ 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
- break;
+ 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
+ {
+ errmsg ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (ipv4_set && ipv6_set)
+ if (!vec_len (name))
{
- errmsg ("ipv4 and ipv6 flags cannot be both set\n");
+ errmsg ("profile name must be specified");
return -99;
}
- if ((!ipv4_set) && (!ipv6_set))
+ if (vec_len (name) > 64)
{
- errmsg ("no ipv4 nor ipv6 flag set\n");
+ errmsg ("profile name too long");
return -99;
}
- is_ipv6 = ipv6_set;
- vam->is_ipv6 = is_ipv6;
+ M (IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
- /* free old data */
- for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++)
- {
- vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr);
- }
- vec_free (vam->ip_details_by_sw_if_index[is_ipv6]);
+ mp->is_local = is_local;
+ mp->proto = (u8) proto;
+ mp->start_port = (u16) start_port;
+ mp->end_port = (u16) end_port;
+ mp->start_addr = start_addr.as_u32;
+ mp->end_addr = end_addr.as_u32;
+ clib_memcpy (mp->name, name, vec_len (name));
+ vec_free (name);
- M (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;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_ipsec_spd_add_del (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_spd_add_del_t *mp;
+ vl_api_ikev2_set_local_key_t *mp;
f64 timeout;
- u32 spd_id = ~0;
- u8 is_add = 1;
+ u8 *file = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "spd_id %d", &spd_id))
- ;
- else if (unformat (i, "del"))
- is_add = 0;
+ 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 == ~0)
+
+ if (!vec_len (file))
{
- errmsg ("spd_id must be set\n");
+ errmsg ("RSA key file must be specified");
return -99;
}
- M (IPSEC_SPD_ADD_DEL, ipsec_spd_add_del);
+ if (vec_len (file) > 256)
+ {
+ errmsg ("file name too long");
+ return -99;
+ }
- mp->spd_id = ntohl (spd_id);
- mp->is_add = is_add;
+ M (IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
+
+ clib_memcpy (mp->key_file, file, vec_len (file));
+ vec_free (file);
S;
W;
/* NOTREACHED */
return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
+/*
+ * MAP
+ */
static int
-api_ipsec_interface_add_del_spd (vat_main_t * vam)
+api_map_add_domain (vat_main_t * vam)
{
-#if DPDK > 0
unformat_input_t *i = vam->input;
- vl_api_ipsec_interface_add_del_spd_t *mp;
+ vl_api_map_add_domain_t *mp;
f64 timeout;
- u32 sw_if_index;
- u8 sw_if_index_set = 0;
- u32 spd_id = (u32) ~ 0;
- u8 is_add = 1;
+
+ ip4_address_t ip4_prefix;
+ ip6_address_t ip6_prefix;
+ ip6_address_t ip6_src;
+ u32 num_m_args = 0;
+ u32 ip6_prefix_len = 0, ip4_prefix_len = 0, ea_bits_len = 0, psid_offset =
+ 0, psid_length = 0;
+ u8 is_translation = 0;
+ u32 mtu = 0;
+ u32 ip6_src_len = 128;
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, "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 (spd_id == (u32) ~ 0)
+ if (num_m_args < 3)
{
- errmsg ("spd_id must be set\n");
+ errmsg ("mandatory argument(s) missing\n");
return -99;
}
- if (sw_if_index_set == 0)
- {
- errmsg ("missing interface name or sw_if_index\n");
- return -99;
- }
+ /* Construct the API message */
+ M (MAP_ADD_DOMAIN, map_add_domain);
- M (IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd);
+ clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix));
+ mp->ip4_prefix_len = ip4_prefix_len;
- mp->spd_id = ntohl (spd_id);
- mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
+ 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;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
static int
-api_ipsec_spd_add_del_entry (vat_main_t * vam)
+api_map_del_domain (vat_main_t * vam)
{
-#if DPDK > 0
unformat_input_t *i = vam->input;
- vl_api_ipsec_spd_add_del_entry_t *mp;
+ vl_api_map_del_domain_t *mp;
f64 timeout;
- u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1;
- u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0;
- i32 priority = 0;
- u32 rport_start = 0, rport_stop = (u32) ~ 0;
- u32 lport_start = 0, lport_stop = (u32) ~ 0;
- ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop;
- ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop;
-
- 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;
- }
- }
+ 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;
}
- M (IPSEC_SPD_ADD_DEL_ENTRY, ipsec_spd_add_del_entry);
+ /* Construct the API message */
+ M (MAP_DEL_DOMAIN, map_del_domain);
- mp->spd_id = ntohl (spd_id);
- mp->priority = ntohl (priority);
- mp->is_outbound = is_outbound;
+ mp->index = ntohl (index);
- 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;
+ /* send it... */
S;
+
+ /* Wait for a reply, return good/bad news */
W;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
static int
-api_ipsec_sad_add_del_entry (vat_main_t * vam)
+api_map_add_del_rule (vat_main_t * vam)
{
-#if DPDK > 0
unformat_input_t *i = vam->input;
- vl_api_ipsec_sad_add_del_entry_t *mp;
+ vl_api_map_add_del_rule_t *mp;
f64 timeout;
- u32 sad_id = 0, spi = 0;
- u8 *ck = 0, *ik = 0;
u8 is_add = 1;
-
- u8 protocol = IPSEC_PROTOCOL_AH;
- u8 is_tunnel = 0, is_tunnel_ipv6 = 0;
- u32 crypto_alg = 0, integ_alg = 0;
- ip4_address_t tun_src4;
- ip4_address_t tun_dst4;
- ip6_address_t tun_src6;
- ip6_address_t tun_dst6;
+ ip6_address_t ip6_dst;
+ u32 num_m_args = 0, index, psid = 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 (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"))
{
- 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;
- }
+ is_add = 0;
}
- 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_SAD_ADD_DEL_ENTRY, ipsec_sad_add_del_entry);
+ /* Construct the API message */
+ M (MAP_ADD_DEL_RULE, map_add_del_rule);
- mp->sad_id = ntohl (sad_id);
+ mp->index = ntohl (index);
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);
+ clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst));
+ mp->psid = ntohs (psid);
- if (mp->crypto_key_length > sizeof (mp->crypto_key))
- mp->crypto_key_length = sizeof (mp->crypto_key);
+ /* 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;
+
+ /* Construct the API message */
+ M (MAP_DOMAIN_DUMP, map_domain_dump);
+
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ 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;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "index %u", &domain_index))
+ ;
+ else
+ break;
+ }
+
+ if (domain_index == ~0)
+ {
+ clib_warning ("parse error: domain index expected");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (MAP_RULE_DUMP, map_rule_dump);
+
+ mp->domain_index = htonl (domain_index);
+
+ /* send it... */
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ 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 (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->result_ready = 1;
+ }
+}
+
+static void vl_api_map_add_domain_reply_t_handler_json
+ (vl_api_map_add_domain_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t node;
+
+ vat_json_init_object (&node);
+ vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
+ vat_json_object_add_uint (&node, "index", ntohl (mp->index));
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
+
+static int
+api_get_first_msg_id (vat_main_t * vam)
+{
+ vl_api_get_first_msg_id_t *mp;
+ f64 timeout;
+ unformat_input_t *i = vam->input;
+ u8 *name;
+ u8 name_set = 0;
- if (mp->integrity_key_length > sizeof (mp->integrity_key))
- mp->integrity_key_length = sizeof (mp->integrity_key);
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "client %s", &name))
+ name_set = 1;
+ else
+ break;
+ }
- if (ck)
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- if (ik)
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+ if (name_set == 0)
+ {
+ errmsg ("missing client name\n");
+ return -99;
+ }
+ vec_add1 (name, 0);
- if (is_tunnel)
+ if (vec_len (name) > 63)
{
- 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));
- }
+ 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_ipsec_sa_set_key (vat_main_t * vam)
+api_cop_interface_enable_disable (vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t *i = vam->input;
- vl_api_ipsec_sa_set_key_t *mp;
+ unformat_input_t *line_input = vam->input;
+ vl_api_cop_interface_enable_disable_t *mp;
f64 timeout;
- u32 sa_id;
- u8 *ck = 0, *ik = 0;
+ u32 sw_if_index = ~0;
+ u8 enable_disable = 1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sa_id %d", &sa_id))
- ;
- else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck))
+ 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, "integ_key %U", unformat_hex_string, &ik))
+ else if (unformat (line_input, "sw_if_index %d", &sw_if_index))
;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- M (IPSEC_SA_SET_KEY, ipsec_set_sa_key);
-
- mp->sa_id = ntohl (sa_id);
- mp->crypto_key_length = vec_len (ck);
- mp->integrity_key_length = vec_len (ik);
-
- if (mp->crypto_key_length > sizeof (mp->crypto_key))
- mp->crypto_key_length = sizeof (mp->crypto_key);
-
- if (mp->integrity_key_length > sizeof (mp->integrity_key))
- mp->integrity_key_length = sizeof (mp->integrity_key);
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
- if (ck)
- clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length);
- if (ik)
- clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length);
+ /* 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;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
static int
-api_ikev2_profile_add_del (vat_main_t * vam)
+api_cop_whitelist_enable_disable (vat_main_t * vam)
{
-#if DPDK > 0
- unformat_input_t *i = vam->input;
- vl_api_ikev2_profile_add_del_t *mp;
+ unformat_input_t *line_input = vam->input;
+ vl_api_cop_whitelist_enable_disable_t *mp;
f64 timeout;
- u8 is_add = 1;
- u8 *name = 0;
-
- const char *valid_chars = "a-zA-Z0-9_";
+ u32 sw_if_index = ~0;
+ u8 ip4 = 0, ip6 = 0, default_cop = 0;
+ u32 fib_id = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "del"))
- is_add = 0;
- else if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
+ if (unformat (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
- {
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (!vec_len (name))
+ if (sw_if_index == ~0)
{
- errmsg ("profile name must be specified");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (vec_len (name) > 64)
- {
- errmsg ("profile name too long");
- 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;
- M (IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del);
+ /* send it... */
+ S;
+ /* Wait for the reply */
+ W;
+}
- clib_memcpy (mp->name, name, vec_len (name));
- mp->is_add = is_add;
- vec_free (name);
+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;
- /* NOTREACHED */
- return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
+}
+
+/* *INDENT-OFF* */
+/** Used for parsing LISP eids */
+typedef CLIB_PACKED(struct{
+ u8 addr[16]; /**< eid address */
+ u32 len; /**< prefix length if IP */
+ u8 type; /**< type of eid */
+}) lisp_eid_vat_t;
+/* *INDENT-ON* */
+
+static uword
+unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
+{
+ lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
+
+ memset (a, 0, sizeof (a[0]));
+
+ if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
+ {
+ a->type = 0; /* ipv4 type */
+ }
+ else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr, &a->len))
+ {
+ a->type = 1; /* ipv6 type */
+ }
+ else if (unformat (input, "%U", unformat_ethernet_address, a->addr))
+ {
+ a->type = 2; /* mac type */
+ }
+ else
+ {
+ return 0;
+ }
+
+ if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128))
+ {
+ return 0;
+ }
+
+ return 1;
}
static int
-api_ikev2_profile_set_auth (vat_main_t * vam)
+lisp_eid_size_vat (u8 type)
{
-#if DPDK > 0
- unformat_input_t *i = vam->input;
- vl_api_ikev2_profile_set_auth_t *mp;
- f64 timeout;
- u8 *name = 0;
- u8 *data = 0;
- u32 auth_method = 0;
- u8 is_hex = 0;
+ switch (type)
+ {
+ case 0:
+ return 4;
+ case 1:
+ return 16;
+ case 2:
+ return 6;
+ }
+ return 0;
+}
+
+static void
+lisp_eid_put_vat (u8 * dst, u8 eid[16], u8 type)
+{
+ clib_memcpy (dst, eid, lisp_eid_size_vat (type));
+}
+
+/* *INDENT-OFF* */
+/** Used for transferring locators via VPP API */
+typedef CLIB_PACKED(struct
+{
+ u32 sw_if_index; /**< locator sw_if_index */
+ u8 priority; /**< locator priority */
+ u8 weight; /**< locator weight */
+}) ls_locator_t;
+/* *INDENT-ON* */
- const char *valid_chars = "a-zA-Z0-9_";
+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;
+ ls_locator_t locator, *locators = 0;
+ u32 sw_if_index, priority, weight;
+ u32 data_len = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != 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))
- ;
- 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 (input, "del"))
{
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
+ is_add = 0;
+ }
+ else if (unformat (input, "locator-set %s", &locator_set_name))
+ {
+ locator_set_name_set = 1;
+ }
+ else if (unformat (input, "sw_if_index %u p %u w %u",
+ &sw_if_index, &priority, &weight))
+ {
+ locator.sw_if_index = htonl (sw_if_index);
+ locator.priority = priority;
+ locator.weight = weight;
+ vec_add1 (locators, locator);
+ }
+ else if (unformat (input, "iface %U p %u w %u", unformat_sw_if_index,
+ vam, &sw_if_index, &priority, &weight))
+ {
+ locator.sw_if_index = htonl (sw_if_index);
+ locator.priority = priority;
+ locator.weight = weight;
+ vec_add1 (locators, locator);
}
+ else
+ break;
}
- if (!vec_len (name))
+ if (locator_set_name_set == 0)
{
- errmsg ("profile name must be specified");
+ errmsg ("missing locator-set name");
+ vec_free (locators);
return -99;
}
- if (vec_len (name) > 64)
+ if (vec_len (locator_set_name) > 64)
{
- errmsg ("profile name too long");
+ errmsg ("locator-set name too long\n");
+ vec_free (locator_set_name);
+ vec_free (locators);
return -99;
}
+ vec_add1 (locator_set_name, 0);
- if (!vec_len (data))
- {
- errmsg ("auth_data must be specified");
- return -99;
- }
+ data_len = sizeof (ls_locator_t) * vec_len (locators);
- if (!auth_method)
- {
- errmsg ("auth_method must be specified");
- return -99;
- }
+ /* Construct the API message */
+ M2 (LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set, data_len);
- M (IKEV2_PROFILE_SET_AUTH, ikev2_profile_set_auth);
+ 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->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->locator_num = clib_host_to_net_u32 (vec_len (locators));
+ if (locators)
+ clib_memcpy (mp->locators, locators, data_len);
+ vec_free (locators);
+ /* send it... */
S;
+
+ /* Wait for a reply... */
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;
-
- const char *valid_chars = "a-zA-Z0-9_";
+ 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;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "name %U", unformat_token, valid_chars, &name))
- vec_add1 (name, 0);
- else if (unformat (i, "id_type %U", unformat_ikev2_id_type, &id_type))
- ;
- else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4))
+ if (unformat (input, "del"))
{
- data = vec_new (u8, 4);
- clib_memcpy (data, ip4.as_u8, 4);
+ is_add = 0;
}
- 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
+ else if (unformat (input, "locator-set %s", &locator_set_name))
{
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
+ 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;
}
- if (!vec_len (name))
+ if (locator_set_name_set == 0)
{
- errmsg ("profile name must be specified");
+ errmsg ("missing locator-set name");
return -99;
}
- if (vec_len (name) > 64)
+ if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0)
{
- errmsg ("profile name too long");
+ errmsg ("missing sw_if_index");
+ vec_free (locator_set_name);
return -99;
}
- if (!vec_len (data))
+ if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0)
{
- errmsg ("id_data must be specified");
+ errmsg ("cannot use both params interface name and sw_if_index");
+ vec_free (locator_set_name);
return -99;
}
- if (!id_type)
+ if (priority_set == 0)
{
- errmsg ("id_type must be specified");
+ errmsg ("missing locator-set priority\n");
+ vec_free (locator_set_name);
return -99;
}
- M (IKEV2_PROFILE_SET_ID, ikev2_profile_set_id);
-
- 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_ikev2_profile_set_ts (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;
-
- 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))
- ;
- 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 (!vec_len (name))
+ if (weight_set == 0)
{
- errmsg ("profile name must be specified");
+ errmsg ("missing locator-set weight\n");
+ vec_free (locator_set_name);
return -99;
}
- if (vec_len (name) > 64)
+ if (vec_len (locator_set_name) > 64)
{
- errmsg ("profile name too long");
+ errmsg ("locator-set name too long\n");
+ vec_free (locator_set_name);
return -99;
}
+ vec_add1 (locator_set_name, 0);
- M (IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts);
+ /* Construct the API message */
+ M (LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
- 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);
+ 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;
+
/* NOTREACHED */
return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
-static int
-api_ikev2_set_local_key (vat_main_t * vam)
+uword
+unformat_hmac_key_id (unformat_input_t * input, va_list * args)
{
-#if DPDK > 0
- unformat_input_t *i = vam->input;
- vl_api_ikev2_set_local_key_t *mp;
- f64 timeout;
- u8 *file = 0;
+ u32 *key_id = va_arg (*args, u32 *);
+ u8 *s = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ if (unformat (input, "%s", &s))
{
- if (unformat (i, "file %v", &file))
- vec_add1 (file, 0);
+ if (!strcmp ((char *) s, "sha1"))
+ key_id[0] = HMAC_SHA_1_96;
+ else if (!strcmp ((char *) s, "sha256"))
+ key_id[0] = HMAC_SHA_256_128;
else
{
- errmsg ("parse error '%U'", format_unformat_error, i);
- return -99;
+ clib_warning ("invalid key_id: '%s'", s);
+ key_id[0] = HMAC_NO_KEY;
}
}
+ else
+ return 0;
- if (!vec_len (file))
+ vec_free (s);
+ return 1;
+}
+
+static int
+api_lisp_add_del_local_eid (vat_main_t * vam)
+{
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_local_eid_t *mp;
+ f64 timeout = ~0;
+ u8 is_add = 1;
+ u8 eid_set = 0;
+ lisp_eid_vat_t _eid, *eid = &_eid;
+ u8 *locator_set_name = 0;
+ u8 locator_set_name_set = 0;
+ u32 vni = 0;
+ u16 key_id = 0;
+ u8 *key = 0;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- errmsg ("RSA key file must be specified");
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ ;
+ }
+ else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
+ {
+ eid_set = 1;
+ }
+ else if (unformat (input, "locator-set %s", &locator_set_name))
+ {
+ locator_set_name_set = 1;
+ }
+ else if (unformat (input, "key-id %U", unformat_hmac_key_id, &key_id))
+ ;
+ else if (unformat (input, "secret-key %_%v%_", &key))
+ ;
+ else
+ break;
+ }
+
+ if (locator_set_name_set == 0)
+ {
+ errmsg ("missing locator-set name\n");
return -99;
}
- if (vec_len (file) > 256)
+ if (0 == eid_set)
{
- errmsg ("file name too long");
+ errmsg ("EID address not set!");
+ vec_free (locator_set_name);
return -99;
}
- M (IKEV2_SET_LOCAL_KEY, ikev2_set_local_key);
+ if (key && (0 == key_id))
+ {
+ errmsg ("invalid key_id!");
+ return -99;
+ }
- clib_memcpy (mp->key_file, file, vec_len (file));
- vec_free (file);
+ if (vec_len (key) > 64)
+ {
+ errmsg ("key too long");
+ vec_free (key);
+ 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);
+
+ /* Construct the API message */
+ M (LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
+
+ mp->is_add = is_add;
+ lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
+ mp->eid_type = eid->type;
+ mp->prefix_len = eid->len;
+ mp->vni = clib_host_to_net_u32 (vni);
+ mp->key_id = clib_host_to_net_u16 (key_id);
+ clib_memcpy (mp->locator_set_name, locator_set_name,
+ vec_len (locator_set_name));
+ clib_memcpy (mp->key, key, vec_len (key));
+
+ vec_free (locator_set_name);
+ vec_free (key);
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
+
/* NOTREACHED */
return 0;
-#else
- clib_warning ("unsupported (no dpdk)");
- return -99;
-#endif
}
-/*
- * MAP
- */
+/* *INDENT-OFF* */
+/** 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;
+/* *INDENT-ON* */
+
static int
-api_map_add_domain (vat_main_t * vam)
+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;
+ lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid;
+ lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid;
+ u8 rmt_eid_set = 0, lcl_eid_set = 0;
+ u32 action = ~0, p, w;
+ ip4_address_t rmt_rloc4, lcl_rloc4;
+ ip6_address_t rmt_rloc6, lcl_rloc6;
+ rloc_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 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 = 0, ip4_prefix_len = 0, ea_bits_len = 0, psid_offset =
- 0, psid_length = 0;
- u8 is_translation = 0;
- u32 mtu = 0;
- u32 ip6_src_len = 128;
+ memset (&rloc, 0, sizeof (rloc));
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != 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;
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "rmt_eid %U", unformat_lisp_eid_vat, rmt_eid))
+ {
+ rmt_eid_set = 1;
+ }
+ else if (unformat (input, "lcl_eid %U", unformat_lisp_eid_vat, lcl_eid))
+ {
+ lcl_eid_set = 1;
+ }
+ 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, "loc-pair %U %U", unformat_ip4_address,
+ &lcl_rloc4, unformat_ip4_address, &rmt_rloc4))
+ {
+ rloc.is_ip4 = 1;
+
+ clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4));
+ rloc.priority = rloc.weight = 0;
+ vec_add1 (lcl_locs, rloc);
+
+ clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4));
+ vec_add1 (rmt_locs, rloc);
+ /* priority and weight saved in rmt loc */
+ curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ }
+ else if (unformat (input, "loc-pair %U %U", unformat_ip6_address,
+ &lcl_rloc6, unformat_ip6_address, &rmt_rloc6))
+ {
+ rloc.is_ip4 = 0;
+ clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6));
+ rloc.priority = rloc.weight = 0;
+ vec_add1 (lcl_locs, rloc);
+
+ clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6));
+ vec_add1 (rmt_locs, rloc);
+ /* priority and weight saved in rmt loc */
+ curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ }
+ else if (unformat (input, "action %d", &action))
+ {
+ ;
+ }
else
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
+ clib_warning ("parse error '%U'", format_unformat_error, input);
return -99;
}
}
- if (num_m_args < 3)
+ if (!rmt_eid_set)
{
- errmsg ("mandatory argument(s) missing\n");
+ errmsg ("remote eid addresses not set\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 (lcl_eid_set && rmt_eid->type != lcl_eid->type)
{
- if (unformat (i, "index %d", &index))
- num_m_args++;
- else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ errmsg ("eid types don't match\n");
+ return -99;
}
- if (num_m_args != 1)
+ if (0 == rmt_locs && (u32) ~ 0 == action)
{
- errmsg ("mandatory argument(s) missing\n");
+ errmsg ("action not set for negative mapping\n");
return -99;
}
/* Construct the API message */
- M (MAP_DEL_DOMAIN, map_del_domain);
+ M (LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
- mp->index = ntohl (index);
+ mp->is_add = is_add;
+ lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
+ lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type);
+ mp->eid_type = rmt_eid->type;
+ mp->rmt_len = rmt_eid->len;
+ mp->lcl_len = lcl_eid->len;
+ mp->action = action;
+
+ if (0 != rmt_locs && 0 != lcl_locs)
+ {
+ mp->loc_num = vec_len (rmt_locs);
+ clib_memcpy (mp->lcl_locs, lcl_locs,
+ (sizeof (rloc_t) * vec_len (lcl_locs)));
+ clib_memcpy (mp->rmt_locs, rmt_locs,
+ (sizeof (rloc_t) * vec_len (rmt_locs)));
+ }
+ vec_free (lcl_locs);
+ vec_free (rmt_locs);
/* send it... */
S;
- /* Wait for a reply, return good/bad news */
+ /* Wait for a reply... */
W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_map_add_del_rule (vat_main_t * vam)
+api_lisp_add_del_map_server (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_map_add_del_rule_t *mp;
- f64 timeout;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_add_del_map_server_t *mp;
+ f64 timeout = ~0;
u8 is_add = 1;
- ip6_address_t ip6_dst;
- u32 num_m_args = 0, index, psid = 0;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ ip4_address_t ipv4;
+ ip6_address_t ipv6;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != 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"))
+ if (unformat (input, "del"))
{
is_add = 0;
}
- else
+ else if (unformat (input, "%U", unformat_ip4_address, &ipv4))
{
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
+ ipv4_set = 1;
}
+ else if (unformat (input, "%U", unformat_ip6_address, &ipv6))
+ {
+ ipv6_set = 1;
+ }
+ else
+ break;
+ }
+
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("both eid v4 and v6 addresses set\n");
+ return -99;
+ }
+
+ if (!ipv4_set && !ipv6_set)
+ {
+ errmsg ("eid addresses not set\n");
+ return -99;
}
/* Construct the API message */
- M (MAP_ADD_DEL_RULE, map_add_del_rule);
+ M (LISP_ADD_DEL_MAP_SERVER, lisp_add_del_map_server);
- mp->index = ntohl (index);
mp->is_add = is_add;
- clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst));
- mp->psid = ntohs (psid);
+ 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;
- /* Wait for a reply, return good/bad news */
+ /* Wait for a reply... */
W;
-}
-
-static int
-api_map_domain_dump (vat_main_t * vam)
-{
- vl_api_map_domain_dump_t *mp;
- f64 timeout;
-
- /* Construct the API message */
- M (MAP_DOMAIN_DUMP, map_domain_dump);
- /* send it... */
- S;
-
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
- W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_map_rule_dump (vat_main_t * vam)
+api_lisp_add_del_map_resolver (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_map_rule_dump_t *mp;
- f64 timeout;
- u32 domain_index = ~0;
+ 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;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "index %u", &domain_index))
- ;
+ 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 (domain_index == ~0)
+ if (ipv4_set && ipv6_set)
{
- clib_warning ("parse error: domain index expected");
+ errmsg ("both eid v4 and v6 addresses set\n");
+ return -99;
+ }
+
+ if (!ipv4_set && !ipv6_set)
+ {
+ errmsg ("eid addresses not set\n");
return -99;
}
/* Construct the API message */
- M (MAP_RULE_DUMP, map_rule_dump);
+ M (LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
- mp->domain_index = htonl (domain_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;
- /* 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 void vl_api_map_add_domain_reply_t_handler
- (vl_api_map_add_domain_reply_t * mp)
+static int
+api_lisp_gpe_enable_disable (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl (mp->retval);
+ 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;
- if (vam->async_mode)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- vam->async_errors += (retval < 0);
+ if (unformat (input, "enable"))
+ {
+ is_set = 1;
+ is_en = 1;
+ }
+ else if (unformat (input, "disable"))
+ {
+ is_set = 1;
+ is_en = 0;
+ }
+ else
+ break;
}
- else
+
+ if (is_set == 0)
{
- vam->retval = retval;
- vam->result_ready = 1;
+ errmsg ("Value not set\n");
+ return -99;
}
-}
-static void vl_api_map_add_domain_reply_t_handler_json
- (vl_api_map_add_domain_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
+ /* Construct the API message */
+ M (LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
- 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));
+ mp->is_en = is_en;
- vat_json_print (vam->ofp, &node);
- vat_json_free (&node);
+ /* send it... */
+ S;
- vam->retval = ntohl (mp->retval);
- vam->result_ready = 1;
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_get_first_msg_id (vat_main_t * vam)
+api_lisp_rloc_probe_enable_disable (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;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_rloc_probe_enable_disable_t *mp;
+ f64 timeout = ~0;
+ u8 is_set = 0;
+ u8 is_en = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "client %s", &name))
- name_set = 1;
+ if (unformat (input, "enable"))
+ {
+ is_set = 1;
+ is_en = 1;
+ }
+ else if (unformat (input, "disable"))
+ is_set = 1;
else
break;
}
- if (name_set == 0)
+ if (!is_set)
{
- errmsg ("missing client name\n");
+ errmsg ("Value not set\n");
return -99;
}
- vec_add1 (name, 0);
- if (vec_len (name) > 63)
- {
- errmsg ("client name too long\n");
- return -99;
- }
+ /* Construct the API message */
+ M (LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable);
- M (GET_FIRST_MSG_ID, get_first_msg_id);
- clib_memcpy (mp->name, name, vec_len (name));
+ mp->is_enabled = is_en;
+
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
+
/* NOTREACHED */
return 0;
}
static int
-api_cop_interface_enable_disable (vat_main_t * vam)
+api_lisp_map_register_enable_disable (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;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_map_register_enable_disable_t *mp;
+ f64 timeout = ~0;
+ u8 is_set = 0;
+ u8 is_en = 0;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (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))
- ;
+ if (unformat (input, "enable"))
+ {
+ is_set = 1;
+ is_en = 1;
+ }
+ else if (unformat (input, "disable"))
+ is_set = 1;
else
break;
}
- if (sw_if_index == ~0)
+ if (!is_set)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("Value not set\n");
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_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable);
+
+ mp->is_enabled = is_en;
/* send it... */
S;
- /* Wait for the reply */
+
+ /* Wait for a reply... */
W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_cop_whitelist_enable_disable (vat_main_t * vam)
+api_lisp_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 = 0;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_enable_disable_t *mp;
+ f64 timeout = ~0;
+ u8 is_set = 0;
+ u8 is_en = 0;
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (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))
- ;
+ if (unformat (input, "enable"))
+ {
+ is_set = 1;
+ is_en = 1;
+ }
+ else if (unformat (input, "disable"))
+ {
+ is_set = 1;
+ }
else
break;
}
- if (sw_if_index == ~0)
+ if (!is_set)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("Value not set\n");
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;
+ M (LISP_ENABLE_DISABLE, lisp_enable_disable);
+
+ mp->is_en = is_en;
/* send it... */
S;
- /* Wait for the reply */
+
+ /* Wait for a reply... */
W;
+
+ /* NOTREACHED */
+ return 0;
}
static int
-api_get_node_graph (vat_main_t * vam)
+api_show_lisp_map_register_state (vat_main_t * vam)
{
- vl_api_get_node_graph_t *mp;
- f64 timeout;
+ f64 timeout = ~0;
+ vl_api_show_lisp_map_register_state_t *mp;
- M (GET_NODE_GRAPH, get_node_graph);
+ M (SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state);
- /* send it... */
+ /* send */
S;
- /* Wait for the reply */
+
+ /* wait for reply */
W;
-}
-/* *INDENT-OFF* */
-/** Used for parsing LISP eids */
-typedef CLIB_PACKED(struct{
- u8 addr[16]; /**< eid address */
- u32 len; /**< prefix length if IP */
- u8 type; /**< type of eid */
-}) lisp_eid_vat_t;
-/* *INDENT-ON* */
+ return 0;
+}
-static uword
-unformat_lisp_eid_vat (unformat_input_t * input, va_list * args)
+static int
+api_show_lisp_rloc_probe_state (vat_main_t * vam)
{
- lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *);
-
- memset (a, 0, sizeof (a[0]));
+ f64 timeout = ~0;
+ vl_api_show_lisp_rloc_probe_state_t *mp;
- if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len))
- {
- a->type = 0; /* ipv4 type */
- }
- else if (unformat (input, "%U/%d", unformat_ip6_address, a->addr, &a->len))
- {
- a->type = 1; /* ipv6 type */
- }
- else if (unformat (input, "%U", unformat_ethernet_address, a->addr))
- {
- a->type = 2; /* mac type */
- }
- else
- {
- return 0;
- }
+ M (SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state);
- if ((a->type == 0 && a->len > 32) || (a->type == 1 && a->len > 128))
- {
- return 0;
- }
+ /* send */
+ S;
- return 1;
-}
+ /* wait for reply */
+ W;
-static int
-lisp_eid_size_vat (u8 type)
-{
- switch (type)
- {
- case 0:
- return 4;
- case 1:
- return 16;
- case 2:
- return 6;
- }
return 0;
}
-static void
-lisp_eid_put_vat (u8 * dst, u8 eid[16], u8 type)
+static int
+api_show_lisp_map_request_mode (vat_main_t * vam)
{
- clib_memcpy (dst, eid, lisp_eid_size_vat (type));
-}
+ f64 timeout = ~0;
+ vl_api_show_lisp_map_request_mode_t *mp;
-/* *INDENT-OFF* */
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
-{
- u32 sw_if_index; /**< locator sw_if_index */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
-}) ls_locator_t;
-/* *INDENT-ON* */
+ M (SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode);
+
+ /* send */
+ S;
+
+ /* wait for reply */
+ W;
+
+ return 0;
+}
static int
-api_lisp_add_del_locator_set (vat_main_t * vam)
+api_lisp_map_request_mode (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;
- ls_locator_t locator, *locators = 0;
- u32 sw_if_index, priority, weight;
- u32 data_len = 0;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_map_request_mode_t *mp;
+ u8 mode = 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 if (unformat (input, "sw_if_index %u p %u w %u",
- &sw_if_index, &priority, &weight))
- {
- locator.sw_if_index = htonl (sw_if_index);
- locator.priority = priority;
- locator.weight = weight;
- vec_add1 (locators, locator);
- }
- else if (unformat (input, "iface %U p %u w %u", unformat_sw_if_index,
- vam, &sw_if_index, &priority, &weight))
+ if (unformat (input, "dst-only"))
+ mode = 0;
+ else if (unformat (input, "src-dst"))
+ mode = 1;
+ else
{
- locator.sw_if_index = htonl (sw_if_index);
- locator.priority = priority;
- locator.weight = weight;
- vec_add1 (locators, locator);
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
}
- else
- break;
- }
-
- if (locator_set_name_set == 0)
- {
- errmsg ("missing locator-set name");
- vec_free (locators);
- return -99;
- }
-
- if (vec_len (locator_set_name) > 64)
- {
- errmsg ("locator-set name too long\n");
- vec_free (locator_set_name);
- vec_free (locators);
- return -99;
}
- vec_add1 (locator_set_name, 0);
-
- data_len = sizeof (ls_locator_t) * vec_len (locators);
-
- /* Construct the API message */
- M2 (LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set, data_len);
- mp->is_add = is_add;
- clib_memcpy (mp->locator_set_name, locator_set_name,
- vec_len (locator_set_name));
- vec_free (locator_set_name);
+ M (LISP_MAP_REQUEST_MODE, lisp_map_request_mode);
- mp->locator_num = clib_host_to_net_u32 (vec_len (locators));
- if (locators)
- clib_memcpy (mp->locators, locators, data_len);
- vec_free (locators);
+ mp->mode = mode;
- /* send it... */
+ /* send */
S;
- /* Wait for a reply... */
+ /* wait for reply */
W;
- /* NOTREACHED */
+ /* notreached */
return 0;
}
+/**
+ * Enable/disable LISP proxy ITR.
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
static int
-api_lisp_add_del_locator (vat_main_t * vam)
+api_lisp_pitr_set_locator_set (vat_main_t * vam)
{
- 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 ls_name_set = 0;
+ unformat_input_t *input = vam->input;
+ vl_api_lisp_pitr_set_locator_set_t *mp;
u8 is_add = 1;
- u8 *locator_set_name = NULL;
- u8 locator_set_name_set = 0;
+ u8 *ls_name = 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", &ls_name))
+ ls_name_set = 1;
+ else
{
- 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;
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
}
- else
- break;
}
- if (locator_set_name_set == 0)
+ if (!ls_name_set)
{
- errmsg ("missing locator-set name");
+ errmsg ("locator-set name not set!");
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;
- }
+ M (LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
- 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;
- }
+ mp->is_add = is_add;
+ clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
+ vec_free (ls_name);
- if (priority_set == 0)
- {
- errmsg ("missing locator-set priority\n");
- vec_free (locator_set_name);
- return -99;
- }
+ /* send */
+ S;
- if (weight_set == 0)
- {
- errmsg ("missing locator-set weight\n");
- vec_free (locator_set_name);
- return -99;
- }
+ /* wait for reply */
+ W;
- 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);
+ /* notreached */
+ return 0;
+}
- /* Construct the API message */
- M (LISP_ADD_DEL_LOCATOR, lisp_add_del_locator);
+static int
+api_show_lisp_pitr (vat_main_t * vam)
+{
+ vl_api_show_lisp_pitr_t *mp;
+ f64 timeout = ~0;
- 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);
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=20s\n", "lisp status:");
+ }
+ M (SHOW_LISP_PITR, show_lisp_pitr);
/* send it... */
S;
return 0;
}
+/**
+ * Add/delete mapping between vni and vrf
+ */
static int
-api_lisp_add_del_local_eid (vat_main_t * vam)
+api_lisp_eid_table_add_del_map (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_lisp_add_del_local_eid_t *mp;
f64 timeout = ~0;
- u8 is_add = 1;
- u8 eid_set = 0;
- lisp_eid_vat_t _eid, *eid = &_eid;
- u8 *locator_set_name = 0;
- u8 locator_set_name_set = 0;
- u32 vni = 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, bd_index_set = 0;
+ u32 vni, vrf, bd_index;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "del"))
- {
- is_add = 0;
- }
+ is_add = 0;
+ else if (unformat (input, "vrf %d", &vrf))
+ vrf_set = 1;
+ else if (unformat (input, "bd_index %d", &bd_index))
+ bd_index_set = 1;
else if (unformat (input, "vni %d", &vni))
- {
- ;
- }
- else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
- {
- eid_set = 1;
- }
- else if (unformat (input, "locator-set %s", &locator_set_name))
- {
- locator_set_name_set = 1;
- }
+ vni_set = 1;
else
break;
}
- if (locator_set_name_set == 0)
- {
- errmsg ("missing locator-set name\n");
- return -99;
- }
-
- if (0 == eid_set)
+ if (!vni_set || (!vrf_set && !bd_index_set))
{
- errmsg ("EID address not set!");
- vec_free (locator_set_name);
+ errmsg ("missing arguments!");
return -99;
}
- if (vec_len (locator_set_name) > 64)
+ if (vrf_set && bd_index_set)
{
- errmsg ("locator-set name too long\n");
- vec_free (locator_set_name);
+ errmsg ("error: both vrf and bd entered!");
return -99;
}
- vec_add1 (locator_set_name, 0);
- /* Construct the API message */
- M (LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid);
+ M (LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
mp->is_add = is_add;
- lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
- mp->eid_type = eid->type;
- mp->prefix_len = eid->len;
- 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);
+ mp->vni = htonl (vni);
+ mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index);
+ mp->is_l2 = bd_index_set;
- /* send it... */
+ /* send */
S;
- /* Wait for a reply... */
+ /* wait for reply */
W;
- /* NOTREACHED */
+ /* notreached */
return 0;
}
-/* *INDENT-OFF* */
-/** Used for transferring locators via VPP API */
-typedef CLIB_PACKED(struct
+uword
+unformat_negative_mapping_action (unformat_input_t * input, va_list * args)
{
- u8 is_ip4; /**< is locator an IPv4 address? */
- u8 priority; /**< locator priority */
- u8 weight; /**< locator weight */
- u8 addr[16]; /**< IPv4/IPv6 address */
-}) rloc_t;
-/* *INDENT-ON* */
+ u32 *action = va_arg (*args, u32 *);
+ u8 *s = 0;
+
+ if (unformat (input, "%s", &s))
+ {
+ if (!strcmp ((char *) s, "no-action"))
+ action[0] = 0;
+ else if (!strcmp ((char *) s, "natively-forward"))
+ action[0] = 1;
+ else if (!strcmp ((char *) s, "send-map-request"))
+ action[0] = 2;
+ else if (!strcmp ((char *) s, "drop"))
+ action[0] = 3;
+ else
+ {
+ clib_warning ("invalid action: '%s'", s);
+ action[0] = 3;
+ }
+ }
+ else
+ return 0;
+
+ vec_free (s);
+ return 1;
+}
+/**
+ * Add/del remote mapping to/from LISP control plane
+ *
+ * @param vam vpp API test context
+ * @return return code
+ */
static int
-api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam)
+api_lisp_add_del_remote_mapping (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_lisp_gpe_add_del_fwd_entry_t *mp;
+ vl_api_lisp_add_del_remote_mapping_t *mp;
f64 timeout = ~0;
- u8 is_add = 1;
- lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid;
- lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid;
- u8 rmt_eid_set = 0, lcl_eid_set = 0;
- u32 action = ~0, p, w;
- ip4_address_t rmt_rloc4, lcl_rloc4;
- ip6_address_t rmt_rloc6, lcl_rloc6;
- rloc_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0;
+ u32 vni = 0;
+ lisp_eid_vat_t _eid, *eid = &_eid;
+ lisp_eid_vat_t _seid, *seid = &_seid;
+ u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0;
+ u32 action = ~0, p, w, data_len;
+ ip4_address_t rloc4;
+ ip6_address_t rloc6;
+ rloc_t *rlocs = 0, rloc, *curr_rloc = 0;
memset (&rloc, 0, sizeof (rloc));
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "del"))
+ if (unformat (input, "del-all"))
+ {
+ del_all = 1;
+ }
+ else if (unformat (input, "del"))
{
is_add = 0;
}
- else if (unformat (input, "rmt_eid %U", unformat_lisp_eid_vat, rmt_eid))
+ else if (unformat (input, "add"))
{
- rmt_eid_set = 1;
+ is_add = 1;
}
- else if (unformat (input, "lcl_eid %U", unformat_lisp_eid_vat, lcl_eid))
+ else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid))
{
- lcl_eid_set = 1;
+ eid_set = 1;
+ }
+ else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid))
+ {
+ seid_set = 1;
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ ;
}
else if (unformat (input, "p %d w %d", &p, &w))
{
curr_rloc->priority = p;
curr_rloc->weight = w;
}
- else if (unformat (input, "loc-pair %U %U", unformat_ip4_address,
- &lcl_rloc4, unformat_ip4_address, &rmt_rloc4))
+ else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4))
{
rloc.is_ip4 = 1;
-
- clib_memcpy (&rloc.addr, &lcl_rloc4, sizeof (lcl_rloc4));
- rloc.priority = rloc.weight = 0;
- vec_add1 (lcl_locs, rloc);
-
- clib_memcpy (&rloc.addr, &rmt_rloc4, sizeof (rmt_rloc4));
- vec_add1 (rmt_locs, rloc);
- /* priority and weight saved in rmt loc */
- curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4));
+ vec_add1 (rlocs, rloc);
+ curr_rloc = &rlocs[vec_len (rlocs) - 1];
}
- else if (unformat (input, "loc-pair %U %U", unformat_ip6_address,
- &lcl_rloc6, unformat_ip6_address, &rmt_rloc6))
+ else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6))
{
rloc.is_ip4 = 0;
- clib_memcpy (&rloc.addr, &lcl_rloc6, sizeof (lcl_rloc6));
- rloc.priority = rloc.weight = 0;
- vec_add1 (lcl_locs, rloc);
-
- clib_memcpy (&rloc.addr, &rmt_rloc6, sizeof (rmt_rloc6));
- vec_add1 (rmt_locs, rloc);
- /* priority and weight saved in rmt loc */
- curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1];
+ 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 if (unformat (input, "action %U",
+ unformat_negative_mapping_action, &action))
{
;
}
}
}
- if (!rmt_eid_set)
- {
- errmsg ("remote eid addresses not set\n");
- return -99;
- }
-
- if (lcl_eid_set && rmt_eid->type != lcl_eid->type)
- {
- errmsg ("eid types don't match\n");
- return -99;
- }
-
- if (0 == rmt_locs && (u32) ~ 0 == action)
- {
- errmsg ("action not set for negative mapping\n");
- return -99;
- }
-
- /* Construct the API message */
- M (LISP_GPE_ADD_DEL_FWD_ENTRY, lisp_gpe_add_del_fwd_entry);
-
- mp->is_add = is_add;
- lisp_eid_put_vat (mp->rmt_eid, rmt_eid->addr, rmt_eid->type);
- lisp_eid_put_vat (mp->lcl_eid, lcl_eid->addr, lcl_eid->type);
- mp->eid_type = rmt_eid->type;
- mp->rmt_len = rmt_eid->len;
- mp->lcl_len = lcl_eid->len;
- mp->action = action;
-
- if (0 != rmt_locs && 0 != lcl_locs)
- {
- mp->loc_num = vec_len (rmt_locs);
- clib_memcpy (mp->lcl_locs, lcl_locs,
- (sizeof (rloc_t) * vec_len (lcl_locs)));
- clib_memcpy (mp->rmt_locs, rmt_locs,
- (sizeof (rloc_t) * vec_len (rmt_locs)));
- }
- vec_free (lcl_locs);
- vec_free (rmt_locs);
-
- /* send it... */
- S;
-
- /* Wait for a reply... */
- W;
-
- /* NOTREACHED */
- return 0;
-}
-
-static int
-api_lisp_add_del_map_resolver (vat_main_t * vam)
-{
- 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;
-
- /* 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 (ipv4_set && ipv6_set)
+ if (0 == eid_set)
{
- errmsg ("both eid v4 and v6 addresses set\n");
+ errmsg ("missing params!");
return -99;
}
- if (!ipv4_set && !ipv6_set)
+ if (is_add && (~0 == action) && 0 == vec_len (rlocs))
{
- errmsg ("eid addresses not set\n");
+ errmsg ("no action set for negative map-reply!");
return -99;
}
- /* Construct the API message */
- M (LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver);
+ data_len = vec_len (rlocs) * sizeof (rloc_t);
+ M2 (LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping, data_len);
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));
- }
+ mp->vni = htonl (vni);
+ mp->action = (u8) action;
+ mp->is_src_dst = seid_set;
+ mp->eid_len = eid->len;
+ mp->seid_len = seid->len;
+ mp->del_all = del_all;
+ mp->eid_type = eid->type;
+ lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
+ lisp_eid_put_vat (mp->seid, seid->addr, seid->type);
+
+ mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs));
+ clib_memcpy (mp->rlocs, rlocs, data_len);
+ vec_free (rlocs);
/* send it... */
S;
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_gpe_enable_disable (vat_main_t * vam)
+api_lisp_add_del_adjacency (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_lisp_gpe_enable_disable_t *mp;
+ vl_api_lisp_add_del_adjacency_t *mp;
f64 timeout = ~0;
- u8 is_set = 0;
- u8 is_en = 1;
+ u32 vni = 0;
+ ip4_address_t leid4, reid4;
+ ip6_address_t leid6, reid6;
+ u8 reid_mac[6] = { 0 };
+ u8 leid_mac[6] = { 0 };
+ u8 reid_type, leid_type;
+ u32 leid_len = 0, reid_len = 0, len;
+ u8 is_add = 1;
+
+ leid_type = reid_type = (u8) ~ 0;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "enable"))
+ if (unformat (input, "del"))
{
- is_set = 1;
- is_en = 1;
+ is_add = 0;
}
- else if (unformat (input, "disable"))
+ else if (unformat (input, "add"))
{
- is_set = 1;
- is_en = 0;
+ is_add = 1;
+ }
+ else if (unformat (input, "reid %U/%d", unformat_ip4_address,
+ &reid4, &len))
+ {
+ reid_type = 0; /* ipv4 */
+ reid_len = len;
+ }
+ else if (unformat (input, "reid %U/%d", unformat_ip6_address,
+ &reid6, &len))
+ {
+ reid_type = 1; /* ipv6 */
+ reid_len = len;
+ }
+ else if (unformat (input, "reid %U", unformat_ethernet_address,
+ reid_mac))
+ {
+ reid_type = 2; /* mac */
+ }
+ else if (unformat (input, "leid %U/%d", unformat_ip4_address,
+ &leid4, &len))
+ {
+ leid_type = 0; /* ipv4 */
+ leid_len = len;
+ }
+ else if (unformat (input, "leid %U/%d", unformat_ip6_address,
+ &leid6, &len))
+ {
+ leid_type = 1; /* ipv6 */
+ leid_len = len;
+ }
+ else if (unformat (input, "leid %U", unformat_ethernet_address,
+ leid_mac))
+ {
+ leid_type = 2; /* mac */
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ ;
}
else
- break;
+ {
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- if (is_set == 0)
+ if ((u8) ~ 0 == reid_type)
{
- errmsg ("Value not set\n");
+ errmsg ("missing params!");
return -99;
}
- /* Construct the API message */
- M (LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable);
+ if (leid_type != reid_type)
+ {
+ errmsg ("remote and local EIDs are of different types!");
+ return -99;
+ }
- mp->is_en = is_en;
+ M (LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
+ mp->is_add = is_add;
+ mp->vni = htonl (vni);
+ mp->leid_len = leid_len;
+ mp->reid_len = reid_len;
+ mp->eid_type = reid_type;
+
+ switch (mp->eid_type)
+ {
+ case 0:
+ clib_memcpy (mp->leid, &leid4, sizeof (leid4));
+ clib_memcpy (mp->reid, &reid4, sizeof (reid4));
+ break;
+ case 1:
+ clib_memcpy (mp->leid, &leid6, sizeof (leid6));
+ clib_memcpy (mp->reid, &reid6, sizeof (reid6));
+ break;
+ case 2:
+ clib_memcpy (mp->leid, leid_mac, 6);
+ clib_memcpy (mp->reid, reid_mac, 6);
+ break;
+ default:
+ errmsg ("unknown EID type %d!", mp->eid_type);
+ return 0;
+ }
/* send it... */
S;
}
static int
-api_lisp_enable_disable (vat_main_t * vam)
+api_lisp_gpe_add_del_iface (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_lisp_enable_disable_t *mp;
+ vl_api_lisp_gpe_add_del_iface_t *mp;
f64 timeout = ~0;
- u8 is_set = 0;
- u8 is_en = 0;
+ u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0;
+ u32 dp_table = 0, vni = 0;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "enable"))
+ if (unformat (input, "up"))
{
- is_set = 1;
- is_en = 1;
+ action_set = 1;
+ is_add = 1;
}
- else if (unformat (input, "disable"))
+ else if (unformat (input, "down"))
{
- is_set = 1;
+ action_set = 1;
+ is_add = 0;
+ }
+ else if (unformat (input, "table_id %d", &dp_table))
+ {
+ dp_table_set = 1;
+ }
+ else if (unformat (input, "bd_id %d", &dp_table))
+ {
+ dp_table_set = 1;
+ is_l2 = 1;
+ }
+ else if (unformat (input, "vni %d", &vni))
+ {
+ vni_set = 1;
}
else
break;
}
- if (!is_set)
+ if (action_set == 0)
{
- errmsg ("Value not set\n");
+ errmsg ("Action not set\n");
+ return -99;
+ }
+ if (dp_table_set == 0 || vni_set == 0)
+ {
+ errmsg ("vni and dp_table must be set\n");
return -99;
}
/* Construct the API message */
- M (LISP_ENABLE_DISABLE, lisp_enable_disable);
+ M (LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
- mp->is_en = is_en;
+ mp->is_add = is_add;
+ mp->dp_table = dp_table;
+ mp->is_l2 = is_l2;
+ 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_show_lisp_map_request_mode (vat_main_t * vam)
-{
- f64 timeout = ~0;
- vl_api_show_lisp_map_request_mode_t *mp;
-
- M (SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode);
-
- /* send */
- S;
-
- /* wait for reply */
- W;
-
- return 0;
-}
-
-static int
-api_lisp_map_request_mode (vat_main_t * vam)
+api_lisp_add_del_map_request_itr_rlocs (vat_main_t * vam)
{
- f64 timeout = ~0;
unformat_input_t *input = vam->input;
- vl_api_lisp_map_request_mode_t *mp;
- u8 mode = 0;
+ vl_api_lisp_add_del_map_request_itr_rlocs_t *mp;
+ f64 timeout = ~0;
+ u8 *locator_set_name = 0;
+ u8 locator_set_name_set = 0;
+ u8 is_add = 1;
/* Parse args required to build the message */
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "dst-only"))
- mode = 0;
- else if (unformat (input, "src-dst"))
- mode = 1;
+ if (unformat (input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (input, "%_%v%_", &locator_set_name))
+ {
+ locator_set_name_set = 1;
+ }
else
{
- errmsg ("parse error '%U'", format_unformat_error, input);
+ clib_warning ("parse error '%U'", format_unformat_error, input);
return -99;
}
}
- M (LISP_MAP_REQUEST_MODE, lisp_map_request_mode);
+ if (is_add && !locator_set_name_set)
+ {
+ errmsg ("itr-rloc is not set!");
+ return -99;
+ }
- mp->mode = mode;
+ 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;
+ }
- /* send */
+ M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
+ mp->is_add = is_add;
+ if (is_add)
+ {
+ clib_memcpy (mp->locator_set_name, locator_set_name,
+ vec_len (locator_set_name));
+ }
+ else
+ {
+ memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
+ }
+ vec_free (locator_set_name);
+
+ /* send it... */
S;
- /* wait for reply */
+ /* Wait for a reply... */
W;
- /* notreached */
+ /* NOTREACHED */
return 0;
}
-/**
- * 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)
+api_lisp_locator_dump (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;
+ vl_api_lisp_locator_dump_t *mp;
+ f64 timeout = ~0;
+ u8 is_index_set = 0, is_name_set = 0;
u8 *ls_name = 0;
+ u32 ls_index = ~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", &ls_name))
- ls_name_set = 1;
+ if (unformat (input, "ls_name %_%v%_", &ls_name))
+ {
+ is_name_set = 1;
+ }
+ else if (unformat (input, "ls_index %d", &ls_index))
+ {
+ is_index_set = 1;
+ }
else
{
errmsg ("parse error '%U'", format_unformat_error, input);
}
}
- if (!ls_name_set)
+ if (!is_index_set && !is_name_set)
{
- errmsg ("locator-set name not set!");
+ errmsg ("error: expected one of index or name!\n");
return -99;
}
- M (LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set);
-
- mp->is_add = is_add;
- clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name));
- vec_free (ls_name);
-
- /* send */
- S;
-
- /* wait for reply */
- W;
-
- /* notreached */
- return 0;
-}
+ if (is_index_set && is_name_set)
+ {
+ errmsg ("error: only one param expected!\n");
+ return -99;
+ }
-static int
-api_show_lisp_pitr (vat_main_t * vam)
-{
- vl_api_show_lisp_pitr_t *mp;
- f64 timeout = ~0;
+ if (vec_len (ls_name) > 62)
+ {
+ errmsg ("error: locator set name too long!");
+ return -99;
+ }
if (!vam->json_output)
{
- fformat (vam->ofp, "%=20s\n", "lisp status:");
+ fformat (vam->ofp, "%=16s%=16s%=16s\n", "locator", "priority",
+ "weight");
+ }
+
+ M (LISP_LOCATOR_DUMP, lisp_locator_dump);
+ mp->is_index_set = is_index_set;
+
+ if (is_index_set)
+ mp->ls_index = clib_host_to_net_u32 (ls_index);
+ else
+ {
+ vec_add1 (ls_name, 0);
+ strncpy ((char *) mp->ls_name, (char *) ls_name,
+ sizeof (mp->ls_name) - 1);
}
- M (SHOW_LISP_PITR, show_lisp_pitr);
/* 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;
return 0;
}
-/**
- * Add/delete mapping between vni and vrf
- */
static int
-api_lisp_eid_table_add_del_map (vat_main_t * vam)
+api_lisp_locator_set_dump (vat_main_t * vam)
{
- f64 timeout = ~0;
+ vl_api_lisp_locator_set_dump_t *mp;
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, bd_index_set = 0;
- u32 vni, vrf, bd_index;
+ f64 timeout = ~0;
+ u8 filter = 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, "vrf %d", &vrf))
- vrf_set = 1;
- else if (unformat (input, "bd_index %d", &bd_index))
- bd_index_set = 1;
- else if (unformat (input, "vni %d", &vni))
- vni_set = 1;
+ if (unformat (input, "local"))
+ {
+ filter = 1;
+ }
+ else if (unformat (input, "remote"))
+ {
+ filter = 2;
+ }
else
- break;
- }
-
- if (!vni_set || (!vrf_set && !bd_index_set))
- {
- errmsg ("missing arguments!");
- return -99;
+ {
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- if (vrf_set && bd_index_set)
+ if (!vam->json_output)
{
- errmsg ("error: both vrf and bd entered!");
- return -99;
+ fformat (vam->ofp, "%=10s%=15s\n", "ls_index", "ls_name");
}
- M (LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
+ M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
- mp->is_add = is_add;
- mp->vni = htonl (vni);
- mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index);
- mp->is_l2 = bd_index_set;
+ mp->filter = filter;
- /* send */
+ /* send it... */
S;
- /* wait for reply */
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ /* Wait for a reply... */
W;
- /* notreached */
+ /* NOTREACHED */
return 0;
}
-uword
-unformat_negative_mapping_action (unformat_input_t * input, va_list * args)
-{
- u32 *action = va_arg (*args, u32 *);
- u8 *s = 0;
-
- if (unformat (input, "%s", &s))
- {
- if (!strcmp ((char *) s, "no-action"))
- action[0] = 0;
- else if (!strcmp ((char *) s, "natively-forward"))
- action[0] = 1;
- else if (!strcmp ((char *) s, "send-map-request"))
- action[0] = 2;
- else if (!strcmp ((char *) s, "drop"))
- action[0] = 3;
- else
- {
- clib_warning ("invalid action: '%s'", s);
- action[0] = 3;
- }
- }
- else
- return 0;
-
- vec_free (s);
- return 1;
-}
-
-/**
- * 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)
+api_lisp_eid_table_map_dump (vat_main_t * vam)
{
+ u8 is_l2 = 0;
+ u8 mode_set = 0;
unformat_input_t *input = vam->input;
- vl_api_lisp_add_del_remote_mapping_t *mp;
+ vl_api_lisp_eid_table_map_dump_t *mp;
f64 timeout = ~0;
- u32 vni = 0;
- lisp_eid_vat_t _eid, *eid = &_eid;
- lisp_eid_vat_t _seid, *seid = &_seid;
- u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0;
- u32 action = ~0, p, w, data_len;
- ip4_address_t rloc4;
- ip6_address_t rloc6;
- rloc_t *rlocs = 0, rloc, *curr_rloc = 0;
-
- memset (&rloc, 0, sizeof (rloc));
/* 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, "eid %U", unformat_lisp_eid_vat, eid))
- {
- eid_set = 1;
- }
- else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid))
- {
- seid_set = 1;
- }
- else if (unformat (input, "vni %d", &vni))
- {
- ;
- }
- 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))
+ if (unformat (input, "l2"))
{
- rloc.is_ip4 = 0;
- clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6));
- vec_add1 (rlocs, rloc);
- curr_rloc = &rlocs[vec_len (rlocs) - 1];
+ is_l2 = 1;
+ mode_set = 1;
}
- else if (unformat (input, "action %U",
- unformat_negative_mapping_action, &action))
+ else if (unformat (input, "l3"))
{
- ;
+ is_l2 = 0;
+ mode_set = 1;
}
else
{
- clib_warning ("parse error '%U'", format_unformat_error, input);
+ errmsg ("parse error '%U'", format_unformat_error, input);
return -99;
}
}
- if (0 == eid_set)
+ if (!mode_set)
{
- errmsg ("missing params!");
+ errmsg ("expected one of 'l2' or 'l3' parameter!\n");
return -99;
}
- if (is_add && (~0 == action) && 0 == vec_len (rlocs))
+ if (!vam->json_output)
{
- errmsg ("no action set for negative map-reply!");
- return -99;
+ fformat (vam->ofp, "%=10s%=10s\n", "VNI", is_l2 ? "BD" : "VRF");
}
- data_len = vec_len (rlocs) * sizeof (rloc_t);
+ M (LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
+ mp->is_l2 = is_l2;
- M2 (LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping, data_len);
- mp->is_add = is_add;
- mp->vni = htonl (vni);
- mp->action = (u8) action;
- mp->is_src_dst = seid_set;
- mp->eid_len = eid->len;
- mp->seid_len = seid->len;
- mp->del_all = del_all;
- mp->eid_type = eid->type;
- lisp_eid_put_vat (mp->eid, eid->addr, eid->type);
- lisp_eid_put_vat (mp->seid, seid->addr, seid->type);
+ /* send it... */
+ S;
- mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs));
- clib_memcpy (mp->rlocs, rlocs, data_len);
- vec_free (rlocs);
+ /* 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_eid_table_vni_dump (vat_main_t * vam)
+{
+ vl_api_lisp_eid_table_vni_dump_t *mp;
+ f64 timeout = ~0;
+
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "VNI\n");
+ }
+
+ M (LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_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;
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_adjacency (vat_main_t * vam)
+api_lisp_eid_table_dump (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_lisp_add_del_adjacency_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_lisp_eid_table_dump_t *mp;
f64 timeout = ~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;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+ u8 mac[6];
+ u8 eid_type = ~0, eid_set = 0;
+ u32 prefix_length = ~0, t, vni = 0;
+ u8 filter = 0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- 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))
+ if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t))
{
- deid_type = 1; /* ipv6 */
- deid_len = len;
+ eid_set = 1;
+ eid_type = 0;
+ prefix_length = t;
}
- else if (unformat (input, "deid %U", unformat_ethernet_address,
- deid_mac))
+ else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t))
{
- deid_type = 2; /* mac */
+ eid_set = 1;
+ eid_type = 1;
+ prefix_length = t;
}
- else if (unformat (input, "seid %U/%d", unformat_ip4_address,
- &seid4, &len))
+ else if (unformat (i, "eid %U", unformat_ethernet_address, mac))
{
- seid_type = 0; /* ipv4 */
- seid_len = len;
+ eid_set = 1;
+ eid_type = 2;
}
- else if (unformat (input, "seid %U/%d", unformat_ip6_address,
- &seid6, &len))
+ else if (unformat (i, "vni %d", &t))
{
- seid_type = 1; /* ipv6 */
- seid_len = len;
+ vni = t;
}
- else if (unformat (input, "seid %U", unformat_ethernet_address,
- seid_mac))
+ else if (unformat (i, "local"))
{
- seid_type = 2; /* mac */
+ filter = 1;
}
- else if (unformat (input, "vni %d", &vni))
+ else if (unformat (i, "remote"))
{
- ;
+ filter = 2;
}
else
{
- errmsg ("parse error '%U'", format_unformat_error, input);
+ errmsg ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if ((u8) ~ 0 == deid_type)
+ if (!vam->json_output)
{
- errmsg ("missing params!");
- return -99;
+ fformat (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s\n", "EID",
+ "type", "ls_index", "ttl", "authoritative", "key_id", "key");
}
- if (seid_type != deid_type)
+ M (LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
+
+ mp->filter = filter;
+ if (eid_set)
{
- errmsg ("source and destination EIDs are of different types!");
- return -99;
+ 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;
+ }
}
- M (LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency);
- mp->is_add = is_add;
- mp->vni = htonl (vni);
- mp->seid_len = seid_len;
- mp->deid_len = deid_len;
- mp->eid_type = deid_type;
+ /* send it... */
+ S;
- switch (mp->eid_type)
+ /* 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_gpe_tunnel_dump (vat_main_t * vam)
+{
+ vl_api_lisp_gpe_tunnel_dump_t *mp;
+ f64 timeout = ~0;
+
+ if (!vam->json_output)
{
- 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;
+ 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");
}
+ 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;
}
static int
-api_lisp_gpe_add_del_iface (vat_main_t * vam)
+api_lisp_adjacencies_get (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_lisp_gpe_add_del_iface_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_lisp_adjacencies_get_t *mp;
f64 timeout = ~0;
- u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0;
- u32 dp_table = 0, vni = 0;
+ u8 vni_set = 0;
+ u32 vni = ~0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "up"))
- {
- action_set = 1;
- is_add = 1;
- }
- else if (unformat (input, "down"))
- {
- action_set = 1;
- is_add = 0;
- }
- else if (unformat (input, "table_id %d", &dp_table))
- {
- dp_table_set = 1;
- }
- else if (unformat (input, "bd_id %d", &dp_table))
- {
- dp_table_set = 1;
- is_l2 = 1;
- }
- else if (unformat (input, "vni %d", &vni))
+ if (unformat (i, "vni %d", &vni))
{
vni_set = 1;
}
else
- break;
+ {
+ errmsg ("parse error '%U'\n", format_unformat_error, i);
+ return -99;
+ }
}
- if (action_set == 0)
+ if (!vni_set)
{
- errmsg ("Action not set\n");
+ errmsg ("vni not set!\n");
return -99;
}
- if (dp_table_set == 0 || vni_set == 0)
+
+ if (!vam->json_output)
{
- errmsg ("vni and dp_table must be set\n");
- return -99;
+ fformat (vam->ofp, "%s %40s\n", "leid", "reid");
}
- /* Construct the API message */
- M (LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface);
-
- mp->is_add = is_add;
- mp->dp_table = dp_table;
- mp->is_l2 = is_l2;
- mp->vni = vni;
+ M (LISP_ADJACENCIES_GET, lisp_adjacencies_get);
+ mp->vni = clib_host_to_net_u32 (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_map_request_itr_rlocs (vat_main_t * vam)
+api_lisp_map_server_dump (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_lisp_add_del_map_request_itr_rlocs_t *mp;
+ vl_api_lisp_map_server_dump_t *mp;
f64 timeout = ~0;
- u8 *locator_set_name = 0;
- u8 locator_set_name_set = 0;
- u8 is_add = 1;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ if (!vam->json_output)
{
- 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;
- }
+ fformat (vam->ofp, "%=20s\n", "Map server");
}
- if (is_add && !locator_set_name_set)
- {
- errmsg ("itr-rloc is not set!");
- return -99;
- }
+ M (LISP_MAP_SERVER_DUMP, lisp_map_server_dump);
+ /* send it... */
+ S;
- 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;
- }
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ /* Wait for a reply... */
+ W;
- M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, lisp_add_del_map_request_itr_rlocs);
- mp->is_add = is_add;
- if (is_add)
- {
- clib_memcpy (mp->locator_set_name, locator_set_name,
- vec_len (locator_set_name));
- }
- else
+ /* 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)
{
- memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name));
+ fformat (vam->ofp, "%=20s\n", "Map resolver");
}
- vec_free (locator_set_name);
+ 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_locator_dump (vat_main_t * vam)
+api_show_lisp_status (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_lisp_locator_dump_t *mp;
+ vl_api_show_lisp_status_t *mp;
f64 timeout = ~0;
- u8 is_index_set = 0, is_name_set = 0;
- u8 *ls_name = 0;
- u32 ls_index = ~0;
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ if (!vam->json_output)
{
- if (unformat (input, "ls_name %_%v%_", &ls_name))
- {
- is_name_set = 1;
- }
- else if (unformat (input, "ls_index %d", &ls_index))
- {
- is_index_set = 1;
- }
- else
- {
- errmsg ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
+ fformat (vam->ofp, "%-20s%-16s\n", "lisp status", "locator-set");
}
- if (!is_index_set && !is_name_set)
+ M (SHOW_LISP_STATUS, show_lisp_status);
+ /* send it... */
+ S;
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
+}
+
+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;
+
+ if (!vam->json_output)
{
- errmsg ("error: expected one of index or name!\n");
- return -99;
+ fformat (vam->ofp, "%=20s\n", "itr-rlocs:");
}
- if (is_index_set && is_name_set)
+ M (LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs);
+ /* send it... */
+ S;
+ /* Wait for a reply... */
+ W;
+
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_af_packet_create (vat_main_t * vam)
+{
+ 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;
+
+ memset (hw_addr, 0, sizeof (hw_addr));
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- errmsg ("error: only one param expected!\n");
- return -99;
+ 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;
}
- if (vec_len (ls_name) > 62)
+ if (!vec_len (host_if_name))
{
- errmsg ("error: locator set name too long!");
+ errmsg ("host-interface name must be specified");
return -99;
}
- if (!vam->json_output)
+ if (vec_len (host_if_name) > 64)
{
- fformat (vam->ofp, "%=16s%=16s%=16s\n", "locator", "priority",
- "weight");
+ errmsg ("host-interface name too long");
+ return -99;
}
- M (LISP_LOCATOR_DUMP, lisp_locator_dump);
- mp->is_index_set = is_index_set;
+ M (AF_PACKET_CREATE, af_packet_create);
- if (is_index_set)
- mp->ls_index = clib_host_to_net_u32 (ls_index);
- else
- {
- vec_add1 (ls_name, 0);
- strncpy ((char *) mp->ls_name, (char *) ls_name,
- sizeof (mp->ls_name) - 1);
- }
+ 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);
- /* 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;
-
+ W2 (fprintf (vam->ofp, " new sw_if_index = %d ", vam->sw_if_index));
/* NOTREACHED */
return 0;
}
static int
-api_lisp_locator_set_dump (vat_main_t * vam)
+api_af_packet_delete (vat_main_t * vam)
{
- vl_api_lisp_locator_set_dump_t *mp;
- unformat_input_t *input = vam->input;
- f64 timeout = ~0;
- u8 filter = 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)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "local"))
- {
- filter = 1;
- }
- else if (unformat (input, "remote"))
- {
- filter = 2;
- }
+ if (unformat (i, "name %s", &host_if_name))
+ vec_add1 (host_if_name, 0);
else
- {
- errmsg ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
+ break;
}
- if (!vam->json_output)
+ if (!vec_len (host_if_name))
{
- fformat (vam->ofp, "%=10s%=15s\n", "ls_index", "ls_name");
+ errmsg ("host-interface name must be specified");
+ return -99;
}
- M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
+ if (vec_len (host_if_name) > 64)
+ {
+ errmsg ("host-interface name too long");
+ return -99;
+ }
- mp->filter = filter;
+ M (AF_PACKET_DELETE, af_packet_delete);
- /* send it... */
- S;
+ clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+ vec_free (host_if_name);
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
- /* Wait for a reply... */
+ S;
W;
-
/* NOTREACHED */
return 0;
}
static int
-api_lisp_eid_table_map_dump (vat_main_t * vam)
+api_policer_add_del (vat_main_t * vam)
{
- u8 is_l2 = 0;
- u8 mode_set = 0;
- unformat_input_t *input = vam->input;
- vl_api_lisp_eid_table_map_dump_t *mp;
- f64 timeout = ~0;
+ unformat_input_t *i = vam->input;
+ vl_api_policer_add_del_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;
+ u8 color_aware = 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)
+ conform_action.action_type = SSE2_QOS_ACTION_TRANSMIT;
+ conform_action.dscp = 0;
+ exceed_action.action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
+ exceed_action.dscp = 0;
+ violate_action.action_type = SSE2_QOS_ACTION_DROP;
+ violate_action.dscp = 0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "l2"))
- {
- is_l2 = 1;
- mode_set = 1;
- }
- else if (unformat (input, "l3"))
- {
- is_l2 = 0;
- mode_set = 1;
- }
+ 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))
+ ;
+ 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 if (unformat (i, "color-aware"))
+ color_aware = 1;
else
- {
- errmsg ("parse error '%U'", format_unformat_error, input);
- return -99;
- }
+ break;
}
- if (!mode_set)
+ if (!vec_len (name))
{
- errmsg ("expected one of 'l2' or 'l3' parameter!\n");
+ errmsg ("policer name must be specified");
return -99;
}
- if (!vam->json_output)
+ if (vec_len (name) > 64)
{
- fformat (vam->ofp, "%=10s%=10s\n", "VNI", is_l2 ? "BD" : "VRF");
+ errmsg ("policer name too long");
+ return -99;
}
- M (LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump);
- mp->is_l2 = is_l2;
+ M (POLICER_ADD_DEL, policer_add_del);
- /* send it... */
- S;
+ 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;
+ 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;
+ mp->color_aware = color_aware;
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
- /* Wait for a reply... */
+ S;
W;
-
/* NOTREACHED */
return 0;
}
static int
-api_lisp_eid_table_vni_dump (vat_main_t * vam)
+api_policer_dump (vat_main_t * vam)
{
- vl_api_lisp_eid_table_vni_dump_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_policer_dump_t *mp;
f64 timeout = ~0;
+ u8 *match_name = 0;
+ u8 match_name_valid = 0;
- if (!vam->json_output)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- fformat (vam->ofp, "VNI\n");
+ if (unformat (i, "name %s", &match_name))
+ {
+ vec_add1 (match_name, 0);
+ match_name_valid = 1;
+ }
+ else
+ break;
}
- M (LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump);
-
+ 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;
}
static int
-api_lisp_eid_table_dump (vat_main_t * vam)
+api_policer_classify_set_interface (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_lisp_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 = 0;
- u32 prefix_length = ~0, t, vni = 0;
- u8 filter = 0;
+ vl_api_policer_classify_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, "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 if (unformat (i, "local"))
- {
- filter = 1;
- }
- else if (unformat (i, "remote"))
- {
- filter = 2;
- }
+ 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
{
- errmsg ("parse error '%U'", format_unformat_error, i);
+ clib_warning ("parse error '%U'", format_unformat_error, i);
return -99;
}
}
- if (!vam->json_output)
+ if (sw_if_index_set == 0)
{
- fformat (vam->ofp, "%-35s%-20s%-30s%-20s%-s\n", "EID", "type",
- "ls_index", "ttl", "authoritative");
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
}
- M (LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
+ M (POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface);
- mp->filter = filter;
- 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;
- }
- }
+ 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;
- /* 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_gpe_tunnel_dump (vat_main_t * vam)
+api_policer_classify_dump (vat_main_t * vam)
{
- vl_api_lisp_gpe_tunnel_dump_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_policer_classify_dump_t *mp;
f64 timeout = ~0;
+ u8 type = POLICER_CLASSIFY_N_TABLES;
- if (!vam->json_output)
+ if (unformat (i, "type %U", unformat_policer_classify_table_type, &type))
+ ;
+ else
{
- 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");
+ errmsg ("classify table type must be specified\n");
+ return -99;
}
- 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");
+ fformat (vam->ofp, "%10s%20s\n", "Intfc idx", "Classify table");
}
- M (LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump);
+ M (POLICER_CLASSIFY_DUMP, policer_classify_dump);
+ mp->type = type;
/* send it... */
S;
}
static int
-api_show_lisp_status (vat_main_t * vam)
-{
- vl_api_show_lisp_status_t *mp;
- f64 timeout = ~0;
-
- if (!vam->json_output)
- {
- fformat (vam->ofp, "%-20s%-16s\n", "lisp status", "locator-set");
- }
-
- M (SHOW_LISP_STATUS, show_lisp_status);
- /* send it... */
- S;
- /* Wait for a reply... */
- W;
-
- /* NOTREACHED */
- return 0;
-}
-
-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;
-
- 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;
-
- /* NOTREACHED */
- return 0;
-}
-
-static int
-api_af_packet_create (vat_main_t * vam)
+api_netmap_create (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_af_packet_create_t *mp;
+ vl_api_netmap_create_t *mp;
f64 timeout;
- u8 *host_if_name = 0;
+ 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", &host_if_name))
- vec_add1 (host_if_name, 0);
+ if (unformat (i, "name %s", &if_name))
+ vec_add1 (if_name, 0);
else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
random_hw_addr = 0;
+ else if (unformat (i, "pipe"))
+ is_pipe = 1;
+ else if (unformat (i, "master"))
+ is_master = 1;
+ else if (unformat (i, "slave"))
+ is_master = 0;
else
break;
}
- if (!vec_len (host_if_name))
+ if (!vec_len (if_name))
{
- errmsg ("host-interface name must be specified");
+ errmsg ("interface name must be specified");
return -99;
}
- if (vec_len (host_if_name) > 64)
+ if (vec_len (if_name) > 64)
{
- errmsg ("host-interface name too long");
+ errmsg ("interface name too long");
return -99;
}
- M (AF_PACKET_CREATE, af_packet_create);
+ M (NETMAP_CREATE, netmap_create);
- clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
+ 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;
- vec_free (host_if_name);
+ mp->is_pipe = is_pipe;
+ mp->is_master = is_master;
+ vec_free (if_name);
S;
- W2 (fprintf (vam->ofp, " new sw_if_index = %d ", vam->sw_if_index));
+ W;
/* NOTREACHED */
return 0;
}
static int
-api_af_packet_delete (vat_main_t * vam)
+api_netmap_delete (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_af_packet_delete_t *mp;
+ vl_api_netmap_delete_t *mp;
f64 timeout;
- u8 *host_if_name = 0;
+ u8 *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);
+ if (unformat (i, "name %s", &if_name))
+ vec_add1 (if_name, 0);
else
break;
}
- if (!vec_len (host_if_name))
+ if (!vec_len (if_name))
{
- errmsg ("host-interface name must be specified");
+ errmsg ("interface name must be specified");
return -99;
}
- if (vec_len (host_if_name) > 64)
+ if (vec_len (if_name) > 64)
{
- errmsg ("host-interface name too long");
+ errmsg ("interface name too long");
return -99;
}
- M (AF_PACKET_DELETE, af_packet_delete);
+ M (NETMAP_DELETE, netmap_delete);
- clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
- vec_free (host_if_name);
+ clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
+ vec_free (if_name);
S;
W;
return 0;
}
+static void vl_api_mpls_tunnel_details_t_handler
+ (vl_api_mpls_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 len = mp->mt_next_hop_n_labels;
+ i32 i;
+
+ fformat (vam->ofp, "[%d]: via %U %d labels ",
+ mp->tunnel_index,
+ format_ip4_address, mp->mt_next_hop,
+ ntohl (mp->mt_next_hop_sw_if_index));
+ for (i = 0; i < len; i++)
+ {
+ fformat (vam->ofp, "%u ", ntohl (mp->mt_next_hop_out_labels[i]));
+ }
+ fformat (vam->ofp, "\n");
+}
+
+static void vl_api_mpls_tunnel_details_t_handler_json
+ (vl_api_mpls_tunnel_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ i32 i;
+ i32 len = mp->mt_next_hop_n_labels;
+
+ 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, "tunnel_index", ntohl (mp->tunnel_index));
+ clib_memcpy (&ip4, &(mp->mt_next_hop), sizeof (ip4));
+ vat_json_object_add_ip4 (node, "next_hop", ip4);
+ vat_json_object_add_uint (node, "next_hop_sw_if_index",
+ ntohl (mp->mt_next_hop_sw_if_index));
+ vat_json_object_add_uint (node, "l2_only", ntohl (mp->mt_l2_only));
+ vat_json_object_add_uint (node, "label_count", len);
+ for (i = 0; i < len; i++)
+ {
+ vat_json_object_add_uint (node, "label",
+ ntohl (mp->mt_next_hop_out_labels[i]));
+ }
+}
+
static int
-api_policer_add_del (vat_main_t * vam)
+api_mpls_tunnel_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_policer_add_del_t *mp;
+ vl_api_mpls_tunnel_dump_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;
- u8 color_aware = 0;
- sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action;
-
- conform_action.action_type = SSE2_QOS_ACTION_TRANSMIT;
- conform_action.dscp = 0;
- exceed_action.action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT;
- exceed_action.dscp = 0;
- violate_action.action_type = SSE2_QOS_ACTION_DROP;
- violate_action.dscp = 0;
+ i32 index = -1;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ /* Parse args required to build the message */
+ while (unformat_check_input (vam->input) != 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))
- ;
- 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 if (unformat (i, "color-aware"))
- color_aware = 1;
- else
- break;
+ if (!unformat (vam->input, "tunnel_index %d", &index))
+ {
+ index = -1;
+ break;
+ }
}
- if (!vec_len (name))
+ fformat (vam->ofp, " tunnel_index %d\n", index);
+
+ M (MPLS_TUNNEL_DUMP, mpls_tunnel_dump);
+ mp->tunnel_index = htonl (index);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
+ W;
+}
+
+#define vl_api_mpls_fib_details_t_endian vl_noop_handler
+#define vl_api_mpls_fib_details_t_print vl_noop_handler
+
+static void
+vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ int count = ntohl (mp->count);
+ vl_api_fib_path_t *fp;
+ int i;
+
+ fformat (vam->ofp,
+ "table-id %d, label %u, ess_bit %u\n",
+ ntohl (mp->table_id), ntohl (mp->label), mp->eos_bit);
+ fp = mp->path;
+ for (i = 0; i < count; i++)
{
- errmsg ("policer name must be specified");
- return -99;
+ if (fp->afi == IP46_TYPE_IP6)
+ fformat (vam->ofp,
+ " weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U\n",
+ ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+ format_ip6_address, fp->next_hop);
+ else if (fp->afi == IP46_TYPE_IP4)
+ fformat (vam->ofp,
+ " weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U\n",
+ ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+ format_ip4_address, fp->next_hop);
+ fp++;
}
+}
- if (vec_len (name) > 64)
+static void vl_api_mpls_fib_details_t_handler_json
+ (vl_api_mpls_fib_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ int count = ntohl (mp->count);
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+ vl_api_fib_path_t *fp;
+ int i;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- errmsg ("policer name too long");
- return -99;
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- M (POLICER_ADD_DEL, policer_add_del);
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
+ vat_json_object_add_uint (node, "s_bit", mp->eos_bit);
+ vat_json_object_add_uint (node, "label", ntohl (mp->label));
+ vat_json_object_add_uint (node, "path_count", count);
+ fp = mp->path;
+ for (i = 0; i < count; i++)
+ {
+ vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
+ vat_json_object_add_uint (node, "is_local", fp->is_local);
+ vat_json_object_add_uint (node, "is_drop", fp->is_drop);
+ vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
+ vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
+ vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
+ if (fp->afi == IP46_TYPE_IP4)
+ {
+ clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "next_hop", ip4);
+ }
+ else if (fp->afi == IP46_TYPE_IP6)
+ {
+ clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "next_hop", ip6);
+ }
+ }
+}
- 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;
- 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;
- mp->color_aware = color_aware;
+static int
+api_mpls_fib_dump (vat_main_t * vam)
+{
+ vl_api_mpls_fib_dump_t *mp;
+ f64 timeout;
+ M (MPLS_FIB_DUMP, mpls_fib_dump);
S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
W;
- /* NOTREACHED */
- return 0;
}
-static int
-api_policer_dump (vat_main_t * vam)
+#define vl_api_ip_fib_details_t_endian vl_noop_handler
+#define vl_api_ip_fib_details_t_print vl_noop_handler
+
+static void
+vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
{
- unformat_input_t *i = vam->input;
- vl_api_policer_dump_t *mp;
- f64 timeout = ~0;
- u8 *match_name = 0;
- u8 match_name_valid = 0;
+ vat_main_t *vam = &vat_main;
+ int count = ntohl (mp->count);
+ vl_api_fib_path_t *fp;
+ int i;
+
+ fformat (vam->ofp,
+ "table-id %d, prefix %U/%d\n",
+ ntohl (mp->table_id), format_ip4_address, mp->address,
+ mp->address_length);
+ fp = mp->path;
+ for (i = 0; i < count; i++)
+ {
+ if (fp->afi == IP46_TYPE_IP6)
+ fformat (vam->ofp,
+ " weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U\n",
+ ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+ format_ip6_address, fp->next_hop);
+ else if (fp->afi == IP46_TYPE_IP4)
+ fformat (vam->ofp,
+ " weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U\n",
+ ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+ format_ip4_address, fp->next_hop);
+ fp++;
+ }
+}
+
+static void vl_api_ip_fib_details_t_handler_json
+ (vl_api_ip_fib_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ int count = ntohl (mp->count);
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+ vl_api_fib_path_t *fp;
+ int i;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- if (unformat (i, "name %s", &match_name))
+ 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->table_id));
+ clib_memcpy (&ip4, &mp->address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "prefix", ip4);
+ vat_json_object_add_uint (node, "mask_length", mp->address_length);
+ vat_json_object_add_uint (node, "path_count", count);
+ fp = mp->path;
+ for (i = 0; i < count; i++)
+ {
+ vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
+ vat_json_object_add_uint (node, "is_local", fp->is_local);
+ vat_json_object_add_uint (node, "is_drop", fp->is_drop);
+ vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
+ vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
+ vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
+ if (fp->afi == IP46_TYPE_IP4)
{
- vec_add1 (match_name, 0);
- match_name_valid = 1;
+ clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "next_hop", ip4);
+ }
+ else if (fp->afi == IP46_TYPE_IP6)
+ {
+ clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "next_hop", ip6);
}
- 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... */
+static int
+api_ip_fib_dump (vat_main_t * vam)
+{
+ vl_api_ip_fib_dump_t *mp;
+ f64 timeout;
+
+ M (IP_FIB_DUMP, ip_fib_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_ip_neighbor_details_t_handler
+ (vl_api_ip_neighbor_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+
+ fformat (vam->ofp, "%c %U %U\n",
+ (mp->is_static) ? 'S' : 'D',
+ format_ethernet_address, &mp->mac_address,
+ (mp->is_ipv6) ? format_ip6_address : format_ip4_address,
+ &mp->ip_address);
+}
+
+static void vl_api_ip_neighbor_details_t_handler_json
+ (vl_api_ip_neighbor_details_t * mp)
+{
+
+ vat_main_t *vam = &vat_main;
+ vat_json_node_t *node;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+ node = vat_json_array_add (&vam->json_tree);
+
+ vat_json_init_object (node);
+ vat_json_object_add_string_copy (node, "flag",
+ (mp->is_static) ? (u8 *) "static" : (u8 *)
+ "dynamic");
+
+ vat_json_object_add_string_copy (node, "link_layer",
+ format (0, "%U", format_ethernet_address,
+ &mp->mac_address));
+
+ if (mp->is_ipv6)
+ {
+ clib_memcpy (&ip6, &mp->ip_address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "ip_address", ip6);
+ }
+ else
+ {
+ clib_memcpy (&ip4, &mp->ip_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "ip_address", ip4);
+ }
}
static int
-api_policer_classify_set_interface (vat_main_t * vam)
+api_ip_neighbor_dump (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_policer_classify_set_interface_t *mp;
+ vl_api_ip_neighbor_dump_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 is_ipv6 = 0;
+ u32 sw_if_index = ~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, "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, "sw_if_index %d", &sw_if_index))
;
+ else if (unformat (i, "ip6"))
+ is_ipv6 = 1;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- if (sw_if_index_set == 0)
+ if (sw_if_index == ~0)
{
errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (POLICER_CLASSIFY_SET_INTERFACE, policer_classify_set_interface);
-
+ M (IP_NEIGHBOR_DUMP, ip_neighbor_dump);
+ mp->is_ipv6 = (u8) is_ipv6;
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;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
+ S;
+ }
W;
- /* NOTREACHED */
- return 0;
}
-static int
-api_policer_classify_dump (vat_main_t * vam)
+#define vl_api_ip6_fib_details_t_endian vl_noop_handler
+#define vl_api_ip6_fib_details_t_print vl_noop_handler
+
+static void
+vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp)
{
- unformat_input_t *i = vam->input;
- vl_api_policer_classify_dump_t *mp;
- f64 timeout = ~0;
- u8 type = POLICER_CLASSIFY_N_TABLES;
+ vat_main_t *vam = &vat_main;
+ int count = ntohl (mp->count);
+ vl_api_fib_path_t *fp;
+ int i;
- if (unformat (i, "type %U", unformat_classify_table_type, &type))
- ;
- else
+ fformat (vam->ofp,
+ "table-id %d, prefix %U/%d\n",
+ ntohl (mp->table_id), format_ip6_address, mp->address,
+ mp->address_length);
+ fp = mp->path;
+ for (i = 0; i < count; i++)
{
- errmsg ("classify table type must be specified\n");
- return -99;
+ if (fp->afi == IP46_TYPE_IP6)
+ fformat (vam->ofp,
+ " weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U\n",
+ ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+ format_ip6_address, fp->next_hop);
+ else if (fp->afi == IP46_TYPE_IP4)
+ fformat (vam->ofp,
+ " weight %d, sw_if_index %d, is_local %d, is_drop %d, "
+ "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U\n",
+ ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
+ fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
+ format_ip4_address, fp->next_hop);
+ fp++;
}
+}
- if (!vam->json_output)
+static void vl_api_ip6_fib_details_t_handler_json
+ (vl_api_ip6_fib_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ int count = ntohl (mp->count);
+ vat_json_node_t *node = NULL;
+ struct in_addr ip4;
+ struct in6_addr ip6;
+ vl_api_fib_path_t *fp;
+ int i;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
{
- fformat (vam->ofp, "%10s%20s\n", "Intfc idx", "Classify table");
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
}
+ node = vat_json_array_add (&vam->json_tree);
- M (POLICER_CLASSIFY_DUMP, policer_classify_dump);
- mp->type = type;
- /* send it... */
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "table", ntohl (mp->table_id));
+ clib_memcpy (&ip6, &mp->address, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "prefix", ip6);
+ vat_json_object_add_uint (node, "mask_length", mp->address_length);
+ vat_json_object_add_uint (node, "path_count", count);
+ fp = mp->path;
+ for (i = 0; i < count; i++)
+ {
+ vat_json_object_add_uint (node, "weight", ntohl (fp->weight));
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index));
+ vat_json_object_add_uint (node, "is_local", fp->is_local);
+ vat_json_object_add_uint (node, "is_drop", fp->is_drop);
+ vat_json_object_add_uint (node, "is_unreach", fp->is_unreach);
+ vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit);
+ vat_json_object_add_uint (node, "next_hop_afi", fp->afi);
+ if (fp->afi == IP46_TYPE_IP4)
+ {
+ clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "next_hop", ip4);
+ }
+ else if (fp->afi == IP46_TYPE_IP6)
+ {
+ clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6));
+ vat_json_object_add_ip6 (node, "next_hop", ip6);
+ }
+ }
+}
+
+static int
+api_ip6_fib_dump (vat_main_t * vam)
+{
+ vl_api_ip6_fib_dump_t *mp;
+ f64 timeout;
+
+ M (IP6_FIB_DUMP, ip6_fib_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_netmap_create (vat_main_t * vam)
+int
+api_classify_table_by_interface (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_netmap_create_t *mp;
+ unformat_input_t *input = vam->input;
+ vl_api_classify_table_by_interface_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)
+ u32 sw_if_index = ~0;
+ while (unformat_check_input (input) != 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;
+ 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;
}
-
- if (!vec_len (if_name))
+ if (sw_if_index == ~0)
{
- errmsg ("interface name must be specified");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- if (vec_len (if_name) > 64)
+ /* 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)
{
- errmsg ("interface name too long");
+ if (unformat (input, "table_id %d", &table_id))
+ ;
+ else
+ break;
+ }
+ if (table_id == ~0)
+ {
+ errmsg ("missing table id\n");
return -99;
}
- M (NETMAP_CREATE, netmap_create);
-
- 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);
+ /* Construct the API message */
+ M (CLASSIFY_TABLE_INFO, classify_table_info);
+ mp->context = 0;
+ mp->table_id = ntohl (table_id);
S;
W;
return 0;
}
-static int
-api_netmap_delete (vat_main_t * vam)
+int
+api_classify_session_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_netmap_delete_t *mp;
+ unformat_input_t *input = vam->input;
+ vl_api_classify_session_dump_t *mp;
f64 timeout;
- u8 *if_name = 0;
- while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ u32 table_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "name %s", &if_name))
- vec_add1 (if_name, 0);
+ if (unformat (input, "table_id %d", &table_id))
+ ;
else
break;
}
-
- if (!vec_len (if_name))
- {
- errmsg ("interface name must be specified");
- return -99;
- }
-
- if (vec_len (if_name) > 64)
+ if (table_id == ~0)
{
- errmsg ("interface name too long");
+ errmsg ("missing table id\n");
return -99;
}
- M (NETMAP_DELETE, netmap_delete);
-
- clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name));
- vec_free (if_name);
-
+ /* 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;
}
-static void vl_api_mpls_gre_tunnel_details_t_handler
- (vl_api_mpls_gre_tunnel_details_t * mp)
+static void
+vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_details_t * mp)
{
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));
- }
+ fformat (vam->ofp, "collector_address %U, collector_port %d, "
+ "src_address %U, vrf_id %d, path_mtu %u, "
+ "template_interval %u, udp_checksum %d\n",
+ format_ip4_address, mp->collector_address,
+ ntohs (mp->collector_port),
+ format_ip4_address, mp->src_address,
+ ntohl (mp->vrf_id), ntohl (mp->path_mtu),
+ ntohl (mp->template_interval), mp->udp_checksum);
+
+ vam->retval = 0;
+ vam->result_ready = 1;
}
-static void vl_api_mpls_gre_tunnel_details_t_handler_json
- (vl_api_mpls_gre_tunnel_details_t * mp)
+static void
+ vl_api_ipfix_exporter_details_t_handler_json
+ (vl_api_ipfix_exporter_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);
+ vat_json_node_t node;
+ struct in_addr collector_address;
+ struct in_addr src_address;
- 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 (&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_int (&node, "vrf_id", ntohl (mp->vrf_id));
+ 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_object_add_int (&node, "udp_checksum", mp->udp_checksum);
- 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]));
- }
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+ vam->retval = 0;
+ vam->result_ready = 1;
}
-static int
-api_mpls_gre_tunnel_dump (vat_main_t * vam)
+int
+api_ipfix_exporter_dump (vat_main_t * vam)
{
- vl_api_mpls_gre_tunnel_dump_t *mp;
+ vl_api_ipfix_exporter_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);
+ /* Construct the API message */
+ M (IPFIX_EXPORTER_DUMP, ipfix_exporter_dump);
+ mp->context = 0;
- M (MPLS_GRE_TUNNEL_DUMP, mpls_gre_tunnel_dump);
- mp->tunnel_index = htonl (index);
S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
+static int
+api_ipfix_classify_stream_dump (vat_main_t * vam)
+{
+ vl_api_ipfix_classify_stream_dump_t *mp;
+ f64 timeout;
+
+ /* Construct the API message */
+ M (IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump);
+ mp->context = 0;
+
+ S;
W;
+ /* NOTREACHED */
+ return 0;
}
-static void vl_api_mpls_eth_tunnel_details_t_handler
- (vl_api_mpls_eth_tunnel_details_t * mp)
+static void
+ vl_api_ipfix_classify_stream_details_t_handler
+ (vl_api_ipfix_classify_stream_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));
+ fformat (vam->ofp, "domain_id %d, src_port %d\n",
+ ntohl (mp->domain_id), ntohs (mp->src_port));
+ vam->retval = 0;
+ vam->result_ready = 1;
}
-static void vl_api_mpls_eth_tunnel_details_t_handler_json
- (vl_api_mpls_eth_tunnel_details_t * mp)
+static void
+ vl_api_ipfix_classify_stream_details_t_handler_json
+ (vl_api_ipfix_classify_stream_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);
+ vat_json_node_t node;
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
- node = vat_json_array_add (&vam->json_tree);
+ vat_json_init_object (&node);
+ vat_json_object_add_uint (&node, "domain_id", ntohl (mp->domain_id));
+ vat_json_object_add_uint (&node, "src_port", ntohs (mp->src_port));
- 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]));
- }
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+ vam->retval = 0;
+ vam->result_ready = 1;
}
static int
-api_mpls_eth_tunnel_dump (vat_main_t * vam)
+api_ipfix_classify_table_dump (vat_main_t * vam)
{
- vl_api_mpls_eth_tunnel_dump_t *mp;
+ vl_api_ipfix_classify_table_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 (!vam->json_output)
{
- if (!unformat (vam->input, "tunnel_index %d", &index))
- {
- index = -1;
- break;
- }
+ fformat (vam->ofp, "%15s%15s%20s\n", "table_id", "ip_version",
+ "transport_protocol");
}
- fformat (vam->ofp, " tunnel_index %d\n", index);
+ /* Construct the API message */
+ M (IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump);
- M (MPLS_ETH_TUNNEL_DUMP, mpls_eth_tunnel_dump);
- mp->tunnel_index = htonl (index);
+ /* send it... */
S;
/* Use a control ping for synchronization */
W;
}
-static void vl_api_mpls_fib_encap_details_t_handler
- (vl_api_mpls_fib_encap_details_t * mp)
+static void
+ vl_api_ipfix_classify_table_details_t_handler
+ (vl_api_ipfix_classify_table_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");
+ fformat (vam->ofp, "%15d%15d%20d\n", ntohl (mp->table_id), mp->ip_version,
+ mp->transport_protocol);
}
-static void vl_api_mpls_fib_encap_details_t_handler_json
- (vl_api_mpls_fib_encap_details_t * mp)
+static void
+ vl_api_ipfix_classify_table_details_t_handler_json
+ (vl_api_ipfix_classify_table_details_t * mp)
{
- vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
- i32 i;
- i32 len = ntohl (mp->nlabels);
- struct in_addr ip4;
+ vat_main_t *vam = &vat_main;
if (VAT_JSON_ARRAY != vam->json_tree.type)
{
ASSERT (VAT_JSON_NONE == vam->json_tree.type);
vat_json_init_array (&vam->json_tree);
}
- node = vat_json_array_add (&vam->json_tree);
+ 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_count", len);
- for (i = 0; i < len; i++)
- {
- vat_json_object_add_uint (node, "label", ntohl (mp->labels[i]));
- }
+
+ vat_json_object_add_uint (node, "table_id", ntohl (mp->table_id));
+ vat_json_object_add_uint (node, "ip_version", mp->ip_version);
+ vat_json_object_add_uint (node, "transport_protocol",
+ mp->transport_protocol);
}
static int
-api_mpls_fib_encap_dump (vat_main_t * vam)
+api_sw_interface_span_enable_disable (vat_main_t * vam)
{
- vl_api_mpls_fib_encap_dump_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_sw_interface_span_enable_disable_t *mp;
f64 timeout;
+ u32 src_sw_if_index = ~0;
+ u32 dst_sw_if_index = ~0;
+ u8 enable = 1;
- M (MPLS_FIB_ENCAP_DUMP, mpls_fib_encap_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, "src %U", unformat_sw_if_index, vam, &src_sw_if_index))
+ ;
+ else if (unformat (i, "src_sw_if_index %d", &src_sw_if_index))
+ ;
+ else
+ if (unformat
+ (i, "dst %U", unformat_sw_if_index, vam, &dst_sw_if_index))
+ ;
+ else if (unformat (i, "dst_sw_if_index %d", &dst_sw_if_index))
+ ;
+ else if (unformat (i, "disable"))
+ enable = 0;
+ else
+ break;
+ }
+
+ M (SW_INTERFACE_SPAN_ENABLE_DISABLE, sw_interface_span_enable_disable);
+
+ mp->sw_if_index_from = htonl (src_sw_if_index);
+ mp->sw_if_index_to = htonl (dst_sw_if_index);
+ mp->enable = enable;
+
+ S;
W;
+ /* NOTREACHED */
+ return 0;
}
-static void vl_api_mpls_fib_decap_details_t_handler
- (vl_api_mpls_fib_decap_details_t * mp)
+static void
+vl_api_sw_interface_span_details_t_handler (vl_api_sw_interface_span_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));
+ fformat (vam->ofp, "%u => %u\n",
+ ntohl (mp->sw_if_index_from), ntohl (mp->sw_if_index_to));
}
-static void vl_api_mpls_fib_decap_details_t_handler_json
- (vl_api_mpls_fib_decap_details_t * mp)
+static void
+ vl_api_sw_interface_span_details_t_handler_json
+ (vl_api_sw_interface_span_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)
{
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);
+ vat_json_object_add_uint (node, "src-if-index",
+ ntohl (mp->sw_if_index_from));
+ vat_json_object_add_uint (node, "dst-if-index", ntohl (mp->sw_if_index_to));
}
static int
-api_mpls_fib_decap_dump (vat_main_t * vam)
+api_sw_interface_span_dump (vat_main_t * vam)
{
- vl_api_mpls_fib_decap_dump_t *mp;
+ vl_api_sw_interface_span_dump_t *mp;
f64 timeout;
- M (MPLS_FIB_DECAP_DUMP, mpls_fib_decap_dump);
+ M (SW_INTERFACE_SPAN_DUMP, sw_interface_span_dump);
S;
/* Use a control ping for synchronization */
}
int
-api_classify_table_ids (vat_main_t * vam)
+api_pg_create_interface (vat_main_t * vam)
{
- vl_api_classify_table_ids_t *mp;
+ unformat_input_t *input = vam->input;
+ vl_api_pg_create_interface_t *mp;
f64 timeout;
+ u32 if_id = ~0;
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "if_id %d", &if_id))
+ ;
+ else
+ break;
+ }
+ if (if_id == ~0)
+ {
+ errmsg ("missing pg interface index\n");
+ return -99;
+ }
+
/* Construct the API message */
- M (CLASSIFY_TABLE_IDS, classify_table_ids);
+ M (PG_CREATE_INTERFACE, pg_create_interface);
mp->context = 0;
+ mp->interface_id = ntohl (if_id);
S;
W;
}
int
-api_classify_table_by_interface (vat_main_t * vam)
+api_pg_capture (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_classify_table_by_interface_t *mp;
+ vl_api_pg_capture_t *mp;
f64 timeout;
- u32 sw_if_index = ~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, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ if (unformat (input, "if_id %d", &if_id))
;
- else if (unformat (input, "sw_if_index %d", &sw_if_index))
+ 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;
}
- if (sw_if_index == ~0)
+ if (if_id == ~0)
{
- errmsg ("missing interface name or sw_if_index\n");
+ errmsg ("missing pg interface index\n");
return -99;
}
+ if (pcap_file_set > 0)
+ {
+ if (vec_len (pcap_file) > 255)
+ {
+ errmsg ("pcap file name is too long\n");
+ return -99;
+ }
+ }
+ u32 name_len = vec_len (pcap_file);
/* Construct the API message */
- M (CLASSIFY_TABLE_BY_INTERFACE, classify_table_by_interface);
+ M (PG_CAPTURE, pg_capture);
mp->context = 0;
- mp->sw_if_index = ntohl (sw_if_index);
+ 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;
}
int
-api_classify_table_info (vat_main_t * vam)
+api_pg_enable_disable (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_classify_table_info_t *mp;
+ vl_api_pg_enable_disable_t *mp;
f64 timeout;
- u32 table_id = ~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, "table_id %d", &table_id))
- ;
+ if (unformat (input, "stream %s", &stream_name))
+ stream_name_set = 1;
+ else if (unformat (input, "disable"))
+ enable = 0;
else
break;
}
- if (table_id == ~0)
+
+ if (stream_name_set > 0)
{
- errmsg ("missing table id\n");
- return -99;
+ if (vec_len (stream_name) > 255)
+ {
+ errmsg ("stream name too long\n");
+ return -99;
+ }
}
+ u32 name_len = vec_len (stream_name);
/* Construct the API message */
- M (CLASSIFY_TABLE_INFO, classify_table_info);
+ M (PG_ENABLE_DISABLE, pg_enable_disable);
mp->context = 0;
- mp->table_id = ntohl (table_id);
+ 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);
+ }
+ vec_free (stream_name);
S;
W;
}
int
-api_classify_session_dump (vat_main_t * vam)
+api_ip_source_and_port_range_check_add_del (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_classify_session_dump_t *mp;
+ vl_api_ip_source_and_port_range_check_add_del_t *mp;
f64 timeout;
- u32 table_id = ~0;
+ u16 *low_ports = 0;
+ u16 *high_ports = 0;
+ u16 this_low;
+ u16 this_hi;
+ ip4_address_t ip4_addr;
+ ip6_address_t ip6_addr;
+ u32 length;
+ u32 tmp, tmp2;
+ u8 prefix_set = 0;
+ u32 vrf_id = ~0;
+ u8 is_add = 1;
+ u8 is_ipv6 = 0;
+
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "table_id %d", &table_id))
+ if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
+ {
+ prefix_set = 1;
+ }
+ else
+ if (unformat
+ (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
+ {
+ prefix_set = 1;
+ is_ipv6 = 1;
+ }
+ else if (unformat (input, "vrf %d", &vrf_id))
;
+ else if (unformat (input, "del"))
+ is_add = 0;
+ else if (unformat (input, "port %d", &tmp))
+ {
+ if (tmp == 0 || tmp > 65535)
+ {
+ errmsg ("port %d out of range", tmp);
+ return -99;
+ }
+ this_low = tmp;
+ this_hi = this_low + 1;
+ vec_add1 (low_ports, this_low);
+ vec_add1 (high_ports, this_hi);
+ }
+ else if (unformat (input, "range %d - %d", &tmp, &tmp2))
+ {
+ if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535))
+ {
+ errmsg ("incorrect range parameters\n");
+ return -99;
+ }
+ this_low = tmp;
+ /* Note: in debug CLI +1 is added to high before
+ passing to real fn that does "the work"
+ (ip_source_and_port_range_check_add_del).
+ This fn is a wrapper around the binary API fn a
+ control plane will call, which expects this increment
+ to have occurred. Hence letting the binary API control
+ plane fn do the increment for consistency between VAT
+ and other control planes.
+ */
+ this_hi = tmp2;
+ vec_add1 (low_ports, this_low);
+ vec_add1 (high_ports, this_hi);
+ }
else
break;
}
- if (table_id == ~0)
+
+ if (prefix_set == 0)
{
- errmsg ("missing table id\n");
+ errmsg ("<address>/<mask> not specified\n");
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;
-}
-
-static void
-vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
+ if (vrf_id == ~0)
+ {
+ errmsg ("VRF ID required, not specified\n");
+ return -99;
+ }
- fformat (vam->ofp, "collector_address %U, collector_port %d, "
- "src_address %U, vrf_id %d, path_mtu %u, "
- "template_interval %u, udp_checksum %d\n",
- format_ip4_address, mp->collector_address,
- ntohs (mp->collector_port),
- format_ip4_address, mp->src_address,
- ntohl (mp->vrf_id), ntohl (mp->path_mtu),
- ntohl (mp->template_interval), mp->udp_checksum);
+ if (vrf_id == 0)
+ {
+ errmsg
+ ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
+ return -99;
+ }
- vam->retval = 0;
- vam->result_ready = 1;
-}
+ if (vec_len (low_ports) == 0)
+ {
+ errmsg ("At least one port or port range required\n");
+ return -99;
+ }
-static void
- vl_api_ipfix_exporter_details_t_handler_json
- (vl_api_ipfix_exporter_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
- struct in_addr collector_address;
- struct in_addr src_address;
+ M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,
+ ip_source_and_port_range_check_add_del);
- 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_int (&node, "vrf_id", ntohl (mp->vrf_id));
- 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_object_add_int (&node, "udp_checksum", mp->udp_checksum);
+ mp->is_add = is_add;
- vat_json_print (vam->ofp, &node);
- vat_json_free (&node);
- vam->retval = 0;
- vam->result_ready = 1;
-}
+ if (is_ipv6)
+ {
+ mp->is_ipv6 = 1;
+ clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
+ }
+ else
+ {
+ mp->is_ipv6 = 0;
+ clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
+ }
-int
-api_ipfix_exporter_dump (vat_main_t * vam)
-{
- vl_api_ipfix_exporter_dump_t *mp;
- f64 timeout;
+ mp->mask_length = length;
+ mp->number_of_ranges = vec_len (low_ports);
- /* Construct the API message */
- M (IPFIX_EXPORTER_DUMP, ipfix_exporter_dump);
- mp->context = 0;
+ clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports));
+ vec_free (low_ports);
+
+ clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports));
+ vec_free (high_ports);
+
+ mp->vrf_id = ntohl (vrf_id);
S;
W;
return 0;
}
-static int
-api_ipfix_classify_stream_dump (vat_main_t * vam)
+int
+api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam)
{
- vl_api_ipfix_classify_stream_dump_t *mp;
+ unformat_input_t *input = vam->input;
+ vl_api_ip_source_and_port_range_check_interface_add_del_t *mp;
f64 timeout;
+ u32 sw_if_index = ~0;
+ int vrf_set = 0;
+ u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0;
+ u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0;
+ u8 is_add = 1;
+
+ 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 if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id))
+ vrf_set = 1;
+ else if (unformat (input, "del"))
+ is_add = 0;
+ else
+ break;
+ }
+
+ if (sw_if_index == ~0)
+ {
+ errmsg ("Interface required but not specified\n");
+ return -99;
+ }
+
+ if (vrf_set == 0)
+ {
+ errmsg ("VRF ID required but not specified\n");
+ return -99;
+ }
+
+ if (tcp_out_vrf_id == 0
+ || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0)
+ {
+ errmsg
+ ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
+ return -99;
+ }
/* Construct the API message */
- M (IPFIX_CLASSIFY_STREAM_DUMP, ipfix_classify_stream_dump);
- mp->context = 0;
+ M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,
+ ip_source_and_port_range_check_interface_add_del);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = is_add;
+ mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id);
+ mp->udp_out_vrf_id = ntohl (udp_out_vrf_id);
+ mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id);
+ mp->udp_in_vrf_id = ntohl (udp_in_vrf_id);
+
+ /* send it... */
S;
+
+ /* Wait for a reply... */
W;
- /* NOTREACHED */
- return 0;
}
-static void
- vl_api_ipfix_classify_stream_details_t_handler
- (vl_api_ipfix_classify_stream_details_t * mp)
+static int
+api_ipsec_gre_add_del_tunnel (vat_main_t * vam)
{
- vat_main_t *vam = &vat_main;
- fformat (vam->ofp, "domain_id %d, src_port %d\n",
- ntohl (mp->domain_id), ntohs (mp->src_port));
- vam->retval = 0;
- vam->result_ready = 1;
-}
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_gre_add_del_tunnel_t *mp;
+ f64 timeout;
+ u32 local_sa_id = 0;
+ u32 remote_sa_id = 0;
+ ip4_address_t src_address;
+ ip4_address_t dst_address;
+ u8 is_add = 1;
-static void
- vl_api_ipfix_classify_stream_details_t_handler_json
- (vl_api_ipfix_classify_stream_details_t * mp)
-{
- vat_main_t *vam = &vat_main;
- vat_json_node_t node;
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "local_sa %d", &local_sa_id))
+ ;
+ else if (unformat (i, "remote_sa %d", &remote_sa_id))
+ ;
+ else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
+ ;
+ else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+ ;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
- vat_json_init_object (&node);
- vat_json_object_add_uint (&node, "domain_id", ntohl (mp->domain_id));
- vat_json_object_add_uint (&node, "src_port", ntohs (mp->src_port));
+ M (IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel);
- vat_json_print (vam->ofp, &node);
- vat_json_free (&node);
- vam->retval = 0;
- vam->result_ready = 1;
+ mp->local_sa_id = ntohl (local_sa_id);
+ mp->remote_sa_id = ntohl (remote_sa_id);
+ clib_memcpy (mp->src_address, &src_address, sizeof (src_address));
+ clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
+ mp->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
}
static int
-api_ipfix_classify_table_dump (vat_main_t * vam)
+api_punt (vat_main_t * vam)
{
- vl_api_ipfix_classify_table_dump_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_punt_t *mp;
f64 timeout;
+ u32 ipv = ~0;
+ u32 protocol = ~0;
+ u32 port = ~0;
+ int is_add = 1;
- if (!vam->json_output)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- fformat (vam->ofp, "%15s%15s%20s\n", "table_id", "ip_version",
- "transport_protocol");
+ if (unformat (i, "ip %d", &ipv))
+ ;
+ else if (unformat (i, "protocol %d", &protocol))
+ ;
+ else if (unformat (i, "port %d", &port))
+ ;
+ 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 (IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump);
+ M (PUNT, punt);
- /* send it... */
- S;
+ mp->is_add = (u8) is_add;
+ mp->ipv = (u8) ipv;
+ mp->l4_protocol = (u8) protocol;
+ mp->l4_port = htons ((u16) port);
- /* Use a control ping for synchronization */
- {
- vl_api_control_ping_t *mp;
- M (CONTROL_PING, control_ping);
- S;
- }
+ S;
W;
+ /* NOTREACHED */
+ return 0;
}
-static void
- vl_api_ipfix_classify_table_details_t_handler
- (vl_api_ipfix_classify_table_details_t * mp)
+static void vl_api_ipsec_gre_tunnel_details_t_handler
+ (vl_api_ipsec_gre_tunnel_details_t * mp)
{
vat_main_t *vam = &vat_main;
- fformat (vam->ofp, "%15d%15d%20d\n", ntohl (mp->table_id), mp->ip_version,
- mp->transport_protocol);
+
+ fformat (vam->ofp, "%11d%15U%15U%14d%14d\n",
+ ntohl (mp->sw_if_index),
+ format_ip4_address, &mp->src_address,
+ format_ip4_address, &mp->dst_address,
+ ntohl (mp->local_sa_id), ntohl (mp->remote_sa_id));
}
-static void
- vl_api_ipfix_classify_table_details_t_handler_json
- (vl_api_ipfix_classify_table_details_t * mp)
+static void vl_api_ipsec_gre_tunnel_details_t_handler_json
+ (vl_api_ipsec_gre_tunnel_details_t * mp)
{
- vat_json_node_t *node = NULL;
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_id", ntohl (mp->table_id));
- vat_json_object_add_uint (node, "ip_version", mp->ip_version);
- vat_json_object_add_uint (node, "transport_protocol",
- mp->transport_protocol);
-}
-
-int
-api_pg_create_interface (vat_main_t * vam)
-{
- unformat_input_t *input = vam->input;
- vl_api_pg_create_interface_t *mp;
- f64 timeout;
-
- u32 if_id = ~0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "if_id %d", &if_id))
- ;
- else
- break;
- }
- if (if_id == ~0)
- {
- errmsg ("missing pg interface index\n");
- return -99;
- }
-
- /* 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;
+ vat_json_init_object (node);
+ vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
+ clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "src_address", ip4);
+ clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
+ vat_json_object_add_ip4 (node, "dst_address", ip4);
+ vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id));
+ vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id));
}
-int
-api_pg_capture (vat_main_t * vam)
+static int
+api_ipsec_gre_tunnel_dump (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_pg_capture_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_ipsec_gre_tunnel_dump_t *mp;
f64 timeout;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 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)
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != 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;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
else
break;
}
- if (if_id == ~0)
- {
- errmsg ("missing pg interface index\n");
- return -99;
- }
- if (pcap_file_set > 0)
+
+ if (sw_if_index_set == 0)
{
- if (vec_len (pcap_file) > 255)
- {
- errmsg ("pcap file name is too long\n");
- return -99;
- }
+ sw_if_index = ~0;
}
- 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)
+ if (!vam->json_output)
{
- clib_memcpy (mp->pcap_file_name, pcap_file, name_len);
+ fformat (vam->ofp, "%11s%15s%15s%14s%14s\n",
+ "sw_if_index", "src_address", "dst_address",
+ "local_sa_id", "remote_sa_id");
}
- vec_free (pcap_file);
+
+ /* Get list of gre-tunnel interfaces */
+ M (IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump);
+
+ 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;
- /* NOTREACHED */
- return 0;
}
-int
-api_pg_enable_disable (vat_main_t * vam)
+static int
+api_delete_subif (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_pg_enable_disable_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_delete_subif_t *mp;
f64 timeout;
+ u32 sw_if_index = ~0;
- u8 enable = 1;
- u8 stream_name_set = 0;
- u8 *stream_name = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "stream %s", &stream_name))
- stream_name_set = 1;
- else if (unformat (input, "disable"))
- enable = 0;
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
else
break;
}
- if (stream_name_set > 0)
+ if (sw_if_index == ~0)
{
- if (vec_len (stream_name) > 255)
- {
- errmsg ("stream name too long\n");
- return -99;
- }
+ errmsg ("missing sw_if_index\n");
+ 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);
- }
- vec_free (stream_name);
+ M (DELETE_SUBIF, delete_subif);
+ mp->sw_if_index = ntohl (sw_if_index);
S;
W;
- /* NOTREACHED */
- return 0;
}
-int
-api_ip_source_and_port_range_check_add_del (vat_main_t * vam)
+#define foreach_pbb_vtr_op \
+_("disable", L2_VTR_DISABLED) \
+_("pop", L2_VTR_POP_2) \
+_("push", L2_VTR_PUSH_2)
+
+static int
+api_l2_interface_pbb_tag_rewrite (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_ip_source_and_port_range_check_add_del_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_l2_interface_pbb_tag_rewrite_t *mp;
f64 timeout;
+ u32 sw_if_index = ~0, vtr_op = ~0;
+ u16 outer_tag = ~0;
+ u8 dmac[6], smac[6];
+ u8 dmac_set = 0, smac_set = 0;
+ u16 vlanid = 0;
+ u32 sid = ~0;
+ u32 tmp;
- u16 *low_ports = 0;
- u16 *high_ports = 0;
- u16 this_low;
- u16 this_hi;
- ip4_address_t ip4_addr;
- ip6_address_t ip6_addr;
- u32 length;
- u32 tmp, tmp2;
- u8 prefix_set = 0;
- u32 vrf_id = ~0;
- u8 is_add = 1;
- u8 is_ipv6 = 0;
+ /* Shut up coverity */
+ memset (dmac, 0, sizeof (dmac));
+ memset (smac, 0, sizeof (smac));
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length))
- {
- prefix_set = 1;
- }
- else
- if (unformat
- (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length))
- {
- prefix_set = 1;
- is_ipv6 = 1;
- }
- else if (unformat (input, "vrf %d", &vrf_id))
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
;
- else if (unformat (input, "del"))
- is_add = 0;
- else if (unformat (input, "port %d", &tmp))
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "vtr_op %d", &vtr_op))
+ ;
+#define _(n,v) else if (unformat(i, n)) {vtr_op = v;}
+ foreach_pbb_vtr_op
+#undef _
+ else if (unformat (i, "translate_pbb_stag"))
{
- if (tmp == 0 || tmp > 65535)
+ if (unformat (i, "%d", &tmp))
{
- errmsg ("port %d out of range", tmp);
- return -99;
+ vtr_op = L2_VTR_TRANSLATE_2_1;
+ outer_tag = tmp;
}
- this_low = tmp;
- this_hi = this_low + 1;
- vec_add1 (low_ports, this_low);
- vec_add1 (high_ports, this_hi);
- }
- else if (unformat (input, "range %d - %d", &tmp, &tmp2))
- {
- if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535))
+ else
{
- errmsg ("incorrect range parameters\n");
+ errmsg
+ ("translate_pbb_stag operation requires outer tag definition\n");
return -99;
}
- this_low = tmp;
- /* Note: in debug CLI +1 is added to high before
- passing to real fn that does "the work"
- (ip_source_and_port_range_check_add_del).
- This fn is a wrapper around the binary API fn a
- control plane will call, which expects this increment
- to have occurred. Hence letting the binary API control
- plane fn do the increment for consistency between VAT
- and other control planes.
- */
- this_hi = tmp2;
- vec_add1 (low_ports, this_low);
- vec_add1 (high_ports, this_hi);
}
+ else if (unformat (i, "dmac %U", unformat_ethernet_address, dmac))
+ dmac_set++;
+ else if (unformat (i, "smac %U", unformat_ethernet_address, smac))
+ smac_set++;
+ else if (unformat (i, "sid %d", &sid))
+ ;
+ else if (unformat (i, "vlanid %d", &tmp))
+ vlanid = tmp;
else
- break;
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (prefix_set == 0)
+ if ((sw_if_index == ~0) || (vtr_op == ~0))
{
- errmsg ("<address>/<mask> not specified\n");
+ errmsg ("missing sw_if_index or vtr operation\n");
return -99;
}
-
- if (vrf_id == ~0)
+ if (((vtr_op == L2_VTR_PUSH_2) || (vtr_op == L2_VTR_TRANSLATE_2_2))
+ && ((dmac_set == 0) || (smac_set == 0) || (sid == ~0)))
{
- errmsg ("VRF ID required, not specified\n");
+ errmsg
+ ("push and translate_qinq operations require dmac, smac, sid and optionally vlanid\n");
return -99;
}
- if (vrf_id == 0)
+ M (L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->vtr_op = ntohl (vtr_op);
+ mp->outer_tag = ntohs (outer_tag);
+ clib_memcpy (mp->b_dmac, dmac, sizeof (dmac));
+ clib_memcpy (mp->b_smac, smac, sizeof (smac));
+ mp->b_vlanid = ntohs (vlanid);
+ mp->i_sid = ntohl (sid);
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
+
+static int
+api_flow_classify_set_interface (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_flow_classify_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;
+ u8 is_add = 1;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- errmsg
- ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
- return -99;
+ 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
+ {
+ clib_warning ("parse error '%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (vec_len (low_ports) == 0)
+ if (sw_if_index_set == 0)
{
- errmsg ("At least one port or port range required\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
- M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL,
- ip_source_and_port_range_check_add_del);
+ M (FLOW_CLASSIFY_SET_INTERFACE, flow_classify_set_interface);
+
+ 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->is_add = is_add;
+
+ S;
+ W;
+ /* NOTREACHED */
+ return 0;
+}
- mp->is_add = is_add;
+static int
+api_flow_classify_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_flow_classify_dump_t *mp;
+ f64 timeout = ~0;
+ u8 type = FLOW_CLASSIFY_N_TABLES;
- if (is_ipv6)
- {
- mp->is_ipv6 = 1;
- clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr));
- }
+ if (unformat (i, "type %U", unformat_flow_classify_table_type, &type))
+ ;
else
{
- mp->is_ipv6 = 0;
- clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr));
+ errmsg ("classify table type must be specified\n");
+ return -99;
}
- mp->mask_length = length;
- mp->number_of_ranges = vec_len (low_ports);
-
- clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports));
- vec_free (low_ports);
-
- clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports));
- vec_free (high_ports);
-
- mp->vrf_id = ntohl (vrf_id);
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%10s%20s\n", "Intfc idx", "Classify table");
+ }
+ M (FLOW_CLASSIFY_DUMP, flow_classify_dump);
+ mp->type = type;
+ /* 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;
}
-int
-api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam)
+static int
+api_feature_enable_disable (vat_main_t * vam)
{
- unformat_input_t *input = vam->input;
- vl_api_ip_source_and_port_range_check_interface_add_del_t *mp;
+ unformat_input_t *i = vam->input;
+ vl_api_feature_enable_disable_t *mp;
f64 timeout;
+ u8 *arc_name = 0;
+ u8 *feature_name = 0;
u32 sw_if_index = ~0;
- int vrf_set = 0;
- u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0;
- u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0;
- u8 is_add = 1;
+ u8 enable = 1;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ if (unformat (i, "arc_name %s", &arc_name))
;
- else if (unformat (input, "sw_if_index %d", &sw_if_index))
+ else if (unformat (i, "feature_name %s", &feature_name))
;
- else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id))
- vrf_set = 1;
- else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id))
- vrf_set = 1;
- else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id))
- vrf_set = 1;
- else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id))
- vrf_set = 1;
- else if (unformat (input, "del"))
- is_add = 0;
+ else if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else if (unformat (i, "disable"))
+ enable = 0;
else
break;
}
- if (sw_if_index == ~0)
+ if (arc_name == 0)
{
- errmsg ("Interface required but not specified\n");
+ errmsg ("missing arc name\n");
return -99;
}
+ if (vec_len (arc_name) > 63)
+ {
+ errmsg ("arc name too long\n");
+ }
- if (vrf_set == 0)
+ if (feature_name == 0)
{
- errmsg ("VRF ID required but not specified\n");
+ errmsg ("missing feature name\n");
return -99;
}
+ if (vec_len (feature_name) > 63)
+ {
+ errmsg ("feature name too long\n");
+ }
- if (tcp_out_vrf_id == 0
- || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0)
+ if (sw_if_index == ~0)
{
- errmsg
- ("VRF ID should not be default. Should be distinct VRF for this purpose.\n");
+ errmsg ("missing interface name or sw_if_index\n");
return -99;
}
/* Construct the API message */
- M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL,
- ip_source_and_port_range_check_interface_add_del);
-
+ M (FEATURE_ENABLE_DISABLE, feature_enable_disable);
mp->sw_if_index = ntohl (sw_if_index);
- mp->is_add = is_add;
- mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id);
- mp->udp_out_vrf_id = ntohl (udp_out_vrf_id);
- mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id);
- mp->udp_in_vrf_id = ntohl (udp_in_vrf_id);
+ mp->enable = enable;
+ clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name));
+ clib_memcpy (mp->feature_name, feature_name, vec_len (feature_name));
+ vec_free (arc_name);
+ vec_free (feature_name);
- /* send it... */
S;
-
- /* Wait for a reply... */
W;
}
static int
-api_ipsec_gre_add_del_tunnel (vat_main_t * vam)
+api_sw_interface_tag_add_del (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipsec_gre_add_del_tunnel_t *mp;
+ vl_api_sw_interface_tag_add_del_t *mp;
f64 timeout;
- u32 local_sa_id = 0;
- u32 remote_sa_id = 0;
- ip4_address_t src_address;
- ip4_address_t dst_address;
- u8 is_add = 1;
+ u32 sw_if_index = ~0;
+ u8 *tag = 0;
+ u8 enable = 1;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "local_sa %d", &local_sa_id))
+ if (unformat (i, "tag %s", &tag))
;
- else if (unformat (i, "remote_sa %d", &remote_sa_id))
- ;
- else if (unformat (i, "src %U", unformat_ip4_address, &src_address))
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
;
- else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address))
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
;
else if (unformat (i, "del"))
- is_add = 0;
+ enable = 0;
else
- {
- clib_warning ("parse error '%U'", format_unformat_error, i);
- return -99;
- }
+ break;
}
- M (IPSEC_GRE_ADD_DEL_TUNNEL, ipsec_gre_add_del_tunnel);
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
- mp->local_sa_id = ntohl (local_sa_id);
- mp->remote_sa_id = ntohl (remote_sa_id);
- clib_memcpy (mp->src_address, &src_address, sizeof (src_address));
- clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address));
- mp->is_add = is_add;
+ if (enable && (tag == 0))
+ {
+ errmsg ("no tag specified\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del);
+ mp->sw_if_index = ntohl (sw_if_index);
+ mp->is_add = enable;
+ if (enable)
+ strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1);
+ vec_free (tag);
S;
W;
- /* NOTREACHED */
- return 0;
}
-static void vl_api_ipsec_gre_tunnel_details_t_handler
- (vl_api_ipsec_gre_tunnel_details_t * mp)
+static void vl_api_l2_xconnect_details_t_handler
+ (vl_api_l2_xconnect_details_t * mp)
{
vat_main_t *vam = &vat_main;
- fformat (vam->ofp, "%11d%15U%15U%14d%14d\n",
- ntohl (mp->sw_if_index),
- format_ip4_address, &mp->src_address,
- format_ip4_address, &mp->dst_address,
- ntohl (mp->local_sa_id), ntohl (mp->remote_sa_id));
+ fformat (vam->ofp, "%15d%15d\n",
+ ntohl (mp->rx_sw_if_index), ntohl (mp->tx_sw_if_index));
}
-static void vl_api_ipsec_gre_tunnel_details_t_handler_json
- (vl_api_ipsec_gre_tunnel_details_t * mp)
+static void vl_api_l2_xconnect_details_t_handler_json
+ (vl_api_l2_xconnect_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)
{
node = vat_json_array_add (&vam->json_tree);
vat_json_init_object (node);
- vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
- clib_memcpy (&ip4, &mp->src_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "src_address", ip4);
- clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "dst_address", ip4);
- vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id));
- vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id));
+ vat_json_object_add_uint (node, "rx_sw_if_index",
+ ntohl (mp->rx_sw_if_index));
+ vat_json_object_add_uint (node, "tx_sw_if_index",
+ ntohl (mp->tx_sw_if_index));
}
static int
-api_ipsec_gre_tunnel_dump (vat_main_t * vam)
+api_l2_xconnect_dump (vat_main_t * vam)
{
- unformat_input_t *i = vam->input;
- vl_api_ipsec_gre_tunnel_dump_t *mp;
+ vl_api_l2_xconnect_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%15s%15s%14s%14s\n",
- "sw_if_index", "src_address", "dst_address",
- "local_sa_id", "remote_sa_id");
+ fformat (vam->ofp, "%15s%15s\n", "rx_sw_if_index", "tx_sw_if_index");
}
- /* Get list of gre-tunnel interfaces */
- M (IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump);
-
- mp->sw_if_index = htonl (sw_if_index);
+ M (L2_XCONNECT_DUMP, l2_xconnect_dump);
S;
}
static int
-api_delete_subif (vat_main_t * vam)
+api_sw_interface_set_mtu (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_delete_subif_t *mp;
+ vl_api_sw_interface_set_mtu_t *mp;
f64 timeout;
u32 sw_if_index = ~0;
+ u32 mtu = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "sw_if_index %d", &sw_if_index))
+ if (unformat (i, "mtu %d", &mtu))
+ ;
+ if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index))
+ ;
+ else if (unformat (i, "sw_if_index %d", &sw_if_index))
;
else
break;
if (sw_if_index == ~0)
{
- errmsg ("missing sw_if_index\n");
+ errmsg ("missing interface name or sw_if_index\n");
+ return -99;
+ }
+
+ if (mtu == 0)
+ {
+ errmsg ("no mtu specified\n");
return -99;
}
/* Construct the API message */
- M (DELETE_SUBIF, delete_subif);
+ M (SW_INTERFACE_SET_MTU, sw_interface_set_mtu);
mp->sw_if_index = ntohl (sw_if_index);
+ mp->mtu = ntohs ((u16) mtu);
S;
W;
}
+
static int
q_or_quit (vat_main_t * vam)
{
return 0;
}
+static int
+value_sort_cmp (void *a1, void *a2)
+{
+ name_sort_t *n1 = a1;
+ name_sort_t *n2 = a2;
+
+ if (n1->value < n2->value)
+ return -1;
+ if (n1->value > n2->value)
+ return 1;
+ return 0;
+}
+
+
+static int
+dump_msg_api_table (vat_main_t * vam)
+{
+ api_main_t *am = &api_main;
+ name_sort_t *nses = 0, *ns;
+ hash_pair_t *hp;
+ int i;
+
+ /* *INDENT-OFF* */
+ hash_foreach_pair (hp, am->msg_index_by_name_and_crc,
+ ({
+ vec_add2 (nses, ns, 1);
+ ns->name = (u8 *)(hp->key);
+ ns->value = (u32) hp->value[0];
+ }));
+ /* *INDENT-ON* */
+
+ vec_sort_with_function (nses, value_sort_cmp);
+
+ for (i = 0; i < vec_len (nses); i++)
+ fformat (vam->ofp, " [%d]: %s\n", nses[i].value, nses[i].name);
+ vec_free (nses);
+ return 0;
+}
+
+static int
+get_msg_id (vat_main_t * vam)
+{
+ u8 *name_and_crc;
+ u32 message_index;
+
+ if (unformat (vam->input, "%s", &name_and_crc))
+ {
+ message_index = vl_api_get_msg_index (name_and_crc);
+ if (message_index == ~0)
+ {
+ fformat (vam->ofp, " '%s' not found\n", name_and_crc);
+ return 0;
+ }
+ fformat (vam->ofp, " '%s' has message index %d\n",
+ name_and_crc, message_index);
+ return 0;
+ }
+ errmsg ("name_and_crc required...\n");
+ return 0;
+}
+
static int
search_node_table (vat_main_t * vam)
{
"<intfc> | sw_if_index <id> <ip4-address> | <ip6-address> [del] [del-all] ") \
_(sw_interface_set_table, \
"<intfc> | sw_if_index <id> vrf <table-id> [ipv6]") \
+_(sw_interface_set_mpls_enable, \
+ "<intfc> | sw_if_index [disable | dis]") \
_(sw_interface_set_vpath, \
"<intfc> | sw_if_index <id> enable | disable") \
+_(sw_interface_set_vxlan_bypass, \
+ "<intfc> | sw_if_index <id> [ip4 | ip6] enable | disable") \
_(sw_interface_set_l2_xconnect, \
"rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
"enable | disable") \
"<intfc> | sw_if_index <id> bd_id <bridge-domain-id>\n" \
"[shg <split-horizon-group>] [bvi]\n" \
"enable | disable") \
+_(sw_interface_set_dpdk_hqos_pipe, \
+ "rx <intfc> | sw_if_index <id> subport <subport-id> pipe <pipe-id>\n" \
+ "profile <profile-id>\n") \
+_(sw_interface_set_dpdk_hqos_subport, \
+ "rx <intfc> | sw_if_index <id> subport <subport-id> [rate <n>]\n" \
+ "[bktsize <n>] [tc0 <n>] [tc1 <n>] [tc2 <n>] [tc3 <n>] [period <n>]\n") \
+_(sw_interface_set_dpdk_hqos_tctbl, \
+ "rx <intfc> | sw_if_index <id> entry <n> tc <n> queue <n>\n") \
_(bridge_domain_add_del, \
"bd_id <bridge-domain-id> [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [del]\n")\
_(bridge_domain_dump, "[bd_id <bridge-domain-id>]\n") \
_(bridge_flags, \
"bd_id <bridge-domain-id> [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \
_(tap_connect, \
- "tapname <name> mac <mac-addr> | random-mac") \
+ "tapname <name> mac <mac-addr> | random-mac [tag <string>]") \
_(tap_modify, \
"<vpp-if-name> | sw_if_index <id> tapname <name> mac <mac-addr> | random-mac") \
_(tap_delete, \
"<vpp-if-name> | sw_if_index <id>") \
_(sw_interface_tap_dump, "") \
_(ip_add_del_route, \
- "<addr>/<mask> via <addr> [vrf <n>]\n" \
+ "<addr>/<mask> via <addr> [table-id <n>]\n" \
+ "[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n" \
+ "[weight <n>] [drop] [local] [classify <n>] [del]\n" \
+ "[multipath] [count <n>]") \
+_(mpls_route_add_del, \
+ "<label> <eos> via <addr> [table-id <n>]\n" \
"[<intfc> | sw_if_index <id>] [resolve-attempts <n>]\n" \
"[weight <n>] [drop] [local] [classify <n>] [del]\n" \
"[multipath] [count <n>]") \
+_(mpls_ip_bind_unbind, \
+ "<label> <addr/len>") \
+_(mpls_tunnel_add_del, \
+ " via <addr> [table-id <n>]\n" \
+ "sw_if_index <id>] [l2] [del]") \
_(proxy_arp_add_del, \
"<lo-ip4-addr> - <hi-ip4-addr> [vrf <n>] [del]") \
_(proxy_arp_intfc_enable_disable, \
"<intfc> | sw_if_index <id> enable | disable") \
-_(mpls_add_del_encap, \
- "label <n> dst <ip4-addr> [vrf <n>] [del]") \
-_(mpls_add_del_decap, \
- "label <n> [rx_vrf_id <n>] [tx_vrf_id] [s-bit-clear][del]") \
-_(mpls_gre_add_del_tunnel, \
- "inner_vrf_id <n> outer_vrf_id <n> src <ip4-address> dst <ip4-address>\n" \
- "adj <ip4-address>/<mask-width> [del]") \
_(sw_interface_set_unnumbered, \
"<intfc> | sw_if_index <id> unnum_if_index <id> [del]") \
_(ip_neighbor_add_del, \
_(l2_patch_add_del, \
"rx <intfc> | rx_sw_if_index <id> tx <intfc> | tx_sw_if_index <id>\n" \
"enable | disable") \
-_(mpls_ethernet_add_del_tunnel, \
- "tx <intfc> | tx_sw_if_index <n> dst <mac-addr>\n" \
- "adj <ip4-addr>/<mw> dst <mac-addr> [del]") \
-_(mpls_ethernet_add_del_tunnel_2, \
- "inner_vrf_id <n> outer_vrf_id <n> next-hop <ip4-addr>\n" \
- "resolve-attempts <n> resolve-if-needed 0 | 1 [del]") \
_(sr_tunnel_add_del, \
"[name <name>] src <ip6-addr> dst <ip6-addr>/<mw> \n" \
"(next <ip6-addr>)+ [tag <ip6-addr>]* [clean] [reroute] \n" \
"address [ip6 multicast address] sr-policy [policy name] [del]") \
_(classify_add_del_table, \
"buckets <nn> [skip <n>] [match <n>] [memory_size <nn-bytes>]\n" \
- "[del] mask <mask-value>\n" \
- " [l2-miss-next | miss-next | acl-miss-next] <name|nn>") \
+ " [del] mask <mask-value>\n" \
+ " [l2-miss-next | miss-next | acl-miss-next] <name|nn>\n" \
+ " [current-data-flag <n>] [current-data-offset <nn>] [table <nn>]") \
_(classify_add_del_session, \
"[hit-next|l2-hit-next|acl-hit-next|policer-hit-next] <name|nn>\n" \
" table-index <nn> skip_n <nn> match_n <nn> match [hex] [l2]\n" \
- " [l3 [ip4|ip6]]") \
+ " [l3 [ip4|ip6]] [action set-ip4-fib-id <nn>]\n" \
+ " [action set-ip6-fib-id <nn> | action <n> metadata <nn>] [del]") \
_(classify_set_interface_ip_table, \
"<intfc> | sw_if_index <nn> table <nn>") \
_(classify_set_interface_l2_tables, \
"lookup_v6_src | lookup_v6_dst | lookup_session_id") \
_(sw_if_l2tpv3_tunnel_dump, "") \
_(vxlan_add_del_tunnel, \
- "src <ip-addr> dst <ip-addr> vni <vni> [encap-vrf-id <nn>]\n" \
- " [decap-next l2|ip4|ip6] [del]") \
+ "src <ip-addr> { dst <ip-addr> | group <mcast-ip-addr>\n" \
+ "{ <intfc> | mcast_sw_if_index <nn> } }\n" \
+ "vni <vni> [encap-vrf-id <nn>] [decap-next <l2|nn>] [del]") \
_(vxlan_tunnel_dump, "[<intfc> | sw_if_index <nn>]") \
_(gre_add_del_tunnel, \
"src <ip4-addr> dst <ip4-addr> [outer-fib-id <nn>] [teb] [del]\n") \
"p <priority> w <weight> [del]") \
_(lisp_add_del_local_eid,"vni <vni> eid " \
"<ipv4|ipv6>/<prefix> | <L2 address> " \
- "locator-set <locator_name> [del]") \
+ "locator-set <locator_name> [del]" \
+ "[key-id sha1|sha256 secret-key <secret-key>]")\
_(lisp_gpe_add_del_fwd_entry, "rmt_eid <eid> [lcl_eid <eid>] vni <vni>" \
"dp_table <table> loc-pair <lcl_loc> <rmt_loc> ... [del]") \
_(lisp_add_del_map_resolver, "<ip4|6-addr> [del]") \
+_(lisp_add_del_map_server, "<ip4|6-addr> [del]") \
_(lisp_gpe_enable_disable, "enable|disable") \
_(lisp_enable_disable, "enable|disable") \
+_(lisp_map_register_enable_disable, "enable|disable") \
+_(lisp_rloc_probe_enable_disable, "enable|disable") \
_(lisp_gpe_add_del_iface, "up|down") \
_(lisp_add_del_remote_mapping, "add|del vni <vni> eid <dest-eid> " \
"[seid <seid>] " \
"rloc <locator> p <prio> " \
"w <weight> [rloc <loc> ... ] " \
"action <action> [del-all]") \
-_(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_add_del_adjacency, "add|del vni <vni> reid <remote-eid> leid " \
+ "<local-eid>") \
_(lisp_pitr_set_locator_set, "locator-set <loc-set-name> | del") \
_(lisp_map_request_mode, "src-dst|dst-only") \
_(lisp_add_del_map_request_itr_rlocs, "<loc-set-name> [del]") \
_(lisp_eid_table_map_dump, "l2|l3") \
_(lisp_gpe_tunnel_dump, "") \
_(lisp_map_resolver_dump, "") \
+_(lisp_map_server_dump, "") \
+_(lisp_adjacencies_get, "vni <vni>") \
+_(show_lisp_rloc_probe_state, "") \
+_(show_lisp_map_register_state, "") \
_(show_lisp_status, "") \
_(lisp_get_map_request_itr_rlocs, "") \
_(show_lisp_pitr, "") \
_(netmap_create, "name <interface name> [hw-addr <mac>] [pipe] " \
"[master|slave]") \
_(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, "") \
+_(mpls_tunnel_dump, "tunnel_index <tunnel-id>") \
+_(mpls_fib_dump, "") \
_(classify_table_ids, "") \
_(classify_table_by_interface, "sw_if_index <sw_if_index>") \
_(classify_table_info, "table_id <nn>") \
_(ipfix_classify_stream_dump, "") \
_(ipfix_classify_table_add_del, "table <table-index> ip4|ip6 [tcp|udp]")\
_(ipfix_classify_table_dump, "") \
+_(sw_interface_span_enable_disable, "[src <intfc> | src_sw_if_index <id>] [[dst <intfc> | dst_sw_if_index <id>] | disable]") \
+_(sw_interface_span_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]") \
_(ipsec_gre_add_del_tunnel, \
"src <addr> dst <addr> local_sa <sa-id> remote_sa <sa-id> [del]") \
_(ipsec_gre_tunnel_dump, "[sw_if_index <nn>]") \
-_(delete_subif,"sub_sw_if_index <nn> sub_if_id <nn>")
+_(delete_subif,"<intfc> | sw_if_index <nn>") \
+_(l2_interface_pbb_tag_rewrite, \
+ "<intfc> | sw_if_index <nn> \n" \
+ "[disable | push | pop | translate_pbb_stag <outer_tag>] \n" \
+ "dmac <mac> smac <mac> sid <nn> [vlanid <nn>]") \
+_(punt, "protocol <l4-protocol> [ip <ver>] [port <l4-port>] [del]") \
+_(flow_classify_set_interface, \
+ "<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>] [del]") \
+_(flow_classify_dump, "type [ip4|ip6]") \
+_(ip_fib_dump, "") \
+_(ip6_fib_dump, "") \
+_(feature_enable_disable, "arc_name <arc_name> " \
+ "feature_name <feature_name> <intfc> | sw_if_index <nn> [disable]") \
+_(sw_interface_tag_add_del, "<intfc> | sw_if_index <nn> tag <text>" \
+"[disable]") \
+_(l2_xconnect_dump, "") \
+_(sw_interface_set_mtu, "<intfc> | sw_if_index <nn> mtu <nn>") \
+_(ip_neighbor_dump, "[ip6] <intfc> | sw_if_index <nn>")
/* List of command functions, CLI names map directly to functions */
#define foreach_cli_function \
_(dump_stats_table, "usage: dump_stats_table") \
_(dump_macro_table, "usage: dump_macro_table ") \
_(dump_node_table, "usage: dump_node_table") \
+_(dump_msg_api_table, "usage: dump_msg_api_table") \
+_(get_msg_id, "usage: get_msg_id name_and_crc") \
_(echo, "usage: echo <message>") \
_(exec, "usage: exec <vpe-debug-CLI-command>") \
_(exec_inband, "usage: exec_inband <vpe-debug-CLI-command>") \
}
#undef vl_api_version
-#define vl_api_version(n,v) static u32 vpe_api_version = v;
+#define vl_api_version(n,v) static u32 memory_api_version = v;
+#include <vlibmemory/vl_memory_api_h.h>
+#undef vl_api_version
+
+#undef vl_api_version
+#define vl_api_version(n,v) static u32 vnet_interface_api_version = v;
+#include <vnet/interface.api.h>
+#undef vl_api_version
+
+#undef vl_api_version
+#define vl_api_version(n,v) static u32 vpp_api_version = v;
#include <vpp-api/vpe.api.h>
#undef vl_api_version
+static u32 *api_versions[] = {
+ &memory_api_version,
+ &vnet_interface_api_version,
+ &vpp_api_version,
+};
+
void
vl_client_add_api_signatures (vl_api_memclnt_create_t * mp)
{
+ int i;
+
+ ASSERT (ARRAY_LEN (mp->api_versions) >= ARRAY_LEN (api_versions));
+
/*
- * Send the main API signature in slot 0. This bit of code must
+ * Send the API signatures. This bit of code must
* match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
*/
- mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
+
+ for (i = 0; i < ARRAY_LEN (api_versions); i++)
+ mp->api_versions[i] = clib_host_to_net_u32 (*api_versions[i]);
}
/*
Code Review / vpp.git / blobdiff