X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp-api-test%2Fvat%2Fapi_format.c;h=496b2d60d76e487d3e408d87ab18e05870477160;hb=94b1442a6731bb879797c016a8febaec2f2ae7c9;hp=02c3ad5fe060e3d79fc892630685acf166e78780;hpb=a0d4a1a6d1b81b132787e382ac3f8487b71cf52c;p=vpp.git diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c index 02c3ad5fe06..496b2d60d76 100644 --- a/vpp-api-test/vat/api_format.c +++ b/vpp-api-test/vat/api_format.c @@ -26,16 +26,23 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include +#if DPDK > 0 #include +#include +#else +#include +#endif #include +#include +#include #include "vat/json_format.h" @@ -228,6 +235,7 @@ uword unformat_ip6_address (unformat_input_t * input, va_list * args) uword unformat_ipsec_policy_action (unformat_input_t * input, va_list * args) { +#if DPDK > 0 u32 * r = va_arg (*args, u32 *); if (0) ; @@ -237,11 +245,15 @@ unformat_ipsec_policy_action (unformat_input_t * input, va_list * args) else return 0; return 1; +#else + return 0; +#endif } uword unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args) { +#if DPDK > 0 u32 * r = va_arg (*args, u32 *); if (0) ; @@ -251,11 +263,15 @@ unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args) else return 0; return 1; +#else + return 0; +#endif } u8 * format_ipsec_crypto_alg (u8 * s, va_list * args) { +#if DPDK > 0 u32 i = va_arg (*args, u32); u8 * t = 0; @@ -268,11 +284,15 @@ format_ipsec_crypto_alg (u8 * s, va_list * args) return format (s, "unknown"); } return format (s, "%s", t); +#else + return format (s, "Unimplemented"); +#endif } uword unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args) { +#if DPDK > 0 u32 * r = va_arg (*args, u32 *); if (0) ; @@ -282,11 +302,15 @@ unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args) else return 0; return 1; +#else + return 0; +#endif } u8 * format_ipsec_integ_alg (u8 * s, va_list * args) { +#if DPDK > 0 u32 i = va_arg (*args, u32); u8 * t = 0; @@ -299,6 +323,45 @@ format_ipsec_integ_alg (u8 * s, va_list * args) return format (s, "unknown"); } return format (s, "%s", t); +#else + return format (s, "Unsupported"); +#endif +} + +uword +unformat_ikev2_auth_method (unformat_input_t * input, va_list * args) +{ +#if DPDK > 0 + u32 * r = va_arg (*args, u32 *); + + if (0) ; +#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) @@ -356,6 +419,15 @@ u8 * format_ip6_address (u8 * s, va_list * args) return s; } +/* Format an IP46 address. */ +u8 * format_ip46_address (u8 * s, va_list * args) +{ + ip46_address_t *ip46 = va_arg (*args, ip46_address_t *); + return ip46_address_is_ip4(ip46)? + format(s, "%U", format_ip4_address, &ip46->ip4): + format(s, "%U", format_ip6_address, &ip46->ip6); +} + u8 * format_ethernet_address (u8 * s, va_list * args) { u8 * a = va_arg (*args, u8 *); @@ -562,6 +634,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); @@ -594,7 +667,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; @@ -610,10 +683,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); @@ -760,98 +846,6 @@ static void vl_api_mpls_gre_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_nsh_gre_add_del_tunnel_reply_t_handler -(vl_api_nsh_gre_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - i32 retval = ntohl(mp->retval); - u32 sw_if_index = ntohl(mp->sw_if_index); - - if (retval >= 0 && sw_if_index != (u32)~0) { - errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void vl_api_nsh_gre_add_del_tunnel_reply_t_handler_json -(vl_api_nsh_gre_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object(&node); - vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); - vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index)); - - vat_json_print(vam->ofp, &node); - vat_json_free(&node); - - vam->retval = ntohl(mp->retval); - vam->result_ready = 1; -} - -static void vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t_handler -(vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - i32 retval = ntohl(mp->retval); - u32 sw_if_index = ntohl(mp->sw_if_index); - - if (retval >= 0 && sw_if_index != (u32)~0) { - errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t_handler_json -(vl_api_nsh_vxlan_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object(&node); - vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); - vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index)); - - vat_json_print(vam->ofp, &node); - vat_json_free(&node); - - vam->retval = ntohl(mp->retval); - vam->result_ready = 1; -} - -static void vl_api_lisp_gpe_add_del_tunnel_reply_t_handler -(vl_api_lisp_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - i32 retval = ntohl(mp->retval); - u32 sw_if_index = ntohl(mp->sw_if_index); - - if (retval >= 0 && sw_if_index != (u32)~0) { - errmsg ("sw_if_index %d\n", ntohl(mp->sw_if_index)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void vl_api_lisp_gpe_add_del_tunnel_reply_t_handler_json -(vl_api_lisp_gpe_add_del_tunnel_reply_t * mp) -{ - vat_main_t * vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object(&node); - vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); - vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index)); - - vat_json_print(vam->ofp, &node); - vat_json_free(&node); - - vam->retval = ntohl(mp->retval); - vam->result_ready = 1; -} static void vl_api_show_version_reply_t_handler (vl_api_show_version_reply_t * mp) @@ -1268,6 +1262,36 @@ static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } +static void vl_api_gre_add_del_tunnel_reply_t_handler +(vl_api_gre_add_del_tunnel_reply_t * mp) +{ + vat_main_t * vam = &vat_main; + i32 retval = ntohl(mp->retval); + if (vam->async_mode) { + vam->async_errors += (retval < 0); + } else { + vam->retval = retval; + vam->result_ready = 1; + } +} + +static void vl_api_gre_add_del_tunnel_reply_t_handler_json +(vl_api_gre_add_del_tunnel_reply_t * mp) +{ + vat_main_t * vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object(&node); + vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); + vat_json_object_add_uint(&node, "sw_if_index", ntohl(mp->sw_if_index)); + + vat_json_print(vam->ofp, &node); + vat_json_free(&node); + + vam->retval = ntohl(mp->retval); + vam->result_ready = 1; +} + static void vl_api_create_vhost_user_if_reply_t_handler (vl_api_create_vhost_user_if_reply_t * mp) { @@ -1326,7 +1350,7 @@ static void vl_api_ip_address_details_t_handler address = vec_elt_at_index(addresses, vec_len(addresses) - 1); - memcpy(&address->ip, &mp->ip, sizeof(address->ip)); + clib_memcpy(&address->ip, &mp->ip, sizeof(address->ip)); address->prefix_length = mp->prefix_length; #undef addresses } @@ -1347,10 +1371,10 @@ static void vl_api_ip_address_details_t_handler_json vat_json_init_object(node); if (vam->is_ipv6) { - memcpy(&ip6, mp->ip, sizeof(ip6)); + clib_memcpy(&ip6, mp->ip, sizeof(ip6)); vat_json_object_add_ip6(node, "ip", ip6); } else { - memcpy(&ip4, mp->ip, sizeof(ip4)); + clib_memcpy(&ip4, mp->ip, sizeof(ip4)); vat_json_object_add_ip4(node, "ip", ip4); } vat_json_object_add_uint(node, "prefix_length", mp->prefix_length); @@ -1402,11 +1426,11 @@ static void vl_api_map_domain_details_t_handler_json vat_json_init_object(node); vat_json_object_add_uint(node, "domain_index", clib_net_to_host_u32(mp->domain_index)); - memcpy(&ip6, mp->ip6_prefix, sizeof(ip6)); + clib_memcpy(&ip6, mp->ip6_prefix, sizeof(ip6)); vat_json_object_add_ip6(node, "ip6_prefix", ip6); - memcpy(&ip4, mp->ip4_prefix, sizeof(ip4)); + clib_memcpy(&ip4, mp->ip4_prefix, sizeof(ip4)); vat_json_object_add_ip4(node, "ip4_prefix", ip4); - memcpy(&ip6, mp->ip6_src, sizeof(ip6)); + clib_memcpy(&ip6, mp->ip6_src, sizeof(ip6)); vat_json_object_add_ip6(node, "ip6_src", ip6); vat_json_object_add_int(node, "ip6_prefix_len", mp->ip6_prefix_len); vat_json_object_add_int(node, "ip4_prefix_len", mp->ip4_prefix_len); @@ -1455,7 +1479,7 @@ static void vl_api_map_rule_details_t_handler_json vat_json_init_object(node); vat_json_object_add_uint(node, "psid", clib_net_to_host_u16(mp->psid)); - memcpy(&ip6, mp->ip6_dst, sizeof(ip6)); + clib_memcpy(&ip6, mp->ip6_dst, sizeof(ip6)); vat_json_object_add_ip6(node, "ip6_dst", ip6); } @@ -1611,7 +1635,7 @@ static void vl_api_vnet_ip4_fib_counters_t_handler_json for (i = 0; i < count; i++) { vec_validate(vam->ip4_fib_counters[vrf_index], i); counter = &vam->ip4_fib_counters[vrf_index][i]; - memcpy(&ip4, &v->address, sizeof(ip4)); + clib_memcpy(&ip4, &v->address, sizeof(ip4)); counter->address = ip4; counter->address_length = v->address_length; counter->packets = clib_net_to_host_u64(v->packets); @@ -1654,7 +1678,7 @@ static void vl_api_vnet_ip6_fib_counters_t_handler_json for (i = 0; i < count; i++) { vec_validate(vam->ip6_fib_counters[vrf_index], i); counter = &vam->ip6_fib_counters[vrf_index][i]; - memcpy(&ip6, &v->address, sizeof(ip6)); + clib_memcpy(&ip6, &v->address, sizeof(ip6)); counter->address = ip6; counter->address_length = v->address_length; counter->packets = clib_net_to_host_u64(v->packets); @@ -1698,109 +1722,497 @@ static void vl_api_get_first_msg_id_reply_t_handler_json vam->result_ready = 1; } -#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler -#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler -#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler -#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler +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; + } -/* - * Generate boilerplate reply handlers, which - * dig the return value out of the xxx_reply_t API message, - * stick it into vam->retval, and set vam->result_ready - * - * Could also do this by pointing N message decode slots at - * a single function, but that could break in subtle ways. - */ + /* "Should never happen..." */ + if (retval != 0) + return; -#define foreach_standard_reply_retval_handler \ -_(sw_interface_set_flags_reply) \ -_(sw_interface_add_del_address_reply) \ -_(sw_interface_set_table_reply) \ -_(sw_interface_set_vpath_reply) \ -_(sw_interface_set_l2_bridge_reply) \ -_(bridge_domain_add_del_reply) \ -_(sw_interface_set_l2_xconnect_reply) \ -_(l2fib_add_del_reply) \ -_(ip_add_del_route_reply) \ -_(proxy_arp_add_del_reply) \ -_(proxy_arp_intfc_enable_disable_reply) \ -_(mpls_add_del_encap_reply) \ -_(mpls_add_del_decap_reply) \ -_(mpls_ethernet_add_del_tunnel_2_reply) \ -_(sw_interface_set_unnumbered_reply) \ -_(ip_neighbor_add_del_reply) \ -_(reset_vrf_reply) \ -_(oam_add_del_reply) \ -_(reset_fib_reply) \ -_(dhcp_proxy_config_reply) \ -_(dhcp_proxy_config_2_reply) \ -_(dhcp_proxy_set_vss_reply) \ -_(dhcp_client_config_reply) \ -_(set_ip_flow_hash_reply) \ -_(sw_interface_ip6_enable_disable_reply) \ -_(sw_interface_ip6_set_link_local_address_reply) \ -_(sw_interface_ip6nd_ra_prefix_reply) \ -_(sw_interface_ip6nd_ra_config_reply) \ -_(set_arp_neighbor_limit_reply) \ -_(l2_patch_add_del_reply) \ -_(sr_tunnel_add_del_reply) \ -_(classify_add_del_session_reply) \ -_(classify_set_interface_ip_table_reply) \ -_(classify_set_interface_l2_tables_reply) \ -_(l2tpv3_set_tunnel_cookies_reply) \ -_(l2tpv3_interface_enable_disable_reply) \ -_(l2tpv3_set_lookup_key_reply) \ -_(l2_fib_clear_table_reply) \ -_(l2_interface_efp_filter_reply) \ -_(l2_interface_vlan_tag_rewrite_reply) \ -_(modify_vhost_user_if_reply) \ -_(delete_vhost_user_if_reply) \ -_(want_ip4_arp_events_reply) \ -_(input_acl_set_interface_reply) \ -_(ipsec_spd_add_del_reply) \ -_(ipsec_interface_add_del_spd_reply) \ -_(ipsec_spd_add_del_entry_reply) \ -_(ipsec_sad_add_del_entry_reply) \ -_(ipsec_sa_set_key_reply) \ -_(delete_loopback_reply) \ -_(bd_ip_mac_add_del_reply) \ -_(map_del_domain_reply) \ -_(map_add_del_rule_reply) \ -_(want_interface_events_reply) \ -_(want_stats_reply) + reply = (u8 *)(mp->reply_in_shmem); + pvt_copy = vec_dup (reply); -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = &vat_main; \ - i32 retval = ntohl(mp->retval); \ - if (vam->async_mode) { \ - vam->async_errors += (retval < 0); \ - } else { \ - vam->retval = retval; \ - vam->result_ready = 1; \ - } \ - } -foreach_standard_reply_retval_handler; -#undef _ + /* Toss the shared-memory original... */ + pthread_mutex_lock (&am->vlib_rp->mutex); + oldheap = svm_push_data_heap (am->vlib_rp); -#define _(n) \ - static void vl_api_##n##_t_handler_json \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = &vat_main; \ - vat_json_node_t node; \ - vat_json_init_object(&node); \ - vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); \ - vat_json_print(vam->ofp, &node); \ - vam->retval = ntohl(mp->retval); \ - vam->result_ready = 1; \ + 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); } -foreach_standard_reply_retval_handler; -#undef _ -/* + 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; + u8 * tmp_str = NULL; + + if (mp->local) { + fformat(vam->ofp, "%=20s%=16d%=16d%=16d\n", + mp->locator_set_name, + ntohl(mp->sw_if_index), + mp->priority, + mp->weight); + } else { + tmp_str = format(0,"%U/%d", + mp->is_ipv6 ? format_ip6_address : format_ip4_address, + mp->ip_address, + mp->prefix_len); + + fformat(vam->ofp, "%=20s%=16s%=16d%=16d\n", + mp->locator_set_name, + tmp_str, + mp->priority, + mp->weight); + vec_free(tmp_str); + } +} + +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; + 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->local) { + vat_json_object_add_uint(node, "locator", ntohl(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); + } else { + clib_memcpy(&ip4, mp->ip_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "locator", ip4); + } + vat_json_object_add_uint(node, "prefix-length", mp->prefix_len); + } + 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) { + clib_memcpy(&ip6, mp->eid_ip_address, sizeof(ip6)); + vat_json_object_add_ip6(node, "eid address", ip6); + } else { + clib_memcpy(&ip4, mp->eid_ip_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "eid address", ip4); + } + vat_json_object_add_uint(node, "eid prefix len", mp->eid_prefix_len); +} + +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"); + 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) { + clib_memcpy(&ip6, mp->source_ip, sizeof(ip6)); + vat_json_object_add_ip6(node, "source address", ip6); + clib_memcpy(&ip6, mp->destination_ip, sizeof(ip6)); + vat_json_object_add_ip6(node, "destination address", ip6); + } else { + clib_memcpy(&ip4, mp->source_ip, sizeof(ip4)); + vat_json_object_add_ip4(node, "source address", ip4); + clib_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) { + clib_memcpy(&ip6, mp->ip_address, sizeof(ip6)); + vat_json_object_add_ip6(node, "map resolver", ip6); + } else { + clib_memcpy(&ip4, mp->ip_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "map resolver", ip4); + } +} + +static void +vl_api_lisp_enable_disable_status_details_t_handler +(vl_api_lisp_enable_disable_status_details_t *mp) +{ + vat_main_t *vam = &vat_main; + + fformat(vam->ofp, "feature: %s\ngpe: %s\n", + mp->feature_status ? "enabled" : "disabled", + mp->gpe_status ? "enabled" : "disabled"); +} + +static void +vl_api_lisp_enable_disable_status_details_t_handler_json +(vl_api_lisp_enable_disable_status_details_t *mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + u8 * gpe_status = NULL; + u8 * feature_status = NULL; + + gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled"); + feature_status = format (0, "%s", + mp->feature_status ? "enabled" : "disabled"); + + 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, "gpe_status", gpe_status); + vat_json_object_add_string_copy(node, "feature_status", feature_status); + + vec_free (gpe_status); + vec_free (feature_status); +} + +#define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler +#define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler +#define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler +#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler + +/* + * Generate boilerplate reply handlers, which + * dig the return value out of the xxx_reply_t API message, + * stick it into vam->retval, and set vam->result_ready + * + * Could also do this by pointing N message decode slots at + * a single function, but that could break in subtle ways. + */ + +#define foreach_standard_reply_retval_handler \ +_(sw_interface_set_flags_reply) \ +_(sw_interface_add_del_address_reply) \ +_(sw_interface_set_table_reply) \ +_(sw_interface_set_vpath_reply) \ +_(sw_interface_set_l2_bridge_reply) \ +_(bridge_domain_add_del_reply) \ +_(sw_interface_set_l2_xconnect_reply) \ +_(l2fib_add_del_reply) \ +_(ip_add_del_route_reply) \ +_(proxy_arp_add_del_reply) \ +_(proxy_arp_intfc_enable_disable_reply) \ +_(mpls_add_del_encap_reply) \ +_(mpls_add_del_decap_reply) \ +_(mpls_ethernet_add_del_tunnel_2_reply) \ +_(sw_interface_set_unnumbered_reply) \ +_(ip_neighbor_add_del_reply) \ +_(reset_vrf_reply) \ +_(oam_add_del_reply) \ +_(reset_fib_reply) \ +_(dhcp_proxy_config_reply) \ +_(dhcp_proxy_config_2_reply) \ +_(dhcp_proxy_set_vss_reply) \ +_(dhcp_client_config_reply) \ +_(set_ip_flow_hash_reply) \ +_(sw_interface_ip6_enable_disable_reply) \ +_(sw_interface_ip6_set_link_local_address_reply) \ +_(sw_interface_ip6nd_ra_prefix_reply) \ +_(sw_interface_ip6nd_ra_config_reply) \ +_(set_arp_neighbor_limit_reply) \ +_(l2_patch_add_del_reply) \ +_(sr_tunnel_add_del_reply) \ +_(sr_policy_add_del_reply) \ +_(sr_multicast_map_add_del_reply) \ +_(classify_add_del_session_reply) \ +_(classify_set_interface_ip_table_reply) \ +_(classify_set_interface_l2_tables_reply) \ +_(l2tpv3_set_tunnel_cookies_reply) \ +_(l2tpv3_interface_enable_disable_reply) \ +_(l2tpv3_set_lookup_key_reply) \ +_(l2_fib_clear_table_reply) \ +_(l2_interface_efp_filter_reply) \ +_(l2_interface_vlan_tag_rewrite_reply) \ +_(modify_vhost_user_if_reply) \ +_(delete_vhost_user_if_reply) \ +_(want_ip4_arp_events_reply) \ +_(input_acl_set_interface_reply) \ +_(ipsec_spd_add_del_reply) \ +_(ipsec_interface_add_del_spd_reply) \ +_(ipsec_spd_add_del_entry_reply) \ +_(ipsec_sad_add_del_entry_reply) \ +_(ipsec_sa_set_key_reply) \ +_(ikev2_profile_add_del_reply) \ +_(ikev2_profile_set_auth_reply) \ +_(ikev2_profile_set_id_reply) \ +_(ikev2_profile_set_ts_reply) \ +_(ikev2_set_local_key_reply) \ +_(delete_loopback_reply) \ +_(bd_ip_mac_add_del_reply) \ +_(map_del_domain_reply) \ +_(map_add_del_rule_reply) \ +_(want_interface_events_reply) \ +_(want_stats_reply) \ +_(cop_interface_enable_disable_reply) \ +_(cop_whitelist_enable_disable_reply) \ +_(sw_interface_clear_stats_reply) \ +_(trace_profile_add_reply) \ +_(trace_profile_apply_reply) \ +_(trace_profile_del_reply) \ +_(lisp_add_del_locator_set_reply) \ +_(lisp_add_del_locator_reply) \ +_(lisp_add_del_local_eid_reply) \ +_(lisp_gpe_add_del_fwd_entry_reply) \ +_(lisp_add_del_map_resolver_reply) \ +_(lisp_gpe_enable_disable_reply) \ +_(lisp_gpe_add_del_iface_reply) \ +_(lisp_enable_disable_reply) \ +_(vxlan_gpe_add_del_tunnel_reply) \ +_(af_packet_create_reply) \ +_(af_packet_delete_reply) + +#define _(n) \ + static void vl_api_##n##_t_handler \ + (vl_api_##n##_t * mp) \ + { \ + vat_main_t * vam = &vat_main; \ + i32 retval = ntohl(mp->retval); \ + if (vam->async_mode) { \ + vam->async_errors += (retval < 0); \ + } else { \ + vam->retval = retval; \ + vam->result_ready = 1; \ + } \ + } +foreach_standard_reply_retval_handler; +#undef _ + +#define _(n) \ + static void vl_api_##n##_t_handler_json \ + (vl_api_##n##_t * mp) \ + { \ + vat_main_t * vam = &vat_main; \ + vat_json_node_t node; \ + vat_json_init_object(&node); \ + vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); \ + vat_json_print(vam->ofp, &node); \ + vam->retval = ntohl(mp->retval); \ + vam->result_ready = 1; \ + } +foreach_standard_reply_retval_handler; +#undef _ + +/* * Table of message reply handlers, must include boilerplate handlers * we just generated */ @@ -1865,6 +2277,8 @@ _(SW_INTERFACE_IP6ND_RA_CONFIG_REPLY, \ _(SET_ARP_NEIGHBOR_LIMIT_REPLY, set_arp_neighbor_limit_reply) \ _(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply) \ _(SR_TUNNEL_ADD_DEL_REPLY, sr_tunnel_add_del_reply) \ +_(SR_POLICY_ADD_DEL_REPLY, sr_policy_add_del_reply) \ +_(SR_MULTICAST_MAP_ADD_DEL_REPLY, sr_multicast_map_add_del_reply) \ _(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply) \ _(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply) \ _(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY, \ @@ -1880,6 +2294,9 @@ _(L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY, \ _(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply) \ _(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details) \ _(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \ +_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \ +_(GRE_ADD_DEL_TUNNEL_REPLY, gre_add_del_tunnel_reply) \ +_(GRE_TUNNEL_DETAILS, gre_tunnel_details) \ _(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply) \ _(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply) \ _(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \ @@ -1888,10 +2305,8 @@ _(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply) \ _(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply) \ _(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \ _(SHOW_VERSION_REPLY, show_version_reply) \ -_(NSH_GRE_ADD_DEL_TUNNEL_REPLY, nsh_gre_add_del_tunnel_reply) \ _(L2_FIB_TABLE_ENTRY, l2_fib_table_entry) \ -_(NSH_VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, nsh_vxlan_gpe_add_del_tunnel_reply) \ -_(LISP_GPE_ADD_DEL_TUNNEL_REPLY, lisp_gpe_add_del_tunnel_reply) \ +_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_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) \ @@ -1903,6 +2318,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) \ @@ -1911,12 +2331,35 @@ _(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters) \ _(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters) \ _(MAP_ADD_DOMAIN_REPLY, map_add_domain_reply) \ _(MAP_DEL_DOMAIN_REPLY, map_del_domain_reply) \ -_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply) \ +_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply) \ _(MAP_DOMAIN_DETAILS, map_domain_details) \ _(MAP_RULE_DETAILS, map_rule_details) \ _(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \ _(WANT_STATS_REPLY, want_stats_reply) \ -_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) +_(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) \ +_(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_ENABLE_DISABLE_REPLY, lisp_gpe_enable_disable_reply) \ +_(LISP_ENABLE_DISABLE_REPLY, lisp_enable_disable_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) \ +_(LISP_ENABLE_DISABLE_STATUS_DETAILS, \ + lisp_enable_disable_status_details) \ +_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \ +_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) /* M: construct, but don't yet send a message */ @@ -2019,6 +2462,14 @@ static int dump_sub_interface_table (vat_main_t * vam) return 0; } +static int name_sort_cmp (void * a1, void * a2) +{ + name_sort_t * n1 = a1; + name_sort_t * n2 = a2; + + return strcmp ((char *)n1->name, (char *)n2->name); +} + static int dump_interface_table (vat_main_t * vam) { hash_pair_t * p; @@ -2036,8 +2487,7 @@ static int dump_interface_table (vat_main_t * vam) ns->value = (u32) p->value[0]; })); - vec_sort (nses, n1, n2, - strcmp ((char *)n1->name, (char *)n2->name)); + vec_sort_with_function (nses, name_sort_cmp); fformat (vam->ofp, "%-25s%-15s\n", "Interface", "sw_if_index"); vec_foreach (ns, nses) { @@ -2057,7 +2507,7 @@ static int dump_ip_table (vat_main_t * vam, int is_ipv6) "%-12s\n", "sw_if_index"); - if (0 == vam->ip_details_by_sw_if_index) { + if (0 == vam) { return 0; } @@ -2276,7 +2726,7 @@ int exec (vat_main_t * vam) oldheap = svm_push_data_heap (am->vlib_rp); vec_validate (cmd, vec_len(vam->input->buffer)-1); - memcpy (cmd, vam->input->buffer, vec_len(vam->input->buffer)); + clib_memcpy (cmd, vam->input->buffer, vec_len(vam->input->buffer)); svm_pop_heap (oldheap); pthread_mutex_unlock (&am->vlib_rp->mutex); @@ -2288,7 +2738,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); @@ -2324,7 +2775,7 @@ static int api_create_loopback (vat_main_t * vam) /* Construct the API message */ M(CREATE_LOOPBACK, create_loopback); if (mac_set) - memcpy (mp->mac_address, mac_address, sizeof (mac_address)); + clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address)); S; W; } @@ -2454,25 +2905,37 @@ int api_sw_interface_dump (vat_main_t * vam) /* Get list of ethernets */ M(SW_INTERFACE_DUMP, sw_interface_dump); mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1)); + strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter)-1); S; /* and local / loopback interfaces */ M(SW_INTERFACE_DUMP, sw_interface_dump); mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1)); + strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter)-1); S; /* and vxlan tunnel interfaces */ M(SW_INTERFACE_DUMP, sw_interface_dump); mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1)); + 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; - strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", sizeof(mp->name_filter-1)); + strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", sizeof(mp->name_filter)-1); + S; + + /* and GRE tunnel interfaces */ + M(SW_INTERFACE_DUMP, sw_interface_dump); + mp->name_filter_valid = 1; + strncpy ((char *) mp->name_filter, "gre", sizeof(mp->name_filter)-1); S; /* Use a control ping for synchronization */ @@ -2529,7 +2992,40 @@ static int api_sw_interface_set_flags (vat_main_t * vam) W; } -static int api_sw_interface_add_del_address (vat_main_t * vam) +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; vl_api_sw_interface_add_del_address_t *mp; @@ -2586,9 +3082,9 @@ static int api_sw_interface_add_del_address (vat_main_t * vam) mp->del_all = del_all; if (v6_address_set) { mp->is_ipv6 = 1; - memcpy (mp->address, &v6address, sizeof (v6address)); + clib_memcpy (mp->address, &v6address, sizeof (v6address)); } else { - memcpy (mp->address, &v4address, sizeof (v4address)); + clib_memcpy (mp->address, &v4address, sizeof (v4address)); } mp->address_length = address_length; @@ -3097,9 +3593,9 @@ static int api_bd_ip_mac_add_del (vat_main_t * vam) mp->is_ipv6 = is_ipv6; mp->is_add = is_add; if (is_ipv6) - memcpy (mp->ip_address, &v6addr, sizeof (v6addr)); - else memcpy (mp->ip_address, &v4addr, sizeof (v4addr)); - memcpy (mp->mac_address, macaddr, 6); + clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr)); + else clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr)); + clib_memcpy (mp->mac_address, macaddr, 6); S; W; /* NOTREACHED */ return 0; @@ -3143,8 +3639,8 @@ static int api_tap_connect (vat_main_t * vam) M(TAP_CONNECT, tap_connect); mp->use_random_mac = random_mac; - memcpy (mp->mac_address, mac_address, 6); - memcpy (mp->tap_name, tap_name, vec_len (tap_name)); + clib_memcpy (mp->mac_address, mac_address, 6); + clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name)); vec_free (tap_name); /* send it... */ @@ -3203,8 +3699,8 @@ static int api_tap_modify (vat_main_t * vam) mp->use_random_mac = random_mac; mp->sw_if_index = ntohl(sw_if_index); - memcpy (mp->mac_address, mac_address, 6); - memcpy (mp->tap_name, tap_name, vec_len (tap_name)); + clib_memcpy (mp->mac_address, mac_address, 6); + clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name)); vec_free (tap_name); /* send it... */ @@ -3415,15 +3911,15 @@ static int api_ip_add_del_route (vat_main_t * vam) mp->classify_table_index = ntohl(classify_table_index); if (is_ipv6){ - memcpy (mp->dst_address, &v6_dst_address, sizeof (v6_dst_address)); + clib_memcpy (mp->dst_address, &v6_dst_address, sizeof (v6_dst_address)); if (next_hop_set) - memcpy (mp->next_hop_address, &v6_next_hop_address, + clib_memcpy (mp->next_hop_address, &v6_next_hop_address, sizeof (v6_next_hop_address)); increment_v6_address (&v6_dst_address); } else { - memcpy (mp->dst_address, &v4_dst_address, sizeof (v4_dst_address)); + clib_memcpy (mp->dst_address, &v4_dst_address, sizeof (v4_dst_address)); if (next_hop_set) - memcpy (mp->next_hop_address, &v4_next_hop_address, + clib_memcpy (mp->next_hop_address, &v4_next_hop_address, sizeof (v4_next_hop_address)); if (random_add_del) v4_dst_address.as_u32 = random_vector[j+1]; @@ -3506,8 +4002,8 @@ static int api_proxy_arp_add_del (vat_main_t * vam) mp->vrf_id = ntohl(vrf_id); mp->is_add = is_add; - memcpy(mp->low_address, &lo, sizeof (mp->low_address)); - memcpy(mp->hi_address, &hi, sizeof (mp->hi_address)); + clib_memcpy(mp->low_address, &lo, sizeof (mp->low_address)); + clib_memcpy(mp->hi_address, &hi, sizeof (mp->hi_address)); S; W; /* NOTREACHED */ @@ -3633,10 +4129,10 @@ static int api_mpls_add_del_encap (vat_main_t * vam) sizeof (u32) * vec_len (labels)); mp->vrf_id = ntohl(vrf_id); - memcpy(mp->dst_address, &dst_address, sizeof (dst_address)); + clib_memcpy(mp->dst_address, &dst_address, sizeof (dst_address)); mp->is_add = is_add; mp->nlabels = vec_len (labels); - memcpy(mp->labels, labels, sizeof(u32)*mp->nlabels); + clib_memcpy(mp->labels, labels, sizeof(u32)*mp->nlabels); vec_free(labels); @@ -3686,9 +4182,9 @@ static int api_mpls_gre_add_del_tunnel (vat_main_t * vam) mp->inner_vrf_id = ntohl(inner_vrf_id); mp->outer_vrf_id = ntohl(outer_vrf_id); - memcpy(mp->src_address, &src_address, sizeof (src_address)); - memcpy(mp->dst_address, &dst_address, sizeof (dst_address)); - memcpy(mp->intfc_address, &intfc_address, sizeof (intfc_address)); + clib_memcpy(mp->src_address, &src_address, sizeof (src_address)); + clib_memcpy(mp->dst_address, &dst_address, sizeof (dst_address)); + clib_memcpy(mp->intfc_address, &intfc_address, sizeof (intfc_address)); mp->intfc_address_length = intfc_address_length; mp->l2_only = l2_only; mp->is_add = is_add; @@ -3750,9 +4246,9 @@ static int api_mpls_ethernet_add_del_tunnel (vat_main_t * vam) M(MPLS_ETHERNET_ADD_DEL_TUNNEL, mpls_ethernet_add_del_tunnel); mp->vrf_id = ntohl(inner_vrf_id); - memcpy (mp->adj_address, &intfc_address, sizeof (intfc_address)); + clib_memcpy (mp->adj_address, &intfc_address, sizeof (intfc_address)); mp->adj_address_length = intfc_address_length; - memcpy (mp->dst_mac_address, dst_mac_address, sizeof (dst_mac_address)); + clib_memcpy (mp->dst_mac_address, dst_mac_address, sizeof (dst_mac_address)); mp->tx_sw_if_index = ntohl(tx_sw_if_index); mp->l2_only = l2_only; mp->is_add = is_add; @@ -3824,9 +4320,9 @@ static int api_mpls_ethernet_add_del_tunnel_2 (vat_main_t * vam) mp->resolve_if_needed = resolve_if_needed; mp->is_add = is_add; mp->l2_only = l2_only; - memcpy (mp->adj_address, &adj_address, sizeof (adj_address)); + clib_memcpy (mp->adj_address, &adj_address, sizeof (adj_address)); mp->adj_address_length = adj_address_length; - memcpy (mp->next_hop_ip4_address_in_outer_vrf, &next_hop_address, + clib_memcpy (mp->next_hop_ip4_address_in_outer_vrf, &next_hop_address, sizeof (next_hop_address)); S; W; @@ -3942,13 +4438,13 @@ static int api_ip_neighbor_add_del (vat_main_t * vam) mp->vrf_id = ntohl (vrf_id); mp->is_static = is_static; if (mac_set) - memcpy (mp->mac_address, mac_address, 6); + clib_memcpy (mp->mac_address, mac_address, 6); if (v6_address_set) { mp->is_ipv6 = 1; - memcpy (mp->dst_address, &v6address, sizeof (v6address)); + clib_memcpy (mp->dst_address, &v6address, sizeof (v6address)); } else { /* mp->is_ipv6 = 0; via memset in M macro above */ - memcpy (mp->dst_address, &v4address, sizeof (v4address)); + clib_memcpy (mp->dst_address, &v4address, sizeof (v4address)); } /* send it... */ @@ -4157,8 +4653,8 @@ static int api_oam_add_del (vat_main_t * vam) mp->vrf_id = ntohl(vrf_id); mp->is_add = is_add; - memcpy(mp->src_address, &src, sizeof (mp->src_address)); - memcpy(mp->dst_address, &dst, sizeof (mp->dst_address)); + clib_memcpy(mp->src_address, &src, sizeof (mp->src_address)); + clib_memcpy(mp->dst_address, &dst, sizeof (mp->dst_address)); S; W; /* NOTREACHED */ @@ -4273,11 +4769,11 @@ static int api_dhcp_proxy_config (vat_main_t * vam) mp->vrf_id = ntohl (vrf_id); if (v6_address_set) { mp->is_ipv6 = 1; - memcpy (mp->dhcp_server, &v6address, sizeof (v6address)); - memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address)); + clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address)); + clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address)); } else { - memcpy (mp->dhcp_server, &v4address, sizeof (v4address)); - memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address)); + clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address)); + clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address)); } /* send it... */ @@ -4366,11 +4862,11 @@ static int api_dhcp_proxy_config_2 (vat_main_t * vam) mp->server_vrf_id = ntohl (server_vrf_id); if (v6_address_set) { mp->is_ipv6 = 1; - memcpy (mp->dhcp_server, &v6address, sizeof (v6address)); - memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address)); + clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address)); + clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address)); } else { - memcpy (mp->dhcp_server, &v4address, sizeof (v4address)); - memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address)); + clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address)); + clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address)); } /* send it... */ @@ -4480,7 +4976,7 @@ static int api_dhcp_client_config (vat_main_t * vam) M(DHCP_CLIENT_CONFIG, dhcp_client_config); mp->sw_if_index = ntohl (sw_if_index); - memcpy (mp->hostname, hostname, vec_len (hostname)); + clib_memcpy (mp->hostname, hostname, vec_len (hostname)); vec_free (hostname); mp->is_add = is_add; mp->want_dhcp_event = disable_event ? 0 : 1; @@ -4632,7 +5128,7 @@ static int api_sw_interface_ip6_set_link_local_address (vat_main_t * vam) sw_interface_ip6_set_link_local_address); mp->sw_if_index = ntohl (sw_if_index); - memcpy (mp->address, &v6address, sizeof (v6address)); + clib_memcpy (mp->address, &v6address, sizeof (v6address)); mp->address_length = address_length; /* send it... */ @@ -4710,7 +5206,7 @@ static int api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam) M(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix); mp->sw_if_index = ntohl (sw_if_index); - memcpy (mp->address, &v6address, sizeof (v6address)); + clib_memcpy (mp->address, &v6address, sizeof (v6address)); mp->address_length = address_length; mp->use_default = use_default; mp->no_advertise = no_advertise; @@ -4916,6 +5412,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); + 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) +{ + 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) { @@ -4937,11 +5548,17 @@ static int api_sr_tunnel_add_del (vat_main_t * vam) ip6_address_t * tags = 0; ip6_address_t * this_tag; ip6_address_t next_address, tag; + u8 * name = 0; + u8 * policy_name = 0; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "del")) is_del = 1; + else if (unformat (i, "name %s", &name)) + ; + else if (unformat (i, "policy %s", &policy_name)) + ; else if (unformat (i, "rx_fib_id %d", &rx_table_id)) ; else if (unformat (i, "tx_fib_id %d", &tx_table_id)) @@ -4956,13 +5573,13 @@ static int api_sr_tunnel_add_del (vat_main_t * vam) &next_address)) { vec_add2 (segments, this_seg, 1); - memcpy (this_seg->as_u8, next_address.as_u8, sizeof (*this_seg)); + clib_memcpy (this_seg->as_u8, next_address.as_u8, sizeof (*this_seg)); } else if (unformat (i, "tag %U", unformat_ip6_address, &tag)) { vec_add2 (tags, this_tag, 1); - memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag)); + clib_memcpy (this_tag->as_u8, tag.as_u8, sizeof (*this_tag)); } else if (unformat (i, "clean")) flags |= IP6_SR_HEADER_FLAG_CLEANUP; @@ -5016,20 +5633,22 @@ static int api_sr_tunnel_add_del (vat_main_t * vam) vec_len(segments) * sizeof (ip6_address_t) + vec_len(tags) * sizeof (ip6_address_t)); - memcpy (mp->src_address, &src_address, sizeof (mp->src_address)); - memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address)); + clib_memcpy (mp->src_address, &src_address, sizeof (mp->src_address)); + clib_memcpy (mp->dst_address, &dst_address, sizeof (mp->dst_address)); mp->dst_mask_width = dst_mask_width; mp->flags_net_byte_order = clib_host_to_net_u16 (flags); mp->n_segments = vec_len (segments); mp->n_tags = vec_len (tags); mp->is_add = is_del == 0; - memcpy (mp->segs_and_tags, segments, + clib_memcpy (mp->segs_and_tags, segments, vec_len(segments)* sizeof (ip6_address_t)); - memcpy (mp->segs_and_tags + vec_len(segments)*sizeof (ip6_address_t), + clib_memcpy (mp->segs_and_tags + vec_len(segments)*sizeof (ip6_address_t), tags, vec_len(tags)* sizeof (ip6_address_t)); mp->outer_vrf_id = ntohl (rx_table_id); mp->inner_vrf_id = ntohl (tx_table_id); + memcpy (mp->name, name, vec_len(name)); + memcpy (mp->policy_name, policy_name, vec_len(policy_name)); vec_free (segments); vec_free (tags); @@ -5038,6 +5657,136 @@ static int api_sr_tunnel_add_del (vat_main_t * vam) /* NOTREACHED */ } +static int api_sr_policy_add_del (vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_sr_policy_add_del_t *mp; + f64 timeout; + int is_del = 0; + u8 * name = 0; + u8 * tunnel_name = 0; + u8 ** tunnel_names = 0; + + int name_set = 0 ; + int tunnel_set = 0; + int j = 0; + int tunnel_names_length = 1; // Init to 1 to offset the #tunnel_names counter byte + int tun_name_len = 0; // Different naming convention used as confusing these would be "bad" (TM) + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_del = 1; + else if (unformat (input, "name %s", &name)) + name_set = 1; + else if (unformat (input, "tunnel %s", &tunnel_name)) + { + if (tunnel_name) + { + vec_add1 (tunnel_names, tunnel_name); + /* For serializer: + - length = #bytes to store in serial vector + - +1 = byte to store that length + */ + tunnel_names_length += (vec_len (tunnel_name) + 1); + tunnel_set = 1; + tunnel_name = 0; + } + } + else + break; + } + + if (!name_set) + { + errmsg ("policy name required\n"); + return -99; + } + + if ((!tunnel_set) && (!is_del)) + { + errmsg ("tunnel name required\n"); + return -99; + } + + M2(SR_POLICY_ADD_DEL, sr_policy_add_del, tunnel_names_length); + + + + mp->is_add = !is_del; + + memcpy (mp->name, name, vec_len(name)); + // Since mp->tunnel_names is of type u8[0] and not a u8 *, u8 ** needs to be serialized + u8 * serial_orig = 0; + vec_validate (serial_orig, tunnel_names_length); + *serial_orig = vec_len(tunnel_names); // Store the number of tunnels as length in first byte of serialized vector + serial_orig += 1; // Move along one byte to store the length of first tunnel_name + + for (j=0; j < vec_len(tunnel_names); j++) + { + tun_name_len = vec_len (tunnel_names[j]); + *serial_orig = tun_name_len; // Store length of tunnel name in first byte of Length/Value pair + serial_orig += 1; // Move along one byte to store the actual tunnel name + memcpy (serial_orig, tunnel_names[j], tun_name_len); + serial_orig += tun_name_len; // Advance past the copy + } + memcpy (mp->tunnel_names, serial_orig - tunnel_names_length, tunnel_names_length); // Regress serial_orig to head then copy fwd + + vec_free (tunnel_names); + vec_free (tunnel_name); + + S; W; + /* NOTREACHED */ +} + +static int api_sr_multicast_map_add_del (vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_sr_multicast_map_add_del_t *mp; + f64 timeout; + int is_del = 0; + ip6_address_t multicast_address; + u8 * policy_name = 0; + int multicast_address_set = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_del = 1; + else if (unformat (input, "address %U", unformat_ip6_address, &multicast_address)) + multicast_address_set = 1; + else if (unformat (input, "sr-policy %s", &policy_name)) + ; + else + break; + } + + if (!is_del && !policy_name) + { + errmsg ("sr-policy name required\n"); + return -99; + } + + + if (!multicast_address_set) + { + errmsg ("address required\n"); + return -99; + } + + M(SR_MULTICAST_MAP_ADD_DEL, sr_multicast_map_add_del); + + mp->is_add = !is_del; + memcpy (mp->policy_name, policy_name, vec_len(policy_name)); + clib_memcpy (mp->multicast_address, &multicast_address, sizeof (mp->multicast_address)); + + + vec_free (policy_name); + + S; W; + /* NOTREACHED */ +} + #define foreach_ip4_proto_field \ _(src_address) \ @@ -5550,7 +6299,7 @@ static int api_classify_add_del_table (vat_main_t * vam) mp->match_n_vectors = ntohl(match); mp->next_table_index = ntohl(next_table_index); mp->miss_next_index = ntohl(miss_next_index); - memcpy (mp->mask, mask, vec_len(mask)); + clib_memcpy (mp->mask, mask, vec_len(mask)); vec_free(mask); @@ -5708,10 +6457,10 @@ uword unformat_ip6_match (unformat_input_t * input, va_list * args) ip = (ip6_header_t *) match; if (src) - memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); + clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); if (dst) - memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); + clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); if (proto) ip->protocol = proto_val; @@ -5827,10 +6576,10 @@ uword unformat_l2_match (unformat_input_t * input, va_list * args) vec_validate_aligned (match, len-1, sizeof(u32x4)); if (dst) - memcpy (match, dst_val, 6); + clib_memcpy (match, dst_val, 6); if (src) - memcpy (match + 6, src_val, 6); + clib_memcpy (match + 6, src_val, 6); if (tag2) { @@ -6000,7 +6749,7 @@ static int api_classify_add_del_session (vat_main_t * vam) mp->hit_next_index = ntohl(hit_next_index); mp->opaque_index = ntohl(opaque_index); mp->advance = ntohl(advance); - memcpy (mp->match, match, vec_len(match)); + clib_memcpy (mp->match, match, vec_len(match)); vec_free(match); S; W; @@ -6117,7 +6866,7 @@ static int api_get_node_index (vat_main_t * vam) } M(GET_NODE_INDEX, get_node_index); - memcpy (mp->node_name, name, vec_len(name)); + clib_memcpy (mp->node_name, name, vec_len(name)); vec_free(name); S; W; @@ -6159,8 +6908,8 @@ static int api_add_node_next (vat_main_t * vam) } M(ADD_NODE_NEXT, add_node_next); - memcpy (mp->node_name, name, vec_len(name)); - memcpy (mp->next_name, next, vec_len(next)); + clib_memcpy (mp->node_name, name, vec_len(name)); + clib_memcpy (mp->next_name, next, vec_len(next)); vec_free(name); vec_free(next); @@ -6216,10 +6965,10 @@ static int api_l2tpv3_create_tunnel (vat_main_t * vam) M(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel); - memcpy (mp->client_address, client_address.as_u8, + clib_memcpy (mp->client_address, client_address.as_u8, sizeof (mp->client_address)); - memcpy (mp->our_address, our_address.as_u8, + clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address)); mp->local_session_id = ntohl (local_session_id); @@ -6328,7 +7077,7 @@ static int api_l2tpv3_set_lookup_key (vat_main_t * vam) break; } - if (key == ~0) { + if (key == (u8) ~0) { errmsg ("l2tp session lookup key unset\n"); return -99; } @@ -6381,9 +7130,9 @@ static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json vat_json_init_object(node); - memcpy(&addr, mp->our_address, sizeof(addr)); + clib_memcpy(&addr, mp->our_address, sizeof(addr)); vat_json_object_add_ip6(node, "our_address", addr); - memcpy(&addr, mp->client_address, sizeof(addr)); + clib_memcpy(&addr, mp->client_address, sizeof(addr)); vat_json_object_add_ip6(node, "client_address", addr); vat_json_node_t * lc = vat_json_object_add(node, "local_cookie"); @@ -6490,8 +7239,10 @@ static int api_vxlan_add_del_tunnel (vat_main_t * vam) unformat_input_t * line_input = vam->input; vl_api_vxlan_add_del_tunnel_t *mp; f64 timeout; - ip4_address_t src, dst; + ip4_address_t src4, dst4; + ip6_address_t src6, dst6; u8 is_add = 1; + u8 ipv4_set = 0, ipv6_set = 0; u8 src_set = 0; u8 dst_set = 0; u32 encap_vrf_id = 0; @@ -6502,11 +7253,29 @@ static int api_vxlan_add_del_tunnel (vat_main_t * vam) if (unformat (line_input, "del")) is_add = 0; else if (unformat (line_input, "src %U", - unformat_ip4_address, &src)) + unformat_ip4_address, &src4)) + { + ipv4_set = 1; + src_set = 1; + } + else if (unformat (line_input, "dst %U", + unformat_ip4_address, &dst4)) + { + ipv4_set = 1; + dst_set = 1; + } + else if (unformat (line_input, "src %U", + unformat_ip6_address, &src6)) + { + ipv6_set = 1; src_set = 1; + } else if (unformat (line_input, "dst %U", - unformat_ip4_address, &dst)) + unformat_ip6_address, &dst6)) + { + ipv6_set = 1; dst_set = 1; + } else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) ; else if (unformat (line_input, "decap-next %U", @@ -6529,86 +7298,312 @@ static int api_vxlan_add_del_tunnel (vat_main_t * vam) return -99; } + if (ipv4_set && ipv6_set) { + errmsg ("both IPv4 and IPv6 addresses specified"); + return -99; + } + if ((vni == 0) || (vni>>24)) { errmsg ("vni not specified or out of range\n"); return -99; } M (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel); - - mp->src_address = src.as_u32; - mp->dst_address = dst.as_u32; + + if (ipv6_set) { + clib_memcpy(&mp->dst_address, &src6, sizeof(src6)); + clib_memcpy(&mp->dst_address, &src6, sizeof(dst6)); + } else { + clib_memcpy(&mp->src_address, &src4, sizeof(src4)); + clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4)); + } mp->encap_vrf_id = ntohl(encap_vrf_id); mp->decap_next_index = ntohl(decap_next_index); mp->vni = ntohl(vni); mp->is_add = is_add; + mp->is_ipv6 = ipv6_set; S; W; /* NOTREACHED */ return 0; } -static int api_l2_fib_clear_table (vat_main_t * vam) +static void vl_api_vxlan_tunnel_details_t_handler +(vl_api_vxlan_tunnel_details_t * mp) { -// unformat_input_t * i = vam->input; - vl_api_l2_fib_clear_table_t *mp; - f64 timeout; + vat_main_t * vam = &vat_main; - M(L2_FIB_CLEAR_TABLE, l2_fib_clear_table); + fformat(vam->ofp, "%11d%24U%24U%14d%18d%13d\n", + ntohl(mp->sw_if_index), + format_ip46_address, &(mp->src_address[0]), + format_ip46_address, &(mp->dst_address[0]), + ntohl(mp->encap_vrf_id), + ntohl(mp->decap_next_index), + ntohl(mp->vni)); +} - S; W; - /* NOTREACHED */ - return 0; +static void vl_api_vxlan_tunnel_details_t_handler_json +(vl_api_vxlan_tunnel_details_t * mp) +{ + vat_main_t * vam = &vat_main; + vat_json_node_t *node = NULL; + struct in_addr ip4; + struct in6_addr ip6; + + if (VAT_JSON_ARRAY != vam->json_tree.type) { + ASSERT(VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array(&vam->json_tree); + } + node = vat_json_array_add(&vam->json_tree); + + vat_json_init_object(node); + vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index)); + if (mp->is_ipv6) { + clib_memcpy(&ip6, &(mp->src_address[0]), sizeof(ip6)); + vat_json_object_add_ip6(node, "src_address", ip6); + clib_memcpy(&ip6, &(mp->dst_address[0]), sizeof(ip6)); + vat_json_object_add_ip6(node, "dst_address", ip6); + } else { + clib_memcpy(&ip4, &(mp->src_address[0]), sizeof(ip4)); + vat_json_object_add_ip4(node, "src_address", ip4); + clib_memcpy(&ip4, &(mp->dst_address[0]), sizeof(ip4)); + vat_json_object_add_ip4(node, "dst_address", ip4); + } + vat_json_object_add_uint(node, "encap_vrf_id", ntohl(mp->encap_vrf_id)); + vat_json_object_add_uint(node, "decap_next_index", ntohl(mp->decap_next_index)); + vat_json_object_add_uint(node, "vni", ntohl(mp->vni)); + vat_json_object_add_uint(node, "is_ipv6", mp->is_ipv6 ? 1 : 0); } -static int api_l2_interface_efp_filter (vat_main_t * vam) +static int api_vxlan_tunnel_dump (vat_main_t * vam) { unformat_input_t * i = vam->input; - vl_api_l2_interface_efp_filter_t *mp; + vl_api_vxlan_tunnel_dump_t *mp; f64 timeout; u32 sw_if_index; - u8 enable = 1; u8 sw_if_index_set = 0; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) + if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; + else + break; + } + + if (sw_if_index_set == 0) { + sw_if_index = ~0; + } + + if (!vam->json_output) { + fformat(vam->ofp, "%11s%24s%24s%14s%18s%13s\n", + "sw_if_index", "src_address", "dst_address", + "encap_vrf_id", "decap_next_index", "vni"); + } + + /* Get list of vxlan-tunnel interfaces */ + M(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump); + + mp->sw_if_index = htonl(sw_if_index); + + S; + + /* Use a control ping for synchronization */ + { + vl_api_control_ping_t * mp; + M(CONTROL_PING, control_ping); + S; + } + W; +} + +static int api_gre_add_del_tunnel (vat_main_t * vam) +{ + unformat_input_t * line_input = vam->input; + vl_api_gre_add_del_tunnel_t *mp; + f64 timeout; + ip4_address_t src4, dst4; + u8 is_add = 1; + u8 src_set = 0; + u8 dst_set = 0; + u32 outer_fib_id = 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "src %U", + unformat_ip4_address, &src4)) + src_set = 1; + else if (unformat (line_input, "dst %U", + unformat_ip4_address, &dst4)) + dst_set = 1; + else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id)) + ; else { - clib_warning ("parse error '%U'", format_unformat_error, i); + errmsg ("parse error '%U'\n", format_unformat_error, line_input); return -99; } } - - if (sw_if_index_set == 0) { - errmsg ("missing sw_if_index\n"); + + if (src_set == 0) { + errmsg ("tunnel src address not specified\n"); + return -99; + } + if (dst_set == 0) { + errmsg ("tunnel dst address not specified\n"); return -99; } - M(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter); - mp->sw_if_index = ntohl(sw_if_index); - mp->enable_disable = enable; + M (GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel); + + clib_memcpy(&mp->src_address, &src4, sizeof(src4)); + clib_memcpy(&mp->dst_address, &dst4, sizeof(dst4)); + mp->outer_table_id = ntohl(outer_fib_id); + mp->is_add = is_add; S; W; /* NOTREACHED */ return 0; } -#define foreach_vtr_op \ -_("disable", L2_VTR_DISABLED) \ -_("push-1", L2_VTR_PUSH_1) \ -_("push-2", L2_VTR_PUSH_2) \ -_("pop-1", L2_VTR_POP_1) \ -_("pop-2", L2_VTR_POP_2) \ -_("translate-1-1", L2_VTR_TRANSLATE_1_1) \ -_("translate-1-2", L2_VTR_TRANSLATE_1_2) \ -_("translate-2-1", L2_VTR_TRANSLATE_2_1) \ +static void vl_api_gre_tunnel_details_t_handler +(vl_api_gre_tunnel_details_t * mp) +{ + vat_main_t * vam = &vat_main; + + fformat(vam->ofp, "%11d%15U%15U%14d\n", + ntohl(mp->sw_if_index), + format_ip4_address, &mp->src_address, + format_ip4_address, &mp->dst_address, + ntohl(mp->outer_table_id)); +} + +static void vl_api_gre_tunnel_details_t_handler_json +(vl_api_gre_tunnel_details_t * mp) +{ + vat_main_t * vam = &vat_main; + vat_json_node_t *node = NULL; + struct in_addr ip4; + + if (VAT_JSON_ARRAY != vam->json_tree.type) { + ASSERT(VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array(&vam->json_tree); + } + node = vat_json_array_add(&vam->json_tree); + + vat_json_init_object(node); + vat_json_object_add_uint(node, "sw_if_index", ntohl(mp->sw_if_index)); + clib_memcpy(&ip4, &mp->src_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "src_address", ip4); + clib_memcpy(&ip4, &mp->dst_address, sizeof(ip4)); + vat_json_object_add_ip4(node, "dst_address", ip4); + vat_json_object_add_uint(node, "outer_fib_id", ntohl(mp->outer_table_id)); +} + +static int api_gre_tunnel_dump (vat_main_t * vam) +{ + unformat_input_t * i = vam->input; + vl_api_gre_tunnel_dump_t *mp; + f64 timeout; + u32 sw_if_index; + u8 sw_if_index_set = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) { + sw_if_index = ~0; + } + + if (!vam->json_output) { + fformat(vam->ofp, "%11s%15s%15s%14s\n", + "sw_if_index", "src_address", "dst_address", + "outer_fib_id"); + } + + /* Get list of gre-tunnel interfaces */ + M(GRE_TUNNEL_DUMP, gre_tunnel_dump); + + mp->sw_if_index = htonl(sw_if_index); + + S; + + /* Use a control ping for synchronization */ + { + vl_api_control_ping_t * mp; + M(CONTROL_PING, control_ping); + S; + } + W; +} + +static int api_l2_fib_clear_table (vat_main_t * vam) +{ +// unformat_input_t * i = vam->input; + vl_api_l2_fib_clear_table_t *mp; + f64 timeout; + + M(L2_FIB_CLEAR_TABLE, l2_fib_clear_table); + + S; W; + /* NOTREACHED */ + return 0; +} + +static int api_l2_interface_efp_filter (vat_main_t * vam) +{ + unformat_input_t * i = vam->input; + vl_api_l2_interface_efp_filter_t *mp; + f64 timeout; + u32 sw_if_index; + u8 enable = 1; + u8 sw_if_index_set = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "%U", unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; + else { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (sw_if_index_set == 0) { + errmsg ("missing sw_if_index\n"); + return -99; + } + + M(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter); + + mp->sw_if_index = ntohl(sw_if_index); + mp->enable_disable = enable; + + S; W; + /* NOTREACHED */ + return 0; +} + +#define foreach_vtr_op \ +_("disable", L2_VTR_DISABLED) \ +_("push-1", L2_VTR_PUSH_1) \ +_("push-2", L2_VTR_PUSH_2) \ +_("pop-1", L2_VTR_POP_1) \ +_("pop-2", L2_VTR_POP_2) \ +_("translate-1-1", L2_VTR_TRANSLATE_1_1) \ +_("translate-1-2", L2_VTR_TRANSLATE_1_2) \ +_("translate-2-1", L2_VTR_TRANSLATE_2_1) \ _("translate-2-2", L2_VTR_TRANSLATE_2_2) static int api_l2_interface_vlan_tag_rewrite (vat_main_t * vam) @@ -6674,6 +7669,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)) { @@ -6681,6 +7678,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 @@ -6701,12 +7700,14 @@ static int api_create_vhost_user_if (vat_main_t * vam) M(CREATE_VHOST_USER_IF, create_vhost_user_if); mp->is_server = is_server; - memcpy(mp->sock_filename, file_name, vec_len(file_name)); + clib_memcpy(mp->sock_filename, file_name, vec_len(file_name)); vec_free(file_name); if (custom_dev_instance != ~0) { mp->renumber = 1; mp->custom_dev_instance = ntohl(custom_dev_instance); } + mp->use_custom_mac = use_custom_mac; + clib_memcpy(mp->mac_address, hwaddr, 6); S; W; /* NOTREACHED */ @@ -6761,7 +7762,7 @@ static int api_modify_vhost_user_if (vat_main_t * vam) mp->sw_if_index = ntohl(sw_if_index); mp->is_server = is_server; - memcpy(mp->sock_filename, file_name, vec_len(file_name)); + clib_memcpy(mp->sock_filename, file_name, vec_len(file_name)); vec_free(file_name); if (custom_dev_instance != ~0) { mp->renumber = 1; @@ -6872,464 +7873,91 @@ static int api_show_version (vat_main_t * vam) return 0; } -static uword unformat_nsh_gre_decap_next -(unformat_input_t * input, va_list * args) -{ - u32 * result = va_arg (*args, u32 *); - u32 tmp; - - if (unformat (input, "drop")) - *result = NSH_INPUT_NEXT_DROP; - else if (unformat (input, "ip4")) - *result = NSH_INPUT_NEXT_IP4_INPUT; - else if (unformat (input, "ip6")) - *result = NSH_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "ethernet")) - *result = NSH_INPUT_NEXT_ETHERNET_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; -} - -static int api_nsh_gre_add_del_tunnel (vat_main_t * vam) -{ - unformat_input_t * line_input = vam->input; - vl_api_nsh_gre_add_del_tunnel_t *mp; - f64 timeout; - ip4_address_t src, dst; - u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; - u32 encap_vrf_id = 0; - u32 decap_vrf_id = 0; - u8 ver_o_c = 0; - u8 md_type = 0; - u8 next_protocol = 1; /* ip4 */ - u32 spi; - u8 spi_set = 0; - u32 si; - u8 si_set = 0; - u32 spi_si; - u32 c1 = 0; - u32 c2 = 0; - u32 c3 = 0; - u32 c4 = 0; - u32 *tlvs = 0; - u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT; - u32 tmp; - int i; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "src %U", - unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (line_input, "dst %U", - unformat_ip4_address, &dst)) - dst_set = 1; - else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) - ; - else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id)) - ; - else if (unformat (line_input, "decap-next %U", - unformat_nsh_gre_decap_next, &decap_next_index)) - ; - else if (unformat (line_input, "version %d", &tmp)) - ver_o_c |= (tmp & 3) << 6; - else if (unformat (line_input, "o-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 5; - else if (unformat (line_input, "c-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 4; - else if (unformat (line_input, "md-type %d", &tmp)) - md_type = tmp; - else if (unformat(line_input, "next-ip4")) - next_protocol = 1; - else if (unformat(line_input, "next-ip6")) - next_protocol = 2; - else if (unformat(line_input, "next-ethernet")) - next_protocol = 3; - else if (unformat (line_input, "c1 %d", &c1)) - ; - else if (unformat (line_input, "c2 %d", &c2)) - ; - else if (unformat (line_input, "c3 %d", &c3)) - ; - else if (unformat (line_input, "c4 %d", &c4)) - ; - else if (unformat (line_input, "spi %d", &spi)) - spi_set = 1; - else if (unformat (line_input, "si %d", &si)) - si_set = 1; - else if (unformat (line_input, "tlv %x")) - vec_add1 (tlvs, tmp); - else { - errmsg ("parse error '%U'\n", format_unformat_error, line_input); - return -99; - } - } - - if (src_set == 0) { - errmsg ("tunnel src address not specified\n"); - return -99; - } - if (dst_set == 0) { - errmsg ("tunnel dst address not specified\n"); - return -99; - } - - if (spi_set == 0) { - errmsg ("spi not specified\n"); - return -99; - } - - if (si_set == 0) { - errmsg ("si not specified\n"); - return -99; - } - - M2 (NSH_GRE_ADD_DEL_TUNNEL, nsh_gre_add_del_tunnel, - sizeof(u32) * vec_len (tlvs)); - - spi_si = (spi<<8) | si; - - mp->src = src.as_u32; - mp->dst = dst.as_u32; - mp->encap_vrf_id = ntohl(encap_vrf_id); - mp->decap_vrf_id = ntohl(decap_vrf_id); - mp->decap_next_index = ntohl(decap_next_index); - mp->tlv_len_in_words = vec_len (tlvs); - mp->is_add = is_add; - mp->ver_o_c = ver_o_c; - mp->length = 6 + vec_len(tlvs); - mp->md_type = md_type; - mp->next_protocol = next_protocol; - mp->spi_si = ntohl(spi_si); - mp->c1 = ntohl(c1); - mp->c2 = ntohl(c2); - mp->c3 = ntohl(c3); - mp->c4 = ntohl(c4); - - for (i = 0; i < vec_len(tlvs); i++) - mp->tlvs[i] = ntohl(tlvs[i]); - - vec_free (tlvs); - - S; W; - /* NOTREACHED */ - return 0; -} - -static uword unformat_nsh_vxlan_gpe_decap_next -(unformat_input_t * input, va_list * args) -{ - u32 * result = va_arg (*args, u32 *); - u32 tmp; - - if (unformat (input, "drop")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_DROP; - else if (unformat (input, "ip4")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_IP4_INPUT; - else if (unformat (input, "ip6")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "ethernet")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT; - else if (unformat (input, "nsh-vxlan-gpe")) - *result = NSH_VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; -} -static int api_nsh_vxlan_gpe_add_del_tunnel (vat_main_t * vam) +static int api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) { unformat_input_t * line_input = vam->input; - vl_api_nsh_vxlan_gpe_add_del_tunnel_t *mp; + vl_api_vxlan_gpe_add_del_tunnel_t *mp; f64 timeout; - ip4_address_t src, dst; + ip4_address_t local, remote; u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; + u8 local_set = 0; + u8 remote_set = 0; u32 encap_vrf_id = 0; u32 decap_vrf_id = 0; - u8 ver_o_c = 0; - u8 md_type = 0; - u8 next_protocol = 1; /* ip4 */ - u32 spi; - u8 spi_set = 0; - u32 si; - u8 si_set = 0; - u32 spi_si; - u32 c1 = 0; - u32 c2 = 0; - u32 c3 = 0; - u32 c4 = 0; - u32 *tlvs = 0; - u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT; + u8 protocol = ~0; u32 vni; u8 vni_set = 0; - u32 tmp; - int i; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { if (unformat (line_input, "del")) is_add = 0; - else if (unformat (line_input, "src %U", - unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (line_input, "dst %U", - unformat_ip4_address, &dst)) - dst_set = 1; + else if (unformat (line_input, "local %U", + unformat_ip4_address, &local)) + local_set = 1; + else if (unformat (line_input, "remote %U", + unformat_ip4_address, &remote)) + remote_set = 1; else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) ; else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id)) ; - else if (unformat (line_input, "decap-next %U", - unformat_nsh_vxlan_gpe_decap_next, - &decap_next_index)) - ; else if (unformat (line_input, "vni %d", &vni)) vni_set = 1; - else if (unformat (line_input, "version %d", &tmp)) - ver_o_c |= (tmp & 3) << 6; - else if (unformat (line_input, "o-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 5; - else if (unformat (line_input, "c-bit %d", &tmp)) - ver_o_c |= (tmp & 1) << 4; - else if (unformat (line_input, "md-type %d", &tmp)) - md_type = tmp; else if (unformat(line_input, "next-ip4")) - next_protocol = 1; + protocol = 1; else if (unformat(line_input, "next-ip6")) - next_protocol = 2; + protocol = 2; else if (unformat(line_input, "next-ethernet")) - next_protocol = 3; - else if (unformat (line_input, "c1 %d", &c1)) - ; - else if (unformat (line_input, "c2 %d", &c2)) - ; - else if (unformat (line_input, "c3 %d", &c3)) - ; - else if (unformat (line_input, "c4 %d", &c4)) - ; - else if (unformat (line_input, "spi %d", &spi)) - spi_set = 1; - else if (unformat (line_input, "si %d", &si)) - si_set = 1; - else if (unformat (line_input, "tlv %x")) - vec_add1 (tlvs, tmp); + protocol = 3; + else if (unformat(line_input, "next-nsh")) + protocol = 4; else { errmsg ("parse error '%U'\n", format_unformat_error, line_input); return -99; } } - if (src_set == 0) { - errmsg ("tunnel src address not specified\n"); - return -99; - } - if (dst_set == 0) { - errmsg ("tunnel dst address not specified\n"); + if (local_set == 0) { + errmsg ("tunnel local address not specified\n"); return -99; } - - if (spi_set == 0) { - errmsg ("spi not specified\n"); + if (remote_set == 0) { + errmsg ("tunnel remote address not specified\n"); return -99; } - if (si_set == 0) { - errmsg ("si not specified\n"); - return -99; - } if (vni_set == 0) { errmsg ("vni not specified\n"); return -99; } - M2 (NSH_VXLAN_GPE_ADD_DEL_TUNNEL, nsh_vxlan_gpe_add_del_tunnel, - sizeof(u32) * vec_len (tlvs)); + M(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel); - spi_si = (spi<<8) | si; - - mp->src = src.as_u32; - mp->dst = dst.as_u32; + mp->local = local.as_u32; + mp->remote = remote.as_u32; mp->encap_vrf_id = ntohl(encap_vrf_id); mp->decap_vrf_id = ntohl(decap_vrf_id); - mp->decap_next_index = ntohl(decap_next_index); - mp->tlv_len_in_words = vec_len (tlvs); + mp->protocol = ntohl(protocol); mp->vni = ntohl(vni); mp->is_add = is_add; - mp->ver_o_c = ver_o_c; - mp->length = 6 + vec_len(tlvs); - mp->md_type = md_type; - mp->next_protocol = next_protocol; - mp->spi_si = ntohl(spi_si); - mp->c1 = ntohl(c1); - mp->c2 = ntohl(c2); - mp->c3 = ntohl(c3); - mp->c4 = ntohl(c4); - - for (i = 0; i < vec_len(tlvs); i++) - mp->tlvs[i] = ntohl(tlvs[i]); - vec_free (tlvs); S; W; /* NOTREACHED */ return 0; } -static uword unformat_lisp_gpe_decap_next (unformat_input_t * input, - va_list * args) +u8 * format_l2_fib_mac_address (u8 * s, va_list * args) { - u32 * result = va_arg (*args, u32 *); - u32 tmp; - - if (unformat (input, "drop")) - *result = LISP_GPE_INPUT_NEXT_DROP; - else if (unformat (input, "ip4")) - *result = LISP_GPE_INPUT_NEXT_IP4_INPUT; - else if (unformat (input, "ip6")) - *result = LISP_GPE_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "ethernet")) - *result = LISP_GPE_INPUT_NEXT_IP6_INPUT; - else if (unformat (input, "lisp-gpe")) - *result = LISP_GPE_INPUT_NEXT_LISP_GPE_ENCAP; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; + u8 * a = va_arg (*args, u8 *); + + return format (s, "%02x:%02x:%02x:%02x:%02x:%02x", + a[2], a[3], a[4], a[5], a[6], a[7]); } -static int -api_lisp_gpe_add_del_tunnel (vat_main_t * vam) -{ - unformat_input_t * line_input = vam->input; - vl_api_lisp_gpe_add_del_tunnel_t *mp; - f64 timeout; - ip4_address_t src, dst; - u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; - u32 encap_vrf_id = 0; - u32 decap_vrf_id = 0; - u8 next_protocol = LISP_GPE_NEXT_PROTOCOL_IP4; - u32 decap_next_index = LISP_GPE_INPUT_NEXT_IP4_INPUT; - u8 flags = LISP_GPE_FLAGS_P; - u8 ver_res = 0; - u8 res = 0; - u32 iid = 0; - u8 iid_set = 0; - u32 tmp; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "src %U", - unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (line_input, "dst %U", - unformat_ip4_address, &dst)) - dst_set = 1; - else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) - ; - else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id)) - ; - else if (unformat (line_input, "decap-next %U", - unformat_lisp_gpe_decap_next, - &decap_next_index)) - ; - else if (unformat(line_input, "next-ip4")) - next_protocol = 1; - else if (unformat(line_input, "next-ip6")) - next_protocol = 2; - else if (unformat(line_input, "next-ethernet")) - next_protocol = 3; - else if (unformat(line_input, "next-nsh")) - next_protocol = 4; - /* Allow the user to specify anything they want in the LISP hdr */ - else if (unformat (line_input, "ver_res %x", &tmp)) - ver_res = tmp; - else if (unformat (line_input, "res %x", &tmp)) - res = tmp; - else if (unformat (line_input, "flags %x", &tmp)) - flags = tmp; - else if (unformat (line_input, "n-bit")) - flags |= LISP_GPE_FLAGS_N; - else if (unformat (line_input, "l-bit")) - flags |= LISP_GPE_FLAGS_L; - else if (unformat (line_input, "e-bit")) - flags |= LISP_GPE_FLAGS_E; - else if (unformat (line_input, "v-bit")) - flags |= LISP_GPE_FLAGS_V; - else if (unformat (line_input, "i-bit")) - flags |= LISP_GPE_FLAGS_V; - else if (unformat (line_input, "not-p-bit")) - flags &= !LISP_GPE_FLAGS_P; - else if (unformat (line_input, "p-bit")) - flags |= LISP_GPE_FLAGS_P; - else if (unformat (line_input, "o-bit")) - flags |= LISP_GPE_FLAGS_O; - else if (unformat (line_input, "iidx %x", &iid)) - iid_set = 1; - else if (unformat (line_input, "iid %d", &iid)) - iid_set = 1; - else { - errmsg ("parse error '%U'\n", format_unformat_error, line_input); - return -99; - } - } - - if (src_set == 0) { - errmsg ("tunnel src address not specified\n"); - return -99; - } - if (dst_set == 0) { - errmsg ("tunnel dst address not specified\n"); - return -99; - } - if (iid_set == 0) { - errmsg ("iid not specified\n"); - return -99; - } - - M(LISP_GPE_ADD_DEL_TUNNEL, lisp_gpe_add_del_tunnel); - - mp->src = src.as_u32; - mp->dst = dst.as_u32; - mp->encap_vrf_id = ntohl(encap_vrf_id); - mp->decap_vrf_id = ntohl(decap_vrf_id); - mp->decap_next_index = ntohl(decap_next_index); - mp->is_add = is_add; - mp->flags = flags; - mp->ver_res = ver_res; - mp->res = res; - mp->next_protocol = next_protocol; - mp->iid = ntohl(iid); - - S; W; - - /* NOTREACHED */ - return 0; -} - - -u8 * format_l2_fib_mac_address (u8 * s, va_list * args) -{ - u8 * a = va_arg (*args, u8 *); - - return format (s, "%02x:%02x:%02x:%02x:%02x:%02x", - a[2], a[3], a[4], a[5], a[6], a[7]); -} - -static void vl_api_l2_fib_table_entry_t_handler -(vl_api_l2_fib_table_entry_t * mp) +static void vl_api_l2_fib_table_entry_t_handler +(vl_api_l2_fib_table_entry_t * mp) { vat_main_t * vam = &vat_main; @@ -7633,6 +8261,7 @@ api_ip_dump (vat_main_t * vam) static int api_ipsec_spd_add_del (vat_main_t * vam) { +#if DPDK > 0 unformat_input_t * i = vam->input; vl_api_ipsec_spd_add_del_t *mp; f64 timeout; @@ -7662,11 +8291,16 @@ api_ipsec_spd_add_del (vat_main_t * vam) S; W; /* NOTREACHED */ return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif } static int api_ipsec_interface_add_del_spd (vat_main_t * vam) { +#if DPDK > 0 unformat_input_t * i = vam->input; vl_api_ipsec_interface_add_del_spd_t *mp; f64 timeout; @@ -7710,11 +8344,16 @@ api_ipsec_interface_add_del_spd (vat_main_t * vam) S; W; /* NOTREACHED */ return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif } static int api_ipsec_spd_add_del_entry (vat_main_t * vam) { +#if DPDK > 0 unformat_input_t * i = vam->input; vl_api_ipsec_spd_add_del_entry_t *mp; f64 timeout; @@ -7818,15 +8457,15 @@ api_ipsec_spd_add_del_entry (vat_main_t * vam) mp->is_ipv6 = is_ipv6; if (is_ipv6 || is_ip_any) { - memcpy (mp->remote_address_start, &raddr6_start, sizeof(ip6_address_t)); - memcpy (mp->remote_address_stop, &raddr6_stop, sizeof(ip6_address_t)); - memcpy (mp->local_address_start, &laddr6_start, sizeof(ip6_address_t)); - memcpy (mp->local_address_stop, &laddr6_stop, sizeof(ip6_address_t)); + clib_memcpy (mp->remote_address_start, &raddr6_start, sizeof(ip6_address_t)); + clib_memcpy (mp->remote_address_stop, &raddr6_stop, sizeof(ip6_address_t)); + clib_memcpy (mp->local_address_start, &laddr6_start, sizeof(ip6_address_t)); + clib_memcpy (mp->local_address_stop, &laddr6_stop, sizeof(ip6_address_t)); } else { - memcpy (mp->remote_address_start, &raddr4_start, sizeof(ip4_address_t)); - memcpy (mp->remote_address_stop, &raddr4_stop, sizeof(ip4_address_t)); - memcpy (mp->local_address_start, &laddr4_start, sizeof(ip4_address_t)); - memcpy (mp->local_address_stop, &laddr4_stop, sizeof(ip4_address_t)); + clib_memcpy (mp->remote_address_start, &raddr4_start, sizeof(ip4_address_t)); + clib_memcpy (mp->remote_address_stop, &raddr4_stop, sizeof(ip4_address_t)); + clib_memcpy (mp->local_address_start, &laddr4_start, sizeof(ip4_address_t)); + clib_memcpy (mp->local_address_stop, &laddr4_stop, sizeof(ip4_address_t)); } mp->protocol = (u8) protocol; mp->local_port_start = ntohs((u16) lport_start); @@ -7840,11 +8479,16 @@ api_ipsec_spd_add_del_entry (vat_main_t * vam) S; W; /* NOTREACHED */ return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif } static int api_ipsec_sad_add_del_entry (vat_main_t * vam) { +#if DPDK > 0 unformat_input_t * i = vam->input; vl_api_ipsec_sad_add_del_entry_t *mp; f64 timeout; @@ -7931,27 +8575,32 @@ api_ipsec_sad_add_del_entry (vat_main_t * vam) if (mp->integrity_key_length > sizeof(mp->integrity_key)) mp->integrity_key_length = sizeof(mp->integrity_key); - memcpy (mp->crypto_key, ck, mp->crypto_key_length); - memcpy (mp->integrity_key, ik, mp->integrity_key_length); + clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length); + clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length); if (is_tunnel) { if (is_tunnel_ipv6) { - memcpy (mp->tunnel_src_address, &tun_src6, sizeof(ip6_address_t)); - memcpy (mp->tunnel_dst_address, &tun_dst6, sizeof(ip6_address_t)); + clib_memcpy (mp->tunnel_src_address, &tun_src6, sizeof(ip6_address_t)); + clib_memcpy (mp->tunnel_dst_address, &tun_dst6, sizeof(ip6_address_t)); } else { - memcpy (mp->tunnel_src_address, &tun_src4, sizeof(ip4_address_t)); - memcpy (mp->tunnel_dst_address, &tun_dst4, sizeof(ip4_address_t)); + clib_memcpy (mp->tunnel_src_address, &tun_src4, sizeof(ip4_address_t)); + clib_memcpy (mp->tunnel_dst_address, &tun_dst4, sizeof(ip4_address_t)); } } S; W; /* NOTREACHED */ return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif } static int api_ipsec_sa_set_key (vat_main_t * vam) { +#if DPDK > 0 unformat_input_t * i = vam->input; vl_api_ipsec_sa_set_key_t *mp; f64 timeout; @@ -7983,12 +8632,324 @@ api_ipsec_sa_set_key (vat_main_t * vam) if (mp->integrity_key_length > sizeof(mp->integrity_key)) mp->integrity_key_length = sizeof(mp->integrity_key); - memcpy (mp->crypto_key, ck, mp->crypto_key_length); - memcpy (mp->integrity_key, ik, mp->integrity_key_length); + clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length); + clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length); + + S; W; + /* NOTREACHED */ + return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif +} + +static int +api_ikev2_profile_add_del (vat_main_t * vam) +{ +#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); + + clib_memcpy(mp->name, name, vec_len (name)); + mp->is_add = is_add; + vec_free (name); + + S; W; + /* NOTREACHED */ + return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif +} + +static int +api_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); + clib_memcpy (mp->name, name, vec_len (name)); + clib_memcpy (mp->data, data, vec_len (data)); + vec_free (name); + vec_free (data); + + S; W; + /* NOTREACHED */ + return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif +} + +static int +api_ikev2_profile_set_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); + clib_memcpy(data, ip4.as_u8, 4); + } + else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data)) + ; + else if (unformat (i, "id_data %v", &data)) + ; + else if (unformat (i, "local")) + is_local = 1; + else if (unformat (i, "remote")) + is_local = 0; + else { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!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); + clib_memcpy (mp->name, name, vec_len (name)); + clib_memcpy (mp->data, data, vec_len (data)); + vec_free (name); + vec_free (data); + + S; W; + /* NOTREACHED */ + return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif +} + +static int +api_ikev2_profile_set_ts (vat_main_t * vam) +{ +#if DPDK > 0 + unformat_input_t * i = vam->input; + vl_api_ikev2_profile_set_ts_t * mp; + f64 timeout; + u8 * name = 0; + u8 is_local = 0; + u32 proto = 0, start_port = 0, end_port = (u32) ~0; + ip4_address_t start_addr, end_addr; + + const char * valid_chars = "a-zA-Z0-9_"; + + start_addr.as_u32 = 0; + end_addr.as_u32 = (u32) ~0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "name %U", unformat_token, valid_chars, &name)) + vec_add1 (name, 0); + else if (unformat (i, "protocol %d", &proto)) + ; + else if (unformat (i, "start_port %d", &start_port)) + ; + else if (unformat (i, "end_port %d", &end_port)) + ; + else if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr)) + ; + else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr)) + ; + else if (unformat (i, "local")) + is_local = 1; + else if (unformat (i, "remote")) + is_local = 0; + else { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vec_len (name)) { + 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; + clib_memcpy (mp->name, name, vec_len (name)); + vec_free (name); + + S; W; + /* NOTREACHED */ + return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif +} + +static int +api_ikev2_set_local_key (vat_main_t * vam) +{ +#if DPDK > 0 + unformat_input_t * i = vam->input; + vl_api_ikev2_set_local_key_t * mp; + f64 timeout; + u8 * file = 0; + + 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); + + clib_memcpy (mp->key_file, file, vec_len (file)); + vec_free (file); S; W; /* NOTREACHED */ return 0; +#else + clib_warning ("unsupported (no dpdk)"); + return -99; +#endif } /* @@ -8045,13 +9006,13 @@ static int api_map_add_domain (vat_main_t * vam) /* Construct the API message */ M(MAP_ADD_DOMAIN, map_add_domain); - memcpy(mp->ip4_prefix, &ip4_prefix, sizeof(ip4_prefix)); + clib_memcpy(mp->ip4_prefix, &ip4_prefix, sizeof(ip4_prefix)); mp->ip4_prefix_len = ip4_prefix_len; - memcpy(mp->ip6_prefix, &ip6_prefix, sizeof(ip6_prefix)); + clib_memcpy(mp->ip6_prefix, &ip6_prefix, sizeof(ip6_prefix)); mp->ip6_prefix_len = ip6_prefix_len; - memcpy(mp->ip6_src, &ip6_src, sizeof(ip6_src)); + clib_memcpy(mp->ip6_src, &ip6_src, sizeof(ip6_src)); mp->ip6_src_prefix_len = ip6_src_len; mp->ea_bits_len = ea_bits_len; @@ -8131,7 +9092,7 @@ static int api_map_add_del_rule (vat_main_t * vam) mp->index = ntohl(index); mp->is_add = is_add; - memcpy(mp->ip6_dst, &ip6_dst, sizeof(ip6_dst)); + clib_memcpy(mp->ip6_dst, &ip6_dst, sizeof(ip6_dst)); mp->psid = ntohs(psid); /* send it... */ @@ -8256,31 +9217,896 @@ api_get_first_msg_id (vat_main_t * vam) } M(GET_FIRST_MSG_ID, get_first_msg_id); - memcpy (mp->name, name, vec_len(name)); + clib_memcpy (mp->name, name, vec_len(name)); S; 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) +static int api_cop_interface_enable_disable (vat_main_t * vam) { - return 0; -} + unformat_input_t * line_input = vam->input; + vl_api_cop_interface_enable_disable_t * mp; + f64 timeout; + u32 sw_if_index = ~0; + u8 enable_disable = 1; -static int help (vat_main_t * vam) -{ - u8 ** cmds = 0; - u8 * name = 0; - hash_pair_t * p; - unformat_input_t * i = vam->input; + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { + if (unformat (line_input, "disable")) + enable_disable = 0; + if (unformat (line_input, "enable")) + enable_disable = 1; + else if (unformat (line_input, "%U", unformat_sw_if_index, + vam, &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } + + if (sw_if_index == ~0) { + errmsg ("missing interface name or sw_if_index\n"); + return -99; + } + + /* Construct the API message */ + M(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable); + mp->sw_if_index = ntohl(sw_if_index); + mp->enable_disable = enable_disable; + + /* send it... */ + S; + /* Wait for the reply */ + W; +} + +static int api_cop_whitelist_enable_disable (vat_main_t * vam) +{ + unformat_input_t * line_input = vam->input; + vl_api_cop_whitelist_enable_disable_t * mp; + f64 timeout; + u32 sw_if_index = ~0; + u8 ip4=0, ip6=0, default_cop=0; + u32 fib_id; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { + if (unformat (line_input, "ip4")) + ip4 = 1; + else if (unformat (line_input, "ip6")) + ip6 = 1; + else if (unformat (line_input, "default")) + default_cop = 1; + else if (unformat (line_input, "%U", unformat_sw_if_index, + vam, &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (line_input, "fib-id %d", &fib_id)) + ; + else + break; + } + + if (sw_if_index == ~0) { + errmsg ("missing interface name or sw_if_index\n"); + return -99; + } + + /* Construct the API message */ + M(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable); + mp->sw_if_index = ntohl(sw_if_index); + mp->fib_id = ntohl(fib_id); + mp->ip4 = ip4; + mp->ip6 = ip6; + mp->default_cop = default_cop; + + /* send it... */ + S; + /* Wait for the reply */ + W; +} + +static int api_get_node_graph (vat_main_t * vam) +{ + vl_api_get_node_graph_t * mp; + f64 timeout; + + M(GET_NODE_GRAPH, get_node_graph); + + /* send it... */ + S; + /* Wait for the reply */ + W; +} + +static int +api_lisp_add_del_locator_set(vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_lisp_add_del_locator_set_t *mp; + f64 timeout = ~0; + u8 is_add = 1; + u8 *locator_set_name = NULL; + u8 locator_set_name_set = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "del")) { + is_add = 0; + } else if (unformat(input, "locator-set %s", &locator_set_name)) { + locator_set_name_set = 1; + } else + break; + } + + if (locator_set_name_set == 0) { + errmsg ("missing locator-set name"); + return -99; + } + + if (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_SET, lisp_add_del_locator_set); + + mp->is_add = is_add; + clib_memcpy(mp->locator_set_name, locator_set_name, + vec_len(locator_set_name)); + vec_free(locator_set_name); + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +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; + clib_memcpy(mp->locator_set_name, locator_set_name, + vec_len(locator_set_name)); + vec_free(locator_set_name); + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +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; + } + + if (eidv4_set && eid_lenght > 32) { + errmsg ("eid prefix to big\n"); + vec_free(locator_set_name); + return -99; + } + + if (eidv6_set && eid_lenght > 128) { + errmsg ("eid prefix to big\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; + clib_memcpy(mp->ip_address, &eidv6, sizeof(eidv6)); + } else { + mp->is_ipv6 = 0; + clib_memcpy(mp->ip_address, &eidv4, sizeof(eidv4)); + } + mp->prefix_len = eid_lenght; + clib_memcpy(mp->locator_set_name, locator_set_name, + vec_len(locator_set_name)); + vec_free(locator_set_name); + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +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; + clib_memcpy(mp->eid_ip_address, &eidv6, sizeof(eidv6)); + } else { + mp->eid_is_ipv6 = 0; + clib_memcpy(mp->eid_ip_address, &eidv4, sizeof(eidv4)); + } + mp->eid_prefix_len = eid_lenght; + if (slocv6_set) { + mp->address_is_ipv6 = 1; + clib_memcpy(mp->source_ip_address, &slocv6, sizeof(slocv6)); + clib_memcpy(mp->destination_ip_address, &dlocv6, sizeof(dlocv6)); + } else { + mp->address_is_ipv6 = 0; + clib_memcpy(mp->source_ip_address, &slocv4, sizeof(slocv4)); + clib_memcpy(mp->destination_ip_address, &dlocv4, sizeof(dlocv4)); + } + + /* 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; + clib_memcpy(mp->ip_address, &ipv6, sizeof(ipv6)); + } else { + mp->is_ipv6 = 0; + clib_memcpy(mp->ip_address, &ipv4, sizeof(ipv4)); + } + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int +api_lisp_gpe_enable_disable (vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_lisp_gpe_enable_disable_t *mp; + f64 timeout = ~0; + u8 is_set = 0; + u8 is_en = 1; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "enable")) { + is_set = 1; + is_en = 1; + } else if (unformat(input, "disable")) { + is_set = 1; + is_en = 0; + } else + break; + } + + if (is_set == 0) { + errmsg("Value not set\n"); + return -99; + } + + /* Construct the API message */ + M(LISP_GPE_ENABLE_DISABLE, lisp_gpe_enable_disable); + + mp->is_en = is_en; + + /* send it... */ + S; + + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int +api_lisp_enable_disable (vat_main_t * vam) +{ + unformat_input_t * input = vam->input; + vl_api_lisp_enable_disable_t *mp; + f64 timeout = ~0; + u8 is_set = 0; + u8 is_en = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_en = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set\n"); + return -99; + } + + /* Construct the API message */ + M(LISP_ENABLE_DISABLE, lisp_enable_disable); + + mp->is_en = is_en; + + /* 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; + u32 table_id, vni; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { + if (unformat(input, "up")) { + is_set = 1; + is_add = 1; + } else if (unformat(input, "down")) { + is_set = 1; + is_add = 0; + } else if (unformat(input, "table_id %d", &table_id)) { + ; + } else if (unformat(input, "vni %d", &vni)) { + ; + } else + break; + } + + 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; + mp->table_id = table_id; + mp->vni = vni; + + /* 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 +api_lisp_enable_disable_status_dump(vat_main_t *vam) +{ + vl_api_lisp_enable_disable_status_dump_t *mp; + f64 timeout = ~0; + + if (!vam->json_output) { + fformat(vam->ofp, "%=20s\n", + "lisp status:"); + } + + M(LISP_ENABLE_DISABLE_STATUS_DUMP, + lisp_enable_disable_status_dump); + /* send it... */ + S; + + /* Use a control ping for synchronization */ + { + vl_api_control_ping_t * mp; + M(CONTROL_PING, control_ping); + S; + } + /* Wait for a reply... */ + W; + + /* NOTREACHED */ + return 0; +} + +static int +api_af_packet_create (vat_main_t * vam) +{ + unformat_input_t * i = vam->input; + vl_api_af_packet_create_t * mp; + f64 timeout; + u8 * host_if_name = 0; + u8 hw_addr[6]; + u8 random_hw_addr = 1; + + memset (hw_addr, 0, sizeof (hw_addr)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "name %s", &host_if_name)) + vec_add1 (host_if_name, 0); + else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr)) + random_hw_addr = 0; + else + break; + } + + if (!vec_len (host_if_name)) { + errmsg ("host-interface name must be specified"); + return -99; + } + + if (vec_len (host_if_name) > 64) { + errmsg ("host-interface name too long"); + return -99; + } + + M(AF_PACKET_CREATE, af_packet_create); + + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + clib_memcpy (mp->hw_addr, hw_addr, 6); + mp->use_random_hw_addr = random_hw_addr; + vec_free (host_if_name); + + S; W; + /* NOTREACHED */ + return 0; +} + +static int +api_af_packet_delete (vat_main_t * vam) +{ + unformat_input_t * i = vam->input; + vl_api_af_packet_delete_t * mp; + f64 timeout; + u8 * host_if_name = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { + if (unformat (i, "name %s", &host_if_name)) + vec_add1 (host_if_name, 0); + else + break; + } + + if (!vec_len (host_if_name)) { + errmsg ("host-interface name must be specified"); + return -99; + } + + if (vec_len (host_if_name) > 64) { + errmsg ("host-interface name too long"); + return -99; + } + + M(AF_PACKET_DELETE, af_packet_delete); + + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + vec_free (host_if_name); + + S; 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)) { @@ -8304,8 +10130,7 @@ static int help (vat_main_t * vam) vec_add1 (cmds, (u8 *)(p->key)); })); - vec_sort (cmds, c1, c2, - strcmp ((char *)(c1[0]), (char *)(c2[0]))); + vec_sort_with_function (cmds, cmd_cmp); for (j = 0; j < vec_len(cmds); j++) fformat (vam->ofp, "%s\n", cmds[j]); @@ -8356,6 +10181,14 @@ typedef struct { } macro_sort_t; +static int macro_sort_cmp (void * a1, void * a2) +{ + macro_sort_t * s1 = a1; + macro_sort_t * s2 = a2; + + return strcmp ((char *)(s1->name), (char *)(s2->name)); +} + static int dump_macro_table (vat_main_t * vam) { macro_sort_t * sort_me = 0, * sm; @@ -8369,7 +10202,7 @@ static int dump_macro_table (vat_main_t * vam) sm->value = (u8 *) (p->value[0]); })); - vec_sort (sort_me, s1, s2, strcmp ((char *)(s1->name), (char *)(s2->name))); + vec_sort_with_function (sort_me, macro_sort_cmp); if (vec_len(sort_me)) fformat (vam->ofp, "%-15s%s\n", "Name", "Value"); @@ -8382,6 +10215,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; @@ -8404,8 +10306,8 @@ static int script (vat_main_t * vam) return -99; } - memcpy (&save_input, &vam->input, sizeof (save_input)); - memcpy (&save_jump_buf, &vam->jump_buf, sizeof (save_jump_buf)); + clib_memcpy (&save_input, &vam->input, sizeof (save_input)); + clib_memcpy (&save_jump_buf, &vam->jump_buf, sizeof (save_jump_buf)); save_ifp = vam->ifp; save_line_number = vam->input_line_number; save_current_file = (char *) vam->current_file; @@ -8415,8 +10317,8 @@ static int script (vat_main_t * vam) vam->current_file = s; do_one_file (vam); - memcpy (&vam->input, &save_input, sizeof (vam->input)); - memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf)); + clib_memcpy (&vam->input, &save_input, sizeof (vam->input)); + clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf)); vam->ifp = save_ifp; vam->input_line_number = save_line_number; vam->current_file = (u8 *) save_current_file; @@ -8529,8 +10431,13 @@ _(mpls_ethernet_add_del_tunnel_2, \ "inner_vrf_id outer_vrf_id next-hop \n" \ "resolve-attempts resolve-if-needed 0 | 1 [del]") \ _(sr_tunnel_add_del, \ - "src dst / (next )+\n" \ - " [tag ]* [clean] [reroute]") \ + "[name ] src dst / \n" \ + "(next )+ [tag ]* [clean] [reroute] \n" \ + "[policy ]") \ +_(sr_policy_add_del, \ + "name tunnel [tunnel ]* [del]") \ +_(sr_multicast_map_add_del, \ + "address [ip6 multicast address] sr-policy [policy name] [del]") \ _(classify_add_del_table, \ "buckets [skip ] [match ] [memory_size ]\n" \ "[del] mask \n" \ @@ -8558,8 +10465,12 @@ _(l2tpv3_set_lookup_key, \ "lookup_v6_src | lookup_v6_dst | lookup_session_id") \ _(sw_if_l2tpv3_tunnel_dump, "") \ _(vxlan_add_del_tunnel, \ - "src dst vni [encap-vrf-id ]\n" \ + "src dst vni [encap-vrf-id ]\n" \ " [decap-next l2|ip4|ip6] [del]") \ +_(vxlan_tunnel_dump, "[ | sw_if_index ]") \ +_(gre_add_del_tunnel, \ + "src dst [outer-fib-id ] [del]\n") \ +_(gre_tunnel_dump, "[ | sw_if_index ]") \ _(l2_fib_clear_table, "") \ _(l2_interface_efp_filter, "sw_if_index enable | disable") \ _(l2_interface_vlan_tag_rewrite, \ @@ -8567,32 +10478,19 @@ _(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 ]") \ _(delete_vhost_user_if, " | sw_if_index ") \ _(sw_interface_vhost_user_dump, "") \ _(show_version, "") \ -_(nsh_gre_add_del_tunnel, \ - "src dst " \ - "c1 c2 c3 c4 spi si \n" \ - "[encap-fib-id ] [decap-fib-id ] [o-bit <1|0>]\n" \ - "[c-bit <1|0>] [md-type ][next-ip4][next-ip6][next-ethernet]\n" \ - "[tlv ][del]") \ -_(nsh_vxlan_gpe_add_del_tunnel, \ - "src dst vni \n" \ - "c1 c2 c3 c4 spi si \n" \ - "[encap-vrf-id ] [decap-vrf-id ] [o-bit <1|0>]\n" \ - "[c-bit <1|0>] [md-type ][next-ip4][next-ip6][next-ethernet]\n" \ - "[tlv ][del]") \ +_(vxlan_gpe_add_del_tunnel, \ + "local remote vni \n" \ + "[encap-vrf-id ] [decap-vrf-id ] [next-ip4][next-ip6]" \ + "[next-ethernet] [next-nsh]\n") \ _(l2_fib_table_dump, "bd_id ") \ -_(lisp_gpe_add_del_tunnel, \ - "src dst iid |iidx <0xnn>\n" \ - "[encap-vrf-id ] [decap-vrf-id ]\n" \ - "[n-bit][l-bit][e-bit][v-bit][i-bit][p-bit][not-p-bit][o-bit]\n" \ - "[next-ip4][next-ip6][next-ethernet][next-nsh]\n" \ - "[decap-next [ip4|ip6|ethernet|nsh-encap|]][del]") \ _(interface_name_renumber, \ " | sw_if_index new_show_dev_instance ") \ _(input_acl_set_interface, \ @@ -8612,6 +10510,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, \ @@ -8625,7 +10532,37 @@ _(map_domain_dump, "") \ _(map_rule_dump, "index ") \ _(want_interface_events, "enable|disable") \ _(want_stats,"enable|disable") \ -_(get_first_msg_id, "client ") +_(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]") \ +_(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_enable_disable, "enable|disable") \ +_(lisp_enable_disable, "enable|disable") \ +_(lisp_gpe_add_del_iface, "up|down") \ +_(lisp_locator_set_dump, "") \ +_(lisp_local_eid_table_dump, "") \ +_(lisp_gpe_tunnel_dump, "") \ +_(lisp_map_resolver_dump, "") \ +_(lisp_enable_disable_status_dump, "") \ +_(af_packet_create, "name [hw_addr ]") \ +_(af_packet_delete, "name ") /* List of command functions, CLI names map directly to functions */ #define foreach_cli_function \ @@ -8636,11 +10573,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 ")