vam->result_ready = 1;
}
+static void
+vl_api_cli_inband_reply_t_handler (vl_api_cli_inband_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+
+ vam->retval = retval;
+ vam->cmd_reply = mp->reply;
+ vam->result_ready = 1;
+}
+
+static void
+vl_api_cli_inband_reply_t_handler_json (vl_api_cli_inband_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_string_copy (&node, "reply", mp->reply);
+
+ vat_json_print (vam->ofp, &node);
+ vat_json_free (&node);
+
+ vam->retval = ntohl (mp->retval);
+ vam->result_ready = 1;
+}
+
static void vl_api_classify_add_del_table_reply_t_handler
(vl_api_classify_add_del_table_reply_t * mp)
{
vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp)
{
vat_main_t *vam = &vat_main;
- errmsg ("arp event: address %U new mac %U sw_if_index %d\n",
+ errmsg ("arp %s event: address %U new mac %U sw_if_index %d\n",
+ mp->mac_ip ? "mac/ip binding" : "address resolution",
format_ip4_address, &mp->address,
format_ethernet_address, mp->new_mac, mp->sw_if_index);
}
/* JSON output not supported */
}
+static void
+vl_api_ip6_nd_event_t_handler (vl_api_ip6_nd_event_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ errmsg ("ip6 nd %s event: address %U new mac %U sw_if_index %d\n",
+ mp->mac_ip ? "mac/ip binding" : "address resolution",
+ format_ip6_address, mp->address,
+ format_ethernet_address, mp->new_mac, mp->sw_if_index);
+}
+
+static void
+vl_api_ip6_nd_event_t_handler_json (vl_api_ip6_nd_event_t * mp)
+{
+ /* JSON output not supported */
+}
+
/*
* Special-case: build the bridge domain table, maintain
* the next bd id vbl.
vam->result_ready = 1;
}
-static void vl_api_noprint_control_ping_reply_t_handler
- (vl_api_noprint_control_ping_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_noprint_control_ping_reply_t_handler_json
- (vl_api_noprint_control_ping_reply_t * mp)
-{
- vat_main_t *vam = &vat_main;
- i32 retval = ntohl (mp->retval);
-
- if (vam->noprint_msg)
- {
- vam->retval = retval;
- vam->result_ready = 1;
- return;
- }
-
- if (VAT_JSON_NONE != vam->json_tree.type)
- {
- vat_json_print (vam->ofp, &vam->json_tree);
- vat_json_free (&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- }
- else
- {
- /* just print [] */
- vat_json_init_array (&vam->json_tree);
- vat_json_print (vam->ofp, &vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- }
-
- vam->retval = retval;
- vam->result_ready = 1;
-}
-
static void
vl_api_l2_flags_reply_t_handler (vl_api_l2_flags_reply_t * mp)
{
vl_api_lisp_locator_details_t_handler (vl_api_lisp_locator_details_t * mp)
{
vat_main_t *vam = &vat_main;
- locator_msg_t loc;
- u8 *tmp_str = 0;
+ u8 *s = 0;
- memset (&loc, 0, sizeof (loc));
- if (vam->noprint_msg)
+ if (mp->local)
{
- loc.local = mp->local;
- loc.priority = mp->priority;
- loc.weight = mp->weight;
- if (loc.local)
- {
- loc.sw_if_index = ntohl (mp->sw_if_index);
- }
- else
- {
- loc.is_ipv6 = mp->is_ipv6;
- clib_memcpy (loc.ip_address, mp->ip_address,
- sizeof (loc.ip_address));
- }
- vec_add1 (vam->locator_msg, loc);
+ s = format (s, "%=16d%=16d%=16d\n",
+ ntohl (mp->sw_if_index), mp->priority, mp->weight);
}
else
{
- if (mp->local)
- {
- tmp_str = format (tmp_str, "%=16d%=16d%=16d\n",
- ntohl (mp->sw_if_index),
- mp->priority, mp->weight);
- }
- else
- {
- tmp_str = format (tmp_str, "%=16U%=16d%=16d\n",
- mp->is_ipv6 ? format_ip6_address :
- format_ip4_address,
- mp->ip_address, mp->priority, mp->weight);
- }
-
- fformat (vam->ofp, "%s", tmp_str);
-
- vec_free (tmp_str);
+ s = format (s, "%=16U%=16d%=16d\n",
+ mp->is_ipv6 ? format_ip6_address :
+ format_ip4_address,
+ mp->ip_address, mp->priority, mp->weight);
}
+
+ fformat (vam->ofp, "%v", s);
+ vec_free (s);
}
static void
{
vat_main_t *vam = &vat_main;
vat_json_node_t *node = NULL;
- locator_msg_t loc;
struct in6_addr ip6;
struct in_addr ip4;
- memset (&loc, 0, sizeof (loc));
- if (vam->noprint_msg)
- {
- loc.local = mp->local;
- loc.priority = mp->priority;
- loc.weight = mp->weight;
- if (loc.local)
- {
- loc.sw_if_index = ntohl (mp->sw_if_index);
- }
- else
- {
- loc.is_ipv6 = mp->is_ipv6;
- clib_memcpy (loc.ip_address, mp->ip_address,
- sizeof (loc.ip_address));
- }
- vec_add1 (vam->locator_msg, loc);
- return;
- }
-
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, "local", mp->local ? 1 : 0);
+ vat_json_object_add_uint (node, "priority", mp->priority);
+ vat_json_object_add_uint (node, "weight", mp->weight);
+
if (mp->local)
- {
- vat_json_object_add_uint (node, "locator_index",
- ntohl (mp->sw_if_index));
- }
+ vat_json_object_add_uint (node, "sw_if_index",
+ clib_net_to_host_u32 (mp->sw_if_index));
else
{
if (mp->is_ipv6)
{
clib_memcpy (&ip6, mp->ip_address, sizeof (ip6));
- vat_json_object_add_ip6 (node, "locator", ip6);
+ vat_json_object_add_ip6 (node, "address", ip6);
}
else
{
clib_memcpy (&ip4, mp->ip_address, sizeof (ip4));
- vat_json_object_add_ip4 (node, "locator", ip4);
+ vat_json_object_add_ip4 (node, "address", ip4);
}
}
- vat_json_object_add_uint (node, "priority", mp->priority);
- vat_json_object_add_uint (node, "weight", mp->weight);
}
static void
mp)
{
vat_main_t *vam = &vat_main;
- locator_set_msg_t ls;
+ u8 *ls_name = 0;
+
+ ls_name = format (0, "%s", mp->ls_name);
- ls.locator_set_index = ntohl (mp->locator_set_index);
- ls.locator_set_name = format (0, "%s", mp->locator_set_name);
- vec_add1 (vam->locator_set_msg, ls);
+ fformat (vam->ofp, "%=10d%=15v\n", clib_net_to_host_u32 (mp->ls_index),
+ ls_name);
+ vec_free (ls_name);
}
static void
(vl_api_lisp_locator_set_details_t * mp)
{
vat_main_t *vam = &vat_main;
- locator_set_msg_t ls;
+ vat_json_node_t *node = 0;
+ u8 *ls_name = 0;
+
+ ls_name = format (0, "%s", mp->ls_name);
+ vec_add1 (ls_name, 0);
+
+ 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, "ls_name", ls_name);
+ vat_json_object_add_uint (node, "ls_index",
+ clib_net_to_host_u32 (mp->ls_index));
+ vec_free (ls_name);
+}
+
+static u8 *
+format_lisp_flat_eid (u8 * s, va_list * args)
+{
+ u32 type = va_arg (*args, u32);
+ u8 *eid = va_arg (*args, u8 *);
+ u32 eid_len = va_arg (*args, u32);
+
+ switch (type)
+ {
+ case 0:
+ return format (s, "%U/%d", format_ip4_address, eid, eid_len);
+ case 1:
+ return format (s, "%U/%d", format_ip6_address, eid, eid_len);
+ case 2:
+ return format (s, "%U", format_ethernet_address, eid);
+ }
+ return 0;
+}
+
+static u8 *
+format_lisp_eid_vat (u8 * s, va_list * args)
+{
+ u32 type = va_arg (*args, u32);
+ u8 *eid = va_arg (*args, u8 *);
+ u32 eid_len = va_arg (*args, u32);
+ u8 *seid = va_arg (*args, u8 *);
+ u32 seid_len = va_arg (*args, u32);
+ u32 is_src_dst = va_arg (*args, u32);
+
+ if (is_src_dst)
+ s = format (s, "%U|", format_lisp_flat_eid, type, seid, seid_len);
+
+ s = format (s, "%U", format_lisp_flat_eid, type, eid, eid_len);
- ls.locator_set_index = ntohl (mp->locator_set_index);
- ls.locator_set_name = format (0, "%s", mp->locator_set_name);
- vec_add1 (vam->locator_set_msg, ls);
+ return s;
}
static void
vl_api_lisp_eid_table_details_t_handler (vl_api_lisp_eid_table_details_t * mp)
{
vat_main_t *vam = &vat_main;
- eid_table_t eid_table;
+ u8 *s = 0, *eid = 0;
- memset (&eid_table, 0, sizeof (eid_table));
- eid_table.is_local = mp->is_local;
- eid_table.locator_set_index = mp->locator_set_index;
- eid_table.eid_type = mp->eid_type;
- eid_table.vni = mp->vni;
- eid_table.eid_prefix_len = mp->eid_prefix_len;
- eid_table.ttl = mp->ttl;
- eid_table.authoritative = mp->authoritative;
- clib_memcpy (eid_table.eid, mp->eid, sizeof (eid_table.eid));
- vec_add1 (vam->eid_tables, eid_table);
+ if (~0 == mp->locator_set_index)
+ s = format (0, "action: %d", mp->action);
+ else
+ s = format (0, "%d", clib_net_to_host_u32 (mp->locator_set_index));
+
+ eid = format (0, "%U", format_lisp_eid_vat,
+ mp->eid_type,
+ mp->eid,
+ mp->eid_prefix_len,
+ mp->seid, mp->seid_prefix_len, mp->is_src_dst);
+ vec_add1 (eid, 0);
+
+ fformat (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-d\n",
+ clib_net_to_host_u32 (mp->vni),
+ eid,
+ mp->is_local ? "local" : "remote",
+ s, clib_net_to_host_u32 (mp->ttl), mp->authoritative);
+ vec_free (s);
+ vec_free (eid);
}
static void
* mp)
{
vat_main_t *vam = &vat_main;
- eid_table_t eid_table;
+ vat_json_node_t *node = 0;
+ u8 *eid = 0;
+
+ 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);
- memset (&eid_table, 0, sizeof (eid_table));
- eid_table.is_local = mp->is_local;
- eid_table.locator_set_index = mp->locator_set_index;
- eid_table.eid_type = mp->eid_type;
- eid_table.vni = mp->vni;
- eid_table.eid_prefix_len = mp->eid_prefix_len;
- eid_table.ttl = mp->ttl;
- eid_table.authoritative = mp->authoritative;
- clib_memcpy (eid_table.eid, mp->eid, sizeof (eid_table.eid));
- vec_add1 (vam->eid_tables, eid_table);
+ vat_json_init_object (node);
+ if (~0 == mp->locator_set_index)
+ vat_json_object_add_uint (node, "action", mp->action);
+ else
+ vat_json_object_add_uint (node, "locator_set_index",
+ clib_net_to_host_u32 (mp->locator_set_index));
+
+ vat_json_object_add_uint (node, "is_local", mp->is_local ? 1 : 0);
+ eid = format (0, "%U", format_lisp_eid_vat,
+ mp->eid_type,
+ mp->eid,
+ mp->eid_prefix_len,
+ mp->seid, mp->seid_prefix_len, mp->is_src_dst);
+ vec_add1 (eid, 0);
+ vat_json_object_add_string_copy (node, "eid", 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));
+ vec_free (eid);
}
static void
_(modify_vhost_user_if_reply) \
_(delete_vhost_user_if_reply) \
_(want_ip4_arp_events_reply) \
+_(want_ip6_nd_events_reply) \
_(input_acl_set_interface_reply) \
_(ipsec_spd_add_del_reply) \
_(ipsec_interface_add_del_spd_reply) \
_(cop_interface_enable_disable_reply) \
_(cop_whitelist_enable_disable_reply) \
_(sw_interface_clear_stats_reply) \
-_(trace_profile_add_reply) \
-_(trace_profile_apply_reply) \
-_(trace_profile_del_reply) \
+_(ioam_enable_reply) \
+_(ioam_disable_reply) \
_(lisp_add_del_locator_reply) \
_(lisp_add_del_local_eid_reply) \
_(lisp_add_del_remote_mapping_reply) \
_(policer_classify_set_interface_reply) \
_(netmap_create_reply) \
_(netmap_delete_reply) \
-_(ipfix_enable_reply) \
+_(set_ipfix_exporter_reply) \
+_(set_ipfix_classify_stream_reply) \
+_(ipfix_classify_table_add_del_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)
+_(ip_source_and_port_range_check_interface_add_del_reply)\
+_(delete_subif_reply)
#define _(n) \
static void vl_api_##n##_t_handler \
_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \
_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply) \
_(CONTROL_PING_REPLY, control_ping_reply) \
-_(NOPRINT_CONTROL_PING_REPLY, noprint_control_ping_reply) \
_(CLI_REPLY, cli_reply) \
+_(CLI_INBAND_REPLY, cli_inband_reply) \
_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \
sw_interface_add_del_address_reply) \
_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \
_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \
_(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply) \
_(IP4_ARP_EVENT, ip4_arp_event) \
+_(WANT_IP6_ND_EVENTS_REPLY, want_ip6_nd_events_reply) \
+_(IP6_ND_EVENT, ip6_nd_event) \
_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply) \
_(IP_ADDRESS_DETAILS, ip_address_details) \
_(IP_DETAILS, ip_details) \
_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \
_(GET_NODE_GRAPH_REPLY, get_node_graph_reply) \
_(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply) \
-_(TRACE_PROFILE_ADD_REPLY, trace_profile_add_reply) \
-_(TRACE_PROFILE_APPLY_REPLY, trace_profile_apply_reply) \
-_(TRACE_PROFILE_DEL_REPLY, trace_profile_del_reply) \
+_(IOAM_ENABLE_REPLY, ioam_enable_reply) \
+_(IOAM_DISABLE_REPLY, ioam_disable_reply) \
_(LISP_ADD_DEL_LOCATOR_SET_REPLY, lisp_add_del_locator_set_reply) \
_(LISP_ADD_DEL_LOCATOR_REPLY, lisp_add_del_locator_reply) \
_(LISP_ADD_DEL_LOCAL_EID_REPLY, lisp_add_del_local_eid_reply) \
_(CLASSIFY_TABLE_BY_INTERFACE_REPLY, classify_table_by_interface_reply) \
_(CLASSIFY_TABLE_INFO_REPLY, classify_table_info_reply) \
_(CLASSIFY_SESSION_DETAILS, classify_session_details) \
-_(IPFIX_ENABLE_REPLY, ipfix_enable_reply) \
-_(IPFIX_DETAILS, ipfix_details) \
+_(SET_IPFIX_EXPORTER_REPLY, set_ipfix_exporter_reply) \
+_(IPFIX_EXPORTER_DETAILS, ipfix_exporter_details) \
+_(SET_IPFIX_CLASSIFY_STREAM_REPLY, set_ipfix_classify_stream_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) \
_(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, \
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)
+_(IPSEC_GRE_TUNNEL_DETAILS, ipsec_gre_tunnel_details) \
+_(DELETE_SUBIF_REPLY, delete_subif_reply)
/* M: construct, but don't yet send a message */
return -99; \
} while(0);
-/* W_L: wait for results, with timeout */
-#define W_L(body) \
-do { \
- timeout = vat_time_now (vam) + 1.0; \
- \
- while (vat_time_now (vam) < timeout) { \
- if (vam->result_ready == 1) { \
- (body); \
- return (vam->retval); \
- } \
- } \
- vam->noprint_msg = 0; \
- return -99; \
-} while(0);
-
typedef struct
{
u8 *name;
return -99;
}
+/*
+ * Future replacement of exec() that passes CLI buffers directly in
+ * the API messages instead of an additional shared memory area.
+ */
+static int
+exec_inband (vat_main_t * vam)
+{
+ vl_api_cli_inband_t *mp;
+ f64 timeout;
+ unformat_input_t *i = vam->input;
+
+ if (vec_len (i->buffer) == 0)
+ return -1;
+
+ if (vam->exec_mode == 0 && unformat (i, "mode"))
+ {
+ vam->exec_mode = 1;
+ return 0;
+ }
+ if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit")))
+ {
+ vam->exec_mode = 0;
+ return 0;
+ }
+
+ /*
+ * In order for the CLI command to work, it
+ * must be a vector ending in \n, not a C-string ending
+ * in \n\0.
+ */
+ u32 len = vec_len (vam->input->buffer);
+ M2 (CLI_INBAND, cli_inband, len);
+ clib_memcpy (mp->cmd, vam->input->buffer, len);
+ mp->length = htonl (len);
+
+ S;
+ W2 (fformat (vam->ofp, "%s", vam->cmd_reply));
+}
+
static int
api_create_loopback (vat_main_t * vam)
{
strncpy ((char *) mp->name_filter, "gre", sizeof (mp->name_filter) - 1);
S;
+ /* and LISP-GPE interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "lisp_gpe",
+ sizeof (mp->name_filter) - 1);
+ S;
+
+ /* and IPSEC tunnel interfaces */
+ M (SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "ipsec", sizeof (mp->name_filter) - 1);
+ S;
+
/* Use a control ping for synchronization */
{
vl_api_control_ping_t *mp;
}
static int
-api_trace_profile_add (vat_main_t * vam)
+api_ioam_enable (vat_main_t * vam)
{
unformat_input_t *input = vam->input;
- vl_api_trace_profile_add_t *mp;
+ vl_api_ioam_enable_t *mp;
f64 timeout;
u32 id = 0;
- u32 trace_option_elts = 0;
- u32 trace_type = 0, node_id = 0, app_data = 0, trace_tsp = 2;
+ int has_trace_option = 0;
int has_pow_option = 0;
int has_ppc_option = 0;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "id %d trace-type 0x%x trace-elts %d "
- "trace-tsp %d node-id 0x%x app-data 0x%x",
- &id, &trace_type, &trace_option_elts, &trace_tsp,
- &node_id, &app_data))
- ;
+ if (unformat (input, "trace"))
+ has_trace_option = 1;
else if (unformat (input, "pow"))
has_pow_option = 1;
else if (unformat (input, "ppc encap"))
else
break;
}
- M (TRACE_PROFILE_ADD, trace_profile_add);
+ M (IOAM_ENABLE, ioam_enable);
mp->id = htons (id);
- mp->trace_type = trace_type;
- mp->trace_num_elt = trace_option_elts;
mp->trace_ppc = has_ppc_option;
- mp->trace_app_data = htonl (app_data);
mp->pow_enable = has_pow_option;
- mp->trace_tsp = trace_tsp;
- mp->node_id = htonl (node_id);
+ mp->trace_enable = has_trace_option;
S;
W;
}
-static int
-api_trace_profile_apply (vat_main_t * vam)
-{
- unformat_input_t *input = vam->input;
- vl_api_trace_profile_apply_t *mp;
- f64 timeout;
- ip6_address_t addr;
- u32 mask_width = ~0;
- int is_add = 0;
- int is_pop = 0;
- int is_none = 0;
- u32 vrf_id = 0;
- u32 id = 0;
-
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "%U/%d", unformat_ip6_address, &addr, &mask_width))
- ;
- else if (unformat (input, "id %d", &id))
- ;
- else if (unformat (input, "vrf-id %d", &vrf_id))
- ;
- else if (unformat (input, "add"))
- is_add = 1;
- else if (unformat (input, "pop"))
- is_pop = 1;
- else if (unformat (input, "none"))
- is_none = 1;
- else
- break;
- }
-
- if ((is_add + is_pop + is_none) != 1)
- {
- errmsg ("One of (add, pop, none) required");
- return -99;
- }
- if (mask_width == ~0)
- {
- errmsg ("<address>/<mask-width> required");
- return -99;
- }
- M (TRACE_PROFILE_APPLY, trace_profile_apply);
- clib_memcpy (mp->dest_ipv6, &addr, sizeof (mp->dest_ipv6));
- mp->id = htons (id);
- mp->prefix_length = htonl (mask_width);
- mp->vrf_id = htonl (vrf_id);
- if (is_add)
- mp->trace_op = IOAM_HBYH_ADD;
- else if (is_pop)
- mp->trace_op = IOAM_HBYH_POP;
- else
- mp->trace_op = IOAM_HBYH_MOD;
-
- if (is_none)
- mp->enable = 0;
- else
- mp->enable = 1;
-
- S;
- W;
-
- return 0;
-}
static int
-api_trace_profile_del (vat_main_t * vam)
+api_ioam_disable (vat_main_t * vam)
{
- vl_api_trace_profile_del_t *mp;
+ vl_api_ioam_disable_t *mp;
f64 timeout;
- M (TRACE_PROFILE_DEL, trace_profile_del);
+ M (IOAM_DISABLE, ioam_disable);
S;
W;
return 0;
u32 tmp;
#define _(n,N) \
- if (unformat (input, #n)) { next_index = L2_CLASSIFY_NEXT_##N; goto out;}
+ if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;}
foreach_l2_next;
#undef _
u32 ip4_table_index = ~0;
u32 ip6_table_index = ~0;
u32 other_table_index = ~0;
+ u32 is_input = 1;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
;
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);
mp->ip4_table_index = ntohl (ip4_table_index);
mp->ip6_table_index = ntohl (ip6_table_index);
mp->other_table_index = ntohl (other_table_index);
-
+ mp->is_input = (u8) is_input;
S;
W;
}
static int
-api_ipfix_enable (vat_main_t * vam)
+api_set_ipfix_exporter (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_ipfix_enable_t *mp;
+ vl_api_set_ipfix_exporter_t *mp;
ip4_address_t collector_address;
u8 collector_address_set = 0;
u32 collector_port = ~0;
u32 vrf_id = ~0;
u32 path_mtu = ~0;
u32 template_interval = ~0;
+ u8 udp_checksum = 0;
f64 timeout;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
;
else if (unformat (i, "template_interval %d", &template_interval))
;
+ else if (unformat (i, "udp_checksum"))
+ udp_checksum = 1;
else
break;
}
return -99;
}
- M (IPFIX_ENABLE, ipfix_enable);
+ M (SET_IPFIX_EXPORTER, set_ipfix_exporter);
memcpy (mp->collector_address, collector_address.data,
sizeof (collector_address.data));
mp->vrf_id = htonl (vrf_id);
mp->path_mtu = htonl (path_mtu);
mp->template_interval = htonl (template_interval);
+ mp->udp_checksum = udp_checksum;
S;
W;
}
static int
-api_get_node_index (vat_main_t * vam)
+api_set_ipfix_classify_stream (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- vl_api_get_node_index_t *mp;
+ vl_api_set_ipfix_classify_stream_t *mp;
+ u32 domain_id = 0;
+ u32 src_port = UDP_DST_PORT_ipfix;
f64 timeout;
- u8 *name = 0;
while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (i, "node %s", &name))
+ if (unformat (i, "domain %d", &domain_id))
+ ;
+ else if (unformat (i, "src_port %d", &src_port))
;
else
- break;
+ {
+ errmsg ("unknown input `%U'", format_unformat_error, i);
+ return -99;
+ }
}
- if (name == 0)
+
+ M (SET_IPFIX_CLASSIFY_STREAM, set_ipfix_classify_stream);
+
+ mp->domain_id = htonl (domain_id);
+ mp->src_port = htons ((u16) src_port);
+
+ S;
+ W;
+ /* NOTREACHED */
+}
+
+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;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "add"))
+ is_add = 1;
+ else if (unformat (i, "del"))
+ is_add = 0;
+ else if (unformat (i, "table %d", &classify_table_index))
+ ;
+ else if (unformat (i, "ip4"))
+ ip_version = 4;
+ else if (unformat (i, "ip6"))
+ ip_version = 6;
+ else if (unformat (i, "tcp"))
+ transport_protocol = 6;
+ else if (unformat (i, "udp"))
+ transport_protocol = 17;
+ else
+ {
+ errmsg ("unknown input `%U'", format_unformat_error, i);
+ return -99;
+ }
+ }
+
+ if (is_add == -1)
+ {
+ errmsg ("expecting: add|del");
+ return -99;
+ }
+ if (classify_table_index == ~0)
+ {
+ errmsg ("classifier table not specified");
+ return -99;
+ }
+ if (ip_version == 0)
+ {
+ errmsg ("IP version not specified");
+ return -99;
+ }
+
+ M (IPFIX_CLASSIFY_TABLE_ADD_DEL, 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 (unformat (i, "node %s", &name))
+ ;
+ else
+ break;
+ }
+ if (name == 0)
{
errmsg ("node name required\n");
return -99;
W;
}
+static int
+api_want_ip6_nd_events (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ vl_api_want_ip6_nd_events_t *mp;
+ f64 timeout;
+ ip6_address_t address;
+ int address_set = 0;
+ u32 enable_disable = 1;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "address %U", unformat_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;
+}
+
static int
api_input_acl_set_interface (vat_main_t * vam)
{
vec_len (locator_set_name));
vec_free (locator_set_name);
- mp->locator_num = vec_len (locators);
+ mp->locator_num = clib_host_to_net_u32 (vec_len (locators));
if (locators)
clib_memcpy (mp->locators, locators,
(sizeof (ls_locator_t) * vec_len (locators)));
return -99;
}
+ if (vrf_set && bd_index_set)
+ {
+ errmsg ("error: both vrf and bd entered!");
+ return -99;
+ }
+
M (LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map);
mp->is_add = is_add;
mp->vni = htonl (vni);
- mp->dp_table = htonl (vrf);
+ mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index);
mp->is_l2 = bd_index_set;
/* send */
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
*
vl_api_lisp_add_del_remote_mapping_t *mp;
f64 timeout = ~0;
u32 vni = 0;
- //TODO: seid need remove
lisp_eid_vat_t _eid, *eid = &_eid;
lisp_eid_vat_t _seid, *seid = &_seid;
- u8 is_add = 1, del_all = 0, eid_set = 0;
+ u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0;
u32 action = ~0, p, w;
ip4_address_t rloc4;
ip6_address_t rloc6;
{
is_add = 1;
}
- else if (unformat (input, "deid %U", unformat_lisp_eid_vat, eid))
+ 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))
+ else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid))
{
- //TODO: Need remove, but first must be remove from CSIT test
+ seid_set = 1;
}
else if (unformat (input, "vni %d", &vni))
{
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))
{
;
}
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);
- mp->rloc_num = vec_len (rlocs);
+ mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs));
clib_memcpy (mp->rlocs, rlocs, (sizeof (rloc_t) * vec_len (rlocs)));
vec_free (rlocs);
}
static int
-lisp_locator_dump_send_msg (vat_main_t * vam, u32 locator_set_index,
- u8 filter)
+api_lisp_locator_dump (vat_main_t * vam)
{
+ unformat_input_t *input = vam->input;
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;
- M (LISP_LOCATOR_DUMP, lisp_locator_dump);
-
- mp->locator_set_index = htonl (locator_set_index);
- mp->filter = filter;
-
- /* send it... */
- S;
-
- /* Use a control ping for synchronization */
- {
- vl_api_noprint_control_ping_t *mp;
- M (NOPRINT_CONTROL_PING, noprint_control_ping);
- S;
- }
- /* Wait for a reply... */
- W;
-}
-
-static inline void
-clean_locator_set_message (vat_main_t * vam)
-{
- locator_set_msg_t *ls = 0;
-
- vec_foreach (ls, vam->locator_set_msg)
- {
- vec_free (ls->locator_set_name);
- }
-
- vec_free (vam->locator_set_msg);
-}
-
-static int
-print_locator_in_locator_set (vat_main_t * vam, u8 filter)
-{
- locator_set_msg_t *ls;
- locator_msg_t *loc;
- u8 *tmp_str = 0;
- int i = 0, ret = 0;
-
- vec_foreach (ls, vam->locator_set_msg)
- {
- ret = lisp_locator_dump_send_msg (vam, ls->locator_set_index, filter);
- if (ret)
- {
- vec_free (vam->locator_msg);
- clean_locator_set_message (vam);
- return ret;
- }
-
- tmp_str = format (0, "%=20s%=16d%s", ls->locator_set_name,
- ls->locator_set_index,
- vec_len (vam->locator_msg) ? "" : "\n");
- i = 0;
- vec_foreach (loc, vam->locator_msg)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (i)
+ if (unformat (input, "ls_name %_%v%_", &ls_name))
{
- tmp_str = format (tmp_str, "%=37s", " ");
+ is_name_set = 1;
}
- if (loc->local)
+ else if (unformat (input, "ls_index %d", &ls_index))
{
- tmp_str = format (tmp_str, "%=16d%=16d%=16d\n",
- loc->sw_if_index, loc->priority, loc->weight);
+ is_index_set = 1;
}
else
{
- tmp_str = format (tmp_str, "%=16U%=16d%=16d\n",
- loc->is_ipv6 ? format_ip6_address :
- format_ip4_address,
- loc->ip_address, loc->priority, loc->weight);
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
}
- i++;
}
- fformat (vam->ofp, "%s", tmp_str);
- vec_free (tmp_str);
- vec_free (vam->locator_msg);
- }
-
- clean_locator_set_message (vam);
-
- return ret;
-}
-
-static int
-json_locator_in_locator_set (vat_main_t * vam, u8 filter)
-{
- locator_set_msg_t *ls;
- locator_msg_t *loc;
- vat_json_node_t *node = NULL;
- vat_json_node_t *locator_array;
- vat_json_node_t *locator;
- struct in6_addr ip6;
- struct in_addr ip4;
- int ret = 0;
-
- if (!vec_len (vam->locator_set_msg))
+ if (!is_index_set && !is_name_set)
{
- /* just print [] */
- vat_json_init_array (&vam->json_tree);
- vat_json_print (vam->ofp, &vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
+ errmsg ("error: expected one of index or name!\n");
+ return -99;
}
- if (VAT_JSON_ARRAY != vam->json_tree.type)
+ if (is_index_set && is_name_set)
{
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
+ errmsg ("error: only one param expected!\n");
+ return -99;
}
- vec_foreach (ls, vam->locator_set_msg)
- {
- ret = lisp_locator_dump_send_msg (vam, ls->locator_set_index, filter);
- if (ret)
- {
- vec_free (ls->locator_set_name);
- vec_free (vam->locator_msg);
- vec_free (vam->locator_set_msg);
- vat_json_free (&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
-
- node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object (node);
-
- vat_json_object_add_uint (node, "locator-set-index",
- ls->locator_set_index);
- vat_json_object_add_string_copy (node, "locator-set",
- ls->locator_set_name);
- locator_array = vat_json_object_add_list (node, "locator");
- vec_foreach (loc, vam->locator_msg)
+ if (!vam->json_output)
{
- locator = vat_json_array_add (locator_array);
- vat_json_init_object (locator);
- if (loc->local)
- {
- vat_json_object_add_uint (locator, "locator-index",
- loc->sw_if_index);
- }
- else
- {
- if (loc->is_ipv6)
- {
- clib_memcpy (&ip6, loc->ip_address, sizeof (ip6));
- vat_json_object_add_ip6 (locator, "locator", ip6);
- }
- else
- {
- clib_memcpy (&ip4, loc->ip_address, sizeof (ip4));
- vat_json_object_add_ip4 (locator, "locator", ip4);
- }
- }
- vat_json_object_add_uint (locator, "priority", loc->priority);
- vat_json_object_add_uint (locator, "weight", loc->weight);
+ fformat (vam->ofp, "%=16s%=16s%=16s\n", "locator", "priority",
+ "weight");
}
- vec_free (ls->locator_set_name);
- vec_free (vam->locator_msg);
- }
-
- vat_json_print (vam->ofp, &vam->json_tree);
- vat_json_free (&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
-
- vec_free (vam->locator_set_msg);
-
- return ret;
-}
-
-static int
-get_locator_set_index_from_msg (vat_main_t * vam, u8 * locator_set,
- u32 * locator_set_index)
-{
- locator_set_msg_t *ls;
- int ret = 0;
-
- *locator_set_index = ~0;
+ M (LISP_LOCATOR_DUMP, lisp_locator_dump);
+ mp->is_index_set = is_index_set;
- if (!vec_len (vam->locator_set_msg))
+ if (is_index_set)
+ mp->ls_index = clib_host_to_net_u32 (ls_index);
+ else
{
- return ret;
+ vec_add1 (ls_name, 0);
+ strcpy ((char *) mp->ls_name, (char *) ls_name);
}
- vec_foreach (ls, vam->locator_set_msg)
- {
- if (!strcmp ((char *) locator_set, (char *) ls->locator_set_name))
- {
- *locator_set_index = ls->locator_set_index;
- vec_free (vam->locator_set_msg);
- return ret;
- }
- }
-
- vec_free (vam->locator_set_msg);
-
- return ret;
-}
-
-static int
-get_locator_set_index (vat_main_t * vam, u8 * locator_set,
- u32 * locator_set_index)
-{
- vl_api_lisp_locator_set_dump_t *mp;
- f64 timeout = ~0;
-
- M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
/* send it... */
S;
/* Use a control ping for synchronization */
{
- vl_api_noprint_control_ping_t *mp;
- M (NOPRINT_CONTROL_PING, noprint_control_ping);
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
S;
}
-
- vam->noprint_msg = 1;
/* Wait for a reply... */
- /* *INDENT-OFF* */
- W_L
- ({
- get_locator_set_index_from_msg (vam, locator_set, locator_set_index);
- vam->noprint_msg = 0;
- });
- /* *INDENT-ON* */
+ W;
/* NOTREACHED */
return 0;
}
-static inline int
-lisp_locator_dump (vat_main_t * vam, u32 locator_set_index, u8 * locator_set,
- u8 filter)
-{
- int ret = 0;
-
- ASSERT (vam);
-
- if (!vam->json_output)
- {
- fformat (vam->ofp, "%=20s%=16s%=16s\n",
- "locator", "priority", "weight");
- }
-
- if (locator_set)
- {
- ret = get_locator_set_index (vam, locator_set, &locator_set_index);
- }
-
- if (!ret && ~0 == locator_set_index)
- {
- return -99;
- }
-
- ret = lisp_locator_dump_send_msg (vam, locator_set_index, filter);
-
- return ret;
-}
-
static int
-lisp_locator_set_dump (vat_main_t * vam, u8 filter)
+api_lisp_locator_set_dump (vat_main_t * vam)
{
vl_api_lisp_locator_set_dump_t *mp;
+ unformat_input_t *input = vam->input;
f64 timeout = ~0;
+ u8 filter = 0;
- if (!vam->json_output)
+ /* Parse args required to build the message */
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- fformat (vam->ofp, "%=20s%=16s%=16s%=16s%=16s\n",
- "locator-set", "locator-set-index", "locator", "priority",
- "weight");
+ if (unformat (input, "local"))
+ {
+ filter = 1;
+ }
+ else if (unformat (input, "remote"))
+ {
+ filter = 2;
+ }
+ else
+ {
+ errmsg ("parse error '%U'", format_unformat_error, input);
+ return -99;
+ }
}
- vam->noprint_msg = 1;
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%=10s%=15s\n", "ls_index", "ls_name");
+ }
M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
/* Use a control ping for synchronization */
{
- vl_api_noprint_control_ping_t *mp;
- M (NOPRINT_CONTROL_PING, noprint_control_ping);
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
S;
}
-
/* Wait for a reply... */
- /* *INDENT-OFF* */
- W_L
- ({
- if (vam->noprint_msg)
- {
- if (!vam->json_output)
- {
- print_locator_in_locator_set(vam, filter);
- }
- else
- {
- json_locator_in_locator_set(vam, filter);
- }
- }
- vam->noprint_msg = 0;
- });
- /* *INDENT-ON* */
+ W;
/* NOTREACHED */
return 0;
}
-static int
-api_lisp_locator_set_dump (vat_main_t * vam)
-{
- unformat_input_t *input = vam->input;
- vam->noprint_msg = 0;
- u32 locator_set_index = ~0;
- u8 locator_set_index_set = 0;
- u8 *locator_set = 0;
- u8 locator_set_set = 0;
- u8 filter = 0;
- int ret = 0;
-
- /* Parse args required to build the message */
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "locator-set-index %u", &locator_set_index))
- {
- locator_set_index_set = 1;
- }
- else if (unformat (input, "locator-set %s", &locator_set))
- {
- locator_set_set = 1;
- }
- else if (unformat (input, "local"))
- {
- filter = 1;
- }
- else if (unformat (input, "remote"))
- {
- filter = 2;
- }
- else
- {
- break;
- }
- }
-
- if (locator_set_index_set && locator_set_set)
- {
- errmsg ("use only input parameter!\n");
- return -99;
- }
-
- if (locator_set_index_set || locator_set_set)
- {
- ret = lisp_locator_dump (vam, locator_set_index, locator_set, filter);
- }
- else
- {
- ret = lisp_locator_set_dump (vam, filter);
- }
-
- vec_free (locator_set);
-
- return ret;
-}
-
static int
api_lisp_eid_table_map_dump (vat_main_t * vam)
{
return 0;
}
-static int
-get_locator_set (vat_main_t * vam)
-{
- vl_api_lisp_locator_set_dump_t *mp;
- f64 timeout = ~0;
-
- M (LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump);
- /* send it... */
- S;
-
- /* Use a control ping for synchronization */
- {
- vl_api_noprint_control_ping_t *mp;
- M (NOPRINT_CONTROL_PING, noprint_control_ping);
- S;
- }
-
- /* Wait for a reply... */
- W;
-
- /* NOTREACHED */
- return 0;
-}
-
-static inline u8 *
-format_eid_for_eid_table (vat_main_t * vam, u8 * str, eid_table_t * eid_table,
- int *ret)
-{
- u8 *(*format_eid) (u8 *, va_list *) = 0;
-
- ASSERT (vam != NULL);
- ASSERT (eid_table != NULL);
-
- if (ret)
- {
- *ret = 0;
- }
-
- switch (eid_table->eid_type)
- {
- case 0:
- case 1:
- format_eid = (eid_table->eid_type ? format_ip6_address :
- format_ip4_address);
- str = format (0, "[%d] %U/%d",
- clib_net_to_host_u32 (eid_table->vni),
- format_eid, eid_table->eid, eid_table->eid_prefix_len);
- break;
- case 2:
- str = format (0, "[%d] %U",
- clib_net_to_host_u32 (eid_table->vni),
- format_ethernet_address, eid_table->eid);
- break;
- default:
- errmsg ("unknown EID type %d!", eid_table->eid_type);
- if (ret)
- {
- *ret = -99;
- }
- return 0;
- }
-
- return str;
-}
-
-static inline u8 *
-format_locator_set_for_eid_table (vat_main_t * vam, u8 * str,
- eid_table_t * eid_table)
-{
- locator_set_msg_t *ls = 0;
-
- ASSERT (vam != NULL);
- ASSERT (eid_table != NULL);
-
- if (eid_table->is_local)
- {
- vec_foreach (ls, vam->locator_set_msg)
- {
- if (ls->locator_set_index == eid_table->locator_set_index)
- {
- str = format (0, "local(%s)", ls->locator_set_name);
- return str;
- }
- }
-
- str = format (0, "local(N/A)");
- }
- else
- {
- str = format (0, "remote");
- }
-
- return str;
-}
-
-static inline u8 *
-format_locator_for_eid_table (vat_main_t * vam, u8 * str,
- eid_table_t * eid_table)
-{
- locator_msg_t *loc = 0;
- int first_line = 1;
-
- ASSERT (vam != NULL);
- ASSERT (eid_table != NULL);
-
- vec_foreach (loc, vam->locator_msg)
- {
- if (!first_line)
- {
- if (loc->local)
- {
- str = format (str, "%-55s%-d\n", " ", loc->sw_if_index);
- }
- else
- {
- str = format (str, "%=55s%-U\n", " ",
- loc->is_ipv6 ? format_ip6_address :
- format_ip4_address, loc->ip_address);
- }
-
- continue;
- }
-
- if (loc->local)
- {
- str = format (str, "%-30d%-20u%-u\n", loc->sw_if_index,
- eid_table->ttl, eid_table->authoritative);
- }
- else
- {
- str = format (str, "%-30U%-20u%-u\n",
- loc->is_ipv6 ? format_ip6_address :
- format_ip4_address,
- loc->ip_address, eid_table->ttl,
- eid_table->authoritative);
- }
- first_line = 0;
- }
-
- return str;
-}
-
-static int
-print_lisp_eid_table_dump (vat_main_t * vam)
-{
- eid_table_t *eid_table = 0;
- u8 *tmp_str = 0, *tmp_str2 = 0;
- int ret = 0;
-
- ASSERT (vam != NULL);
-
- ret = get_locator_set (vam);
- if (ret)
- {
- vec_free (vam->eid_tables);
- return ret;
- }
-
- fformat (vam->ofp, "%-35s%-20s%-30s%-20s%-s\n", "EID", "type", "locators",
- "ttl", "authoritative");
-
- vec_foreach (eid_table, vam->eid_tables)
- {
- ret = lisp_locator_dump_send_msg (vam, eid_table->locator_set_index, 0);
- if (ret)
- {
- vec_free (vam->locator_msg);
- clean_locator_set_message (vam);
- vec_free (vam->eid_tables);
- return ret;
- }
-
- tmp_str2 = format_eid_for_eid_table (vam, tmp_str2, eid_table, &ret);
- if (ret)
- {
- vec_free (vam->locator_msg);
- clean_locator_set_message (vam);
- vec_free (vam->eid_tables);
- return ret;
- }
-
- tmp_str = format (0, "%-35s", tmp_str2);
- vec_free (tmp_str2);
-
- tmp_str2 = format_locator_set_for_eid_table (vam, tmp_str2, eid_table);
- tmp_str = format (tmp_str, "%-20s", tmp_str2);
- vec_free (tmp_str2);
-
- tmp_str2 = format_locator_for_eid_table (vam, tmp_str2, eid_table);
- tmp_str = format (tmp_str, "%-s", tmp_str2);
- vec_free (tmp_str2);
-
- fformat (vam->ofp, "%s", tmp_str);
- vec_free (tmp_str);
- vec_free (vam->locator_msg);
- }
-
- clean_locator_set_message (vam);
- vec_free (vam->eid_tables);
-
- return ret;
-}
-
-static inline void
-json_locator_set_for_eid_table (vat_main_t * vam, vat_json_node_t * node,
- eid_table_t * eid_table)
-{
- locator_set_msg_t *ls = 0;
- u8 *s = 0;
-
- ASSERT (vam != NULL);
- ASSERT (node != NULL);
- ASSERT (eid_table != NULL);
-
- if (eid_table->is_local)
- {
- vec_foreach (ls, vam->locator_set_msg)
- {
- if (ls->locator_set_index == eid_table->locator_set_index)
- {
- vat_json_object_add_string_copy (node, "locator-set",
- ls->locator_set_name);
- return;
- }
- }
-
- s = format (0, "N/A");
- vec_add1 (s, 0);
- vat_json_object_add_string_copy (node, "locator-set", s);
- vec_free (s);
- }
- else
- {
- s = format (0, "remote");
- vec_add1 (s, 0);
- vat_json_object_add_string_copy (node, "locator-set", s);
- vec_free (s);
- }
-}
-
-static inline int
-json_eid_for_eid_table (vat_main_t * vam, vat_json_node_t * node,
- eid_table_t * eid_table)
-{
- u8 *s = 0;
- struct in6_addr ip6;
- struct in_addr ip4;
-
- ASSERT (vam != NULL);
- ASSERT (node != NULL);
- ASSERT (eid_table != NULL);
-
- switch (eid_table->eid_type)
- {
- case 0:
- clib_memcpy (&ip4, eid_table->eid, sizeof (ip4));
- vat_json_object_add_ip4 (node, "eid", ip4);
- vat_json_object_add_uint (node, "eid-prefix-len",
- eid_table->eid_prefix_len);
- break;
- case 1:
- clib_memcpy (&ip6, eid_table->eid, sizeof (ip6));
- vat_json_object_add_ip6 (node, "eid", ip6);
- vat_json_object_add_uint (node, "eid-prefix-len",
- eid_table->eid_prefix_len);
- break;
- case 2:
- s = format (0, "%U", format_ethernet_address, eid_table->eid);
- vec_add1 (s, 0);
- vat_json_object_add_string_copy (node, "eid", s);
- vec_free (s);
- break;
- default:
- errmsg ("unknown EID type %d!", eid_table->eid_type);
- return -99;
- }
-
- return 0;
-}
-
-static inline void
-json_locator_for_eid_table (vat_main_t * vam, vat_json_node_t * node,
- eid_table_t * eid_table)
-{
- locator_msg_t *loc = 0;
- vat_json_node_t *locator_array = 0;
- vat_json_node_t *locator = 0;
- struct in6_addr ip6;
- struct in_addr ip4;
-
- ASSERT (vam != NULL);
- ASSERT (node != NULL);
- ASSERT (eid_table != NULL);
-
- locator_array = vat_json_object_add_list (node, "locator");
- vec_foreach (loc, vam->locator_msg)
- {
- locator = vat_json_array_add (locator_array);
- vat_json_init_object (locator);
- if (loc->local)
- {
- vat_json_object_add_uint (locator, "locator-index", loc->sw_if_index);
- }
- else
- {
- if (loc->is_ipv6)
- {
- clib_memcpy (&ip6, loc->ip_address, sizeof (ip6));
- vat_json_object_add_ip6 (locator, "locator", ip6);
- }
- else
- {
- clib_memcpy (&ip4, loc->ip_address, sizeof (ip4));
- vat_json_object_add_ip4 (locator, "locator", ip4);
- }
- }
- }
-}
-
-static int
-json_lisp_eid_table_dump (vat_main_t * vam)
-{
- eid_table_t *eid_table;
- vat_json_node_t *node = 0;
- int ret = 0;
-
- ASSERT (vam != NULL);
-
- ret = get_locator_set (vam);
- if (ret)
- {
- vec_free (vam->eid_tables);
- return ret;
- }
-
- if (!vec_len (vam->eid_tables))
- {
- /* just print [] */
- vat_json_init_array (&vam->json_tree);
- vat_json_print (vam->ofp, &vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
-
- if (VAT_JSON_ARRAY != vam->json_tree.type)
- {
- ASSERT (VAT_JSON_NONE == vam->json_tree.type);
- vat_json_init_array (&vam->json_tree);
- }
-
- vec_foreach (eid_table, vam->eid_tables)
- {
- ret = lisp_locator_dump_send_msg (vam, eid_table->locator_set_index, 0);
- if (ret)
- {
- vec_free (vam->locator_msg);
- vec_free (vam->eid_tables);
- clean_locator_set_message (vam);
- vat_json_free (&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
-
- node = vat_json_array_add (&vam->json_tree);
- vat_json_init_object (node);
-
- vat_json_object_add_uint (node, "vni", eid_table->vni);
-
- json_locator_set_for_eid_table (vam, node, eid_table);
- ret = json_eid_for_eid_table (vam, node, eid_table);
- if (ret)
- {
- vec_free (vam->locator_msg);
- vec_free (vam->eid_tables);
- clean_locator_set_message (vam);
- vat_json_free (&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
- return ret;
- }
-
- json_locator_for_eid_table (vam, node, eid_table);
-
- vat_json_object_add_uint (node, "ttl", eid_table->ttl);
- vat_json_object_add_uint (node, "authoritative",
- eid_table->authoritative);
-
- vec_free (vam->locator_msg);
- }
-
- vat_json_print (vam->ofp, &vam->json_tree);
- vat_json_free (&vam->json_tree);
- vam->json_tree.type = VAT_JSON_NONE;
-
- clean_locator_set_message (vam);
- vec_free (vam->eid_tables);
-
- return ret;
-}
-
static int
api_lisp_eid_table_dump (vat_main_t * vam)
{
}
}
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%-35s%-20s%-30s%-20s%-s\n", "EID", "type",
+ "ls_index", "ttl", "authoritative");
+ }
+
M (LISP_EID_TABLE_DUMP, lisp_eid_table_dump);
mp->filter = filter;
}
}
- vam->noprint_msg = 1;
-
/* send it... */
S;
/* Use a control ping for synchronization */
{
- vl_api_noprint_control_ping_t *mp;
- M (NOPRINT_CONTROL_PING, noprint_control_ping);
+ vl_api_control_ping_t *mp;
+ M (CONTROL_PING, control_ping);
S;
}
/* Wait for a reply... */
- /* *INDENT-OFF* */
- W_L
- ({
- if (vam->noprint_msg)
- {
- if (!vam->json_output)
- {
- vam->retval = print_lisp_eid_table_dump(vam);
- }
- else
- {
- vam->retval = json_lisp_eid_table_dump(vam);
- }
- }
- vam->noprint_msg = 0;
- });
- /* *INDENT-ON* */
+ W;
/* NOTREACHED */
return 0;
}
static void
-vl_api_ipfix_details_t_handler (vl_api_ipfix_details_t * mp)
+vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_details_t * mp)
{
vat_main_t *vam = &vat_main;
fformat (vam->ofp, "collector_address %U, collector_port %d, "
- "src_address %U, fib_index %u, path_mtu %u, "
- "template_interval %u\n",
+ "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->fib_index),
- ntohl (mp->path_mtu), ntohl (mp->template_interval));
+ 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_ipfix_details_t_handler_json (vl_api_ipfix_details_t * mp)
+ 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;
ntohs (mp->collector_port));
clib_memcpy (&src_address, &mp->src_address, sizeof (src_address));
vat_json_object_add_ip4 (&node, "src_address", src_address);
- vat_json_object_add_uint (&node, "fib_index", ntohl (mp->fib_index));
+ vat_json_object_add_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_print (vam->ofp, &node);
vat_json_free (&node);
}
int
-api_ipfix_dump (vat_main_t * vam)
+api_ipfix_exporter_dump (vat_main_t * vam)
{
- vl_api_ipfix_dump_t *mp;
+ vl_api_ipfix_exporter_dump_t *mp;
f64 timeout;
/* Construct the API message */
- M (IPFIX_DUMP, ipfix_dump);
+ M (IPFIX_EXPORTER_DUMP, ipfix_exporter_dump);
mp->context = 0;
S;
return 0;
}
+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_ipfix_classify_stream_details_t_handler
+ (vl_api_ipfix_classify_stream_details_t * mp)
+{
+ 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;
+}
+
+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;
+
+ 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_print (vam->ofp, &node);
+ vat_json_free (&node);
+ vam->retval = 0;
+ vam->result_ready = 1;
+}
+
+static int
+api_ipfix_classify_table_dump (vat_main_t * vam)
+{
+ vl_api_ipfix_classify_table_dump_t *mp;
+ f64 timeout;
+
+ if (!vam->json_output)
+ {
+ fformat (vam->ofp, "%15s%15s%20s\n", "table_id", "ip_version",
+ "transport_protocol");
+ }
+
+ /* Construct the API message */
+ M (IPFIX_CLASSIFY_TABLE_DUMP, ipfix_classify_table_dump);
+
+ /* 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_ipfix_classify_table_details_t_handler
+ (vl_api_ipfix_classify_table_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);
+}
+
+static void
+ vl_api_ipfix_classify_table_details_t_handler_json
+ (vl_api_ipfix_classify_table_details_t * mp)
+{
+ vat_json_node_t *node = NULL;
+ vat_main_t *vam = &vat_main;
+
+ if (VAT_JSON_ARRAY != vam->json_tree.type)
+ {
+ ASSERT (VAT_JSON_NONE == vam->json_tree.type);
+ vat_json_init_array (&vam->json_tree);
+ }
+
+ node = vat_json_array_add (&vam->json_tree);
+ vat_json_init_object (node);
+
+ vat_json_object_add_uint (node, "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)
{
W;
}
+static int
+api_delete_subif (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_delete_subif_t *mp;
+ f64 timeout;
+ u32 sw_if_index = ~0;
+
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ ;
+ else
+ break;
+ }
+
+ if (sw_if_index == ~0)
+ {
+ errmsg ("missing sw_if_index\n");
+ return -99;
+ }
+
+ /* Construct the API message */
+ M (DELETE_SUBIF, delete_subif);
+ mp->sw_if_index = ntohl (sw_if_index);
+
+ S;
+ W;
+}
+
static int
q_or_quit (vat_main_t * vam)
{
"<intfc> | sw_if_index <nn> [ip4-table <nn>] [ip6-table <nn>]\n" \
" [l2-table <nn>] [del]") \
_(want_ip4_arp_events, "address <ip4-address> [del]") \
+_(want_ip6_nd_events, "address <ip6-address> [del]") \
_(ip_address_dump, "(ipv4 | ipv6) (<intfc> | sw_if_index <id>)") \
_(ip_dump, "ipv4 | ipv6") \
_(ipsec_spd_add_del, "spd_id <n> [del]") \
"fib-id <nn> [ip4][ip6][default]") \
_(get_node_graph, " ") \
_(sw_interface_clear_stats,"<intfc> | sw_if_index <nn>") \
-_(trace_profile_add, "id <nn> trace-type <0x1f|0x3|0x9|0x11|0x19> " \
- "trace-elts <nn> trace-tsp <0|1|2|3> node-id <node id in hex> " \
- "app-data <app_data in hex> [pow] [ppc <encap|decap>]") \
-_(trace_profile_apply, "id <nn> <ip6-address>/<width>" \
- " vrf_id <nn> add | pop | none") \
-_(trace_profile_del, "") \
+_(ioam_enable, "[trace] [pow] [ppc <encap|decap>]") \
+_(ioam_disable, "") \
_(lisp_add_del_locator_set, "locator-set <locator_name> [iface <intf> |"\
" sw_if_index <sw_if_index> p <priority> " \
"w <weight>] [del]") \
_(lisp_gpe_enable_disable, "enable|disable") \
_(lisp_enable_disable, "enable|disable") \
_(lisp_gpe_add_del_iface, "up|down") \
-_(lisp_add_del_remote_mapping, "add|del vni <vni> deid <dest-eid> " \
+_(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_pitr_set_locator_set, "locator-set <loc-set-name> | del") \
_(lisp_add_del_map_request_itr_rlocs, "<loc-set-name> [del]") \
_(lisp_eid_table_add_del_map, "[del] vni <vni> vrf <vrf>") \
-_(lisp_locator_set_dump, "[locator-set-index <ls-index> | " \
- "locator-set <loc-set-name>] [local | remote]")\
+_(lisp_locator_set_dump, "[local | remote]") \
+_(lisp_locator_dump, "ls_index <index> | ls_name <name>") \
_(lisp_eid_table_dump, "[eid <ipv4|ipv6>/<prefix> | <mac>] [vni] " \
"[local] | [remote]") \
_(lisp_eid_table_vni_dump, "") \
_(classify_table_by_interface, "sw_if_index <sw_if_index>") \
_(classify_table_info, "table_id <nn>") \
_(classify_session_dump, "table_id <nn>") \
-_(ipfix_enable, "collector_address <ip4> [collector_port <nn>] " \
- "src_address <ip4> [fib_id <nn>] [path_mtu <nn>] " \
- "[template_interval <nn>]") \
-_(ipfix_dump, "") \
+_(set_ipfix_exporter, "collector_address <ip4> [collector_port <nn>] " \
+ "src_address <ip4> [vrf_id <nn>] [path_mtu <nn>] " \
+ "[template_interval <nn>] [udp_checksum]") \
+_(ipfix_exporter_dump, "") \
+_(set_ipfix_classify_stream, "[domain <domain-id>] [src_port <src-port>]") \
+_(ipfix_classify_stream_dump, "") \
+_(ipfix_classify_table_add_del, "table <table-index> ip4|ip6 [tcp|udp]")\
+_(ipfix_classify_table_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]") \
"[udp-in-vrf <id>] [udp-out-vrf <id>]") \
_(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>]")
+_(ipsec_gre_tunnel_dump, "[sw_if_index <nn>]") \
+_(delete_subif,"sub_sw_if_index <nn> sub_if_id <nn>")
/* List of command functions, CLI names map directly to functions */
#define foreach_cli_function \
_(dump_node_table, "usage: dump_node_table") \
_(echo, "usage: echo <message>") \
_(exec, "usage: exec <vpe-debug-CLI-command>") \
+_(exec_inband, "usage: exec_inband <vpe-debug-CLI-command>") \
_(help, "usage: help") \
_(q, "usage: quit") \
_(quit, "usage: quit") \
Code Review / vpp.git / blobdiff