X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp-api-test%2Fvat%2Fapi_format.c;h=704237be225a3cdce65e3ec98ad1c560c07b6dd8;hb=b92feb6bd3f58c44be32eadfd683a1b2caac5607;hp=4283586e307926294ea2d85a5b67fc2b51e5367b;hpb=c07bf5d5032e2b3ed4a651c8e6b8ff2131bc79c6;p=vpp.git diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c index 4283586e307..704237be225 100644 --- a/vpp-api-test/vat/api_format.c +++ b/vpp-api-test/vat/api_format.c @@ -36,11 +36,13 @@ #include #if DPDK > 0 #include +#include #else #include #endif #include #include +#include #include "vat/json_format.h" @@ -326,6 +328,42 @@ format_ipsec_integ_alg (u8 * s, va_list * args) #endif } +uword +unformat_ikev2_auth_method (unformat_input_t * input, va_list * args) +{ +#if DPDK > 0 + u32 * r = va_arg (*args, u32 *); + + if (0) ; +#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_AUTH_METHOD_##f; + foreach_ikev2_auth_method +#undef _ + 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) ; +#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_ID_TYPE_##f; + foreach_ikev2_id_type +#undef _ + else + return 0; + return 1; +#else + return 0; +#endif +} + u8 * format_ip4_address (u8 * s, va_list * args) { u8 * a = va_arg (*args, u8 *); @@ -587,6 +625,7 @@ static void vl_api_sw_interface_details_t_handler_json vat_json_object_add_uint(node, "link_up_down", mp->link_up_down); vat_json_object_add_uint(node, "link_duplex", mp->link_duplex); vat_json_object_add_uint(node, "link_speed", mp->link_speed); + vat_json_object_add_uint(node, "mtu", ntohs(mp->link_mtu)); vat_json_object_add_uint(node, "sub_id", ntohl(mp->sub_id)); vat_json_object_add_uint(node, "sub_dot1ad", mp->sub_dot1ad); vat_json_object_add_uint(node, "sub_number_of_tags", mp->sub_number_of_tags); @@ -619,7 +658,7 @@ static void vl_api_sw_interface_set_flags_t_handler_json /* JSON output not supported */ } -static void vl_api_cli_reply_t_handler +static void vl_api_cli_reply_t_handler (vl_api_cli_reply_t * mp) { vat_main_t * vam = &vat_main; @@ -635,10 +674,23 @@ static void vl_api_cli_reply_t_handler_json { vat_main_t * vam = &vat_main; vat_json_node_t node; + api_main_t * am = &api_main; + void * oldheap; + u8 * reply; vat_json_init_object(&node); vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); - vat_json_object_add_uint(&node, "reply_in_shmem", ntohl(mp->reply_in_shmem)); + vat_json_object_add_uint(&node, "reply_in_shmem", + ntohl(mp->reply_in_shmem)); + /* Toss the shared-memory original... */ + pthread_mutex_lock (&am->vlib_rp->mutex); + oldheap = svm_push_data_heap (am->vlib_rp); + + reply = (u8 *)(mp->reply_in_shmem); + vec_free (reply); + + svm_pop_heap (oldheap); + pthread_mutex_unlock (&am->vlib_rp->mutex); vat_json_print(vam->ofp, &node); vat_json_free(&node); @@ -1723,6 +1775,306 @@ static void vl_api_get_first_msg_id_reply_t_handler_json vam->result_ready = 1; } +static void vl_api_get_node_graph_reply_t_handler +(vl_api_get_node_graph_reply_t * mp) +{ + vat_main_t * vam = &vat_main; + api_main_t * am = &api_main; + i32 retval = ntohl(mp->retval); + u8 * pvt_copy, * reply; + void * oldheap; + vlib_node_t * node; + int i; + + if (vam->async_mode) { + vam->async_errors += (retval < 0); + } else { + vam->retval = retval; + vam->result_ready = 1; + } + + /* "Should never happen..." */ + if (retval != 0) + return; + + reply = (u8 *)(mp->reply_in_shmem); + pvt_copy = vec_dup (reply); + + /* Toss the shared-memory original... */ + pthread_mutex_lock (&am->vlib_rp->mutex); + oldheap = svm_push_data_heap (am->vlib_rp); + + vec_free (reply); + + svm_pop_heap (oldheap); + pthread_mutex_unlock (&am->vlib_rp->mutex); + + if (vam->graph_nodes) { + hash_free (vam->graph_node_index_by_name); + + for (i = 0; i < vec_len (vam->graph_nodes); i++) { + node = vam->graph_nodes[i]; + vec_free (node->name); + vec_free (node->next_nodes); + vec_free (node); + } + vec_free(vam->graph_nodes); + } + + vam->graph_node_index_by_name = hash_create_string (0, sizeof(uword)); + vam->graph_nodes = vlib_node_unserialize (pvt_copy); + vec_free (pvt_copy); + + for (i = 0; i < vec_len (vam->graph_nodes); i++) { + node = vam->graph_nodes[i]; + hash_set_mem (vam->graph_node_index_by_name, node->name, i); + } +} + +static void vl_api_get_node_graph_reply_t_handler_json +(vl_api_get_node_graph_reply_t * mp) +{ + vat_main_t * vam = &vat_main; + api_main_t * am = &api_main; + void * oldheap; + vat_json_node_t node; + u8 * reply; + + /* $$$$ make this real? */ + vat_json_init_object(&node); + vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); + vat_json_object_add_uint(&node, "reply_in_shmem", mp->reply_in_shmem); + + reply = (u8 *)(mp->reply_in_shmem); + + /* Toss the shared-memory original... */ + pthread_mutex_lock (&am->vlib_rp->mutex); + oldheap = svm_push_data_heap (am->vlib_rp); + + vec_free (reply); + + svm_pop_heap (oldheap); + pthread_mutex_unlock (&am->vlib_rp->mutex); + + vat_json_print(vam->ofp, &node); + vat_json_free(&node); + + vam->retval = ntohl(mp->retval); + vam->result_ready = 1; +} + +static void +vl_api_lisp_locator_set_details_t_handler ( + vl_api_lisp_locator_set_details_t *mp) +{ + vat_main_t *vam = &vat_main; + + fformat(vam->ofp, "%=20s%=16d%=16d%=16d\n", + mp->locator_set_name, + ntohl(mp->sw_if_index), + mp->priority, + mp->weight); +} + +static void +vl_api_lisp_locator_set_details_t_handler_json ( + vl_api_lisp_locator_set_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_string_copy(node, "locator-set", mp->locator_set_name); + vat_json_object_add_uint(node, "locator", ntohl(mp->sw_if_index)); + vat_json_object_add_uint(node, "priority", mp->priority); + vat_json_object_add_uint(node, "weight", mp->weight); +} + +static void +vl_api_lisp_local_eid_table_details_t_handler ( + vl_api_lisp_local_eid_table_details_t *mp) +{ + vat_main_t *vam = &vat_main; + u8 *prefix; + + prefix = format(0, "%U/%d", + mp->eid_is_ipv6 ? format_ip6_address : format_ip4_address, + mp->eid_ip_address, + mp->eid_prefix_len); + + fformat(vam->ofp, "%=20s%=30s\n", + mp->locator_set_name, prefix); + + vec_free(prefix); +} + +static void +vl_api_lisp_local_eid_table_details_t_handler_json ( + vl_api_lisp_local_eid_table_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); + vat_json_object_add_string_copy(node, "locator-set", mp->locator_set_name); + if (mp->eid_is_ipv6) { + memcpy(&ip6, mp->eid_ip_address, sizeof(ip6)); + vat_json_object_add_ip6(node, "eid address", ip6); + } else { + memcpy(&ip4, mp->eid_ip_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "eid address", ip4); + } + vat_json_object_add_uint(node, "eid prefix len", mp->eid_prefix_len); +} + +static u8 * +format_decap_next (u8 * s, va_list * args) +{ + u32 next_index = va_arg (*args, u32); + + switch (next_index) + { + case LISP_GPE_INPUT_NEXT_DROP: + return format (s, "drop"); + case LISP_GPE_INPUT_NEXT_IP4_INPUT: + return format (s, "ip4"); + case LISP_GPE_INPUT_NEXT_IP6_INPUT: + return format (s, "ip6"); + case LISP_GPE_INPUT_NEXT_LISP_GPE_ENCAP: + return format (s, "nsh-lisp-gpe"); + default: + return format (s, "unknown %d", next_index); + } + return s; +} + +static void +vl_api_lisp_gpe_tunnel_details_t_handler (vl_api_lisp_gpe_tunnel_details_t *mp) +{ + vat_main_t *vam = &vat_main; + u8 *iid_str; + u8 *flag_str = NULL; + + iid_str = format(0, "%d (0x%x)", ntohl(mp->iid), ntohl(mp->iid)); + +#define _(n,v) if (mp->flags & v) flag_str = format (flag_str, "%s-bit ", #n); + foreach_lisp_gpe_flag_bit; +#undef _ + + fformat(vam->ofp, "%=20d%=30U%=16U%=16d%=16d%=16U" + "%=16d%=16d%=16sd=16d%=16s%=16s\n", + mp->tunnels, + mp->is_ipv6 ? format_ip6_address : format_ip4_address, + mp->source_ip, + mp->is_ipv6 ? format_ip6_address : format_ip4_address, + mp->destination_ip, + ntohl(mp->encap_fib_id), + ntohl(mp->decap_fib_id), + format_decap_next, ntohl(mp->dcap_next), + mp->ver_res >> 6, + flag_str, + mp->next_protocol, + mp->ver_res, + mp->res, + iid_str); + + vec_free(iid_str); +} + +static void +vl_api_lisp_gpe_tunnel_details_t_handler_json ( + vl_api_lisp_gpe_tunnel_details_t *mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in6_addr ip6; + struct in_addr ip4; + u8 *next_decap_str; + + next_decap_str = format(0, "%U", format_decap_next, htonl(mp->dcap_next)); + + 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, "tunel", mp->tunnels); + if (mp->is_ipv6) { + memcpy(&ip6, mp->source_ip, sizeof(ip6)); + vat_json_object_add_ip6(node, "source address", ip6); + memcpy(&ip6, mp->destination_ip, sizeof(ip6)); + vat_json_object_add_ip6(node, "destination address", ip6); + } else { + memcpy(&ip4, mp->source_ip, sizeof(ip4)); + vat_json_object_add_ip4(node, "source address", ip4); + memcpy(&ip4, mp->destination_ip, sizeof(ip4)); + vat_json_object_add_ip4(node, "destination address", ip4); + } + vat_json_object_add_uint(node, "fib encap", ntohl(mp->encap_fib_id)); + vat_json_object_add_uint(node, "fib decap", ntohl(mp->decap_fib_id)); + vat_json_object_add_string_copy(node, "decap next", next_decap_str); + vat_json_object_add_uint(node, "lisp version", mp->ver_res >> 6); + vat_json_object_add_uint(node, "flags", mp->flags); + vat_json_object_add_uint(node, "next protocol", mp->next_protocol); + vat_json_object_add_uint(node, "ver_res", mp->ver_res); + vat_json_object_add_uint(node, "res", mp->res); + vat_json_object_add_uint(node, "iid", ntohl(mp->iid)); + + vec_free(next_decap_str); +} + +static void +vl_api_lisp_map_resolver_details_t_handler ( + vl_api_lisp_map_resolver_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_resolver_details_t_handler_json ( + vl_api_lisp_map_resolver_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) { + memcpy(&ip6, mp->ip_address, sizeof(ip6)); + vat_json_object_add_ip6(node, "map resolver", ip6); + } else { + memcpy(&ip4, mp->ip_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "map resolver", ip4); + } +} + #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 @@ -1787,6 +2139,11 @@ _(ipsec_interface_add_del_spd_reply) \ _(ipsec_spd_add_del_entry_reply) \ _(ipsec_sad_add_del_entry_reply) \ _(ipsec_sa_set_key_reply) \ +_(ikev2_profile_add_del_reply) \ +_(ikev2_profile_set_auth_reply) \ +_(ikev2_profile_set_id_reply) \ +_(ikev2_profile_set_ts_reply) \ +_(ikev2_set_local_key_reply) \ _(delete_loopback_reply) \ _(bd_ip_mac_add_del_reply) \ _(map_del_domain_reply) \ @@ -1794,7 +2151,17 @@ _(map_add_del_rule_reply) \ _(want_interface_events_reply) \ _(want_stats_reply) \ _(cop_interface_enable_disable_reply) \ -_(cop_whitelist_enable_disable_reply) +_(cop_whitelist_enable_disable_reply) \ +_(sw_interface_clear_stats_reply) \ +_(trace_profile_add_reply) \ +_(trace_profile_apply_reply) \ +_(trace_profile_del_reply) \ +_(lisp_add_del_locator_set_reply) \ +_(lisp_add_del_locator_reply) \ +_(lisp_add_del_local_eid_reply) \ +_(lisp_gpe_add_del_fwd_entry_reply) \ +_(lisp_add_del_map_resolver_reply) \ +_(lisp_gpe_add_del_iface_reply) #define _(n) \ static void vl_api_##n##_t_handler \ @@ -1931,6 +2298,11 @@ _(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \ _(IPSEC_SPD_ADD_DEL_ENTRY_REPLY, ipsec_spd_add_del_entry_reply) \ _(IPSEC_SAD_ADD_DEL_ENTRY_REPLY, ipsec_sad_add_del_entry_reply) \ _(IPSEC_SA_SET_KEY_REPLY, ipsec_sa_set_key_reply) \ +_(IKEV2_PROFILE_ADD_DEL_REPLY, ikev2_profile_add_del_reply) \ +_(IKEV2_PROFILE_SET_AUTH_REPLY, ikev2_profile_set_auth_reply) \ +_(IKEV2_PROFILE_SET_ID_REPLY, ikev2_profile_set_id_reply) \ +_(IKEV2_PROFILE_SET_TS_REPLY, ikev2_profile_set_ts_reply) \ +_(IKEV2_SET_LOCAL_KEY_REPLY, ikev2_set_local_key_reply) \ _(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \ _(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \ _(DHCP_COMPL_EVENT, dhcp_compl_event) \ @@ -1946,7 +2318,22 @@ _(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \ _(WANT_STATS_REPLY, want_stats_reply) \ _(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \ _(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \ -_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) +_(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) \ +_(LISP_ADD_DEL_LOCATOR_SET_REPLY, lisp_add_del_locator_set_reply) \ +_(LISP_ADD_DEL_LOCATOR_REPLY, lisp_add_del_locator_reply) \ +_(LISP_ADD_DEL_LOCAL_EID_REPLY, lisp_add_del_local_eid_reply) \ +_(LISP_GPE_ADD_DEL_FWD_ENTRY_REPLY, lisp_gpe_add_del_fwd_entry_reply) \ +_(LISP_ADD_DEL_MAP_RESOLVER_REPLY, lisp_add_del_map_resolver_reply) \ +_(LISP_GPE_ADD_DEL_IFACE_REPLY, lisp_gpe_add_del_iface_reply) \ +_(LISP_LOCATOR_SET_DETAILS, lisp_locator_set_details) \ +_(LISP_LOCAL_EID_TABLE_DETAILS, lisp_local_eid_table_details) \ +_(LISP_GPE_TUNNEL_DETAILS, lisp_gpe_tunnel_details) \ +_(LISP_MAP_RESOLVER_DETAILS, lisp_map_resolver_details) /* M: construct, but don't yet send a message */ @@ -2325,7 +2712,8 @@ int exec (vat_main_t * vam) while (vat_time_now (vam) < timeout) { if (vam->result_ready == 1) { u8 * free_me; - fformat (vam->ofp, "%s", vam->shmem_result); + if (vam->shmem_result != NULL) + fformat (vam->ofp, "%s", vam->shmem_result); pthread_mutex_lock (&am->vlib_rp->mutex); oldheap = svm_push_data_heap (am->vlib_rp); @@ -2506,6 +2894,12 @@ int api_sw_interface_dump (vat_main_t * vam) strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1)); S; + /* and host (af_packet) interfaces */ + M(SW_INTERFACE_DUMP, sw_interface_dump); + mp->name_filter_valid = 1; + strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter-1)); + S; + /* and l2tpv3 tunnel interfaces */ M(SW_INTERFACE_DUMP, sw_interface_dump); mp->name_filter_valid = 1; @@ -2566,6 +2960,39 @@ static int api_sw_interface_set_flags (vat_main_t * vam) W; } +static int api_sw_interface_clear_stats (vat_main_t * vam) +{ + unformat_input_t * i = vam->input; + vl_api_sw_interface_clear_stats_t *mp; + f64 timeout; + u32 sw_if_index; + u8 sw_if_index_set = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + /* Construct the API message */ + M(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats); + + if (sw_if_index_set == 1) + mp->sw_if_index = ntohl (sw_if_index); + else + mp->sw_if_index = ~0; + + /* send it... */ + S; + + /* Wait for a reply, return the good/bad news... */ + W; +} + static int api_sw_interface_add_del_address (vat_main_t * vam) { unformat_input_t * i = vam->input; @@ -4953,7 +5380,121 @@ static int api_l2_patch_add_del (vat_main_t * vam) /* NOTREACHED */ return 0; } +static int api_trace_profile_add (vat_main_t *vam) +{ + unformat_input_t * input = vam->input; + vl_api_trace_profile_add_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_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)) + ; + 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; + else + break; + } + M(TRACE_PROFILE_ADD, trace_profile_add); + 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); + + S; W; + + return(0); + +} +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("
/ required"); + return -99; + } + M(TRACE_PROFILE_APPLY, trace_profile_apply); + 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) +{ + vl_api_trace_profile_del_t *mp; + f64 timeout; + + M(TRACE_PROFILE_DEL, trace_profile_del); + S; W; + return 0; +} static int api_sr_tunnel_add_del (vat_main_t * vam) { unformat_input_t * i = vam->input; @@ -6791,6 +7332,8 @@ static int api_create_vhost_user_if (vat_main_t * vam) u8 is_server = 0; u8 file_name_set = 0; u32 custom_dev_instance = ~0; + u8 hwaddr[6]; + u8 use_custom_mac = 0; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "socket %s", &file_name)) { @@ -6798,6 +7341,8 @@ static int api_create_vhost_user_if (vat_main_t * vam) } 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 @@ -6824,6 +7369,8 @@ static int api_create_vhost_user_if (vat_main_t * vam) mp->renumber = 1; mp->custom_dev_instance = ntohl(custom_dev_instance); } + mp->use_custom_mac = use_custom_mac; + memcpy(mp->mac_address, hwaddr, 6); S; W; /* NOTREACHED */ @@ -8133,13 +8680,321 @@ api_ipsec_sa_set_key (vat_main_t * vam) #endif } -/* - * MAP - */ -static int api_map_add_domain (vat_main_t * vam) +static int +api_ikev2_profile_add_del (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_map_add_domain_t *mp; +#if DPDK > 0 + unformat_input_t * i = vam->input; + vl_api_ikev2_profile_add_del_t * mp; + f64 timeout; + u8 is_add = 1; + u8 * name = 0; + + const char * valid_chars = "a-zA-Z0-9_"; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "name %U", unformat_token, valid_chars, &name)) + vec_add1 (name, 0); + else { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vec_len (name)) { + errmsg ("profile name must be specified"); + return -99; + } + + if (vec_len (name) > 64) { + errmsg ("profile name too long"); + return -99; + } + + M(IKEV2_PROFILE_ADD_DEL, ikev2_profile_add_del); + + memcpy(mp->name, name, vec_len (name)); + mp->is_add = is_add; + vec_free (name); + + S; W; + /* NOTREACHED */ + return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif +} + +static int +api_ikev2_profile_set_auth (vat_main_t * vam) +{ +#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; + + const char * valid_chars = "a-zA-Z0-9_"; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "name %U", unformat_token, valid_chars, &name)) + vec_add1 (name, 0); + else if (unformat (i, "auth_method %U", + unformat_ikev2_auth_method, &auth_method)) + ; + else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data)) + is_hex = 1; + else if (unformat (i, "auth_data %v", &data)) + ; + else { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vec_len (name)) { + errmsg ("profile name must be specified"); + return -99; + } + + if (vec_len (name) > 64) { + errmsg ("profile name too long"); + return -99; + } + + 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); + memcpy (mp->name, name, vec_len (name)); + 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_id (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_"; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "name %U", unformat_token, valid_chars, &name)) + vec_add1 (name, 0); + else if (unformat (i, "id_type %U", + unformat_ikev2_id_type, &id_type)) + ; + else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4)) + { + data = vec_new(u8, 4); + memcpy(data, ip4.as_u8, 4); + } + else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data)) + ; + else if (unformat (i, "id_data %v", &data)) + ; + else if (unformat (i, "local")) + is_local = 1; + else if (unformat (i, "remote")) + is_local = 0; + else { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vec_len (name)) { + errmsg ("profile name must be specified"); + return -99; + } + + if (vec_len (name) > 64) { + errmsg ("profile name too long"); + return -99; + } + + if (!vec_len(data)) { + errmsg ("id_data must be specified"); + return -99; + } + + if (!id_type) { + errmsg ("id_type must be specified"); + 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); + memcpy (mp->name, name, vec_len (name)); + 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)) { + errmsg ("profile name must be specified"); + return -99; + } + + if (vec_len (name) > 64) { + errmsg ("profile name too long"); + return -99; + } + + M(IKEV2_PROFILE_SET_TS, ikev2_profile_set_ts); + + mp->is_local = is_local; + mp->proto = (u8) proto; + mp->start_port = (u16) start_port; + mp->end_port = (u16) end_port; + mp->start_addr = start_addr.as_u32; + mp->end_addr = end_addr.as_u32; + memcpy (mp->name, name, vec_len (name)); + vec_free (name); + + S; W; + /* NOTREACHED */ + return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif +} + +static int +api_ikev2_set_local_key (vat_main_t * vam) +{ +#if DPDK > 0 + unformat_input_t * i = vam->input; + vl_api_ikev2_set_local_key_t * mp; + f64 timeout; + u8 * file = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "file %v", &file)) + vec_add1 (file, 0); + else { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vec_len (file)) { + errmsg ("RSA key file must be specified"); + return -99; + } + + if (vec_len (file) > 256) { + errmsg ("file name too long"); + return -99; + } + + M(IKEV2_SET_LOCAL_KEY, ikev2_set_local_key); + + 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_map_add_domain (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_map_add_domain_t *mp; f64 timeout; ip4_address_t ip4_prefix; @@ -8488,66 +9343,626 @@ static int api_cop_whitelist_enable_disable (vat_main_t * vam) W; } -static int q_or_quit (vat_main_t * vam) -{ - longjmp (vam->jump_buf, 1); - return 0; /* not so much */ -} -static int q (vat_main_t * vam) {return q_or_quit (vam);} -static int quit (vat_main_t * vam) {return q_or_quit (vam);} - -static int comment (vat_main_t * vam) +static int api_get_node_graph (vat_main_t * vam) { - return 0; -} + vl_api_get_node_graph_t * mp; + f64 timeout; -static int cmd_cmp (void * a1, void * a2) -{ - u8 ** c1 = a1; - u8 ** c2 = a2; + M(GET_NODE_GRAPH, get_node_graph); - return strcmp ((char *)(c1[0]), (char *)(c2[0])); + /* send it... */ + S; + /* Wait for the reply */ + W; } -static int help (vat_main_t * vam) +static int +api_lisp_add_del_locator_set(vat_main_t * vam) { - u8 ** cmds = 0; - u8 * name = 0; - hash_pair_t * p; - unformat_input_t * i = vam->input; - int j; + 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; - if (unformat (i, "%s", &name)) { - uword *hs; + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "del")) { + is_add = 0; + } else if (unformat(input, "locator-set %s", &locator_set_name)) { + locator_set_name_set = 1; + } else + break; + } - vec_add1(name, 0); + if (locator_set_name_set == 0) { + errmsg ("missing locator-set name"); + return -99; + } - hs = hash_get_mem (vam->help_by_name, name); - if (hs) - fformat (vam->ofp, "usage: %s %s\n", name, hs[0]); - else - fformat (vam->ofp, "No such msg / command '%s'\n", name); - vec_free(name); - return 0; + if (vec_len(locator_set_name) > 64) { + errmsg ("locator-set name too long\n"); + vec_free(locator_set_name); + return -99; } + vec_add1(locator_set_name, 0); - fformat(vam->ofp, "Help is available for the following:\n"); + /* Construct the API message */ + M(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set); - hash_foreach_pair (p, vam->function_by_name, - ({ - vec_add1 (cmds, (u8 *)(p->key)); - })); + mp->is_add = is_add; + memcpy(mp->locator_set_name, locator_set_name, + vec_len(locator_set_name)); + vec_free(locator_set_name); - vec_sort_with_function (cmds, cmd_cmp); + /* send it... */ + S; - for (j = 0; j < vec_len(cmds); j++) - fformat (vam->ofp, "%s\n", cmds[j]); + /* Wait for a reply... */ + W; - vec_free (cmds); + /* NOTREACHED */ return 0; } -static int set (vat_main_t * vam) +static int +api_lisp_add_del_locator(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; + u8 priority = ~0; + u8 priority_set = 0; + u8 weight = ~0; + u8 weight_set = 0; + u8 is_add = 1; + u8 *locator_set_name = NULL; + u8 locator_set_name_set = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "del")) { + is_add = 0; + } else if (unformat(input, "locator-set %s", &locator_set_name)) { + locator_set_name_set = 1; + } else if (unformat(input, "iface %U", unformat_sw_if_index, vam, + &tmp_if_index)) { + sw_if_index_if_name_set = 1; + sw_if_index = tmp_if_index; + } else if (unformat(input,"sw_if_index %d", &tmp_if_index)) { + sw_if_index_set = 1; + sw_if_index = tmp_if_index; + } else if (unformat(input, "p %d", &priority)) { + priority_set = 1; + } else if (unformat(input, "w %d", &weight)) { + weight_set = 1; + } else + break; + } + + if (locator_set_name_set == 0) { + errmsg ("missing locator-set name"); + return -99; + } + + if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) { + errmsg ("missing sw_if_index"); + vec_free(locator_set_name); + return -99; + } + + if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) { + errmsg ("cannot use both params interface name and sw_if_index"); + vec_free(locator_set_name); + return -99; + } + + if (priority_set == 0) { + errmsg ("missing locator-set priority\n"); + vec_free(locator_set_name); + return -99; + } + + if (weight_set == 0) { + errmsg ("missing locator-set weight\n"); + vec_free(locator_set_name); + return -99; + } + + if (vec_len(locator_set_name) > 64) { + errmsg ("locator-set name too long\n"); + vec_free(locator_set_name); + return -99; + } + vec_add1(locator_set_name, 0); + + /* Construct the API message */ + M(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator); + + mp->is_add = is_add; + mp->sw_if_index = ntohl(sw_if_index); + mp->priority = priority; + mp->weight = weight; + 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; +} + +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 eidv4_set = 0; + u8 eidv6_set = 0; + ip4_address_t eidv4; + ip6_address_t eidv6; + u8 tmp_eid_lenght = ~0; + u8 eid_lenght = ~0; + u8 *locator_set_name = NULL; + u8 locator_set_name_set = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "del")) { + is_add = 0; + } else if (unformat(input, "eid %U/%d", unformat_ip4_address, + &eidv4, &tmp_eid_lenght)) { + eid_lenght = tmp_eid_lenght; + eidv4_set = 1; + } else if (unformat(input, "eid %U/%d", unformat_ip6_address, + &eidv6, &tmp_eid_lenght)) { + eid_lenght = tmp_eid_lenght; + eidv6_set = 1; + } else if (unformat(input, "locator-set %s", &locator_set_name)) { + locator_set_name_set = 1; + } else + break; + } + + if (locator_set_name_set == 0) { + errmsg ("missing locator-set name\n"); + return -99; + } + + if (vec_len(locator_set_name) > 64) { + errmsg ("locator-set name too long\n"); + vec_free(locator_set_name); + return -99; + } + vec_add1(locator_set_name, 0); + + if (eidv4_set && eidv6_set) { + errmsg ("both eid v4 and v6 addresses set\n"); + vec_free(locator_set_name); + return -99; + } + + if (!eidv4_set && !eidv6_set) { + errmsg ("eid addresses not set\n"); + vec_free(locator_set_name); + return -99; + } + + /* Construct the API message */ + M(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid); + + mp->is_add = is_add; + if (eidv6_set) { + mp->is_ipv6 = 1; + memcpy(mp->ip_address, &eidv6, sizeof(eidv6)); + } else { + mp->is_ipv6 = 0; + memcpy(mp->ip_address, &eidv4, sizeof(eidv4)); + } + mp->prefix_len = eid_lenght; + 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; +} + +static int +api_lisp_gpe_add_del_fwd_entry(vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_lisp_gpe_add_del_fwd_entry_t *mp; + f64 timeout = ~0; + u8 is_add = 1; + u8 eidv4_set = 0, slocv4_set = 0, dlocv4_set = 0; + u8 eidv6_set = 0, slocv6_set = 0, dlocv6_set = 0; + ip4_address_t eidv4, slocv4, dlocv4; + ip6_address_t eidv6, slocv6, dlocv6; + u8 tmp_eid_lenght = ~0; + u8 eid_lenght = ~0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "del")) { + is_add = 0; + } else if (unformat(input, "eid %U/%d", unformat_ip4_address, + &eidv4, &tmp_eid_lenght)) { + eid_lenght = tmp_eid_lenght; + eidv4_set = 1; + } else if (unformat(input, "eid %U/%d", unformat_ip6_address, + &eidv6, &tmp_eid_lenght)) { + eid_lenght = tmp_eid_lenght; + eidv6_set = 1; + } else if (unformat(input, "sloc %U", unformat_ip4_address, &slocv4)) { + slocv4_set = 1; + } else if (unformat(input, "sloc %U", unformat_ip6_address, &slocv6)) { + slocv6_set = 1; + } else if (unformat(input, "dloc %U", unformat_ip4_address, &dlocv4)) { + dlocv4_set = 1; + } else if (unformat(input, "dloc %U", unformat_ip6_address, &dlocv6)) { + dlocv6_set = 1; + } else + break; + } + + if (eidv4_set && eidv6_set) { + errmsg ("both eid v4 and v6 addresses set\n"); + return -99; + } + + if (!eidv4_set && !eidv6_set) { + errmsg ("eid addresses not set\n"); + return -99; + } + + if (slocv4_set && slocv6_set) { + errmsg ("both source v4 and v6 addresses set\n"); + return -99; + } + + if (!slocv4_set && !slocv6_set) { + errmsg ("source addresses not set\n"); + return -99; + } + + if (dlocv4_set && dlocv6_set) { + errmsg ("both destination v4 and v6 addresses set\n"); + return -99; + } + + if (dlocv4_set && dlocv6_set) { + errmsg ("destination addresses not set\n"); + return -99; + } + + if (!(slocv4_set == dlocv4_set && slocv6_set == dlocv6_set)) { + errmsg ("mixing type of source and destination address\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; + if (eidv6_set) { + mp->eid_is_ipv6 = 1; + memcpy(mp->eid_ip_address, &eidv6, sizeof(eidv6)); + } else { + mp->eid_is_ipv6 = 0; + memcpy(mp->eid_ip_address, &eidv4, sizeof(eidv4)); + } + mp->eid_prefix_len = eid_lenght; + if (slocv6_set) { + mp->address_is_ipv6 = 1; + memcpy(mp->source_ip_address, &slocv6, sizeof(slocv6)); + memcpy(mp->destination_ip_address, &dlocv6, sizeof(dlocv6)); + } else { + mp->address_is_ipv6 = 0; + memcpy(mp->source_ip_address, &slocv4, sizeof(slocv4)); + memcpy(mp->destination_ip_address, &dlocv4, sizeof(dlocv4)); + } + + /* 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) { + 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(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver); + + mp->is_add = is_add; + if (ipv6_set) { + mp->is_ipv6 = 1; + memcpy(mp->ip_address, &ipv6, sizeof(ipv6)); + } else { + mp->is_ipv6 = 0; + memcpy(mp->ip_address, &ipv4, sizeof(ipv4)); + } + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int +api_lisp_gpe_add_del_iface(vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_lisp_gpe_add_del_iface_t *mp; + f64 timeout = ~0; + u8 is_set = 0; + u8 is_add = 1; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "up")) { + is_set = 1; + is_add = 1; + } else if (unformat(input, "down")) { + is_set = 1; + is_add = 0; + } else + break; + } + + if (is_set == 0) { + errmsg("Value not set\n"); + return -99; + } + + /* Construct the API message */ + M(LISP_GPE_ADD_DEL_IFACE, lisp_gpe_add_del_iface); + + mp->is_add = is_add; + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int +api_lisp_locator_set_dump(vat_main_t *vam) +{ + vl_api_lisp_locator_set_dump_t *mp; + f64 timeout = ~0; + + if (!vam->json_output) { + fformat(vam->ofp, "%=20s%=16s%=16s%=16s\n", + "Locator-set", "Locator", "Priority", "Weight"); + } + + M(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump); + /* send it... */ + S; + + /* Use a control ping for synchronization */ + { + vl_api_control_ping_t * mp; + M(CONTROL_PING, control_ping); + S; + } + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int +api_lisp_local_eid_table_dump(vat_main_t *vam) +{ + vl_api_lisp_local_eid_table_dump_t *mp; + f64 timeout = ~0; + + if (!vam->json_output) { + fformat(vam->ofp, "%=20s%=30s\n", + "Locator-set", "Eid"); + } + + M(LISP_LOCAL_EID_TABLE_DUMP, lisp_local_eid_table_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_gpe_tunnel_dump(vat_main_t *vam) +{ + vl_api_lisp_gpe_tunnel_dump_t *mp; + f64 timeout = ~0; + + if (!vam->json_output) { + fformat(vam->ofp, "%=20s%=30s%=16s%=16s%=16s%=16s" + "%=16s%=16s%=16s%=16s%=16s\n", + "Tunel", "Source", "Destination", "Fib encap", "Fib decap", + "Decap next", "Lisp version", "Flags", "Next protocol", + "ver_res", "res", "iid"); + } + + M(LISP_GPE_TUNNEL_DUMP, lisp_gpe_tunnel_dump); + /* send it... */ + S; + + /* Use a control ping for synchronization */ + { + vl_api_control_ping_t * mp; + M(CONTROL_PING, control_ping); + S; + } + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int +api_lisp_map_resolver_dump(vat_main_t *vam) +{ + vl_api_lisp_map_resolver_dump_t *mp; + f64 timeout = ~0; + + if (!vam->json_output) { + fformat(vam->ofp, "%=20s\n", + "Map resolver"); + } + + M(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump); + /* send it... */ + S; + + /* Use a control ping for synchronization */ + { + vl_api_control_ping_t * mp; + M(CONTROL_PING, control_ping); + S; + } + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int q_or_quit (vat_main_t * vam) +{ + longjmp (vam->jump_buf, 1); + return 0; /* not so much */ +} +static int q (vat_main_t * vam) {return q_or_quit (vam);} +static int quit (vat_main_t * vam) {return q_or_quit (vam);} + +static int comment (vat_main_t * vam) +{ + return 0; +} + +static int cmd_cmp (void * a1, void * a2) +{ + u8 ** c1 = a1; + u8 ** c2 = a2; + + return strcmp ((char *)(c1[0]), (char *)(c2[0])); +} + +static int help (vat_main_t * vam) +{ + u8 ** cmds = 0; + u8 * name = 0; + hash_pair_t * p; + unformat_input_t * i = vam->input; + int j; + + if (unformat (i, "%s", &name)) { + uword *hs; + + vec_add1(name, 0); + + hs = hash_get_mem (vam->help_by_name, name); + if (hs) + fformat (vam->ofp, "usage: %s %s\n", name, hs[0]); + else + fformat (vam->ofp, "No such msg / command '%s'\n", name); + vec_free(name); + return 0; + } + + fformat(vam->ofp, "Help is available for the following:\n"); + + hash_foreach_pair (p, vam->function_by_name, + ({ + vec_add1 (cmds, (u8 *)(p->key)); + })); + + vec_sort_with_function (cmds, cmd_cmp); + + for (j = 0; j < vec_len(cmds); j++) + fformat (vam->ofp, "%s\n", cmds[j]); + + vec_free (cmds); + return 0; +} + +static int set (vat_main_t * vam) { u8 * name = 0, * value = 0; unformat_input_t * i = vam->input; @@ -8623,6 +10038,75 @@ static int dump_macro_table (vat_main_t * vam) return 0; } +static int dump_node_table (vat_main_t * vam) +{ + int i, j; + vlib_node_t * node, * next_node; + + if (vec_len (vam->graph_nodes) == 0) { + fformat (vam->ofp, "Node table empty, issue get_node_graph...\n"); + return 0; + } + + for (i = 0; i < vec_len (vam->graph_nodes); i++) { + node = vam->graph_nodes[i]; + fformat (vam->ofp, "[%d] %s\n", i, node->name); + for (j = 0; j < vec_len (node->next_nodes); j++) { + if (node->next_nodes[j] != ~0) { + next_node = vam->graph_nodes[node->next_nodes[j]]; + fformat (vam->ofp, " [%d] %s\n", j, next_node->name); + } + } + } + return 0; +} + +static int search_node_table (vat_main_t * vam) +{ + unformat_input_t * line_input = vam->input; + u8 * node_to_find; + int j; + vlib_node_t * node, * next_node; + uword * p; + + if (vam->graph_node_index_by_name == 0) { + fformat (vam->ofp, "Node table empty, issue get_node_graph...\n"); + return 0; + } + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { + if (unformat (line_input, "%s", &node_to_find)) { + vec_add1 (node_to_find, 0); + p = hash_get_mem (vam->graph_node_index_by_name, node_to_find); + if (p == 0) { + fformat (vam->ofp, "%s not found...\n", node_to_find); + goto out; + } + node = vam->graph_nodes[p[0]]; + fformat (vam->ofp, "[%d] %s\n", p[0], node->name); + for (j = 0; j < vec_len (node->next_nodes); j++) { + if (node->next_nodes[j] != ~0) { + next_node = vam->graph_nodes[node->next_nodes[j]]; + fformat (vam->ofp, " [%d] %s\n", j, next_node->name); + } + } + } + + else { + clib_warning ("parse error '%U'", format_unformat_error, + line_input); + return -99; + } + + out: + vec_free(node_to_find); + + } + + return 0; +} + + static int script (vat_main_t * vam) { u8 * s = 0; @@ -8809,7 +10293,8 @@ _(l2_interface_vlan_tag_rewrite, \ "[disable][push-[1|2]][pop-[1|2]][translate-1-[1|2]] \n" \ "[translate-2-[1|2]] [push_dot1q 0] tag1 tag2 ") \ _(create_vhost_user_if, \ - "socket [server] [renumber ]") \ + "socket [server] [renumber ] " \ + "[mac ]") \ _(modify_vhost_user_if, \ " | sw_if_index socket \n" \ "[server] [renumber ]") \ @@ -8854,6 +10339,15 @@ _(ipsec_spd_add_del_entry, "spd_id priority action \n" \ " laddr_stop raddr_start raddr_stop \n" \ " [lport_start lport_stop ] [rport_start rport_stop ]" )\ _(ipsec_sa_set_key, "sa_id crypto_key integ_key ") \ +_(ikev2_profile_add_del, "name [del]") \ +_(ikev2_profile_set_auth, "name auth_method \n" \ + "(auth_data 0x | auth_data )") \ +_(ikev2_profile_set_id, "name id_type \n" \ + "(id_data 0x | id_data ) (local|remote)") \ +_(ikev2_profile_set_ts, "name protocol \n" \ + "start_port end_port start_addr end_addr \n" \ + "(local|remote)") \ +_(ikev2_set_local_key, "file ") \ _(delete_loopback,"sw_if_index ") \ _(bd_ip_mac_add_del, "bd_id [del]") \ _(map_add_domain, \ @@ -8870,7 +10364,29 @@ _(want_stats,"enable|disable") \ _(get_first_msg_id, "client ") \ _(cop_interface_enable_disable, " | sw_if_index [disable]") \ _(cop_whitelist_enable_disable, " | sw_if_index \n" \ - "fib-id [ip4][ip6][default]") + "fib-id [ip4][ip6][default]") \ +_(get_node_graph, " ") \ +_(sw_interface_clear_stats," | sw_if_index ") \ +_(trace_profile_add, "id trace-type <0x1f|0x3|0x9|0x11|0x19> " \ + "trace-elts trace-tsp <0|1|2|3> node-id " \ + "app-data [pow] [ppc ]") \ +_(trace_profile_apply, "id /" \ + " vrf_id add | pop | none") \ +_(trace_profile_del, "") \ +_(lisp_add_del_locator_set, "locator-set [del]") \ +_(lisp_add_del_locator, "locator-set " \ + "iface | sw_if_index " \ + "p w [del]") \ +_(lisp_add_del_local_eid, "/ " \ + "locator-set [del]") \ +_(lisp_gpe_add_del_fwd_entry, "eid / " \ + "sloc dloc [del]") \ +_(lisp_add_del_map_resolver, " [del]") \ +_(lisp_gpe_add_del_iface, "up|down") \ +_(lisp_locator_set_dump, "") \ +_(lisp_local_eid_table_dump, "") \ +_(lisp_gpe_tunnel_dump, "") \ +_(lisp_map_resolver_dump, "") /* List of command functions, CLI names map directly to functions */ #define foreach_cli_function \ @@ -8881,11 +10397,13 @@ _(dump_ipv4_table, "usage: dump_ipv4_table") \ _(dump_ipv6_table, "usage: dump_ipv6_table") \ _(dump_stats_table, "usage: dump_stats_table") \ _(dump_macro_table, "usage: dump_macro_table ") \ +_(dump_node_table, "usage: dump_node_table") \ _(echo, "usage: echo ") \ _(exec, "usage: exec ") \ _(help, "usage: help") \ _(q, "usage: quit") \ _(quit, "usage: quit") \ +_(search_node_table, "usage: search_node_table ...") \ _(set, "usage: set ") \ _(script, "usage: script ") \ _(unset, "usage: unset ")