X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=2a56423265e1e4eb073c7069d46e013239400fe7;hb=8389fb9112bcf96def69539fa1de13a7a08923f5;hp=ff3354c9664df35c27ea6d46f723fddfc687776e;hpb=50570ecef6d37b0c9d8c002f6dadb4ed0e138aa3;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index ff3354c9664..2a56423265e 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -18,13 +18,15 @@ */ #include +#include +#include #include #include -#include #include #include #include #include +#include #include #include #include @@ -48,6 +50,7 @@ #include #include #include +#include #include "vat/json_format.h" @@ -73,6 +76,36 @@ #define __plugin_msg_base 0 #include +#if VPP_API_TEST_BUILTIN == 0 +#include + +u32 +vl (void *p) +{ + return vec_len (p); +} + +int +vat_socket_connect (vat_main_t * vam) +{ + return vl_socket_client_connect + (&vam->socket_client_main, (char *) vam->socket_name, + "vpp_api_test(s)", 0 /* default socket rx, tx buffer */ ); +} +#else /* vpp built-in case, we don't do sockets... */ +int +vat_socket_connect (vat_main_t * vam) +{ + return 0; +} + +void +vl_socket_client_read_reply (socket_client_main_t * scm) +{ +}; +#endif + + f64 vat_time_now (vat_main_t * vam) { @@ -686,14 +719,14 @@ increment_v6_address (ip6_address_t * a) } static void -increment_mac_address (u64 * mac) +increment_mac_address (u8 * mac) { - u64 tmp = *mac; - + u64 tmp = *((u64 *) mac); tmp = clib_net_to_host_u64 (tmp); tmp += 1 << 16; /* skip unused (least significant) octets */ tmp = clib_host_to_net_u64 (tmp); - *mac = tmp; + + clib_memcpy (mac, &tmp, 6); } static void vl_api_create_loopback_reply_t_handler @@ -1036,9 +1069,17 @@ vl_api_cli_inband_reply_t_handler (vl_api_cli_inband_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); + u32 length = ntohl (mp->length); + + vec_reset_length (vam->cmd_reply); vam->retval = retval; - vam->cmd_reply = mp->reply; + if (retval == 0) + { + vec_validate (vam->cmd_reply, length); + clib_memcpy ((char *) (vam->cmd_reply), mp->reply, length); + vam->cmd_reply[length] = 0; + } vam->result_ready = 1; } @@ -1048,6 +1089,8 @@ vl_api_cli_inband_reply_t_handler_json (vl_api_cli_inband_reply_t * mp) vat_main_t *vam = &vat_main; vat_json_node_t node; + vec_reset_length (vam->cmd_reply); + vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); vat_json_object_add_string_copy (&node, "reply", mp->reply); @@ -1421,6 +1464,7 @@ static void vl_api_control_ping_reply_t_handler vam->retval = retval; vam->result_ready = 1; } + vam->socket_client_main.control_pings_outstanding--; } static void vl_api_control_ping_reply_t_handler_json @@ -1650,6 +1694,74 @@ static void vl_api_tap_delete_reply_t_handler_json vam->result_ready = 1; } +static void +vl_api_tap_create_v2_reply_t_handler (vl_api_tap_create_v2_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->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; + } + +} + +static void vl_api_tap_create_v2_reply_t_handler_json + (vl_api_tap_create_v2_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_tap_delete_v2_reply_t_handler (vl_api_tap_delete_v2_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_tap_delete_v2_reply_t_handler_json + (vl_api_tap_delete_v2_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_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + static void vl_api_mpls_tunnel_add_del_reply_t_handler (vl_api_mpls_tunnel_add_del_reply_t * mp) { @@ -1752,6 +1864,64 @@ static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json vam->result_ready = 1; } +u8 * +format_lisp_transport_protocol (u8 * s, va_list * args) +{ + u32 proto = va_arg (*args, u32); + + switch (proto) + { + case 1: + return format (s, "udp"); + case 2: + return format (s, "api"); + default: + return 0; + } + return 0; +} + +static void vl_api_one_get_transport_protocol_reply_t_handler + (vl_api_one_get_transport_protocol_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + u32 proto = mp->protocol; + print (vam->ofp, "Transport protocol: %U", + format_lisp_transport_protocol, proto); + vam->retval = retval; + vam->result_ready = 1; + } +} + +static void vl_api_one_get_transport_protocol_reply_t_handler_json + (vl_api_one_get_transport_protocol_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + u8 *s; + + s = format (0, "%U", format_lisp_transport_protocol, mp->protocol); + vec_add1 (s, 0); + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_string_copy (&node, "transport-protocol", s); + + vec_free (s); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + static void vl_api_one_add_del_locator_set_reply_t_handler (vl_api_one_add_del_locator_set_reply_t * mp) { @@ -1819,6 +1989,40 @@ static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } +static void vl_api_geneve_add_del_tunnel_reply_t_handler + (vl_api_geneve_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->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; + } +} + +static void vl_api_geneve_add_del_tunnel_reply_t_handler_json + (vl_api_geneve_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_vxlan_gpe_add_del_tunnel_reply_t_handler (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) { @@ -1921,94 +2125,280 @@ static void vl_api_create_vhost_user_if_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_ip_address_details_t_handler - (vl_api_ip_address_details_t * mp) +static clib_error_t * +receive_fd_msg (int socket_fd, int *my_fd) { - vat_main_t *vam = &vat_main; - static ip_address_details_t empty_ip_address_details = { {0} }; - ip_address_details_t *address = NULL; - ip_details_t *current_ip_details = NULL; - ip_details_t *details = NULL; + char msgbuf[16]; + char ctl[CMSG_SPACE (sizeof (int)) + CMSG_SPACE (sizeof (struct ucred))]; + struct msghdr mh = { 0 }; + struct iovec iov[1]; + ssize_t size; + struct ucred *cr = 0; + struct cmsghdr *cmsg; + pid_t pid __attribute__ ((unused)); + uid_t uid __attribute__ ((unused)); + gid_t gid __attribute__ ((unused)); - details = vam->ip_details_by_sw_if_index[vam->is_ipv6]; + iov[0].iov_base = msgbuf; + iov[0].iov_len = 5; + mh.msg_iov = iov; + mh.msg_iovlen = 1; + mh.msg_control = ctl; + mh.msg_controllen = sizeof (ctl); - if (!details || vam->current_sw_if_index >= vec_len (details) - || !details[vam->current_sw_if_index].present) + memset (ctl, 0, sizeof (ctl)); + + /* receive the incoming message */ + size = recvmsg (socket_fd, &mh, 0); + if (size != 5) { - errmsg ("ip address details arrived but not stored"); - errmsg ("ip_dump should be called first"); - return; + return (size == 0) ? clib_error_return (0, "disconnected") : + clib_error_return_unix (0, "recvmsg: malformed message (fd %d)", + socket_fd); } - current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index); - -#define addresses (current_ip_details->addr) - - vec_validate_init_empty (addresses, vec_len (addresses), - empty_ip_address_details); - - address = vec_elt_at_index (addresses, vec_len (addresses) - 1); - - clib_memcpy (&address->ip, &mp->ip, sizeof (address->ip)); - address->prefix_length = mp->prefix_length; -#undef addresses + cmsg = CMSG_FIRSTHDR (&mh); + while (cmsg) + { + if (cmsg->cmsg_level == SOL_SOCKET) + { + if (cmsg->cmsg_type == SCM_CREDENTIALS) + { + cr = (struct ucred *) CMSG_DATA (cmsg); + uid = cr->uid; + gid = cr->gid; + pid = cr->pid; + } + else if (cmsg->cmsg_type == SCM_RIGHTS) + { + clib_memcpy (my_fd, CMSG_DATA (cmsg), sizeof (int)); + } + } + cmsg = CMSG_NXTHDR (&mh, cmsg); + } + return 0; } -static void vl_api_ip_address_details_t_handler_json - (vl_api_ip_address_details_t * mp) +static void vl_api_memfd_segment_create_reply_t_handler + (vl_api_memfd_segment_create_reply_t * mp) { + /* Dont bother in the builtin version */ +#if VPP_API_TEST_BUILTIN == 0 vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; + api_main_t *am = &api_main; + socket_client_main_t *scm = &vam->socket_client_main; + int my_fd = -1; + clib_error_t *error; + memfd_private_t memfd; + i32 retval = ntohl (mp->retval); - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (retval == 0) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + error = receive_fd_msg (scm->socket_fd, &my_fd); + if (error) + { + retval = -99; + goto out; + } + + memset (&memfd, 0, sizeof (memfd)); + memfd.fd = my_fd; + + vam->client_index_invalid = 1; + + /* Note: this closes memfd.fd */ + retval = memfd_slave_init (&memfd); + if (retval) + clib_warning ("WARNING: segment map returned %d", retval); + + /* Pivot to the memory client segment that vpp just created */ + + am->vlib_rp = (void *) (memfd.requested_va + MMAP_PAGESIZE); + + am->shmem_hdr = (void *) am->vlib_rp->user_ctx; + + vl_client_install_client_message_handlers (); + + vl_client_connect_to_vlib_no_map ("pvt", + "vpp_api_test(p)", + 32 /* input_queue_length */ ); + vam->vl_input_queue = am->shmem_hdr->vl_input_queue; + + vl_socket_client_enable_disable (&vam->socket_client_main, + 0 /* disable socket */ ); } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - if (vam->is_ipv6) +out: + if (vam->async_mode) { - clib_memcpy (&ip6, mp->ip, sizeof (ip6)); - vat_json_object_add_ip6 (node, "ip", ip6); + vam->async_errors += (retval < 0); } else { - clib_memcpy (&ip4, mp->ip, sizeof (ip4)); - vat_json_object_add_ip4 (node, "ip", ip4); + vam->retval = retval; + vam->result_ready = 1; } - vat_json_object_add_uint (node, "prefix_length", mp->prefix_length); +#endif } -static void -vl_api_ip_details_t_handler (vl_api_ip_details_t * mp) +static void vl_api_memfd_segment_create_reply_t_handler_json + (vl_api_memfd_segment_create_reply_t * mp) { - vat_main_t *vam = &vat_main; - static ip_details_t empty_ip_details = { 0 }; - ip_details_t *ip = NULL; - u32 sw_if_index = ~0; - - sw_if_index = ntohl (mp->sw_if_index); - - vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6], - sw_if_index, empty_ip_details); - - ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6], - sw_if_index); - - ip->present = 1; + clib_warning ("no"); } -static void -vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp) +static void vl_api_dns_resolve_name_reply_t_handler + (vl_api_dns_resolve_name_reply_t * mp) { vat_main_t *vam = &vat_main; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->result_ready = 1; + + if (retval == 0) + { + if (mp->ip4_set) + clib_warning ("ip4 address %U", format_ip4_address, + (ip4_address_t *) mp->ip4_address); + if (mp->ip6_set) + clib_warning ("ip6 address %U", format_ip6_address, + (ip6_address_t *) mp->ip6_address); + } + else + clib_warning ("retval %d", retval); + } +} + +static void vl_api_dns_resolve_name_reply_t_handler_json + (vl_api_dns_resolve_name_reply_t * mp) +{ + clib_warning ("not implemented"); +} + +static void vl_api_dns_resolve_ip_reply_t_handler + (vl_api_dns_resolve_ip_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; + + if (retval == 0) + { + clib_warning ("canonical name %s", mp->name); + } + else + clib_warning ("retval %d", retval); + } +} + +static void vl_api_dns_resolve_ip_reply_t_handler_json + (vl_api_dns_resolve_ip_reply_t * mp) +{ + clib_warning ("not implemented"); +} + + +static void vl_api_ip_address_details_t_handler + (vl_api_ip_address_details_t * mp) +{ + vat_main_t *vam = &vat_main; + static ip_address_details_t empty_ip_address_details = { {0} }; + ip_address_details_t *address = NULL; + ip_details_t *current_ip_details = NULL; + ip_details_t *details = NULL; + + details = vam->ip_details_by_sw_if_index[vam->is_ipv6]; + + if (!details || vam->current_sw_if_index >= vec_len (details) + || !details[vam->current_sw_if_index].present) + { + errmsg ("ip address details arrived but not stored"); + errmsg ("ip_dump should be called first"); + return; + } + + current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index); + +#define addresses (current_ip_details->addr) + + vec_validate_init_empty (addresses, vec_len (addresses), + empty_ip_address_details); + + address = vec_elt_at_index (addresses, vec_len (addresses) - 1); + + clib_memcpy (&address->ip, &mp->ip, sizeof (address->ip)); + address->prefix_length = mp->prefix_length; +#undef addresses +} + +static void vl_api_ip_address_details_t_handler_json + (vl_api_ip_address_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 (vam->is_ipv6) + { + clib_memcpy (&ip6, mp->ip, sizeof (ip6)); + vat_json_object_add_ip6 (node, "ip", ip6); + } + else + { + 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); +} + +static void +vl_api_ip_details_t_handler (vl_api_ip_details_t * mp) +{ + vat_main_t *vam = &vat_main; + static ip_details_t empty_ip_details = { 0 }; + ip_details_t *ip = NULL; + u32 sw_if_index = ~0; + + sw_if_index = ntohl (mp->sw_if_index); + + vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6], + sw_if_index, empty_ip_details); + + ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6], + sw_if_index); + + ip->present = 1; +} + +static void +vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { ASSERT (VAT_JSON_NONE == vam->json_tree.type); vat_json_init_array (&vam->json_tree); } @@ -3392,6 +3782,71 @@ end: vam->result_ready = 1; } +static void + vl_api_one_ndp_entries_get_reply_t_handler + (vl_api_one_ndp_entries_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + print (vam->ofp, "%U -> %U", format_ip6_address, &mp->entries[i].ip6, + format_ethernet_address, mp->entries[i].mac); + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_ndp_entries_get_reply_t_handler_json + (vl_api_one_ndp_entries_get_reply_t * mp) +{ + u8 *s = 0; + vat_main_t *vam = &vat_main; + vat_json_node_t *e = 0, root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_one_ndp_entry_t *arp_entry; + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); + + for (i = 0; i < n; i++) + { + e = vat_json_array_add (&root); + arp_entry = &mp->entries[i]; + + vat_json_init_object (e); + s = format (0, "%U", format_ethernet_address, arp_entry->mac); + vec_add1 (s, 0); + + vat_json_object_add_string_copy (e, "mac", s); + vec_free (s); + + s = format (0, "%U", format_ip6_address, &arp_entry->ip6); + vec_add1 (s, 0); + vat_json_object_add_string_copy (e, "ip6", s); + vec_free (s); + } + + vat_json_print (vam->ofp, &root); + vat_json_free (&root); + +end: + vam->retval = retval; + vam->result_ready = 1; +} + static void vl_api_one_l2_arp_entries_get_reply_t_handler (vl_api_one_l2_arp_entries_get_reply_t * mp) @@ -3457,6 +3912,57 @@ end: vam->result_ready = 1; } +static void +vl_api_one_ndp_bd_get_reply_t_handler (vl_api_one_ndp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_ndp_bd_get_reply_t_handler_json + (vl_api_one_ndp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); + + for (i = 0; i < n; i++) + { + vat_json_array_add_uint (&root, + clib_net_to_host_u32 (mp->bridge_domains[i])); + } + + vat_json_print (vam->ofp, &root); + vat_json_free (&root); + +end: + vam->retval = retval; + vam->result_ready = 1; +} + static void vl_api_one_l2_arp_bd_get_reply_t_handler (vl_api_one_l2_arp_bd_get_reply_t * mp) @@ -3802,21 +4308,15 @@ static void } static void - vl_api_show_one_use_petr_reply_t_handler - (vl_api_show_one_use_petr_reply_t * mp) + vl_api_one_show_xtr_mode_reply_t_handler + (vl_api_one_show_xtr_mode_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); if (0 <= retval) { - print (vam->ofp, "%s\n", mp->status ? "enabled" : "disabled"); - if (mp->status) - { - print (vam->ofp, "Proxy-ETR address; %U", - mp->is_ip4 ? format_ip4_address : format_ip6_address, - mp->address); - } + print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); } vam->retval = retval; @@ -3824,26 +4324,149 @@ static void } static void - vl_api_show_one_use_petr_reply_t_handler_json - (vl_api_show_one_use_petr_reply_t * mp) + vl_api_one_show_xtr_mode_reply_t_handler_json + (vl_api_one_show_xtr_mode_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; u8 *status = 0; - struct in_addr ip4; - struct in6_addr ip6; - status = format (0, "%s", mp->status ? "enabled" : "disabled"); + status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); vec_add1 (status, 0); vat_json_init_object (&node); vat_json_object_add_string_copy (&node, "status", status); - if (mp->status) - { - if (mp->is_ip4) - { - clib_memcpy (&ip6, mp->address, sizeof (ip6)); - vat_json_object_add_ip6 (&node, "address", ip6); + + vec_free (status); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_one_show_pitr_mode_reply_t_handler + (vl_api_one_show_pitr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_pitr_mode_reply_t_handler_json + (vl_api_one_show_pitr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + u8 *status = 0; + + status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); + vec_add1 (status, 0); + + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "status", status); + + vec_free (status); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_one_show_petr_mode_reply_t_handler + (vl_api_one_show_petr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_petr_mode_reply_t_handler_json + (vl_api_one_show_petr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + u8 *status = 0; + + status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); + vec_add1 (status, 0); + + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "status", status); + + vec_free (status); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_show_one_use_petr_reply_t_handler + (vl_api_show_one_use_petr_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->status ? "enabled" : "disabled"); + if (mp->status) + { + print (vam->ofp, "Proxy-ETR address; %U", + mp->is_ip4 ? format_ip4_address : format_ip6_address, + mp->address); + } + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_use_petr_reply_t_handler_json + (vl_api_show_one_use_petr_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + u8 *status = 0; + struct in_addr ip4; + struct in6_addr ip6; + + status = format (0, "%s", mp->status ? "enabled" : "disabled"); + vec_add1 (status, 0); + + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "status", status); + if (mp->status) + { + if (mp->is_ip4) + { + clib_memcpy (&ip6, mp->address, sizeof (ip6)); + vat_json_object_add_ip6 (&node, "address", ip6); } else { @@ -4347,7 +4970,7 @@ format_hex_bytes (u8 * s, va_list * va) /* Print short or long form depending on byte count. */ uword short_form = n_bytes <= 32; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); if (n_bytes == 0) return s; @@ -4590,6 +5213,10 @@ static void vl_api_flow_classify_details_t_handler_json #define vl_api_one_l2_arp_entries_get_reply_t_endian vl_noop_handler #define vl_api_one_l2_arp_entries_get_reply_t_print vl_noop_handler #define vl_api_one_l2_arp_bd_get_reply_t_endian vl_noop_handler +#define vl_api_one_ndp_bd_get_reply_t_endian vl_noop_handler +#define vl_api_one_ndp_bd_get_reply_t_print vl_noop_handler +#define vl_api_one_ndp_entries_get_reply_t_print vl_noop_handler +#define vl_api_one_ndp_entries_get_reply_t_endian vl_noop_handler /* * Generate boilerplate reply handlers, which @@ -4603,10 +5230,12 @@ static void vl_api_flow_classify_details_t_handler_json #define foreach_standard_reply_retval_handler \ _(sw_interface_set_flags_reply) \ _(sw_interface_add_del_address_reply) \ +_(sw_interface_set_rx_mode_reply) \ _(sw_interface_set_table_reply) \ _(sw_interface_set_mpls_enable_reply) \ _(sw_interface_set_vpath_reply) \ _(sw_interface_set_vxlan_bypass_reply) \ +_(sw_interface_set_geneve_bypass_reply) \ _(sw_interface_set_vxlan_gpe_bypass_reply) \ _(sw_interface_set_l2_bridge_reply) \ _(bridge_domain_add_del_reply) \ @@ -4620,11 +5249,12 @@ _(ip_mroute_add_del_reply) \ _(mpls_route_add_del_reply) \ _(mpls_table_add_del_reply) \ _(mpls_ip_bind_unbind_reply) \ +_(bier_route_add_del_reply) \ +_(bier_table_add_del_reply) \ _(proxy_arp_add_del_reply) \ _(proxy_arp_intfc_enable_disable_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) \ @@ -4664,6 +5294,8 @@ _(ipsec_spd_add_del_entry_reply) \ _(ipsec_sad_add_del_entry_reply) \ _(ipsec_sa_set_key_reply) \ _(ipsec_tunnel_if_add_del_reply) \ +_(ipsec_tunnel_if_set_key_reply) \ +_(ipsec_tunnel_if_set_sa_reply) \ _(ikev2_profile_add_del_reply) \ _(ikev2_profile_set_auth_reply) \ _(ikev2_profile_set_id_reply) \ @@ -4686,8 +5318,8 @@ _(want_stats_reply) \ _(cop_interface_enable_disable_reply) \ _(cop_whitelist_enable_disable_reply) \ _(sw_interface_clear_stats_reply) \ -_(ioam_enable_reply) \ -_(ioam_disable_reply) \ +_(ioam_enable_reply) \ +_(ioam_disable_reply) \ _(one_add_del_locator_reply) \ _(one_add_del_local_eid_reply) \ _(one_add_del_remote_mapping_reply) \ @@ -4698,6 +5330,7 @@ _(one_enable_disable_reply) \ _(one_rloc_probe_enable_disable_reply) \ _(one_map_register_enable_disable_reply) \ _(one_map_register_set_ttl_reply) \ +_(one_set_transport_protocol_reply) \ _(one_map_register_fallback_threshold_reply) \ _(one_pitr_set_locator_set_reply) \ _(one_map_request_mode_reply) \ @@ -4706,7 +5339,11 @@ _(one_eid_table_add_del_map_reply) \ _(one_use_petr_reply) \ _(one_stats_enable_disable_reply) \ _(one_add_del_l2_arp_entry_reply) \ +_(one_add_del_ndp_entry_reply) \ _(one_stats_flush_reply) \ +_(one_enable_disable_xtr_mode_reply) \ +_(one_enable_disable_pitr_mode_reply) \ +_(one_enable_disable_petr_mode_reply) \ _(gpe_enable_disable_reply) \ _(gpe_set_encap_mode_reply) \ _(gpe_add_del_iface_reply) \ @@ -4734,7 +5371,11 @@ _(p2p_ethernet_add_reply) \ _(p2p_ethernet_del_reply) \ _(lldp_config_reply) \ _(sw_interface_set_lldp_reply) \ -_(tcp_configure_src_addresses_reply) +_(tcp_configure_src_addresses_reply) \ +_(dns_enable_disable_reply) \ +_(dns_name_server_add_del_reply) \ +_(session_rule_add_del_reply) \ +_(ip_container_proxy_add_del_reply) #define _(n) \ static void vl_api_##n##_t_handler \ @@ -4782,10 +5423,12 @@ _(CLI_REPLY, cli_reply) \ _(CLI_INBAND_REPLY, cli_inband_reply) \ _(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \ sw_interface_add_del_address_reply) \ +_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \ _(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \ _(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \ _(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \ _(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \ +_(SW_INTERFACE_SET_GENEVE_BYPASS_REPLY, sw_interface_set_geneve_bypass_reply) \ _(SW_INTERFACE_SET_VXLAN_GPE_BYPASS_REPLY, sw_interface_set_vxlan_gpe_bypass_reply) \ _(SW_INTERFACE_SET_L2_XCONNECT_REPLY, \ sw_interface_set_l2_xconnect_reply) \ @@ -4803,12 +5446,17 @@ _(TAP_CONNECT_REPLY, tap_connect_reply) \ _(TAP_MODIFY_REPLY, tap_modify_reply) \ _(TAP_DELETE_REPLY, tap_delete_reply) \ _(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_details) \ +_(TAP_CREATE_V2_REPLY, tap_create_v2_reply) \ +_(TAP_DELETE_V2_REPLY, tap_delete_v2_reply) \ +_(SW_INTERFACE_TAP_V2_DETAILS, sw_interface_tap_v2_details) \ _(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply) \ _(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \ _(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \ _(MPLS_TABLE_ADD_DEL_REPLY, mpls_table_add_del_reply) \ _(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \ _(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \ +_(BIER_ROUTE_ADD_DEL_REPLY, bier_route_add_del_reply) \ +_(BIER_TABLE_ADD_DEL_REPLY, bier_table_add_del_reply) \ _(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply) \ _(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY, \ proxy_arp_intfc_enable_disable_reply) \ @@ -4816,7 +5464,6 @@ _(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \ _(SW_INTERFACE_SET_UNNUMBERED_REPLY, \ sw_interface_set_unnumbered_reply) \ _(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply) \ -_(RESET_VRF_REPLY, reset_vrf_reply) \ _(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply) \ _(CREATE_SUBIF_REPLY, create_subif_reply) \ _(OAM_ADD_DEL_REPLY, oam_add_del_reply) \ @@ -4858,7 +5505,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) \ +_(GENEVE_ADD_DEL_TUNNEL_REPLY, geneve_add_del_tunnel_reply) \ _(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \ +_(GENEVE_TUNNEL_DETAILS, geneve_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) \ @@ -4886,8 +5535,11 @@ _(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply) \ _(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_DETAILS, ipsec_sa_details) \ _(IPSEC_SA_SET_KEY_REPLY, ipsec_sa_set_key_reply) \ _(IPSEC_TUNNEL_IF_ADD_DEL_REPLY, ipsec_tunnel_if_add_del_reply) \ +_(IPSEC_TUNNEL_IF_SET_KEY_REPLY, ipsec_tunnel_if_set_key_reply) \ +_(IPSEC_TUNNEL_IF_SET_SA_REPLY, ipsec_tunnel_if_set_sa_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) \ @@ -4929,6 +5581,8 @@ _(ONE_ENABLE_DISABLE_REPLY, one_enable_disable_reply) \ _(ONE_MAP_REGISTER_ENABLE_DISABLE_REPLY, \ one_map_register_enable_disable_reply) \ _(ONE_MAP_REGISTER_SET_TTL_REPLY, one_map_register_set_ttl_reply) \ +_(ONE_SET_TRANSPORT_PROTOCOL_REPLY, one_set_transport_protocol_reply) \ +_(ONE_GET_TRANSPORT_PROTOCOL_REPLY, one_get_transport_protocol_reply) \ _(ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, \ one_map_register_fallback_threshold_reply) \ _(ONE_RLOC_PROBE_ENABLE_DISABLE_REPLY, \ @@ -4950,9 +5604,20 @@ _(ONE_STATS_FLUSH_REPLY, one_stats_flush_reply) \ _(ONE_STATS_ENABLE_DISABLE_REPLY, one_stats_enable_disable_reply) \ _(SHOW_ONE_STATS_ENABLE_DISABLE_REPLY, \ show_one_stats_enable_disable_reply) \ +_(ONE_ADD_DEL_NDP_ENTRY_REPLY, one_add_del_ndp_entry_reply) \ +_(ONE_NDP_BD_GET_REPLY, one_ndp_bd_get_reply) \ +_(ONE_NDP_ENTRIES_GET_REPLY, one_ndp_entries_get_reply) \ _(ONE_ADD_DEL_L2_ARP_ENTRY_REPLY, one_add_del_l2_arp_entry_reply) \ _(ONE_L2_ARP_BD_GET_REPLY, one_l2_arp_bd_get_reply) \ _(ONE_L2_ARP_ENTRIES_GET_REPLY, one_l2_arp_entries_get_reply) \ +_(ONE_ENABLE_DISABLE_XTR_MODE_REPLY, one_enable_disable_xtr_mode_reply) \ +_(ONE_ENABLE_DISABLE_PITR_MODE_REPLY, \ + one_enable_disable_pitr_mode_reply) \ +_(ONE_ENABLE_DISABLE_PETR_MODE_REPLY, \ + one_enable_disable_petr_mode_reply) \ +_(ONE_SHOW_XTR_MODE_REPLY, one_show_xtr_mode_reply) \ +_(ONE_SHOW_PITR_MODE_REPLY, one_show_pitr_mode_reply) \ +_(ONE_SHOW_PETR_MODE_REPLY, one_show_petr_mode_reply) \ _(GPE_SET_ENCAP_MODE_REPLY, gpe_set_encap_mode_reply) \ _(GPE_GET_ENCAP_MODE_REPLY, gpe_get_encap_mode_reply) \ _(GPE_ADD_DEL_IFACE_REPLY, gpe_add_del_iface_reply) \ @@ -5029,7 +5694,15 @@ _(P2P_ETHERNET_ADD_REPLY, p2p_ethernet_add_reply) \ _(P2P_ETHERNET_DEL_REPLY, p2p_ethernet_del_reply) \ _(LLDP_CONFIG_REPLY, lldp_config_reply) \ _(SW_INTERFACE_SET_LLDP_REPLY, sw_interface_set_lldp_reply) \ -_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) +_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) \ +_(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply) \ +_(DNS_ENABLE_DISABLE_REPLY, dns_enable_disable_reply) \ +_(DNS_NAME_SERVER_ADD_DEL_REPLY, dns_name_server_add_del_reply) \ +_(DNS_RESOLVE_NAME_REPLY, dns_resolve_name_reply) \ +_(DNS_RESOLVE_IP_REPLY, dns_resolve_ip_reply) \ +_(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ +_(SESSION_RULES_DETAILS, session_rules_details) \ +_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \ #define foreach_standalone_reply_msg \ _(SW_INTERFACE_EVENT, sw_interface_event) \ @@ -5038,7 +5711,8 @@ _(VNET_INTERFACE_COMBINED_COUNTERS, vnet_interface_combined_counters) \ _(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters) \ _(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters) \ _(VNET_IP4_NBR_COUNTERS, vnet_ip4_nbr_counters) \ -_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters) +_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters) \ +_(MEMFD_SEGMENT_CREATE_REPLY, memfd_segment_create_reply) \ typedef struct { @@ -5412,76 +6086,9 @@ dump_stats_table (vat_main_t * vam) return 0; } -int -exec (vat_main_t * vam) -{ - api_main_t *am = &api_main; - vl_api_cli_t *mp; - f64 timeout; - void *oldheap; - u8 *cmd = 0; - unformat_input_t *i = vam->input; - - if (vec_len (i->buffer) == 0) - return -1; - - if (vam->exec_mode == 0 && unformat (i, "mode")) - { - vam->exec_mode = 1; - return 0; - } - if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit"))) - { - vam->exec_mode = 0; - return 0; - } - - - M (CLI, mp); - - /* - * Copy cmd into shared memory. - * In order for the CLI command to work, it - * must be a vector ending in \n, not a C-string ending - * in \n\0. - */ - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); - - vec_validate (cmd, vec_len (vam->input->buffer) - 1); - clib_memcpy (cmd, vam->input->buffer, vec_len (vam->input->buffer)); - - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); - - mp->cmd_in_shmem = pointer_to_uword (cmd); - S (mp); - timeout = vat_time_now (vam) + 10.0; - - while (vat_time_now (vam) < timeout) - { - if (vam->result_ready == 1) - { - u8 *free_me; - if (vam->shmem_result != NULL) - print (vam->ofp, "%s", vam->shmem_result); - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); - - free_me = (u8 *) vam->shmem_result; - vec_free (free_me); - - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); - return 0; - } - } - return -99; -} - /* - * Future replacement of exec() that passes CLI buffers directly in - * the API messages instead of an additional shared memory area. + * Pass CLI buffers directly in the CLI_INBAND API message, + * instead of an additional shared memory area. */ static int exec_inband (vat_main_t * vam) @@ -5515,10 +6122,19 @@ exec_inband (vat_main_t * vam) mp->length = htonl (len); S (mp); - W2 (ret, print (vam->ofp, "%s", vam->cmd_reply)); + W (ret); + /* json responses may or may not include a useful reply... */ + if (vec_len (vam->cmd_reply)) + print (vam->ofp, "%v", (char *) (vam->cmd_reply)); return ret; } +int +exec (vat_main_t * vam) +{ + return exec_inband (vam); +} + static int api_create_loopback (vat_main_t * vam) { @@ -5731,6 +6347,12 @@ api_sw_interface_dump (vat_main_t * vam) strncpy ((char *) mp->name_filter, "vxlan", sizeof (mp->name_filter) - 1); S (mp); + /* and geneve tunnel interfaces */ + M (SW_INTERFACE_DUMP, mp); + mp->name_filter_valid = 1; + strncpy ((char *) mp->name_filter, "geneve", sizeof (mp->name_filter) - 1); + S (mp); + /* and host (af_packet) interfaces */ M (SW_INTERFACE_DUMP, mp); mp->name_filter_valid = 1; @@ -5764,7 +6386,7 @@ api_sw_interface_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -5816,6 +6438,64 @@ api_sw_interface_set_flags (vat_main_t * vam) return ret; } +static int +api_sw_interface_set_rx_mode (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_rx_mode_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + int ret; + u8 queue_id_valid = 0; + u32 queue_id; + vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "queue %d", &queue_id)) + queue_id_valid = 1; + else if (unformat (i, "polling")) + mode = VNET_HW_INTERFACE_RX_MODE_POLLING; + else if (unformat (i, "interrupt")) + mode = VNET_HW_INTERFACE_RX_MODE_INTERRUPT; + else if (unformat (i, "adaptive")) + mode = VNET_HW_INTERFACE_RX_MODE_ADAPTIVE; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (mode == VNET_HW_INTERFACE_RX_MODE_UNKNOWN) + { + errmsg ("missing rx-mode"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_SET_RX_MODE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->mode = mode; + mp->queue_id_valid = queue_id_valid; + mp->queue_id = queue_id_valid ? ntohl (queue_id) : ~0; + + /* send it... */ + S (mp); + + /* Wait for a reply, return the good/bad news... */ + W (ret); + return ret; +} + static int api_sw_interface_clear_stats (vat_main_t * vam) { @@ -6183,48 +6863,98 @@ api_sw_interface_set_vxlan_bypass (vat_main_t * vam) return ret; } - static int -api_sw_interface_set_l2_xconnect (vat_main_t * vam) +api_sw_interface_set_geneve_bypass (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_set_l2_xconnect_t *mp; - u32 rx_sw_if_index; - u8 rx_sw_if_index_set = 0; - u32 tx_sw_if_index; - u8 tx_sw_if_index_set = 0; - u8 enable = 1; + vl_api_sw_interface_set_geneve_bypass_t *mp; + u32 sw_if_index = 0; + u8 sw_if_index_set = 0; + u8 is_enable = 1; + u8 is_ipv6 = 0; int ret; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) - tx_sw_if_index_set = 1; - else if (unformat (i, "rx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &rx_sw_if_index)) - rx_sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "tx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &tx_sw_if_index)) - tx_sw_if_index_set = 1; - } - else - break; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "enable")) + is_enable = 1; + else if (unformat (i, "disable")) + is_enable = 0; + else if (unformat (i, "ip4")) + is_ipv6 = 0; + else if (unformat (i, "ip6")) + is_ipv6 = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_SET_GENEVE_BYPASS, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->enable = is_enable; + mp->is_ipv6 = is_ipv6; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_sw_interface_set_l2_xconnect (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_l2_xconnect_t *mp; + u32 rx_sw_if_index; + u8 rx_sw_if_index_set = 0; + u32 tx_sw_if_index; + u8 tx_sw_if_index_set = 0; + u8 enable = 1; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) + tx_sw_if_index_set = 1; + else if (unformat (i, "rx")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &rx_sw_if_index)) + rx_sw_if_index_set = 1; + } + else + break; + } + else if (unformat (i, "tx")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &tx_sw_if_index)) + tx_sw_if_index_set = 1; + } + else + break; + } else if (unformat (i, "enable")) enable = 1; else if (unformat (i, "disable")) @@ -6341,7 +7071,7 @@ api_bridge_domain_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -6402,7 +7132,7 @@ api_bridge_domain_add_del (vat_main_t * vam) goto done; } - if ((bd_tag) && (strlen ((char *) bd_tag) > 63)) + if ((bd_tag) && (vec_len (bd_tag) > 63)) { errmsg ("bd-tag cannot be longer than 63"); ret = -99; @@ -6420,8 +7150,10 @@ api_bridge_domain_add_del (vat_main_t * vam) mp->is_add = is_add; mp->mac_age = (u8) mac_age; if (bd_tag) - strcpy ((char *) mp->bd_tag, (char *) bd_tag); - + { + clib_memcpy (mp->bd_tag, bd_tag, vec_len (bd_tag)); + mp->bd_tag[vec_len (bd_tag)] = 0; + } S (mp); W (ret); @@ -6500,7 +7232,7 @@ api_l2fib_add_del (vat_main_t * vam) unformat_input_t *i = vam->input; vl_api_l2fib_add_del_t *mp; f64 timeout; - u64 mac = 0; + u8 mac[6] = { 0 }; u8 mac_set = 0; u32 bd_id; u8 bd_id_set = 0; @@ -6517,7 +7249,7 @@ api_l2fib_add_del (vat_main_t * vam) /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "mac %U", unformat_ethernet_address, &mac)) + if (unformat (i, "mac %U", unformat_ethernet_address, mac)) mac_set = 1; else if (unformat (i, "bd_id %d", &bd_id)) bd_id_set = 1; @@ -6584,7 +7316,7 @@ api_l2fib_add_del (vat_main_t * vam) { M (L2FIB_ADD_DEL, mp); - mp->mac = mac; + clib_memcpy (mp->mac, mac, 6); mp->bd_id = ntohl (bd_id); mp->is_add = is_add; @@ -6595,7 +7327,7 @@ api_l2fib_add_del (vat_main_t * vam) mp->filter_mac = filter_mac; mp->bvi_mac = bvi_mac; } - increment_mac_address (&mac); + increment_mac_address (mac); /* send it... */ S (mp); } @@ -6608,7 +7340,7 @@ api_l2fib_add_del (vat_main_t * vam) /* Shut off async mode */ vam->async_mode = 0; - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); timeout = vat_time_now (vam) + 1.0; @@ -7071,6 +7803,142 @@ api_tap_delete (vat_main_t * vam) return ret; } +static int +api_tap_create_v2 (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_tap_create_v2_t *mp; + u8 mac_address[6]; + u8 random_mac = 1; + u8 name_set = 0; + u8 *tap_name; + u8 *net_ns; + u8 net_ns_set = 0; + int ret; + int rx_ring_sz = 0, tx_ring_sz = 0; + + memset (mac_address, 0, sizeof (mac_address)); + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) + { + random_mac = 0; + } + else if (unformat (i, "name %s", &tap_name)) + name_set = 1; + else if (unformat (i, "host-ns %s", &net_ns)) + net_ns_set = 1; + else if (unformat (i, "rx-ring-size %d", &rx_ring_sz)) + ; + else if (unformat (i, "tx-ring-size %d", &tx_ring_sz)) + ; + else + break; + } + + if (name_set == 0) + { + errmsg ("missing tap name. "); + return -99; + } + if (vec_len (tap_name) > 63) + { + errmsg ("tap name too long. "); + return -99; + } + if (vec_len (net_ns) > 63) + { + errmsg ("host name space too long. "); + return -99; + } + if (!is_pow2 (rx_ring_sz)) + { + errmsg ("rx ring size must be power of 2. "); + return -99; + } + if (rx_ring_sz > 32768) + { + errmsg ("rx ring size must be 32768 or lower. "); + return -99; + } + if (!is_pow2 (tx_ring_sz)) + { + errmsg ("tx ring size must be power of 2. "); + return -99; + } + if (tx_ring_sz > 32768) + { + errmsg ("tx ring size must be 32768 or lower. "); + return -99; + } + + vec_add1 (tap_name, 0); + vec_add1 (net_ns, 0); + + /* Construct the API message */ + M (TAP_CREATE_V2, mp); + + mp->use_random_mac = random_mac; + clib_memcpy (mp->mac_address, mac_address, 6); + clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name)); + mp->net_ns_set = net_ns_set; + mp->rx_ring_sz = rx_ring_sz; + mp->tx_ring_sz = tx_ring_sz; + if (net_ns) + clib_memcpy (mp->net_ns, net_ns, vec_len (net_ns)); + + vec_free (tap_name); + vec_free (net_ns); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_tap_delete_v2 (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_tap_delete_v2_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } + + /* Construct the API message */ + M (TAP_DELETE_V2, mp); + + mp->sw_if_index = ntohl (sw_if_index); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + static int api_ip_table_add_del (vat_main_t * vam) { @@ -7133,7 +8001,6 @@ api_ip_add_del_route (vat_main_t * vam) u8 create_vrf_if_needed = 0; u8 is_add = 1; u32 next_hop_weight = 1; - u8 not_last = 0; u8 is_multipath = 0; u8 address_set = 0; u8 address_length_set = 0; @@ -7217,8 +8084,6 @@ api_ip_add_del_route (vat_main_t * vam) is_add = 0; else if (unformat (i, "add")) is_add = 1; - else if (unformat (i, "not-last")) - not_last = 1; else if (unformat (i, "resolve-via-host")) resolve_host = 1; else if (unformat (i, "resolve-via-attached")) @@ -7327,7 +8192,6 @@ api_ip_add_del_route (vat_main_t * vam) mp->is_multipath = is_multipath; mp->is_resolve_host = resolve_host; mp->is_resolve_attached = resolve_attached; - mp->not_last = not_last; mp->next_hop_weight = next_hop_weight; mp->dst_address_length = dst_address_length; mp->next_hop_table_id = ntohl (next_hop_table_id); @@ -7380,7 +8244,7 @@ api_ip_add_del_route (vat_main_t * vam) /* Shut off async mode */ vam->async_mode = 0; - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); timeout = vat_time_now (vam) + 1.0; @@ -7769,7 +8633,7 @@ api_mpls_route_add_del (vat_main_t * vam) /* Shut off async mode */ vam->async_mode = 0; - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); timeout = vat_time_now (vam) + 1.0; @@ -7895,23 +8759,28 @@ api_mpls_ip_bind_unbind (vat_main_t * vam) } static int -api_proxy_arp_add_del (vat_main_t * vam) +api_bier_table_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_proxy_arp_add_del_t *mp; - u32 vrf_id = 0; + vl_api_bier_table_add_del_t *mp; u8 is_add = 1; - ip4_address_t lo, hi; - u8 range_set = 0; + u32 set = 0, sub_domain = 0, hdr_len = 3; + mpls_label_t local_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vrf %d", &vrf_id)) + if (unformat (i, "sub-domain %d", &sub_domain)) ; - else if (unformat (i, "%U - %U", unformat_ip4_address, &lo, - unformat_ip4_address, &hi)) - range_set = 1; + else if (unformat (i, "set %d", &set)) + ; + else if (unformat (i, "label %d", &local_label)) + ; + else if (unformat (i, "hdr-len %d", &hdr_len)) + ; + else if (unformat (i, "add")) + is_add = 1; else if (unformat (i, "del")) is_add = 0; else @@ -7921,44 +8790,71 @@ api_proxy_arp_add_del (vat_main_t * vam) } } - if (range_set == 0) + if (MPLS_LABEL_INVALID == local_label) { - errmsg ("address range not set"); + errmsg ("missing label\n"); return -99; } - M (PROXY_ARP_ADD_DEL, mp); + /* Construct the API message */ + M (BIER_TABLE_ADD_DEL, mp); - mp->vrf_id = ntohl (vrf_id); - mp->is_add = is_add; - clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address)); - clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address)); + mp->bt_is_add = is_add; + mp->bt_label = ntohl (local_label); + mp->bt_tbl_id.bt_set = set; + mp->bt_tbl_id.bt_sub_domain = sub_domain; + mp->bt_tbl_id.bt_hdr_len_id = hdr_len; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); - return ret; + + return (ret); } static int -api_proxy_arp_intfc_enable_disable (vat_main_t * vam) +api_bier_route_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_proxy_arp_intfc_enable_disable_t *mp; - u32 sw_if_index; - u8 enable = 1; - u8 sw_if_index_set = 0; + vl_api_bier_route_add_del_t *mp; + u8 is_add = 1; + u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0; + ip4_address_t v4_next_hop_address; + ip6_address_t v6_next_hop_address; + u8 next_hop_set = 0; + u8 next_hop_proto_is_ip4 = 1; + mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; + if (unformat (i, "%U", unformat_ip4_address, &v4_next_hop_address)) + { + next_hop_proto_is_ip4 = 1; + next_hop_set = 1; + } + else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address)) + { + next_hop_proto_is_ip4 = 0; + next_hop_set = 1; + } + if (unformat (i, "sub-domain %d", &sub_domain)) + ; + else if (unformat (i, "set %d", &set)) + ; + else if (unformat (i, "hdr-len %d", &hdr_len)) + ; + else if (unformat (i, "bp %d", &bp)) + ; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "out-label %d", &next_hop_out_label)) + ; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -7966,16 +8862,132 @@ api_proxy_arp_intfc_enable_disable (vat_main_t * vam) } } - if (sw_if_index_set == 0) + if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label)) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("next hop / label set\n"); + return -99; + } + if (0 == bp) + { + errmsg ("bit=position not set\n"); return -99; } - M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp); + /* Construct the API message */ + M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path3_t)); + + mp->br_is_add = is_add; + mp->br_tbl_id.bt_set = set; + mp->br_tbl_id.bt_sub_domain = sub_domain; + mp->br_tbl_id.bt_hdr_len_id = hdr_len; + mp->br_bp = ntohs (bp); + mp->br_n_paths = 1; + mp->br_paths[0].n_labels = 1; + mp->br_paths[0].label_stack[0] = ntohl (next_hop_out_label); + mp->br_paths[0].afi = (next_hop_proto_is_ip4 ? 0 : 1); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable; + if (next_hop_proto_is_ip4) + { + clib_memcpy (mp->br_paths[0].next_hop, + &v4_next_hop_address, sizeof (v4_next_hop_address)); + } + else + { + clib_memcpy (mp->br_paths[0].next_hop, + &v6_next_hop_address, sizeof (v6_next_hop_address)); + } + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + + return (ret); +} + +static int +api_proxy_arp_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_proxy_arp_add_del_t *mp; + u32 vrf_id = 0; + u8 is_add = 1; + ip4_address_t lo, hi; + u8 range_set = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "vrf %d", &vrf_id)) + ; + else if (unformat (i, "%U - %U", unformat_ip4_address, &lo, + unformat_ip4_address, &hi)) + range_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (range_set == 0) + { + errmsg ("address range not set"); + return -99; + } + + M (PROXY_ARP_ADD_DEL, mp); + + mp->vrf_id = ntohl (vrf_id); + mp->is_add = is_add; + clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address)); + clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address)); + + S (mp); + W (ret); + return ret; +} + +static int +api_proxy_arp_intfc_enable_disable (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_proxy_arp_intfc_enable_disable_t *mp; + u32 sw_if_index; + u8 enable = 1; + u8 sw_if_index_set = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_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 interface name or sw_if_index"); + return -99; + } + + M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->enable_disable = enable; S (mp); W (ret); @@ -8205,45 +9217,6 @@ api_ip_neighbor_add_del (vat_main_t * vam) return ret; } -static int -api_reset_vrf (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_reset_vrf_t *mp; - u32 vrf_id = 0; - u8 is_ipv6 = 0; - u8 vrf_id_set = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "vrf %d", &vrf_id)) - vrf_id_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (vrf_id_set == 0) - { - errmsg ("missing vrf id"); - return -99; - } - - M (RESET_VRF, mp); - - mp->vrf_id = ntohl (vrf_id); - mp->is_ipv6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - static int api_create_vlan_subif (vat_main_t * vam) { @@ -8574,15 +9547,19 @@ vl_api_dhcp_proxy_details_t_handler (vl_api_dhcp_proxy_details_t * mp) if (mp->is_ipv6) print (vam->ofp, - "RX Table-ID %d, Source Address %U, VSS FIB-ID %d, VSS OUI %d", + "RX Table-ID %d, Source Address %U, VSS Type %d, " + "VSS VPN-ID '%s', VSS FIB-ID %d, VSS OUI %d", ntohl (mp->rx_vrf_id), format_ip6_address, mp->dhcp_src_address, + mp->vss_type, mp->vss_vpn_ascii_id, ntohl (mp->vss_oui), ntohl (mp->vss_fib_id)); else print (vam->ofp, - "RX Table-ID %d, Source Address %U, VSS FIB-ID %d, VSS OUI %d", + "RX Table-ID %d, Source Address %U, VSS Type %d, " + "VSS VPN-ID '%s', VSS FIB-ID %d, VSS OUI %d", ntohl (mp->rx_vrf_id), format_ip4_address, mp->dhcp_src_address, + mp->vss_type, mp->vss_vpn_ascii_id, ntohl (mp->vss_oui), ntohl (mp->vss_fib_id)); for (i = 0; i < count; i++) @@ -8619,6 +9596,10 @@ static void vl_api_dhcp_proxy_details_t_handler_json vat_json_init_object (node); vat_json_object_add_uint (node, "rx-table-id", ntohl (mp->rx_vrf_id)); + vat_json_object_add_bytes (node, "vss-type", &mp->vss_type, + sizeof (mp->vss_type)); + vat_json_object_add_string_copy (node, "vss-vpn-ascii-id", + mp->vss_vpn_ascii_id); vat_json_object_add_uint (node, "vss-fib-id", ntohl (mp->vss_fib_id)); vat_json_object_add_uint (node, "vss-oui", ntohl (mp->vss_oui)); @@ -8679,7 +9660,7 @@ api_dhcp_proxy_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -8693,59 +9674,62 @@ api_dhcp_proxy_set_vss (vat_main_t * vam) vl_api_dhcp_proxy_set_vss_t *mp; u8 is_ipv6 = 0; u8 is_add = 1; - u32 tbl_id; - u8 tbl_id_set = 0; - u32 oui; - u8 oui_set = 0; - u32 fib_id; - u8 fib_id_set = 0; + u32 tbl_id = ~0; + u8 vss_type = VSS_TYPE_DEFAULT; + u8 *vpn_ascii_id = 0; + u32 oui = 0; + u32 fib_id = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "tbl_id %d", &tbl_id)) - tbl_id_set = 1; - if (unformat (i, "fib_id %d", &fib_id)) - fib_id_set = 1; - if (unformat (i, "oui %d", &oui)) - oui_set = 1; + ; + else if (unformat (i, "vpn_ascii_id %s", &vpn_ascii_id)) + vss_type = VSS_TYPE_ASCII; + else if (unformat (i, "fib_id %d", &fib_id)) + vss_type = VSS_TYPE_VPN_ID; + else if (unformat (i, "oui %d", &oui)) + vss_type = VSS_TYPE_VPN_ID; else if (unformat (i, "ipv6")) is_ipv6 = 1; else if (unformat (i, "del")) is_add = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (tbl_id_set == 0) + if (tbl_id == ~0) { - errmsg ("missing tbl id"); + errmsg ("missing tbl_id "); + vec_free (vpn_ascii_id); return -99; } - if (fib_id_set == 0) - { - errmsg ("missing fib id"); - return -99; - } - if (oui_set == 0) + if ((vpn_ascii_id) && (vec_len (vpn_ascii_id) > 128)) { - errmsg ("missing oui"); + errmsg ("vpn_ascii_id cannot be longer than 128 "); + vec_free (vpn_ascii_id); return -99; } M (DHCP_PROXY_SET_VSS, mp); mp->tbl_id = ntohl (tbl_id); - mp->fib_id = ntohl (fib_id); + mp->vss_type = vss_type; + if (vpn_ascii_id) + { + clib_memcpy (mp->vpn_ascii_id, vpn_ascii_id, vec_len (vpn_ascii_id)); + mp->vpn_ascii_id[vec_len (vpn_ascii_id)] = 0; + } + mp->vpn_index = ntohl (fib_id); mp->oui = ntohl (oui); mp->is_ipv6 = is_ipv6; mp->is_add = is_add; S (mp); W (ret); + + vec_free (vpn_ascii_id); return ret; } @@ -9031,7 +10015,7 @@ api_ip6nd_proxy_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -11367,7 +12351,7 @@ api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -11415,7 +12399,54 @@ api_sw_interface_tap_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static void vl_api_sw_interface_tap_v2_details_t_handler + (vl_api_sw_interface_tap_v2_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%-16s %d", + mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index)); +} + +static void vl_api_sw_interface_tap_v2_details_t_handler_json + (vl_api_sw_interface_tap_v2_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_string_copy (node, "dev_name", mp->dev_name); +} + +static int +api_sw_interface_tap_v2_dump (vat_main_t * vam) +{ + vl_api_sw_interface_tap_v2_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index"); + /* Get list of tap interfaces */ + M (SW_INTERFACE_TAP_V2_DUMP, mp); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -11690,63 +12721,338 @@ api_vxlan_tunnel_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); return ret; } +static uword unformat_geneve_decap_next + (unformat_input_t * input, va_list * args) +{ + u32 *result = va_arg (*args, u32 *); + u32 tmp; + + if (unformat (input, "l2")) + *result = GENEVE_INPUT_NEXT_L2_INPUT; + else if (unformat (input, "%d", &tmp)) + *result = tmp; + else + return 0; + return 1; +} + static int -api_gre_add_del_tunnel (vat_main_t * vam) +api_geneve_add_del_tunnel (vat_main_t * vam) { unformat_input_t *line_input = vam->input; - vl_api_gre_add_del_tunnel_t *mp; - ip4_address_t src4, dst4; - ip6_address_t src6, dst6; + vl_api_geneve_add_del_tunnel_t *mp; + ip46_address_t src, dst; u8 is_add = 1; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - u8 teb = 0; + u8 ipv4_set = 0, ipv6_set = 0; u8 src_set = 0; u8 dst_set = 0; - u32 outer_fib_id = 0; + u8 grp_set = 0; + u32 mcast_sw_if_index = ~0; + u32 encap_vrf_id = 0; + u32 decap_next_index = ~0; + u32 vni = 0; int ret; - memset (&src4, 0, sizeof src4); - memset (&dst4, 0, sizeof dst4); - memset (&src6, 0, sizeof src6); - memset (&dst6, 0, sizeof dst6); + /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ + memset (&src, 0, sizeof src); + memset (&dst, 0, sizeof dst); while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { if (unformat (line_input, "del")) is_add = 0; - else if (unformat (line_input, "src %U", unformat_ip4_address, &src4)) + else + if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) { - src_set = 1; ipv4_set = 1; + src_set = 1; } - else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4)) + else + if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4)) { - dst_set = 1; ipv4_set = 1; + dst_set = 1; } - else if (unformat (line_input, "src %U", unformat_ip6_address, &src6)) + else + if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6)) { - src_set = 1; ipv6_set = 1; + src_set = 1; } - else if (unformat (line_input, "dst %U", unformat_ip6_address, &dst6)) + else + if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6)) { - dst_set = 1; ipv6_set = 1; + dst_set = 1; } - else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id)) - ; - else if (unformat (line_input, "teb")) - teb = 1; - else + else if (unformat (line_input, "group %U %U", + unformat_ip4_address, &dst.ip4, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + { + grp_set = dst_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "group %U", + unformat_ip4_address, &dst.ip4)) + { + grp_set = dst_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "group %U %U", + unformat_ip6_address, &dst.ip6, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + { + grp_set = dst_set = 1; + ipv6_set = 1; + } + else if (unformat (line_input, "group %U", + unformat_ip6_address, &dst.ip6)) + { + grp_set = dst_set = 1; + ipv6_set = 1; + } + else + if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + ; + else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + ; + else if (unformat (line_input, "decap-next %U", + unformat_geneve_decap_next, &decap_next_index)) + ; + else if (unformat (line_input, "vni %d", &vni)) + ; + else + { + errmsg ("parse error '%U'", format_unformat_error, line_input); + return -99; + } + } + + if (src_set == 0) + { + errmsg ("tunnel src address not specified"); + return -99; + } + if (dst_set == 0) + { + errmsg ("tunnel dst address not specified"); + return -99; + } + + if (grp_set && !ip46_address_is_multicast (&dst)) + { + errmsg ("tunnel group address not multicast"); + return -99; + } + if (grp_set && mcast_sw_if_index == ~0) + { + errmsg ("tunnel nonexistent multicast device"); + return -99; + } + if (grp_set == 0 && ip46_address_is_multicast (&dst)) + { + errmsg ("tunnel dst address must be unicast"); + 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"); + return -99; + } + + M (GENEVE_ADD_DEL_TUNNEL, mp); + + if (ipv6_set) + { + clib_memcpy (mp->local_address, &src.ip6, sizeof (src.ip6)); + clib_memcpy (mp->remote_address, &dst.ip6, sizeof (dst.ip6)); + } + else + { + clib_memcpy (mp->local_address, &src.ip4, sizeof (src.ip4)); + clib_memcpy (mp->remote_address, &dst.ip4, sizeof (dst.ip4)); + } + mp->encap_vrf_id = ntohl (encap_vrf_id); + mp->decap_next_index = ntohl (decap_next_index); + mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); + mp->vni = ntohl (vni); + mp->is_add = is_add; + mp->is_ipv6 = ipv6_set; + + S (mp); + W (ret); + return ret; +} + +static void vl_api_geneve_tunnel_details_t_handler + (vl_api_geneve_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + ip46_address_t src = to_ip46 (mp->is_ipv6, mp->dst_address); + ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->src_address); + + print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d", + ntohl (mp->sw_if_index), + format_ip46_address, &src, IP46_TYPE_ANY, + format_ip46_address, &dst, IP46_TYPE_ANY, + ntohl (mp->encap_vrf_id), + ntohl (mp->decap_next_index), ntohl (mp->vni), + ntohl (mp->mcast_sw_if_index)); +} + +static void vl_api_geneve_tunnel_details_t_handler_json + (vl_api_geneve_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + if (mp->is_ipv6) + { + struct in6_addr ip6; + + clib_memcpy (&ip6, mp->src_address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "src_address", ip6); + clib_memcpy (&ip6, mp->dst_address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "dst_address", ip6); + } + else + { + struct in_addr ip4; + + clib_memcpy (&ip4, mp->src_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "src_address", ip4); + clib_memcpy (&ip4, mp->dst_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "dst_address", ip4); + } + vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); + vat_json_object_add_uint (node, "decap_next_index", + ntohl (mp->decap_next_index)); + vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); + vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); + vat_json_object_add_uint (node, "mcast_sw_if_index", + ntohl (mp->mcast_sw_if_index)); +} + +static int +api_geneve_tunnel_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_geneve_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index; + u8 sw_if_index_set = 0; + int ret; + + /* 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) + { + print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s", + "sw_if_index", "local_address", "remote_address", + "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); + } + + /* Get list of geneve-tunnel interfaces */ + M (GENEVE_TUNNEL_DUMP, mp); + + mp->sw_if_index = htonl (sw_if_index); + + S (mp); + + /* Use a control ping for synchronization */ + M (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +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; + ip4_address_t src4, dst4; + ip6_address_t src6, dst6; + u8 is_add = 1; + u8 ipv4_set = 0; + u8 ipv6_set = 0; + u8 teb = 0; + u8 src_set = 0; + u8 dst_set = 0; + u32 outer_fib_id = 0; + int ret; + + memset (&src4, 0, sizeof src4); + memset (&dst4, 0, sizeof dst4); + memset (&src6, 0, sizeof src6); + memset (&dst6, 0, sizeof dst6); + + 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; + ipv4_set = 1; + } + else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4)) + { + dst_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "src %U", unformat_ip6_address, &src6)) + { + src_set = 1; + ipv6_set = 1; + } + else if (unformat (line_input, "dst %U", unformat_ip6_address, &dst6)) + { + dst_set = 1; + ipv6_set = 1; + } + else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id)) + ; + else if (unformat (line_input, "teb")) + teb = 1; + else { errmsg ("parse error '%U'", format_unformat_error, line_input); return -99; @@ -11881,7 +13187,7 @@ api_gre_tunnel_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -12237,7 +13543,7 @@ api_sw_interface_vhost_user_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -12512,23 +13818,13 @@ api_vxlan_gpe_tunnel_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); return ret; } - -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_details_t_handler (vl_api_l2_fib_table_details_t * mp) { @@ -12536,7 +13832,7 @@ static void vl_api_l2_fib_table_details_t_handler print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32 " %d %d %d", - ntohl (mp->bd_id), format_l2_fib_mac_address, &mp->mac, + ntohl (mp->bd_id), format_ethernet_address, mp->mac, ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac, mp->bvi_mac); } @@ -12556,7 +13852,7 @@ static void vl_api_l2_fib_table_details_t_handler_json vat_json_init_object (node); vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id)); - vat_json_object_add_uint (node, "mac", clib_net_to_host_u64 (mp->mac)); + vat_json_object_add_bytes (node, "mac", mp->mac, 6); vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); vat_json_object_add_uint (node, "static_mac", mp->static_mac); vat_json_object_add_uint (node, "filter_mac", mp->filter_mac); @@ -12597,7 +13893,7 @@ api_l2_fib_table_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -12865,7 +14161,7 @@ api_ip_address_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -12921,7 +14217,7 @@ api_ip_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -13480,6 +14776,245 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) return ret; } +static void +vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "sa_id %u sw_if_index %u spi %u proto %u crypto_alg %u " + "crypto_key %U integ_alg %u integ_key %U use_esn %u " + "use_anti_replay %u is_tunnel %u is_tunnel_ip6 %u " + "tunnel_src_addr %U tunnel_dst_addr %U " + "salt %u seq_outbound %lu last_seq_inbound %lu " + "replay_window %lu total_data_size %lu\n", + ntohl (mp->sa_id), ntohl (mp->sw_if_index), ntohl (mp->spi), + mp->protocol, + mp->crypto_alg, format_hex_bytes, mp->crypto_key, mp->crypto_key_len, + mp->integ_alg, format_hex_bytes, mp->integ_key, mp->integ_key_len, + mp->use_esn, mp->use_anti_replay, mp->is_tunnel, mp->is_tunnel_ip6, + (mp->is_tunnel_ip6) ? format_ip6_address : format_ip4_address, + mp->tunnel_src_addr, + (mp->is_tunnel_ip6) ? format_ip6_address : format_ip4_address, + mp->tunnel_dst_addr, + ntohl (mp->salt), + clib_net_to_host_u64 (mp->seq_outbound), + clib_net_to_host_u64 (mp->last_seq_inbound), + clib_net_to_host_u64 (mp->replay_window), + clib_net_to_host_u64 (mp->total_data_size)); +} + +#define vl_api_ipsec_sa_details_t_endian vl_noop_handler +#define vl_api_ipsec_sa_details_t_print vl_noop_handler + +static void vl_api_ipsec_sa_details_t_handler_json + (vl_api_ipsec_sa_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in_addr src_ip4, dst_ip4; + struct in6_addr src_ip6, dst_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, "sa_id", ntohl (mp->sa_id)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "spi", ntohl (mp->spi)); + vat_json_object_add_uint (node, "proto", mp->protocol); + vat_json_object_add_uint (node, "crypto_alg", mp->crypto_alg); + vat_json_object_add_uint (node, "integ_alg", mp->integ_alg); + vat_json_object_add_uint (node, "use_esn", mp->use_esn); + vat_json_object_add_uint (node, "use_anti_replay", mp->use_anti_replay); + vat_json_object_add_uint (node, "is_tunnel", mp->is_tunnel); + vat_json_object_add_uint (node, "is_tunnel_ip6", mp->is_tunnel_ip6); + vat_json_object_add_bytes (node, "crypto_key", mp->crypto_key, + mp->crypto_key_len); + vat_json_object_add_bytes (node, "integ_key", mp->integ_key, + mp->integ_key_len); + if (mp->is_tunnel_ip6) + { + clib_memcpy (&src_ip6, mp->tunnel_src_addr, sizeof (src_ip6)); + vat_json_object_add_ip6 (node, "tunnel_src_addr", src_ip6); + clib_memcpy (&dst_ip6, mp->tunnel_dst_addr, sizeof (dst_ip6)); + vat_json_object_add_ip6 (node, "tunnel_dst_addr", dst_ip6); + } + else + { + clib_memcpy (&src_ip4, mp->tunnel_src_addr, sizeof (src_ip4)); + vat_json_object_add_ip4 (node, "tunnel_src_addr", src_ip4); + clib_memcpy (&dst_ip4, mp->tunnel_dst_addr, sizeof (dst_ip4)); + vat_json_object_add_ip4 (node, "tunnel_dst_addr", dst_ip4); + } + vat_json_object_add_uint (node, "replay_window", + clib_net_to_host_u64 (mp->replay_window)); + vat_json_object_add_uint (node, "total_data_size", + clib_net_to_host_u64 (mp->total_data_size)); + +} + +static int +api_ipsec_sa_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ipsec_sa_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sa_id = ~0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "sa_id %d", &sa_id)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + M (IPSEC_SA_DUMP, mp); + + mp->sa_id = ntohl (sa_id); + + S (mp); + + /* Use a control ping for synchronization */ + M (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static int +api_ipsec_tunnel_if_set_key (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ipsec_tunnel_if_set_key_t *mp; + u32 sw_if_index = ~0; + u8 key_type = IPSEC_IF_SET_KEY_TYPE_NONE; + u8 *key = 0; + u32 alg = ~0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else + if (unformat (i, "local crypto %U", unformat_ipsec_crypto_alg, &alg)) + key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO; + else + if (unformat (i, "remote crypto %U", unformat_ipsec_crypto_alg, &alg)) + key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO; + else if (unformat (i, "local integ %U", unformat_ipsec_integ_alg, &alg)) + key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG; + else + if (unformat (i, "remote integ %U", unformat_ipsec_integ_alg, &alg)) + key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG; + else if (unformat (i, "%U", unformat_hex_string, &key)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (sw_if_index == ~0) + { + errmsg ("interface must be specified"); + return -99; + } + + if (key_type == IPSEC_IF_SET_KEY_TYPE_NONE) + { + errmsg ("key type must be specified"); + return -99; + } + + if (alg == ~0) + { + errmsg ("algorithm must be specified"); + return -99; + } + + if (vec_len (key) == 0) + { + errmsg ("key must be specified"); + return -99; + } + + M (IPSEC_TUNNEL_IF_SET_KEY, mp); + + mp->sw_if_index = htonl (sw_if_index); + mp->alg = alg; + mp->key_type = key_type; + mp->key_len = vec_len (key); + clib_memcpy (mp->key, key, vec_len (key)); + + S (mp); + W (ret); + + return ret; +} + +static int +api_ipsec_tunnel_if_set_sa (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ipsec_tunnel_if_set_sa_t *mp; + u32 sw_if_index = ~0; + u32 sa_id = ~0; + u8 is_outbound = (u8) ~ 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (i, "sa_id %d", &sa_id)) + ; + else if (unformat (i, "outbound")) + is_outbound = 1; + else if (unformat (i, "inbound")) + is_outbound = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (sw_if_index == ~0) + { + errmsg ("interface must be specified"); + return -99; + } + + if (sa_id == ~0) + { + errmsg ("SA ID must be specified"); + return -99; + } + + M (IPSEC_TUNNEL_IF_SET_SA, mp); + + mp->sw_if_index = htonl (sw_if_index); + mp->sa_id = htonl (sa_id); + mp->is_outbound = is_outbound; + + S (mp); + W (ret); + + return ret; +} + static int api_ikev2_profile_add_del (vat_main_t * vam) { @@ -14300,7 +15835,7 @@ api_map_domain_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -14339,7 +15874,7 @@ api_map_rule_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -15378,153 +16913,134 @@ api_one_enable_disable (vat_main_t * vam) #define api_lisp_enable_disable api_one_enable_disable static int -api_show_one_map_register_state (vat_main_t * vam) +api_one_enable_disable_xtr_mode (vat_main_t * vam) { - vl_api_show_one_map_register_state_t *mp; + unformat_input_t *input = vam->input; + vl_api_one_enable_disable_xtr_mode_t *mp; + u8 is_set = 0; + u8 is_en = 0; int ret; - M (SHOW_ONE_MAP_REGISTER_STATE, mp); + /* 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; + } - /* send */ + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ENABLE_DISABLE_XTR_MODE, mp); + + mp->is_en = is_en; + + /* send it... */ S (mp); - /* wait for reply */ + /* Wait for a reply... */ W (ret); return ret; } -#define api_show_lisp_map_register_state api_show_one_map_register_state - static int -api_show_one_rloc_probe_state (vat_main_t * vam) +api_one_show_xtr_mode (vat_main_t * vam) { - vl_api_show_one_rloc_probe_state_t *mp; + vl_api_one_show_xtr_mode_t *mp; int ret; - M (SHOW_ONE_RLOC_PROBE_STATE, mp); + /* Construct the API message */ + M (ONE_SHOW_XTR_MODE, mp); - /* send */ + /* send it... */ S (mp); - /* wait for reply */ + /* Wait for a reply... */ W (ret); return ret; } -#define api_show_lisp_rloc_probe_state api_show_one_rloc_probe_state - static int -api_one_add_del_l2_arp_entry (vat_main_t * vam) +api_one_enable_disable_pitr_mode (vat_main_t * vam) { - vl_api_one_add_del_l2_arp_entry_t *mp; unformat_input_t *input = vam->input; - u8 is_add = 1; - u8 mac_set = 0; - u8 bd_set = 0; - u8 ip_set = 0; - u8 mac[6] = { 0, }; - u32 ip4 = 0, bd = ~0; + vl_api_one_enable_disable_pitr_mode_t *mp; + u8 is_set = 0; + u8 is_en = 0; int ret; /* 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, "mac %U", unformat_ethernet_address, mac)) - mac_set = 1; - else if (unformat (input, "ip %U", unformat_ip4_address, &ip4)) - ip_set = 1; - else if (unformat (input, "bd %d", &bd)) - bd_set = 1; - else + if (unformat (input, "enable")) { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; + is_set = 1; + is_en = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; } + else + break; } - if (!bd_set || !ip_set || (!mac_set && is_add)) + if (!is_set) { - errmsg ("Missing BD, IP or MAC!"); + errmsg ("Value not set"); return -99; } - M (ONE_ADD_DEL_L2_ARP_ENTRY, mp); - mp->is_add = is_add; - clib_memcpy (mp->mac, mac, 6); - mp->bd = clib_host_to_net_u32 (bd); - mp->ip4 = ip4; + /* Construct the API message */ + M (ONE_ENABLE_DISABLE_PITR_MODE, mp); - /* send */ + mp->is_en = is_en; + + /* send it... */ S (mp); - /* wait for reply */ + /* Wait for a reply... */ W (ret); return ret; } static int -api_one_l2_arp_bd_get (vat_main_t * vam) +api_one_show_pitr_mode (vat_main_t * vam) { - vl_api_one_l2_arp_bd_get_t *mp; + vl_api_one_show_pitr_mode_t *mp; int ret; - M (ONE_L2_ARP_BD_GET, mp); + /* Construct the API message */ + M (ONE_SHOW_PITR_MODE, mp); - /* send */ + /* send it... */ S (mp); - /* wait for reply */ + /* Wait for a reply... */ W (ret); return ret; } static int -api_one_l2_arp_entries_get (vat_main_t * vam) +api_one_enable_disable_petr_mode (vat_main_t * vam) { - vl_api_one_l2_arp_entries_get_t *mp; unformat_input_t *input = vam->input; - u8 bd_set = 0; - u32 bd = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "bd %d", &bd)) - bd_set = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } - - if (!bd_set) - { - errmsg ("Expected bridge domain!"); - return -99; - } - - M (ONE_L2_ARP_ENTRIES_GET, mp); - mp->bd = clib_host_to_net_u32 (bd); - - /* send */ - S (mp); - - /* wait for reply */ - W (ret); - return ret; -} - -static int -api_one_stats_enable_disable (vat_main_t * vam) -{ - vl_api_one_stats_enable_disable_t *mp; - unformat_input_t *input = vam->input; - u8 is_set = 0; - u8 is_en = 0; + vl_api_one_enable_disable_petr_mode_t *mp; + u8 is_set = 0; + u8 is_en = 0; int ret; /* Parse args required to build the message */ @@ -15549,40 +17065,43 @@ api_one_stats_enable_disable (vat_main_t * vam) return -99; } - M (ONE_STATS_ENABLE_DISABLE, mp); + /* Construct the API message */ + M (ONE_ENABLE_DISABLE_PETR_MODE, mp); + mp->is_en = is_en; - /* send */ + /* send it... */ S (mp); - /* wait for reply */ + /* Wait for a reply... */ W (ret); return ret; } static int -api_show_one_stats_enable_disable (vat_main_t * vam) +api_one_show_petr_mode (vat_main_t * vam) { - vl_api_show_one_stats_enable_disable_t *mp; + vl_api_one_show_petr_mode_t *mp; int ret; - M (SHOW_ONE_STATS_ENABLE_DISABLE, mp); + /* Construct the API message */ + M (ONE_SHOW_PETR_MODE, mp); - /* send */ + /* send it... */ S (mp); - /* wait for reply */ + /* Wait for a reply... */ W (ret); return ret; } static int -api_show_one_map_request_mode (vat_main_t * vam) +api_show_one_map_register_state (vat_main_t * vam) { - vl_api_show_one_map_request_mode_t *mp; + vl_api_show_one_map_register_state_t *mp; int ret; - M (SHOW_ONE_MAP_REQUEST_MODE, mp); + M (SHOW_ONE_MAP_REGISTER_STATE, mp); /* send */ S (mp); @@ -15592,33 +17111,15 @@ api_show_one_map_request_mode (vat_main_t * vam) return ret; } -#define api_show_lisp_map_request_mode api_show_one_map_request_mode +#define api_show_lisp_map_register_state api_show_one_map_register_state static int -api_one_map_request_mode (vat_main_t * vam) +api_show_one_rloc_probe_state (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_map_request_mode_t *mp; - u8 mode = 0; + vl_api_show_one_rloc_probe_state_t *mp; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "dst-only")) - mode = 0; - else if (unformat (input, "src-dst")) - mode = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } - - M (ONE_MAP_REQUEST_MODE, mp); - - mp->mode = mode; + M (SHOW_ONE_RLOC_PROBE_STATE, mp); /* send */ S (mp); @@ -15628,22 +17129,20 @@ api_one_map_request_mode (vat_main_t * vam) return ret; } -#define api_lisp_map_request_mode api_one_map_request_mode +#define api_show_lisp_rloc_probe_state api_show_one_rloc_probe_state -/** - * Enable/disable ONE proxy ITR. - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_pitr_set_locator_set (vat_main_t * vam) +api_one_add_del_ndp_entry (vat_main_t * vam) { - u8 ls_name_set = 0; + vl_api_one_add_del_ndp_entry_t *mp; unformat_input_t *input = vam->input; - vl_api_one_pitr_set_locator_set_t *mp; u8 is_add = 1; - u8 *ls_name = 0; + u8 mac_set = 0; + u8 bd_set = 0; + u8 ip_set = 0; + u8 mac[6] = { 0, }; + u8 ip6[16] = { 0, }; + u32 bd = ~0; int ret; /* Parse args required to build the message */ @@ -15651,8 +17150,12 @@ api_one_pitr_set_locator_set (vat_main_t * vam) { if (unformat (input, "del")) is_add = 0; - else if (unformat (input, "locator-set %s", &ls_name)) - ls_name_set = 1; + else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) + mac_set = 1; + else if (unformat (input, "ip %U", unformat_ip6_address, ip6)) + ip_set = 1; + else if (unformat (input, "bd %d", &bd)) + bd_set = 1; else { errmsg ("parse error '%U'", format_unformat_error, input); @@ -15660,17 +17163,17 @@ api_one_pitr_set_locator_set (vat_main_t * vam) } } - if (!ls_name_set) + if (!bd_set || !ip_set || (!mac_set && is_add)) { - errmsg ("locator-set name not set!"); + errmsg ("Missing BD, IP or MAC!"); return -99; } - M (ONE_PITR_SET_LOCATOR_SET, mp); - + M (ONE_ADD_DEL_NDP_ENTRY, mp); mp->is_add = is_add; - clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); - vec_free (ls_name); + clib_memcpy (mp->mac, mac, 6); + mp->bd = clib_host_to_net_u32 (bd); + clib_memcpy (mp->ip6, ip6, sizeof (mp->ip6)); /* send */ S (mp); @@ -15680,16 +17183,17 @@ api_one_pitr_set_locator_set (vat_main_t * vam) return ret; } -#define api_lisp_pitr_set_locator_set api_one_pitr_set_locator_set - static int -api_one_nsh_set_locator_set (vat_main_t * vam) +api_one_add_del_l2_arp_entry (vat_main_t * vam) { - u8 ls_name_set = 0; + vl_api_one_add_del_l2_arp_entry_t *mp; unformat_input_t *input = vam->input; - vl_api_one_nsh_set_locator_set_t *mp; u8 is_add = 1; - u8 *ls_name = 0; + u8 mac_set = 0; + u8 bd_set = 0; + u8 ip_set = 0; + u8 mac[6] = { 0, }; + u32 ip4 = 0, bd = ~0; int ret; /* Parse args required to build the message */ @@ -15697,8 +17201,12 @@ api_one_nsh_set_locator_set (vat_main_t * vam) { if (unformat (input, "del")) is_add = 0; - else if (unformat (input, "ls %s", &ls_name)) - ls_name_set = 1; + else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) + mac_set = 1; + else if (unformat (input, "ip %U", unformat_ip4_address, &ip4)) + ip_set = 1; + else if (unformat (input, "bd %d", &bd)) + bd_set = 1; else { errmsg ("parse error '%U'", format_unformat_error, input); @@ -15706,17 +17214,17 @@ api_one_nsh_set_locator_set (vat_main_t * vam) } } - if (!ls_name_set && is_add) + if (!bd_set || !ip_set || (!mac_set && is_add)) { - errmsg ("locator-set name not set!"); + errmsg ("Missing BD, IP or MAC!"); return -99; } - M (ONE_NSH_SET_LOCATOR_SET, mp); - + M (ONE_ADD_DEL_L2_ARP_ENTRY, mp); mp->is_add = is_add; - clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); - vec_free (ls_name); + clib_memcpy (mp->mac, mac, 6); + mp->bd = clib_host_to_net_u32 (bd); + mp->ip4 = ip4; /* send */ S (mp); @@ -15727,55 +17235,35 @@ api_one_nsh_set_locator_set (vat_main_t * vam) } static int -api_show_one_pitr (vat_main_t * vam) +api_one_ndp_bd_get (vat_main_t * vam) { - vl_api_show_one_pitr_t *mp; + vl_api_one_ndp_bd_get_t *mp; int ret; - if (!vam->json_output) - { - print (vam->ofp, "%=20s", "lisp status:"); - } + M (ONE_NDP_BD_GET, mp); - M (SHOW_ONE_PITR, mp); - /* send it... */ + /* send */ S (mp); - /* Wait for a reply... */ + /* wait for reply */ W (ret); return ret; } -#define api_show_lisp_pitr api_show_one_pitr - static int -api_one_use_petr (vat_main_t * vam) +api_one_ndp_entries_get (vat_main_t * vam) { + vl_api_one_ndp_entries_get_t *mp; unformat_input_t *input = vam->input; - vl_api_one_use_petr_t *mp; - u8 is_add = 0; - ip_address_t ip; + u8 bd_set = 0; + u32 bd = ~0; int ret; - memset (&ip, 0, sizeof (ip)); - /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "disable")) - is_add = 0; - else - if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (&ip))) - { - is_add = 1; - ip_addr_version (&ip) = IP4; - } - else - if (unformat (input, "%U", unformat_ip6_address, &ip_addr_v6 (&ip))) - { - is_add = 1; - ip_addr_version (&ip) = IP6; - } + if (unformat (input, "bd %d", &bd)) + bd_set = 1; else { errmsg ("parse error '%U'", format_unformat_error, input); @@ -15783,18 +17271,15 @@ api_one_use_petr (vat_main_t * vam) } } - M (ONE_USE_PETR, mp); - - mp->is_add = is_add; - if (is_add) + if (!bd_set) { - mp->is_ip4 = ip_addr_version (&ip) == IP4 ? 1 : 0; - if (mp->is_ip4) - clib_memcpy (mp->address, &ip, 4); - else - clib_memcpy (mp->address, &ip, 16); + errmsg ("Expected bridge domain!"); + return -99; } + M (ONE_NDP_ENTRIES_GET, mp); + mp->bd = clib_host_to_net_u32 (bd); + /* send */ S (mp); @@ -15803,95 +17288,109 @@ api_one_use_petr (vat_main_t * vam) return ret; } -#define api_lisp_use_petr api_one_use_petr - static int -api_show_one_nsh_mapping (vat_main_t * vam) +api_one_l2_arp_bd_get (vat_main_t * vam) { - vl_api_show_one_use_petr_t *mp; + vl_api_one_l2_arp_bd_get_t *mp; int ret; - if (!vam->json_output) - { - print (vam->ofp, "%=20s", "local ONE NSH mapping:"); - } + M (ONE_L2_ARP_BD_GET, mp); - M (SHOW_ONE_NSH_MAPPING, mp); - /* send it... */ + /* send */ S (mp); - /* Wait for a reply... */ + /* wait for reply */ W (ret); return ret; } static int -api_show_one_use_petr (vat_main_t * vam) +api_one_l2_arp_entries_get (vat_main_t * vam) { - vl_api_show_one_use_petr_t *mp; + vl_api_one_l2_arp_entries_get_t *mp; + unformat_input_t *input = vam->input; + u8 bd_set = 0; + u32 bd = ~0; int ret; - if (!vam->json_output) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%=20s", "Proxy-ETR status:"); + if (unformat (input, "bd %d", &bd)) + bd_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } } - M (SHOW_ONE_USE_PETR, mp); - /* send it... */ + if (!bd_set) + { + errmsg ("Expected bridge domain!"); + return -99; + } + + M (ONE_L2_ARP_ENTRIES_GET, mp); + mp->bd = clib_host_to_net_u32 (bd); + + /* send */ S (mp); - /* Wait for a reply... */ + /* wait for reply */ W (ret); return ret; } -#define api_show_lisp_use_petr api_show_one_use_petr - -/** - * Add/delete mapping between vni and vrf - */ static int -api_one_eid_table_add_del_map (vat_main_t * vam) +api_one_stats_enable_disable (vat_main_t * vam) { + vl_api_one_stats_enable_disable_t *mp; unformat_input_t *input = vam->input; - vl_api_one_eid_table_add_del_map_t *mp; - u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0; - u32 vni, vrf, bd_index; + u8 is_set = 0; + u8 is_en = 0; int ret; /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "vrf %d", &vrf)) - vrf_set = 1; - else if (unformat (input, "bd_index %d", &bd_index)) - bd_index_set = 1; - else if (unformat (input, "vni %d", &vni)) - vni_set = 1; + if (unformat (input, "enable")) + { + is_set = 1; + is_en = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } else break; } - if (!vni_set || (!vrf_set && !bd_index_set)) + if (!is_set) { - errmsg ("missing arguments!"); + errmsg ("Value not set"); return -99; } - if (vrf_set && bd_index_set) - { - errmsg ("error: both vrf and bd entered!"); - return -99; - } + M (ONE_STATS_ENABLE_DISABLE, mp); + mp->is_en = is_en; - M (ONE_EID_TABLE_ADD_DEL_MAP, mp); + /* send */ + S (mp); - mp->is_add = is_add; - mp->vni = htonl (vni); - mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index); - mp->is_l2 = bd_index_set; + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_show_one_stats_enable_disable (vat_main_t * vam) +{ + vl_api_show_one_stats_enable_disable_t *mp; + int ret; + + M (SHOW_ONE_STATS_ENABLE_DISABLE, mp); /* send */ S (mp); @@ -15901,345 +17400,168 @@ api_one_eid_table_add_del_map (vat_main_t * vam) return ret; } -#define api_lisp_eid_table_add_del_map api_one_eid_table_add_del_map +static int +api_show_one_map_request_mode (vat_main_t * vam) +{ + vl_api_show_one_map_request_mode_t *mp; + int ret; -uword -unformat_negative_mapping_action (unformat_input_t * input, va_list * args) + M (SHOW_ONE_MAP_REQUEST_MODE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_show_lisp_map_request_mode api_show_one_map_request_mode + +static int +api_one_map_request_mode (vat_main_t * vam) { - u32 *action = va_arg (*args, u32 *); - u8 *s = 0; + unformat_input_t *input = vam->input; + vl_api_one_map_request_mode_t *mp; + u8 mode = 0; + int ret; - if (unformat (input, "%s", &s)) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (!strcmp ((char *) s, "no-action")) - action[0] = 0; - else if (!strcmp ((char *) s, "natively-forward")) - action[0] = 1; - else if (!strcmp ((char *) s, "send-map-request")) - action[0] = 2; - else if (!strcmp ((char *) s, "drop")) - action[0] = 3; + if (unformat (input, "dst-only")) + mode = 0; + else if (unformat (input, "src-dst")) + mode = 1; else { - clib_warning ("invalid action: '%s'", s); - action[0] = 3; + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; } } - else - return 0; - vec_free (s); - return 1; + M (ONE_MAP_REQUEST_MODE, mp); + + mp->mode = mode; + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; } +#define api_lisp_map_request_mode api_one_map_request_mode + /** - * Add/del remote mapping to/from ONE control plane + * Enable/disable ONE proxy ITR. * * @param vam vpp API test context * @return return code */ static int -api_one_add_del_remote_mapping (vat_main_t * vam) +api_one_pitr_set_locator_set (vat_main_t * vam) { + u8 ls_name_set = 0; unformat_input_t *input = vam->input; - vl_api_one_add_del_remote_mapping_t *mp; - u32 vni = 0; - lisp_eid_vat_t _eid, *eid = &_eid; - lisp_eid_vat_t _seid, *seid = &_seid; - u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0; - u32 action = ~0, p, w, data_len; - ip4_address_t rloc4; - ip6_address_t rloc6; - vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0; + vl_api_one_pitr_set_locator_set_t *mp; + u8 is_add = 1; + u8 *ls_name = 0; int ret; - memset (&rloc, 0, sizeof (rloc)); - /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del-all")) - { - del_all = 1; - } - else if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "add")) - { - is_add = 1; - } - else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) - { - eid_set = 1; - } - else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid)) - { - seid_set = 1; - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } - else if (unformat (input, "p %d w %d", &p, &w)) - { - if (!curr_rloc) - { - errmsg ("No RLOC configured for setting priority/weight!"); - return -99; - } - curr_rloc->priority = p; - curr_rloc->weight = w; - } - else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4)) - { - rloc.is_ip4 = 1; - clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4)); - vec_add1 (rlocs, rloc); - curr_rloc = &rlocs[vec_len (rlocs) - 1]; - } - else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6)) - { - rloc.is_ip4 = 0; - clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6)); - vec_add1 (rlocs, rloc); - curr_rloc = &rlocs[vec_len (rlocs) - 1]; - } - else if (unformat (input, "action %U", - unformat_negative_mapping_action, &action)) - { - ; - } + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "locator-set %s", &ls_name)) + ls_name_set = 1; else { - clib_warning ("parse error '%U'", format_unformat_error, input); + errmsg ("parse error '%U'", format_unformat_error, input); return -99; } } - if (0 == eid_set) - { - errmsg ("missing params!"); - return -99; - } - - if (is_add && (~0 == action) && 0 == vec_len (rlocs)) + if (!ls_name_set) { - errmsg ("no action set for negative map-reply!"); + errmsg ("locator-set name not set!"); return -99; } - data_len = vec_len (rlocs) * sizeof (vl_api_remote_locator_t); + M (ONE_PITR_SET_LOCATOR_SET, mp); - M2 (ONE_ADD_DEL_REMOTE_MAPPING, mp, data_len); mp->is_add = is_add; - mp->vni = htonl (vni); - mp->action = (u8) action; - mp->is_src_dst = seid_set; - mp->eid_len = eid->len; - mp->seid_len = seid->len; - mp->del_all = del_all; - mp->eid_type = eid->type; - lisp_eid_put_vat (mp->eid, eid->addr, eid->type); - lisp_eid_put_vat (mp->seid, seid->addr, seid->type); - - mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs)); - clib_memcpy (mp->rlocs, rlocs, data_len); - vec_free (rlocs); + clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); + vec_free (ls_name); - /* send it... */ + /* send */ S (mp); - /* Wait for a reply... */ + /* wait for reply */ W (ret); return ret; } -#define api_lisp_add_del_remote_mapping api_one_add_del_remote_mapping +#define api_lisp_pitr_set_locator_set api_one_pitr_set_locator_set -/** - * Add/del ONE adjacency. Saves mapping in ONE control plane and updates - * forwarding entries in data-plane accordingly. - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_add_del_adjacency (vat_main_t * vam) +api_one_nsh_set_locator_set (vat_main_t * vam) { + u8 ls_name_set = 0; unformat_input_t *input = vam->input; - vl_api_one_add_del_adjacency_t *mp; - u32 vni = 0; - ip4_address_t leid4, reid4; - ip6_address_t leid6, reid6; - u8 reid_mac[6] = { 0 }; - u8 leid_mac[6] = { 0 }; - u8 reid_type, leid_type; - u32 leid_len = 0, reid_len = 0, len; + vl_api_one_nsh_set_locator_set_t *mp; u8 is_add = 1; + u8 *ls_name = 0; int ret; - leid_type = reid_type = (u8) ~ 0; - /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "ls %s", &ls_name)) + ls_name_set = 1; + else { - is_add = 0; - } - else if (unformat (input, "add")) - { - is_add = 1; - } - else if (unformat (input, "reid %U/%d", unformat_ip4_address, - &reid4, &len)) - { - reid_type = 0; /* ipv4 */ - reid_len = len; - } - else if (unformat (input, "reid %U/%d", unformat_ip6_address, - &reid6, &len)) - { - reid_type = 1; /* ipv6 */ - reid_len = len; - } - else if (unformat (input, "reid %U", unformat_ethernet_address, - reid_mac)) - { - reid_type = 2; /* mac */ - } - else if (unformat (input, "leid %U/%d", unformat_ip4_address, - &leid4, &len)) - { - leid_type = 0; /* ipv4 */ - leid_len = len; - } - else if (unformat (input, "leid %U/%d", unformat_ip6_address, - &leid6, &len)) - { - leid_type = 1; /* ipv6 */ - leid_len = len; - } - else if (unformat (input, "leid %U", unformat_ethernet_address, - leid_mac)) - { - leid_type = 2; /* mac */ - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; } } - if ((u8) ~ 0 == reid_type) + if (!ls_name_set && is_add) { - errmsg ("missing params!"); + errmsg ("locator-set name not set!"); return -99; } - if (leid_type != reid_type) - { - errmsg ("remote and local EIDs are of different types!"); - return -99; - } + M (ONE_NSH_SET_LOCATOR_SET, mp); - M (ONE_ADD_DEL_ADJACENCY, mp); mp->is_add = is_add; - mp->vni = htonl (vni); - mp->leid_len = leid_len; - mp->reid_len = reid_len; - mp->eid_type = reid_type; - - switch (mp->eid_type) - { - case 0: - clib_memcpy (mp->leid, &leid4, sizeof (leid4)); - clib_memcpy (mp->reid, &reid4, sizeof (reid4)); - break; - case 1: - clib_memcpy (mp->leid, &leid6, sizeof (leid6)); - clib_memcpy (mp->reid, &reid6, sizeof (reid6)); - break; - case 2: - clib_memcpy (mp->leid, leid_mac, 6); - clib_memcpy (mp->reid, reid_mac, 6); - break; - default: - errmsg ("unknown EID type %d!", mp->eid_type); - return 0; - } - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_add_del_adjacency api_one_add_del_adjacency - -uword -unformat_gpe_encap_mode (unformat_input_t * input, va_list * args) -{ - u32 *mode = va_arg (*args, u32 *); - - if (unformat (input, "lisp")) - *mode = 0; - else if (unformat (input, "vxlan")) - *mode = 1; - else - return 0; - - return 1; -} - -static int -api_gpe_get_encap_mode (vat_main_t * vam) -{ - vl_api_gpe_get_encap_mode_t *mp; - int ret; - - /* Construct the API message */ - M (GPE_GET_ENCAP_MODE, mp); + clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); + vec_free (ls_name); - /* send it... */ + /* send */ S (mp); - /* Wait for a reply... */ + /* wait for reply */ W (ret); return ret; } static int -api_gpe_set_encap_mode (vat_main_t * vam) +api_show_one_pitr (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_gpe_set_encap_mode_t *mp; + vl_api_show_one_pitr_t *mp; int ret; - u32 mode = 0; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (!vam->json_output) { - if (unformat (input, "%U", unformat_gpe_encap_mode, &mode)) - ; - else - break; + print (vam->ofp, "%=20s", "lisp status:"); } - /* Construct the API message */ - M (GPE_SET_ENCAP_MODE, mp); - - mp->mode = mode; - + M (SHOW_ONE_PITR, mp); /* send it... */ S (mp); @@ -16248,102 +17570,77 @@ api_gpe_set_encap_mode (vat_main_t * vam) return ret; } +#define api_show_lisp_pitr api_show_one_pitr + static int -api_lisp_gpe_add_del_iface (vat_main_t * vam) +api_one_use_petr (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_gpe_add_del_iface_t *mp; - u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0; - u32 dp_table = 0, vni = 0; + vl_api_one_use_petr_t *mp; + u8 is_add = 0; + ip_address_t ip; int ret; + memset (&ip, 0, sizeof (ip)); + /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "up")) + if (unformat (input, "disable")) + is_add = 0; + else + if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (&ip))) { - action_set = 1; is_add = 1; + ip_addr_version (&ip) = IP4; } - else if (unformat (input, "down")) - { - action_set = 1; - is_add = 0; - } - else if (unformat (input, "table_id %d", &dp_table)) - { - dp_table_set = 1; - } - else if (unformat (input, "bd_id %d", &dp_table)) + else + if (unformat (input, "%U", unformat_ip6_address, &ip_addr_v6 (&ip))) { - dp_table_set = 1; - is_l2 = 1; + is_add = 1; + ip_addr_version (&ip) = IP6; } - else if (unformat (input, "vni %d", &vni)) + else { - vni_set = 1; + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; } - else - break; - } - - if (action_set == 0) - { - errmsg ("Action not set"); - return -99; - } - if (dp_table_set == 0 || vni_set == 0) - { - errmsg ("vni and dp_table must be set"); - return -99; } - /* Construct the API message */ - M (GPE_ADD_DEL_IFACE, mp); + M (ONE_USE_PETR, mp); mp->is_add = is_add; - mp->dp_table = clib_host_to_net_u32 (dp_table); - mp->is_l2 = is_l2; - mp->vni = clib_host_to_net_u32 (vni); + if (is_add) + { + mp->is_ip4 = ip_addr_version (&ip) == IP4 ? 1 : 0; + if (mp->is_ip4) + clib_memcpy (mp->address, &ip, 4); + else + clib_memcpy (mp->address, &ip, 16); + } - /* send it... */ + /* send */ S (mp); - /* Wait for a reply... */ + /* wait for reply */ W (ret); return ret; } +#define api_lisp_use_petr api_one_use_petr + static int -api_one_map_register_fallback_threshold (vat_main_t * vam) +api_show_one_nsh_mapping (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_map_register_fallback_threshold_t *mp; - u32 value = 0; - u8 is_set = 0; + vl_api_show_one_use_petr_t *mp; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "%u", &value)) - is_set = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } - } - - if (!is_set) + if (!vam->json_output) { - errmsg ("fallback threshold value is missing!"); - return -99; + print (vam->ofp, "%=20s", "local ONE NSH mapping:"); } - M (ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); - mp->value = clib_host_to_net_u32 (value); - + M (SHOW_ONE_NSH_MAPPING, mp); /* send it... */ S (mp); @@ -16353,13 +17650,17 @@ api_one_map_register_fallback_threshold (vat_main_t * vam) } static int -api_show_one_map_register_fallback_threshold (vat_main_t * vam) +api_show_one_use_petr (vat_main_t * vam) { - vl_api_show_one_map_register_fallback_threshold_t *mp; + vl_api_show_one_use_petr_t *mp; int ret; - M (SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "Proxy-ETR status:"); + } + M (SHOW_ONE_USE_PETR, mp); /* send it... */ S (mp); @@ -16368,86 +17669,171 @@ api_show_one_map_register_fallback_threshold (vat_main_t * vam) return ret; } -static int -api_one_map_register_set_ttl (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_one_map_register_set_ttl_t *mp; - u32 ttl = 0; - u8 is_set = 0; +#define api_show_lisp_use_petr api_show_one_use_petr + +/** + * Add/delete mapping between vni and vrf + */ +static int +api_one_eid_table_add_del_map (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_eid_table_add_del_map_t *mp; + u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0; + u32 vni, vrf, bd_index; int ret; /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%u", &ttl)) - is_set = 1; + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "vrf %d", &vrf)) + vrf_set = 1; + else if (unformat (input, "bd_index %d", &bd_index)) + bd_index_set = 1; + else if (unformat (input, "vni %d", &vni)) + vni_set = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if (!is_set) + if (!vni_set || (!vrf_set && !bd_index_set)) { - errmsg ("TTL value missing!"); + errmsg ("missing arguments!"); return -99; } - M (ONE_MAP_REGISTER_SET_TTL, mp); - mp->ttl = clib_host_to_net_u32 (ttl); + if (vrf_set && bd_index_set) + { + errmsg ("error: both vrf and bd entered!"); + return -99; + } - /* send it... */ + M (ONE_EID_TABLE_ADD_DEL_MAP, mp); + + mp->is_add = is_add; + mp->vni = htonl (vni); + mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index); + mp->is_l2 = bd_index_set; + + /* send */ S (mp); - /* Wait for a reply... */ + /* wait for reply */ W (ret); return ret; } -static int -api_show_one_map_register_ttl (vat_main_t * vam) -{ - vl_api_show_one_map_register_ttl_t *mp; - int ret; +#define api_lisp_eid_table_add_del_map api_one_eid_table_add_del_map - M (SHOW_ONE_MAP_REGISTER_TTL, mp); +uword +unformat_negative_mapping_action (unformat_input_t * input, va_list * args) +{ + u32 *action = va_arg (*args, u32 *); + u8 *s = 0; - /* send it... */ - S (mp); + if (unformat (input, "%s", &s)) + { + if (!strcmp ((char *) s, "no-action")) + action[0] = 0; + else if (!strcmp ((char *) s, "natively-forward")) + action[0] = 1; + else if (!strcmp ((char *) s, "send-map-request")) + action[0] = 2; + else if (!strcmp ((char *) s, "drop")) + action[0] = 3; + else + { + clib_warning ("invalid action: '%s'", s); + action[0] = 3; + } + } + else + return 0; - /* Wait for a reply... */ - W (ret); - return ret; + vec_free (s); + return 1; } /** - * Add/del map request itr rlocs from ONE control plane and updates + * Add/del remote mapping to/from ONE control plane * * @param vam vpp API test context * @return return code */ static int -api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) +api_one_add_del_remote_mapping (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_one_add_del_map_request_itr_rlocs_t *mp; - u8 *locator_set_name = 0; - u8 locator_set_name_set = 0; - u8 is_add = 1; + vl_api_one_add_del_remote_mapping_t *mp; + u32 vni = 0; + lisp_eid_vat_t _eid, *eid = &_eid; + lisp_eid_vat_t _seid, *seid = &_seid; + u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0; + u32 action = ~0, p, w, data_len; + ip4_address_t rloc4; + ip6_address_t rloc6; + vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0; int ret; + memset (&rloc, 0, sizeof (rloc)); + /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) + if (unformat (input, "del-all")) + { + del_all = 1; + } + else if (unformat (input, "del")) { is_add = 0; } - else if (unformat (input, "%_%v%_", &locator_set_name)) + else if (unformat (input, "add")) { - locator_set_name_set = 1; + is_add = 1; + } + else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) + { + eid_set = 1; + } + else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid)) + { + seid_set = 1; + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else if (unformat (input, "p %d w %d", &p, &w)) + { + if (!curr_rloc) + { + errmsg ("No RLOC configured for setting priority/weight!"); + return -99; + } + curr_rloc->priority = p; + curr_rloc->weight = w; + } + else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4)) + { + rloc.is_ip4 = 1; + clib_memcpy (&rloc.addr, &rloc4, sizeof (rloc4)); + vec_add1 (rlocs, rloc); + curr_rloc = &rlocs[vec_len (rlocs) - 1]; + } + else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6)) + { + rloc.is_ip4 = 0; + clib_memcpy (&rloc.addr, &rloc6, sizeof (rloc6)); + vec_add1 (rlocs, rloc); + curr_rloc = &rlocs[vec_len (rlocs) - 1]; + } + else if (unformat (input, "action %U", + unformat_negative_mapping_action, &action)) + { + ; } else { @@ -16456,31 +17842,35 @@ api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) } } - if (is_add && !locator_set_name_set) + if (0 == eid_set) { - errmsg ("itr-rloc is not set!"); + errmsg ("missing params!"); return -99; } - if (is_add && vec_len (locator_set_name) > 64) + if (is_add && (~0 == action) && 0 == vec_len (rlocs)) { - errmsg ("itr-rloc locator-set name too long"); - vec_free (locator_set_name); + errmsg ("no action set for negative map-reply!"); return -99; } - M (ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS, mp); + data_len = vec_len (rlocs) * sizeof (vl_api_remote_locator_t); + + M2 (ONE_ADD_DEL_REMOTE_MAPPING, mp, data_len); mp->is_add = is_add; - if (is_add) - { - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - } - else - { - memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); - } - vec_free (locator_set_name); + mp->vni = htonl (vni); + mp->action = (u8) action; + mp->is_src_dst = seid_set; + mp->eid_len = eid->len; + mp->seid_len = seid->len; + mp->del_all = del_all; + mp->eid_type = eid->type; + lisp_eid_put_vat (mp->eid, eid->addr, eid->type); + lisp_eid_put_vat (mp->seid, seid->addr, seid->type); + + mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs)); + clib_memcpy (mp->rlocs, rlocs, data_len); + vec_free (rlocs); /* send it... */ S (mp); @@ -16490,366 +17880,362 @@ api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) return ret; } -#define api_lisp_add_del_map_request_itr_rlocs api_one_add_del_map_request_itr_rlocs +#define api_lisp_add_del_remote_mapping api_one_add_del_remote_mapping +/** + * Add/del ONE adjacency. Saves mapping in ONE control plane and updates + * forwarding entries in data-plane accordingly. + * + * @param vam vpp API test context + * @return return code + */ static int -api_one_locator_dump (vat_main_t * vam) +api_one_add_del_adjacency (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_one_locator_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 is_index_set = 0, is_name_set = 0; - u8 *ls_name = 0; - u32 ls_index = ~0; + vl_api_one_add_del_adjacency_t *mp; + u32 vni = 0; + ip4_address_t leid4, reid4; + ip6_address_t leid6, reid6; + u8 reid_mac[6] = { 0 }; + u8 leid_mac[6] = { 0 }; + u8 reid_type, leid_type; + u32 leid_len = 0, reid_len = 0, len; + u8 is_add = 1; int ret; + leid_type = reid_type = (u8) ~ 0; + /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ls_name %_%v%_", &ls_name)) + if (unformat (input, "del")) { - is_name_set = 1; + is_add = 0; } - else if (unformat (input, "ls_index %d", &ls_index)) + else if (unformat (input, "add")) { - is_index_set = 1; + is_add = 1; } - else + else if (unformat (input, "reid %U/%d", unformat_ip4_address, + &reid4, &len)) { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; + reid_type = 0; /* ipv4 */ + reid_len = len; } - } - - if (!is_index_set && !is_name_set) - { - errmsg ("error: expected one of index or name!"); - return -99; - } - - if (is_index_set && is_name_set) - { - errmsg ("error: only one param expected!"); - return -99; - } - - if (vec_len (ls_name) > 62) - { - errmsg ("error: locator set name too long!"); - return -99; - } + else if (unformat (input, "reid %U/%d", unformat_ip6_address, + &reid6, &len)) + { + reid_type = 1; /* ipv6 */ + reid_len = len; + } + else if (unformat (input, "reid %U", unformat_ethernet_address, + reid_mac)) + { + reid_type = 2; /* mac */ + } + else if (unformat (input, "leid %U/%d", unformat_ip4_address, + &leid4, &len)) + { + leid_type = 0; /* ipv4 */ + leid_len = len; + } + else if (unformat (input, "leid %U/%d", unformat_ip6_address, + &leid6, &len)) + { + leid_type = 1; /* ipv6 */ + leid_len = len; + } + else if (unformat (input, "leid %U", unformat_ethernet_address, + leid_mac)) + { + leid_type = 2; /* mac */ + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } - if (!vam->json_output) + if ((u8) ~ 0 == reid_type) { - print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight"); + errmsg ("missing params!"); + return -99; } - M (ONE_LOCATOR_DUMP, mp); - mp->is_index_set = is_index_set; + if (leid_type != reid_type) + { + errmsg ("remote and local EIDs are of different types!"); + return -99; + } - if (is_index_set) - mp->ls_index = clib_host_to_net_u32 (ls_index); - else + M (ONE_ADD_DEL_ADJACENCY, mp); + mp->is_add = is_add; + mp->vni = htonl (vni); + mp->leid_len = leid_len; + mp->reid_len = reid_len; + mp->eid_type = reid_type; + + switch (mp->eid_type) { - vec_add1 (ls_name, 0); - strncpy ((char *) mp->ls_name, (char *) ls_name, - sizeof (mp->ls_name) - 1); + case 0: + clib_memcpy (mp->leid, &leid4, sizeof (leid4)); + clib_memcpy (mp->reid, &reid4, sizeof (reid4)); + break; + case 1: + clib_memcpy (mp->leid, &leid6, sizeof (leid6)); + clib_memcpy (mp->reid, &reid6, sizeof (reid6)); + break; + case 2: + clib_memcpy (mp->leid, leid_mac, 6); + clib_memcpy (mp->reid, reid_mac, 6); + break; + default: + errmsg ("unknown EID type %d!", mp->eid_type); + return 0; } /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_locator_dump api_one_locator_dump +#define api_lisp_add_del_adjacency api_one_add_del_adjacency + +uword +unformat_gpe_encap_mode (unformat_input_t * input, va_list * args) +{ + u32 *mode = va_arg (*args, u32 *); + + if (unformat (input, "lisp")) + *mode = 0; + else if (unformat (input, "vxlan")) + *mode = 1; + else + return 0; + + return 1; +} static int -api_one_locator_set_dump (vat_main_t * vam) +api_gpe_get_encap_mode (vat_main_t * vam) +{ + vl_api_gpe_get_encap_mode_t *mp; + int ret; + + /* Construct the API message */ + M (GPE_GET_ENCAP_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_set_encap_mode (vat_main_t * vam) { - vl_api_one_locator_set_dump_t *mp; - vl_api_control_ping_t *mp_ping; unformat_input_t *input = vam->input; - u8 filter = 0; + vl_api_gpe_set_encap_mode_t *mp; int ret; + u32 mode = 0; /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "local")) - { - filter = 1; - } - else if (unformat (input, "remote")) - { - filter = 2; - } + if (unformat (input, "%U", unformat_gpe_encap_mode, &mode)) + ; else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } - - if (!vam->json_output) - { - print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name"); + break; } - M (ONE_LOCATOR_SET_DUMP, mp); + /* Construct the API message */ + M (GPE_SET_ENCAP_MODE, mp); - mp->filter = filter; + mp->mode = mode; /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_locator_set_dump api_one_locator_set_dump - static int -api_one_eid_table_map_dump (vat_main_t * vam) +api_lisp_gpe_add_del_iface (vat_main_t * vam) { - u8 is_l2 = 0; - u8 mode_set = 0; unformat_input_t *input = vam->input; - vl_api_one_eid_table_map_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_gpe_add_del_iface_t *mp; + u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0; + u32 dp_table = 0, vni = 0; int ret; /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "l2")) + if (unformat (input, "up")) { - is_l2 = 1; - mode_set = 1; + action_set = 1; + is_add = 1; } - else if (unformat (input, "l3")) + else if (unformat (input, "down")) { - is_l2 = 0; - mode_set = 1; + action_set = 1; + is_add = 0; } - else + else if (unformat (input, "table_id %d", &dp_table)) { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; + dp_table_set = 1; + } + else if (unformat (input, "bd_id %d", &dp_table)) + { + dp_table_set = 1; + is_l2 = 1; + } + else if (unformat (input, "vni %d", &vni)) + { + vni_set = 1; } + else + break; } - if (!mode_set) + if (action_set == 0) { - errmsg ("expected one of 'l2' or 'l3' parameter!"); + errmsg ("Action not set"); return -99; } - - if (!vam->json_output) + if (dp_table_set == 0 || vni_set == 0) { - print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); + errmsg ("vni and dp_table must be set"); + return -99; } - M (ONE_EID_TABLE_MAP_DUMP, mp); + /* Construct the API message */ + M (GPE_ADD_DEL_IFACE, mp); + + mp->is_add = is_add; + mp->dp_table = clib_host_to_net_u32 (dp_table); mp->is_l2 = is_l2; + mp->vni = clib_host_to_net_u32 (vni); /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_eid_table_map_dump api_one_eid_table_map_dump - static int -api_one_eid_table_vni_dump (vat_main_t * vam) +api_one_map_register_fallback_threshold (vat_main_t * vam) { - vl_api_one_eid_table_vni_dump_t *mp; - vl_api_control_ping_t *mp_ping; + unformat_input_t *input = vam->input; + vl_api_one_map_register_fallback_threshold_t *mp; + u32 value = 0; + u8 is_set = 0; int ret; - if (!vam->json_output) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "VNI"); + if (unformat (input, "%u", &value)) + is_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } } - M (ONE_EID_TABLE_VNI_DUMP, mp); + if (!is_set) + { + errmsg ("fallback threshold value is missing!"); + return -99; + } + + M (ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); + mp->value = clib_host_to_net_u32 (value); /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_eid_table_vni_dump api_one_eid_table_vni_dump - static int -api_one_eid_table_dump (vat_main_t * vam) +api_show_one_map_register_fallback_threshold (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_one_eid_table_dump_t *mp; - vl_api_control_ping_t *mp_ping; - struct in_addr ip4; - struct in6_addr ip6; - u8 mac[6]; - u8 eid_type = ~0, eid_set = 0; - u32 prefix_length = ~0, t, vni = 0; - u8 filter = 0; + vl_api_show_one_map_register_fallback_threshold_t *mp; int ret; - lisp_nsh_api_t nsh; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t)) - { - eid_set = 1; - eid_type = 0; - prefix_length = t; - } - else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t)) - { - eid_set = 1; - eid_type = 1; - prefix_length = t; - } - else if (unformat (i, "eid %U", unformat_ethernet_address, mac)) - { - eid_set = 1; - eid_type = 2; - } - else if (unformat (i, "eid %U", unformat_nsh_address, &nsh)) - { - eid_set = 1; - eid_type = 3; - } - else if (unformat (i, "vni %d", &t)) - { - vni = t; - } - else if (unformat (i, "local")) - { - filter = 1; - } - else if (unformat (i, "remote")) - { - filter = 2; - } - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vam->json_output) - { - print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID", - "type", "ls_index", "ttl", "authoritative", "key_id", "key"); - } - - M (ONE_EID_TABLE_DUMP, mp); - mp->filter = filter; - if (eid_set) - { - mp->eid_set = 1; - mp->vni = htonl (vni); - mp->eid_type = eid_type; - switch (eid_type) - { - case 0: - mp->prefix_length = prefix_length; - clib_memcpy (mp->eid, &ip4, sizeof (ip4)); - break; - case 1: - mp->prefix_length = prefix_length; - clib_memcpy (mp->eid, &ip6, sizeof (ip6)); - break; - case 2: - clib_memcpy (mp->eid, mac, sizeof (mac)); - break; - case 3: - clib_memcpy (mp->eid, &nsh, sizeof (nsh)); - break; - default: - errmsg ("unknown EID type %d!", eid_type); - return -99; - } - } + M (SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_eid_table_dump api_one_eid_table_dump +uword +unformat_lisp_transport_protocol (unformat_input_t * input, va_list * args) +{ + u32 *proto = va_arg (*args, u32 *); + + if (unformat (input, "udp")) + *proto = 1; + else if (unformat (input, "api")) + *proto = 2; + else + return 0; + + return 1; +} static int -api_lisp_gpe_fwd_entries_get (vat_main_t * vam) +api_one_set_transport_protocol (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_gpe_fwd_entries_get_t *mp; - u8 vni_set = 0; - u32 vni = ~0; + unformat_input_t *input = vam->input; + vl_api_one_set_transport_protocol_t *mp; + u8 is_set = 0; + u32 protocol = 0; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vni %d", &vni)) - { - vni_set = 1; - } + if (unformat (input, "%U", unformat_lisp_transport_protocol, &protocol)) + is_set = 1; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, input); return -99; } } - if (!vni_set) + if (!is_set) { - errmsg ("vni not set!"); + errmsg ("Transport protocol missing!"); return -99; } - if (!vam->json_output) - { - print (vam->ofp, "%10s %10s %s %40s", "fwd_index", "dp_table", - "leid", "reid"); - } - - M (GPE_FWD_ENTRIES_GET, mp); - mp->vni = clib_host_to_net_u32 (vni); + M (ONE_SET_TRANSPORT_PROTOCOL, mp); + mp->protocol = (u8) protocol; /* send it... */ S (mp); @@ -16859,50 +18245,13 @@ api_lisp_gpe_fwd_entries_get (vat_main_t * vam) return ret; } -#define vl_api_gpe_native_fwd_rpaths_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_native_fwd_rpaths_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entry_vnis_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entry_vnis_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entries_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entries_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entry_path_details_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entry_path_details_t_print vl_noop_handler - static int -api_one_adjacencies_get (vat_main_t * vam) +api_one_get_transport_protocol (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_one_adjacencies_get_t *mp; - u8 vni_set = 0; - u32 vni = ~0; + vl_api_one_get_transport_protocol_t *mp; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "vni %d", &vni)) - { - vni_set = 1; - } - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vni_set) - { - errmsg ("vni not set!"); - return -99; - } - - if (!vam->json_output) - { - print (vam->ofp, "%s %40s", "leid", "reid"); - } - - M (ONE_ADJACENCIES_GET, mp); - mp->vni = clib_host_to_net_u32 (vni); + M (ONE_GET_TRANSPORT_PROTOCOL, mp); /* send it... */ S (mp); @@ -16912,43 +18261,35 @@ api_one_adjacencies_get (vat_main_t * vam) return ret; } -#define api_lisp_adjacencies_get api_one_adjacencies_get - static int -api_gpe_native_fwd_rpaths_get (vat_main_t * vam) +api_one_map_register_set_ttl (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_gpe_native_fwd_rpaths_get_t *mp; + unformat_input_t *input = vam->input; + vl_api_one_map_register_set_ttl_t *mp; + u32 ttl = 0; + u8 is_set = 0; int ret; - u8 ip_family_set = 0, is_ip4 = 1; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ip4")) - { - ip_family_set = 1; - is_ip4 = 1; - } - else if (unformat (i, "ip6")) - { - ip_family_set = 1; - is_ip4 = 0; - } + if (unformat (input, "%u", &ttl)) + is_set = 1; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, input); return -99; } } - if (!ip_family_set) + if (!is_set) { - errmsg ("ip family not set!"); + errmsg ("TTL value missing!"); return -99; } - M (GPE_NATIVE_FWD_RPATHS_GET, mp); - mp->is_ip4 = is_ip4; + M (ONE_MAP_REGISTER_SET_TTL, mp); + mp->ttl = clib_host_to_net_u32 (ttl); /* send it... */ S (mp); @@ -16959,17 +18300,12 @@ api_gpe_native_fwd_rpaths_get (vat_main_t * vam) } static int -api_gpe_fwd_entry_vnis_get (vat_main_t * vam) +api_show_one_map_register_ttl (vat_main_t * vam) { - vl_api_gpe_fwd_entry_vnis_get_t *mp; + vl_api_show_one_map_register_ttl_t *mp; int ret; - if (!vam->json_output) - { - print (vam->ofp, "VNIs"); - } - - M (GPE_FWD_ENTRY_VNIS_GET, mp); + M (SHOW_ONE_MAP_REGISTER_TTL, mp); /* send it... */ S (mp); @@ -16979,72 +18315,65 @@ api_gpe_fwd_entry_vnis_get (vat_main_t * vam) return ret; } +/** + * Add/del map request itr rlocs from ONE control plane and updates + * + * @param vam vpp API test context + * @return return code + */ static int -api_gpe_add_del_native_fwd_rpath (vat_main_t * vam) +api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_gpe_add_del_native_fwd_rpath_t *mp; - int ret = 0; - u8 is_add = 1, ip_set = 0, is_ip4 = 1; - struct in_addr ip4; - struct in6_addr ip6; - u32 table_id = 0, nh_sw_if_index = ~0; - - memset (&ip4, 0, sizeof (ip4)); - memset (&ip6, 0, sizeof (ip6)); + unformat_input_t *input = vam->input; + vl_api_one_add_del_map_request_itr_rlocs_t *mp; + u8 *locator_set_name = 0; + u8 locator_set_name_set = 0; + u8 is_add = 1; + int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "via %U %U", unformat_ip4_address, &ip4, - api_unformat_sw_if_index, vam, &nh_sw_if_index)) + if (unformat (input, "del")) { - ip_set = 1; - is_ip4 = 1; + is_add = 0; } - else if (unformat (i, "via %U %U", unformat_ip6_address, &ip6, - api_unformat_sw_if_index, vam, &nh_sw_if_index)) + else if (unformat (input, "%_%v%_", &locator_set_name)) { - ip_set = 1; - is_ip4 = 0; + locator_set_name_set = 1; } - else if (unformat (i, "via %U", unformat_ip4_address, &ip4)) - { - ip_set = 1; - is_ip4 = 1; - nh_sw_if_index = ~0; - } - else if (unformat (i, "via %U", unformat_ip6_address, &ip6)) - { - ip_set = 1; - is_ip4 = 0; - nh_sw_if_index = ~0; - } - else if (unformat (i, "table %d", &table_id)) - ; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, input); return -99; } } - if (!ip_set) + if (is_add && !locator_set_name_set) { - errmsg ("nh addr not set!"); + errmsg ("itr-rloc is not set!"); return -99; } - M (GPE_ADD_DEL_NATIVE_FWD_RPATH, mp); + if (is_add && vec_len (locator_set_name) > 64) + { + errmsg ("itr-rloc locator-set name too long"); + vec_free (locator_set_name); + return -99; + } + + M (ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS, mp); mp->is_add = is_add; - mp->table_id = clib_host_to_net_u32 (table_id); - mp->nh_sw_if_index = clib_host_to_net_u32 (nh_sw_if_index); - mp->is_ip4 = is_ip4; - if (is_ip4) - clib_memcpy (mp->nh_addr, &ip4, sizeof (ip4)); + if (is_add) + { + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + } else - clib_memcpy (mp->nh_addr, &ip6, sizeof (ip6)); + { + memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); + } + vec_free (locator_set_name); /* send it... */ S (mp); @@ -17054,51 +18383,77 @@ api_gpe_add_del_native_fwd_rpath (vat_main_t * vam) return ret; } +#define api_lisp_add_del_map_request_itr_rlocs api_one_add_del_map_request_itr_rlocs + static int -api_one_map_server_dump (vat_main_t * vam) +api_one_locator_dump (vat_main_t * vam) { - vl_api_one_map_server_dump_t *mp; + unformat_input_t *input = vam->input; + vl_api_one_locator_dump_t *mp; vl_api_control_ping_t *mp_ping; + u8 is_index_set = 0, is_name_set = 0; + u8 *ls_name = 0; + u32 ls_index = ~0; int ret; - if (!vam->json_output) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%=20s", "Map server"); + if (unformat (input, "ls_name %_%v%_", &ls_name)) + { + is_name_set = 1; + } + else if (unformat (input, "ls_index %d", &ls_index)) + { + is_index_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } } - M (ONE_MAP_SERVER_DUMP, mp); - /* send it... */ - S (mp); + if (!is_index_set && !is_name_set) + { + errmsg ("error: expected one of index or name!"); + return -99; + } - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + if (is_index_set && is_name_set) + { + errmsg ("error: only one param expected!"); + return -99; + } - /* Wait for a reply... */ - W (ret); - return ret; -} + if (vec_len (ls_name) > 62) + { + errmsg ("error: locator set name too long!"); + return -99; + } -#define api_lisp_map_server_dump api_one_map_server_dump + if (!vam->json_output) + { + print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight"); + } -static int -api_one_map_resolver_dump (vat_main_t * vam) -{ - vl_api_one_map_resolver_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + M (ONE_LOCATOR_DUMP, mp); + mp->is_index_set = is_index_set; - if (!vam->json_output) + if (is_index_set) + mp->ls_index = clib_host_to_net_u32 (ls_index); + else { - print (vam->ofp, "%=20s", "Map resolver"); + vec_add1 (ls_name, 0); + strncpy ((char *) mp->ls_name, (char *) ls_name, + sizeof (mp->ls_name) - 1); } - M (ONE_MAP_RESOLVER_DUMP, mp); /* send it... */ S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); /* Wait for a reply... */ @@ -17106,95 +18461,107 @@ api_one_map_resolver_dump (vat_main_t * vam) return ret; } -#define api_lisp_map_resolver_dump api_one_map_resolver_dump - -static int -api_one_stats_flush (vat_main_t * vam) -{ - vl_api_one_stats_flush_t *mp; - int ret = 0; - - M (ONE_STATS_FLUSH, mp); - S (mp); - W (ret); - return ret; -} +#define api_lisp_locator_dump api_one_locator_dump static int -api_one_stats_dump (vat_main_t * vam) +api_one_locator_set_dump (vat_main_t * vam) { - vl_api_one_stats_dump_t *mp; + vl_api_one_locator_set_dump_t *mp; vl_api_control_ping_t *mp_ping; + unformat_input_t *input = vam->input; + u8 filter = 0; int ret; - M (ONE_STATS_DUMP, mp); - /* send it... */ - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_show_one_status (vat_main_t * vam) -{ - vl_api_show_one_status_t *mp; - int ret; + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "local")) + { + filter = 1; + } + else if (unformat (input, "remote")) + { + filter = 2; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } if (!vam->json_output) { - print (vam->ofp, "%-20s%-16s", "ONE status", "locator-set"); + print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name"); } - M (SHOW_ONE_STATUS, mp); + M (ONE_LOCATOR_SET_DUMP, mp); + + mp->filter = filter; + /* send it... */ S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + /* Wait for a reply... */ W (ret); return ret; } -#define api_show_lisp_status api_show_one_status +#define api_lisp_locator_set_dump api_one_locator_set_dump static int -api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam) +api_one_eid_table_map_dump (vat_main_t * vam) { - vl_api_gpe_fwd_entry_path_dump_t *mp; + u8 is_l2 = 0; + u8 mode_set = 0; + unformat_input_t *input = vam->input; + vl_api_one_eid_table_map_dump_t *mp; vl_api_control_ping_t *mp_ping; - unformat_input_t *i = vam->input; - u32 fwd_entry_index = ~0; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "index %d", &fwd_entry_index)) - ; + if (unformat (input, "l2")) + { + is_l2 = 1; + mode_set = 1; + } + else if (unformat (input, "l3")) + { + is_l2 = 0; + mode_set = 1; + } else - break; + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } } - if (~0 == fwd_entry_index) + if (!mode_set) { - errmsg ("no index specified!"); + errmsg ("expected one of 'l2' or 'l3' parameter!"); return -99; } if (!vam->json_output) { - print (vam->ofp, "first line"); + print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); } - M (GPE_FWD_ENTRY_PATH_DUMP, mp); + M (ONE_EID_TABLE_MAP_DUMP, mp); + mp->is_l2 = is_l2; /* send it... */ S (mp); + /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); /* Wait for a reply... */ @@ -17202,249 +18569,303 @@ api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam) return ret; } +#define api_lisp_eid_table_map_dump api_one_eid_table_map_dump + static int -api_one_get_map_request_itr_rlocs (vat_main_t * vam) +api_one_eid_table_vni_dump (vat_main_t * vam) { - vl_api_one_get_map_request_itr_rlocs_t *mp; + vl_api_one_eid_table_vni_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; if (!vam->json_output) { - print (vam->ofp, "%=20s", "itr-rlocs:"); + print (vam->ofp, "VNI"); } - M (ONE_GET_MAP_REQUEST_ITR_RLOCS, mp); + M (ONE_EID_TABLE_VNI_DUMP, mp); + /* send it... */ S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_get_map_request_itr_rlocs api_one_get_map_request_itr_rlocs +#define api_lisp_eid_table_vni_dump api_one_eid_table_vni_dump static int -api_af_packet_create (vat_main_t * vam) +api_one_eid_table_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_af_packet_create_t *mp; - u8 *host_if_name = 0; - u8 hw_addr[6]; - u8 random_hw_addr = 1; - int ret; - - 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; - } + vl_api_one_eid_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + struct in_addr ip4; + struct in6_addr ip6; + u8 mac[6]; + u8 eid_type = ~0, eid_set = 0; + u32 prefix_length = ~0, t, vni = 0; + u8 filter = 0; + int ret; + lisp_nsh_api_t nsh; - if (!vec_len (host_if_name)) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("host-interface name must be specified"); - return -99; + if (unformat (i, "eid %U/%d", unformat_ip4_address, &ip4, &t)) + { + eid_set = 1; + eid_type = 0; + prefix_length = t; + } + else if (unformat (i, "eid %U/%d", unformat_ip6_address, &ip6, &t)) + { + eid_set = 1; + eid_type = 1; + prefix_length = t; + } + else if (unformat (i, "eid %U", unformat_ethernet_address, mac)) + { + eid_set = 1; + eid_type = 2; + } + else if (unformat (i, "eid %U", unformat_nsh_address, &nsh)) + { + eid_set = 1; + eid_type = 3; + } + else if (unformat (i, "vni %d", &t)) + { + vni = t; + } + else if (unformat (i, "local")) + { + filter = 1; + } + else if (unformat (i, "remote")) + { + filter = 2; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (vec_len (host_if_name) > 64) + if (!vam->json_output) { - errmsg ("host-interface name too long"); - return -99; + print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID", + "type", "ls_index", "ttl", "authoritative", "key_id", "key"); } - M (AF_PACKET_CREATE, mp); + M (ONE_EID_TABLE_DUMP, mp); - 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); + mp->filter = filter; + if (eid_set) + { + mp->eid_set = 1; + mp->vni = htonl (vni); + mp->eid_type = eid_type; + switch (eid_type) + { + case 0: + mp->prefix_length = prefix_length; + clib_memcpy (mp->eid, &ip4, sizeof (ip4)); + break; + case 1: + mp->prefix_length = prefix_length; + clib_memcpy (mp->eid, &ip6, sizeof (ip6)); + break; + case 2: + clib_memcpy (mp->eid, mac, sizeof (mac)); + break; + case 3: + clib_memcpy (mp->eid, &nsh, sizeof (nsh)); + break; + default: + errmsg ("unknown EID type %d!", eid_type); + return -99; + } + } + /* send it... */ S (mp); - /* *INDENT-OFF* */ - W2 (ret, - ({ - if (ret == 0) - fprintf (vam->ofp ? vam->ofp : stderr, - " new sw_if_index = %d\n", vam->sw_if_index); - })); - /* *INDENT-ON* */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); return ret; } +#define api_lisp_eid_table_dump api_one_eid_table_dump + static int -api_af_packet_delete (vat_main_t * vam) +api_lisp_gpe_fwd_entries_get (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_af_packet_delete_t *mp; - u8 *host_if_name = 0; + vl_api_gpe_fwd_entries_get_t *mp; + u8 vni_set = 0; + u32 vni = ~0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "name %s", &host_if_name)) - vec_add1 (host_if_name, 0); + if (unformat (i, "vni %d", &vni)) + { + vni_set = 1; + } else - break; + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (!vec_len (host_if_name)) + if (!vni_set) { - errmsg ("host-interface name must be specified"); + errmsg ("vni not set!"); return -99; } - if (vec_len (host_if_name) > 64) + if (!vam->json_output) { - errmsg ("host-interface name too long"); - return -99; + print (vam->ofp, "%10s %10s %s %40s", "fwd_index", "dp_table", + "leid", "reid"); } - M (AF_PACKET_DELETE, mp); - - clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); - vec_free (host_if_name); + M (GPE_FWD_ENTRIES_GET, mp); + mp->vni = clib_host_to_net_u32 (vni); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } +#define vl_api_gpe_native_fwd_rpaths_get_reply_t_endian vl_noop_handler +#define vl_api_gpe_native_fwd_rpaths_get_reply_t_print vl_noop_handler +#define vl_api_gpe_fwd_entry_vnis_get_reply_t_endian vl_noop_handler +#define vl_api_gpe_fwd_entry_vnis_get_reply_t_print vl_noop_handler +#define vl_api_gpe_fwd_entries_get_reply_t_endian vl_noop_handler +#define vl_api_gpe_fwd_entries_get_reply_t_print vl_noop_handler +#define vl_api_gpe_fwd_entry_path_details_t_endian vl_noop_handler +#define vl_api_gpe_fwd_entry_path_details_t_print vl_noop_handler + static int -api_policer_add_del (vat_main_t * vam) +api_one_adjacencies_get (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_policer_add_del_t *mp; - u8 is_add = 1; - u8 *name = 0; - u32 cir = 0; - u32 eir = 0; - u64 cb = 0; - u64 eb = 0; - u8 rate_type = 0; - u8 round_type = 0; - u8 type = 0; - u8 color_aware = 0; - sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action; + vl_api_one_adjacencies_get_t *mp; + u8 vni_set = 0; + u32 vni = ~0; int ret; - conform_action.action_type = SSE2_QOS_ACTION_TRANSMIT; - conform_action.dscp = 0; - exceed_action.action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT; - exceed_action.dscp = 0; - violate_action.action_type = SSE2_QOS_ACTION_DROP; - violate_action.dscp = 0; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "name %s", &name)) - vec_add1 (name, 0); - else if (unformat (i, "cir %u", &cir)) - ; - else if (unformat (i, "eir %u", &eir)) - ; - else if (unformat (i, "cb %u", &cb)) - ; - else if (unformat (i, "eb %u", &eb)) - ; - else if (unformat (i, "rate_type %U", unformat_policer_rate_type, - &rate_type)) - ; - else if (unformat (i, "round_type %U", unformat_policer_round_type, - &round_type)) - ; - else if (unformat (i, "type %U", unformat_policer_type, &type)) - ; - else if (unformat (i, "conform_action %U", unformat_policer_action_type, - &conform_action)) - ; - else if (unformat (i, "exceed_action %U", unformat_policer_action_type, - &exceed_action)) - ; - else if (unformat (i, "violate_action %U", unformat_policer_action_type, - &violate_action)) - ; - else if (unformat (i, "color-aware")) - color_aware = 1; + if (unformat (i, "vni %d", &vni)) + { + vni_set = 1; + } else - break; + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (!vec_len (name)) + if (!vni_set) { - errmsg ("policer name must be specified"); + errmsg ("vni not set!"); return -99; } - if (vec_len (name) > 64) + if (!vam->json_output) { - errmsg ("policer name too long"); - return -99; + print (vam->ofp, "%s %40s", "leid", "reid"); } - M (POLICER_ADD_DEL, mp); - - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); - mp->is_add = is_add; - mp->cir = cir; - mp->eir = eir; - mp->cb = cb; - mp->eb = eb; - mp->rate_type = rate_type; - mp->round_type = round_type; - mp->type = type; - mp->conform_action_type = conform_action.action_type; - mp->conform_dscp = conform_action.dscp; - mp->exceed_action_type = exceed_action.action_type; - mp->exceed_dscp = exceed_action.dscp; - mp->violate_action_type = violate_action.action_type; - mp->violate_dscp = violate_action.dscp; - mp->color_aware = color_aware; + M (ONE_ADJACENCIES_GET, mp); + mp->vni = clib_host_to_net_u32 (vni); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } +#define api_lisp_adjacencies_get api_one_adjacencies_get + static int -api_policer_dump (vat_main_t * vam) +api_gpe_native_fwd_rpaths_get (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_policer_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 *match_name = 0; - u8 match_name_valid = 0; + vl_api_gpe_native_fwd_rpaths_get_t *mp; int ret; + u8 ip_family_set = 0, is_ip4 = 1; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "name %s", &match_name)) + if (unformat (i, "ip4")) { - vec_add1 (match_name, 0); - match_name_valid = 1; + ip_family_set = 1; + is_ip4 = 1; + } + else if (unformat (i, "ip6")) + { + ip_family_set = 1; + is_ip4 = 0; } else - break; + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } } - M (POLICER_DUMP, mp); - mp->match_name_valid = match_name_valid; - clib_memcpy (mp->match_name, match_name, vec_len (match_name)); - vec_free (match_name); + if (!ip_family_set) + { + errmsg ("ip family not set!"); + return -99; + } + + M (GPE_NATIVE_FWD_RPATHS_GET, mp); + mp->is_ip4 = is_ip4; + /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_fwd_entry_vnis_get (vat_main_t * vam) +{ + vl_api_gpe_fwd_entry_vnis_get_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "VNIs"); + } + + M (GPE_FWD_ENTRY_VNIS_GET, mp); + + /* send it... */ + S (mp); /* Wait for a reply... */ W (ret); @@ -17452,87 +18873,98 @@ api_policer_dump (vat_main_t * vam) } static int -api_policer_classify_set_interface (vat_main_t * vam) +api_gpe_add_del_native_fwd_rpath (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_policer_classify_set_interface_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 l2_table_index = ~0; - u8 is_add = 1; - int ret; + vl_api_gpe_add_del_native_fwd_rpath_t *mp; + int ret = 0; + u8 is_add = 1, ip_set = 0, is_ip4 = 1; + struct in_addr ip4; + struct in6_addr ip6; + u32 table_id = 0, nh_sw_if_index = ~0; + + memset (&ip4, 0, sizeof (ip4)); + memset (&ip6, 0, sizeof (ip6)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "del")) + if (unformat (i, "del")) is_add = 0; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "l2-table %d", &l2_table_index)) + else if (unformat (i, "via %U %U", unformat_ip4_address, &ip4, + api_unformat_sw_if_index, vam, &nh_sw_if_index)) + { + ip_set = 1; + is_ip4 = 1; + } + else if (unformat (i, "via %U %U", unformat_ip6_address, &ip6, + api_unformat_sw_if_index, vam, &nh_sw_if_index)) + { + ip_set = 1; + is_ip4 = 0; + } + else if (unformat (i, "via %U", unformat_ip4_address, &ip4)) + { + ip_set = 1; + is_ip4 = 1; + nh_sw_if_index = ~0; + } + else if (unformat (i, "via %U", unformat_ip6_address, &ip6)) + { + ip_set = 1; + is_ip4 = 0; + nh_sw_if_index = ~0; + } + else if (unformat (i, "table %d", &table_id)) ; else { - clib_warning ("parse error '%U'", format_unformat_error, i); + errmsg ("parse error '%U'", format_unformat_error, i); return -99; } } - if (sw_if_index_set == 0) + if (!ip_set) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("nh addr not set!"); return -99; } - M (POLICER_CLASSIFY_SET_INTERFACE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->l2_table_index = ntohl (l2_table_index); + M (GPE_ADD_DEL_NATIVE_FWD_RPATH, mp); mp->is_add = is_add; + mp->table_id = clib_host_to_net_u32 (table_id); + mp->nh_sw_if_index = clib_host_to_net_u32 (nh_sw_if_index); + mp->is_ip4 = is_ip4; + if (is_ip4) + clib_memcpy (mp->nh_addr, &ip4, sizeof (ip4)); + else + clib_memcpy (mp->nh_addr, &ip6, sizeof (ip6)); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_policer_classify_dump (vat_main_t * vam) +api_one_map_server_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_policer_classify_dump_t *mp; + vl_api_one_map_server_dump_t *mp; vl_api_control_ping_t *mp_ping; - u8 type = POLICER_CLASSIFY_N_TABLES; int ret; - if (unformat (i, "type %U", unformat_policer_classify_table_type, &type)) - ; - else - { - errmsg ("classify table type must be specified"); - return -99; - } - if (!vam->json_output) { - print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); + print (vam->ofp, "%=20s", "Map server"); } - M (POLICER_CLASSIFY_DUMP, mp); - mp->type = type; + M (ONE_MAP_SERVER_DUMP, mp); /* send it... */ S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); /* Wait for a reply... */ @@ -17540,315 +18972,986 @@ api_policer_classify_dump (vat_main_t * vam) return ret; } +#define api_lisp_map_server_dump api_one_map_server_dump + static int -api_netmap_create (vat_main_t * vam) +api_one_map_resolver_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_netmap_create_t *mp; - u8 *if_name = 0; - u8 hw_addr[6]; - u8 random_hw_addr = 1; - u8 is_pipe = 0; - u8 is_master = 0; + vl_api_one_map_resolver_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - memset (hw_addr, 0, sizeof (hw_addr)); - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (!vam->json_output) { - if (unformat (i, "name %s", &if_name)) - vec_add1 (if_name, 0); - else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr)) - random_hw_addr = 0; - else if (unformat (i, "pipe")) - is_pipe = 1; - else if (unformat (i, "master")) - is_master = 1; - else if (unformat (i, "slave")) - is_master = 0; - else - break; + print (vam->ofp, "%=20s", "Map resolver"); } - if (!vec_len (if_name)) - { - errmsg ("interface name must be specified"); - return -99; - } + M (ONE_MAP_RESOLVER_DUMP, mp); + /* send it... */ + S (mp); - if (vec_len (if_name) > 64) - { - errmsg ("interface name too long"); - return -99; - } + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - M (NETMAP_CREATE, mp); + /* Wait for a reply... */ + W (ret); + return ret; +} - clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); - clib_memcpy (mp->hw_addr, hw_addr, 6); - mp->use_random_hw_addr = random_hw_addr; - mp->is_pipe = is_pipe; - mp->is_master = is_master; - vec_free (if_name); +#define api_lisp_map_resolver_dump api_one_map_resolver_dump + +static int +api_one_stats_flush (vat_main_t * vam) +{ + vl_api_one_stats_flush_t *mp; + int ret = 0; + M (ONE_STATS_FLUSH, mp); S (mp); W (ret); return ret; } static int -api_netmap_delete (vat_main_t * vam) +api_one_stats_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_netmap_delete_t *mp; - u8 *if_name = 0; + vl_api_one_stats_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "name %s", &if_name)) - vec_add1 (if_name, 0); - else - break; - } + M (ONE_STATS_DUMP, mp); + /* send it... */ + S (mp); - if (!vec_len (if_name)) - { - errmsg ("interface name must be specified"); - return -99; - } + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - if (vec_len (if_name) > 64) - { - errmsg ("interface name too long"); - return -99; - } + /* Wait for a reply... */ + W (ret); + return ret; +} - M (NETMAP_DELETE, mp); +static int +api_show_one_status (vat_main_t * vam) +{ + vl_api_show_one_status_t *mp; + int ret; - clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); - vec_free (if_name); + if (!vam->json_output) + { + print (vam->ofp, "%-20s%-16s", "ONE status", "locator-set"); + } + M (SHOW_ONE_STATUS, mp); + /* send it... */ S (mp); + /* Wait for a reply... */ W (ret); return ret; } -static void -vl_api_mpls_fib_path_print (vat_main_t * vam, vl_api_fib_path2_t * fp) -{ - if (fp->afi == IP46_TYPE_IP6) - print (vam->ofp, - " weight %d, sw_if_index %d, is_local %d, is_drop %d, " - "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", - ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, - fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, - format_ip6_address, fp->next_hop); - else if (fp->afi == IP46_TYPE_IP4) - print (vam->ofp, - " weight %d, sw_if_index %d, is_local %d, is_drop %d, " - "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", - ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, - fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, - format_ip4_address, fp->next_hop); -} +#define api_show_lisp_status api_show_one_status -static void -vl_api_mpls_fib_path_json_print (vat_json_node_t * node, - vl_api_fib_path2_t * fp) +static int +api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam) { - struct in_addr ip4; - struct in6_addr ip6; + vl_api_gpe_fwd_entry_path_dump_t *mp; + vl_api_control_ping_t *mp_ping; + unformat_input_t *i = vam->input; + u32 fwd_entry_index = ~0; + int ret; - vat_json_object_add_uint (node, "weight", ntohl (fp->weight)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index)); - vat_json_object_add_uint (node, "is_local", fp->is_local); - vat_json_object_add_uint (node, "is_drop", fp->is_drop); - vat_json_object_add_uint (node, "is_unreach", fp->is_unreach); - vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit); - vat_json_object_add_uint (node, "next_hop_afi", fp->afi); - if (fp->afi == IP46_TYPE_IP4) - { - clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4)); - vat_json_object_add_ip4 (node, "next_hop", ip4); - } - else if (fp->afi == IP46_TYPE_IP6) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6)); - vat_json_object_add_ip6 (node, "next_hop", ip6); + if (unformat (i, "index %d", &fwd_entry_index)) + ; + else + break; } -} - -static void -vl_api_mpls_tunnel_details_t_handler (vl_api_mpls_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - int count = ntohl (mp->mt_count); - vl_api_fib_path2_t *fp; - i32 i; - print (vam->ofp, "[%d]: sw_if_index %d via:", - ntohl (mp->mt_tunnel_index), ntohl (mp->mt_sw_if_index)); - fp = mp->mt_paths; - for (i = 0; i < count; i++) + if (~0 == fwd_entry_index) { - vl_api_mpls_fib_path_print (vam, fp); - fp++; + errmsg ("no index specified!"); + return -99; } - print (vam->ofp, ""); -} - -#define vl_api_mpls_tunnel_details_t_endian vl_noop_handler -#define vl_api_mpls_tunnel_details_t_print vl_noop_handler - -static void -vl_api_mpls_tunnel_details_t_handler_json (vl_api_mpls_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - int count = ntohl (mp->mt_count); - vl_api_fib_path2_t *fp; - i32 i; - - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (!vam->json_output) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + print (vam->ofp, "first line"); } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "tunnel_index", - ntohl (mp->mt_tunnel_index)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->mt_sw_if_index)); + M (GPE_FWD_ENTRY_PATH_DUMP, mp); - vat_json_object_add_uint (node, "l2_only", mp->mt_l2_only); + /* send it... */ + S (mp); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - fp = mp->mt_paths; - for (i = 0; i < count; i++) - { - vl_api_mpls_fib_path_json_print (node, fp); - fp++; - } + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_mpls_tunnel_dump (vat_main_t * vam) +api_one_get_map_request_itr_rlocs (vat_main_t * vam) { - vl_api_mpls_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - i32 index = -1; + vl_api_one_get_map_request_itr_rlocs_t *mp; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT) + if (!vam->json_output) { - if (!unformat (vam->input, "tunnel_index %d", &index)) - { - index = -1; - break; - } + print (vam->ofp, "%=20s", "itr-rlocs:"); } - print (vam->ofp, " tunnel_index %d", index); - - M (MPLS_TUNNEL_DUMP, mp); - mp->tunnel_index = htonl (index); + M (ONE_GET_MAP_REQUEST_ITR_RLOCS, mp); + /* send it... */ S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - + /* Wait for a reply... */ W (ret); return ret; } -#define vl_api_mpls_fib_details_t_endian vl_noop_handler -#define vl_api_mpls_fib_details_t_print vl_noop_handler - +#define api_lisp_get_map_request_itr_rlocs api_one_get_map_request_itr_rlocs -static void -vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp) +static int +api_af_packet_create (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); - vl_api_fib_path2_t *fp; - int i; + unformat_input_t *i = vam->input; + vl_api_af_packet_create_t *mp; + u8 *host_if_name = 0; + u8 hw_addr[6]; + u8 random_hw_addr = 1; + int ret; - print (vam->ofp, - "table-id %d, label %u, ess_bit %u", - ntohl (mp->table_id), ntohl (mp->label), mp->eos_bit); - fp = mp->path; - for (i = 0; i < count; i++) + memset (hw_addr, 0, sizeof (hw_addr)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - vl_api_mpls_fib_path_print (vam, fp); - fp++; + 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; } -} - -static void vl_api_mpls_fib_details_t_handler_json - (vl_api_mpls_fib_details_t * mp) -{ - vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); - vat_json_node_t *node = NULL; - vl_api_fib_path2_t *fp; - int i; - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (!vec_len (host_if_name)) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + errmsg ("host-interface name must be specified"); + return -99; } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "table", ntohl (mp->table_id)); - vat_json_object_add_uint (node, "s_bit", mp->eos_bit); - vat_json_object_add_uint (node, "label", ntohl (mp->label)); - vat_json_object_add_uint (node, "path_count", count); - fp = mp->path; - for (i = 0; i < count; i++) + if (vec_len (host_if_name) > 64) { - vl_api_mpls_fib_path_json_print (node, fp); - fp++; + errmsg ("host-interface name too long"); + return -99; } -} -static int -api_mpls_fib_dump (vat_main_t * vam) -{ - vl_api_mpls_fib_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + M (AF_PACKET_CREATE, mp); - M (MPLS_FIB_DUMP, mp); - S (mp); + 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); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + S (mp); - W (ret); + /* *INDENT-OFF* */ + W2 (ret, + ({ + if (ret == 0) + fprintf (vam->ofp ? vam->ofp : stderr, + " new sw_if_index = %d\n", vam->sw_if_index); + })); + /* *INDENT-ON* */ return ret; } -#define vl_api_ip_fib_details_t_endian vl_noop_handler -#define vl_api_ip_fib_details_t_print vl_noop_handler - -static void -vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp) +static int +api_af_packet_delete (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); - vl_api_fib_path_t *fp; - int i; + unformat_input_t *i = vam->input; + vl_api_af_packet_delete_t *mp; + u8 *host_if_name = 0; + int ret; - print (vam->ofp, + 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, mp); + + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + vec_free (host_if_name); + + S (mp); + W (ret); + return ret; +} + +static int +api_policer_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_policer_add_del_t *mp; + u8 is_add = 1; + u8 *name = 0; + u32 cir = 0; + u32 eir = 0; + u64 cb = 0; + u64 eb = 0; + u8 rate_type = 0; + u8 round_type = 0; + u8 type = 0; + u8 color_aware = 0; + sse2_qos_pol_action_params_st conform_action, exceed_action, violate_action; + int ret; + + conform_action.action_type = SSE2_QOS_ACTION_TRANSMIT; + conform_action.dscp = 0; + exceed_action.action_type = SSE2_QOS_ACTION_MARK_AND_TRANSMIT; + exceed_action.dscp = 0; + violate_action.action_type = SSE2_QOS_ACTION_DROP; + violate_action.dscp = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "name %s", &name)) + vec_add1 (name, 0); + else if (unformat (i, "cir %u", &cir)) + ; + else if (unformat (i, "eir %u", &eir)) + ; + else if (unformat (i, "cb %u", &cb)) + ; + else if (unformat (i, "eb %u", &eb)) + ; + else if (unformat (i, "rate_type %U", unformat_policer_rate_type, + &rate_type)) + ; + else if (unformat (i, "round_type %U", unformat_policer_round_type, + &round_type)) + ; + else if (unformat (i, "type %U", unformat_policer_type, &type)) + ; + else if (unformat (i, "conform_action %U", unformat_policer_action_type, + &conform_action)) + ; + else if (unformat (i, "exceed_action %U", unformat_policer_action_type, + &exceed_action)) + ; + else if (unformat (i, "violate_action %U", unformat_policer_action_type, + &violate_action)) + ; + else if (unformat (i, "color-aware")) + color_aware = 1; + else + break; + } + + if (!vec_len (name)) + { + errmsg ("policer name must be specified"); + return -99; + } + + if (vec_len (name) > 64) + { + errmsg ("policer name too long"); + return -99; + } + + M (POLICER_ADD_DEL, mp); + + clib_memcpy (mp->name, name, vec_len (name)); + vec_free (name); + mp->is_add = is_add; + mp->cir = ntohl (cir); + mp->eir = ntohl (eir); + mp->cb = clib_net_to_host_u64 (cb); + mp->eb = clib_net_to_host_u64 (eb); + mp->rate_type = rate_type; + mp->round_type = round_type; + mp->type = type; + mp->conform_action_type = conform_action.action_type; + mp->conform_dscp = conform_action.dscp; + mp->exceed_action_type = exceed_action.action_type; + mp->exceed_dscp = exceed_action.dscp; + mp->violate_action_type = violate_action.action_type; + mp->violate_dscp = violate_action.dscp; + mp->color_aware = color_aware; + + S (mp); + W (ret); + return ret; +} + +static int +api_policer_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_policer_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 *match_name = 0; + u8 match_name_valid = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "name %s", &match_name)) + { + vec_add1 (match_name, 0); + match_name_valid = 1; + } + else + break; + } + + M (POLICER_DUMP, mp); + mp->match_name_valid = match_name_valid; + clib_memcpy (mp->match_name, match_name, vec_len (match_name)); + vec_free (match_name); + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_policer_classify_set_interface (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_policer_classify_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 l2_table_index = ~0; + u8 is_add = 1; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "l2-table %d", &l2_table_index)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + M (POLICER_CLASSIFY_SET_INTERFACE, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->l2_table_index = ntohl (l2_table_index); + mp->is_add = is_add; + + S (mp); + W (ret); + return ret; +} + +static int +api_policer_classify_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_policer_classify_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 type = POLICER_CLASSIFY_N_TABLES; + int ret; + + if (unformat (i, "type %U", unformat_policer_classify_table_type, &type)) + ; + else + { + errmsg ("classify table type must be specified"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); + } + + M (POLICER_CLASSIFY_DUMP, mp); + mp->type = type; + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_netmap_create (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_netmap_create_t *mp; + u8 *if_name = 0; + u8 hw_addr[6]; + u8 random_hw_addr = 1; + u8 is_pipe = 0; + u8 is_master = 0; + int ret; + + memset (hw_addr, 0, sizeof (hw_addr)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "name %s", &if_name)) + vec_add1 (if_name, 0); + else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr)) + random_hw_addr = 0; + else if (unformat (i, "pipe")) + is_pipe = 1; + else if (unformat (i, "master")) + is_master = 1; + else if (unformat (i, "slave")) + is_master = 0; + else + break; + } + + if (!vec_len (if_name)) + { + errmsg ("interface name must be specified"); + return -99; + } + + if (vec_len (if_name) > 64) + { + errmsg ("interface name too long"); + return -99; + } + + M (NETMAP_CREATE, mp); + + clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); + clib_memcpy (mp->hw_addr, hw_addr, 6); + mp->use_random_hw_addr = random_hw_addr; + mp->is_pipe = is_pipe; + mp->is_master = is_master; + vec_free (if_name); + + S (mp); + W (ret); + return ret; +} + +static int +api_netmap_delete (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_netmap_delete_t *mp; + u8 *if_name = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "name %s", &if_name)) + vec_add1 (if_name, 0); + else + break; + } + + if (!vec_len (if_name)) + { + errmsg ("interface name must be specified"); + return -99; + } + + if (vec_len (if_name) > 64) + { + errmsg ("interface name too long"); + return -99; + } + + M (NETMAP_DELETE, mp); + + clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); + vec_free (if_name); + + S (mp); + W (ret); + return ret; +} + +static void +vl_api_mpls_fib_path_print (vat_main_t * vam, vl_api_fib_path2_t * fp) +{ + if (fp->afi == IP46_TYPE_IP6) + print (vam->ofp, + " weight %d, sw_if_index %d, is_local %d, is_drop %d, " + "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", + ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, + fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, + format_ip6_address, fp->next_hop); + else if (fp->afi == IP46_TYPE_IP4) + print (vam->ofp, + " weight %d, sw_if_index %d, is_local %d, is_drop %d, " + "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", + ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, + fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, + format_ip4_address, fp->next_hop); +} + +static void +vl_api_mpls_fib_path_json_print (vat_json_node_t * node, + vl_api_fib_path2_t * fp) +{ + struct in_addr ip4; + struct in6_addr ip6; + + vat_json_object_add_uint (node, "weight", ntohl (fp->weight)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index)); + vat_json_object_add_uint (node, "is_local", fp->is_local); + vat_json_object_add_uint (node, "is_drop", fp->is_drop); + vat_json_object_add_uint (node, "is_unreach", fp->is_unreach); + vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit); + vat_json_object_add_uint (node, "next_hop_afi", fp->afi); + if (fp->afi == IP46_TYPE_IP4) + { + clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4)); + vat_json_object_add_ip4 (node, "next_hop", ip4); + } + else if (fp->afi == IP46_TYPE_IP6) + { + clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6)); + vat_json_object_add_ip6 (node, "next_hop", ip6); + } +} + +static void +vl_api_mpls_tunnel_details_t_handler (vl_api_mpls_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + int count = ntohl (mp->mt_count); + vl_api_fib_path2_t *fp; + i32 i; + + print (vam->ofp, "[%d]: sw_if_index %d via:", + ntohl (mp->mt_tunnel_index), ntohl (mp->mt_sw_if_index)); + fp = mp->mt_paths; + for (i = 0; i < count; i++) + { + vl_api_mpls_fib_path_print (vam, fp); + fp++; + } + + print (vam->ofp, ""); +} + +#define vl_api_mpls_tunnel_details_t_endian vl_noop_handler +#define vl_api_mpls_tunnel_details_t_print vl_noop_handler + +static void +vl_api_mpls_tunnel_details_t_handler_json (vl_api_mpls_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + int count = ntohl (mp->mt_count); + vl_api_fib_path2_t *fp; + i32 i; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "tunnel_index", + ntohl (mp->mt_tunnel_index)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->mt_sw_if_index)); + + vat_json_object_add_uint (node, "l2_only", mp->mt_l2_only); + + fp = mp->mt_paths; + for (i = 0; i < count; i++) + { + vl_api_mpls_fib_path_json_print (node, fp); + fp++; + } +} + +static int +api_mpls_tunnel_dump (vat_main_t * vam) +{ + vl_api_mpls_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; + i32 index = -1; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT) + { + if (!unformat (vam->input, "tunnel_index %d", &index)) + { + index = -1; + break; + } + } + + print (vam->ofp, " tunnel_index %d", index); + + M (MPLS_TUNNEL_DUMP, mp); + mp->tunnel_index = htonl (index); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +#define vl_api_mpls_fib_details_t_endian vl_noop_handler +#define vl_api_mpls_fib_details_t_print vl_noop_handler + + +static void +vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp) +{ + vat_main_t *vam = &vat_main; + int count = ntohl (mp->count); + vl_api_fib_path2_t *fp; + int i; + + print (vam->ofp, + "table-id %d, label %u, ess_bit %u", + ntohl (mp->table_id), ntohl (mp->label), mp->eos_bit); + fp = mp->path; + for (i = 0; i < count; i++) + { + vl_api_mpls_fib_path_print (vam, fp); + fp++; + } +} + +static void vl_api_mpls_fib_details_t_handler_json + (vl_api_mpls_fib_details_t * mp) +{ + vat_main_t *vam = &vat_main; + int count = ntohl (mp->count); + vat_json_node_t *node = NULL; + vl_api_fib_path2_t *fp; + int i; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "table", ntohl (mp->table_id)); + vat_json_object_add_uint (node, "s_bit", mp->eos_bit); + vat_json_object_add_uint (node, "label", ntohl (mp->label)); + vat_json_object_add_uint (node, "path_count", count); + fp = mp->path; + for (i = 0; i < count; i++) + { + vl_api_mpls_fib_path_json_print (node, fp); + fp++; + } +} + +static int +api_mpls_fib_dump (vat_main_t * vam) +{ + vl_api_mpls_fib_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (MPLS_FIB_DUMP, mp); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +#define vl_api_ip_fib_details_t_endian vl_noop_handler +#define vl_api_ip_fib_details_t_print vl_noop_handler + +static void +vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp) +{ + vat_main_t *vam = &vat_main; + int count = ntohl (mp->count); + vl_api_fib_path_t *fp; + int i; + + print (vam->ofp, + "table-id %d, prefix %U/%d", + ntohl (mp->table_id), format_ip4_address, mp->address, + mp->address_length); + fp = mp->path; + for (i = 0; i < count; i++) + { + if (fp->afi == IP46_TYPE_IP6) + print (vam->ofp, + " weight %d, sw_if_index %d, is_local %d, is_drop %d, " + "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", + ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, + fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, + format_ip6_address, fp->next_hop); + else if (fp->afi == IP46_TYPE_IP4) + print (vam->ofp, + " weight %d, sw_if_index %d, is_local %d, is_drop %d, " + "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", + ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, + fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, + format_ip4_address, fp->next_hop); + fp++; + } +} + +static void vl_api_ip_fib_details_t_handler_json + (vl_api_ip_fib_details_t * mp) +{ + vat_main_t *vam = &vat_main; + int count = ntohl (mp->count); + vat_json_node_t *node = NULL; + struct in_addr ip4; + struct in6_addr ip6; + vl_api_fib_path_t *fp; + int i; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "table", ntohl (mp->table_id)); + clib_memcpy (&ip4, &mp->address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "prefix", ip4); + vat_json_object_add_uint (node, "mask_length", mp->address_length); + vat_json_object_add_uint (node, "path_count", count); + fp = mp->path; + for (i = 0; i < count; i++) + { + vat_json_object_add_uint (node, "weight", ntohl (fp->weight)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index)); + vat_json_object_add_uint (node, "is_local", fp->is_local); + vat_json_object_add_uint (node, "is_drop", fp->is_drop); + vat_json_object_add_uint (node, "is_unreach", fp->is_unreach); + vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit); + vat_json_object_add_uint (node, "next_hop_afi", fp->afi); + if (fp->afi == IP46_TYPE_IP4) + { + clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4)); + vat_json_object_add_ip4 (node, "next_hop", ip4); + } + else if (fp->afi == IP46_TYPE_IP6) + { + clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6)); + vat_json_object_add_ip6 (node, "next_hop", ip6); + } + } +} + +static int +api_ip_fib_dump (vat_main_t * vam) +{ + vl_api_ip_fib_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (IP_FIB_DUMP, mp); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static int +api_ip_mfib_dump (vat_main_t * vam) +{ + vl_api_ip_mfib_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (IP_MFIB_DUMP, mp); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static void vl_api_ip_neighbor_details_t_handler + (vl_api_ip_neighbor_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%c %U %U", + (mp->is_static) ? 'S' : 'D', + format_ethernet_address, &mp->mac_address, + (mp->is_ipv6) ? format_ip6_address : format_ip4_address, + &mp->ip_address); +} + +static void vl_api_ip_neighbor_details_t_handler_json + (vl_api_ip_neighbor_details_t * mp) +{ + + vat_main_t *vam = &vat_main; + vat_json_node_t *node; + struct in_addr ip4; + struct in6_addr ip6; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_string_copy (node, "flag", + (mp->is_static) ? (u8 *) "static" : (u8 *) + "dynamic"); + + vat_json_object_add_string_copy (node, "link_layer", + format (0, "%U", format_ethernet_address, + &mp->mac_address)); + + if (mp->is_ipv6) + { + clib_memcpy (&ip6, &mp->ip_address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "ip_address", ip6); + } + else + { + clib_memcpy (&ip4, &mp->ip_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "ip_address", ip4); + } +} + +static int +api_ip_neighbor_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ip_neighbor_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 is_ipv6 = 0; + u32 sw_if_index = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (i, "ip6")) + is_ipv6 = 1; + else + break; + } + + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + M (IP_NEIGHBOR_DUMP, mp); + mp->is_ipv6 = (u8) is_ipv6; + mp->sw_if_index = ntohl (sw_if_index); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +#define vl_api_ip6_fib_details_t_endian vl_noop_handler +#define vl_api_ip6_fib_details_t_print vl_noop_handler + +static void +vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp) +{ + vat_main_t *vam = &vat_main; + int count = ntohl (mp->count); + vl_api_fib_path_t *fp; + int i; + + print (vam->ofp, "table-id %d, prefix %U/%d", - ntohl (mp->table_id), format_ip4_address, mp->address, + ntohl (mp->table_id), format_ip6_address, mp->address, mp->address_length); fp = mp->path; for (i = 0; i < count; i++) @@ -17871,8 +19974,8 @@ vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp) } } -static void vl_api_ip_fib_details_t_handler_json - (vl_api_ip_fib_details_t * mp) +static void vl_api_ip6_fib_details_t_handler_json + (vl_api_ip6_fib_details_t * mp) { vat_main_t *vam = &vat_main; int count = ntohl (mp->count); @@ -17891,8 +19994,8 @@ static void vl_api_ip_fib_details_t_handler_json vat_json_init_object (node); vat_json_object_add_uint (node, "table", ntohl (mp->table_id)); - clib_memcpy (&ip4, &mp->address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "prefix", ip4); + clib_memcpy (&ip6, &mp->address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "prefix", ip6); vat_json_object_add_uint (node, "mask_length", mp->address_length); vat_json_object_add_uint (node, "path_count", count); fp = mp->path; @@ -17918,179 +20021,434 @@ static void vl_api_ip_fib_details_t_handler_json } } -static int -api_ip_fib_dump (vat_main_t * vam) +static int +api_ip6_fib_dump (vat_main_t * vam) +{ + vl_api_ip6_fib_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (IP6_FIB_DUMP, mp); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static int +api_ip6_mfib_dump (vat_main_t * vam) +{ + vl_api_ip6_mfib_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (IP6_MFIB_DUMP, mp); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +int +api_classify_table_ids (vat_main_t * vam) +{ + vl_api_classify_table_ids_t *mp; + int ret; + + /* Construct the API message */ + M (CLASSIFY_TABLE_IDS, mp); + mp->context = 0; + + S (mp); + W (ret); + return ret; +} + +int +api_classify_table_by_interface (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_classify_table_by_interface_t *mp; + + u32 sw_if_index = ~0; + int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (input, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + /* Construct the API message */ + M (CLASSIFY_TABLE_BY_INTERFACE, mp); + mp->context = 0; + mp->sw_if_index = ntohl (sw_if_index); + + S (mp); + W (ret); + return ret; +} + +int +api_classify_table_info (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_classify_table_info_t *mp; + + u32 table_id = ~0; + int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "table_id %d", &table_id)) + ; + else + break; + } + if (table_id == ~0) + { + errmsg ("missing table id"); + return -99; + } + + /* Construct the API message */ + M (CLASSIFY_TABLE_INFO, mp); + mp->context = 0; + mp->table_id = ntohl (table_id); + + S (mp); + W (ret); + return ret; +} + +int +api_classify_session_dump (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_classify_session_dump_t *mp; + vl_api_control_ping_t *mp_ping; + + u32 table_id = ~0; + int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "table_id %d", &table_id)) + ; + else + break; + } + if (table_id == ~0) + { + errmsg ("missing table id"); + return -99; + } + + /* Construct the API message */ + M (CLASSIFY_SESSION_DUMP, mp); + mp->context = 0; + mp->table_id = ntohl (table_id); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static void +vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "collector_address %U, collector_port %d, " + "src_address %U, vrf_id %d, path_mtu %u, " + "template_interval %u, udp_checksum %d", + format_ip4_address, mp->collector_address, + ntohs (mp->collector_port), + format_ip4_address, mp->src_address, + ntohl (mp->vrf_id), ntohl (mp->path_mtu), + ntohl (mp->template_interval), mp->udp_checksum); + + vam->retval = 0; + vam->result_ready = 1; +} + +static void + vl_api_ipfix_exporter_details_t_handler_json + (vl_api_ipfix_exporter_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + struct in_addr collector_address; + struct in_addr src_address; + + vat_json_init_object (&node); + clib_memcpy (&collector_address, &mp->collector_address, + sizeof (collector_address)); + vat_json_object_add_ip4 (&node, "collector_address", collector_address); + vat_json_object_add_uint (&node, "collector_port", + ntohs (mp->collector_port)); + clib_memcpy (&src_address, &mp->src_address, sizeof (src_address)); + vat_json_object_add_ip4 (&node, "src_address", src_address); + vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id)); + vat_json_object_add_uint (&node, "path_mtu", ntohl (mp->path_mtu)); + vat_json_object_add_uint (&node, "template_interval", + ntohl (mp->template_interval)); + vat_json_object_add_int (&node, "udp_checksum", mp->udp_checksum); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + vam->retval = 0; + vam->result_ready = 1; +} + +int +api_ipfix_exporter_dump (vat_main_t * vam) { - vl_api_ip_fib_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_ipfix_exporter_dump_t *mp; int ret; - M (IP_FIB_DUMP, mp); + /* Construct the API message */ + M (IPFIX_EXPORTER_DUMP, mp); + mp->context = 0; + S (mp); + W (ret); + return ret; +} - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); +static int +api_ipfix_classify_stream_dump (vat_main_t * vam) +{ + vl_api_ipfix_classify_stream_dump_t *mp; + int ret; + + /* Construct the API message */ + M (IPFIX_CLASSIFY_STREAM_DUMP, mp); + mp->context = 0; + S (mp); W (ret); return ret; + /* NOTREACHED */ + return 0; +} + +static void + vl_api_ipfix_classify_stream_details_t_handler + (vl_api_ipfix_classify_stream_details_t * mp) +{ + vat_main_t *vam = &vat_main; + print (vam->ofp, "domain_id %d, src_port %d", + ntohl (mp->domain_id), ntohs (mp->src_port)); + vam->retval = 0; + vam->result_ready = 1; +} + +static void + vl_api_ipfix_classify_stream_details_t_handler_json + (vl_api_ipfix_classify_stream_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object (&node); + vat_json_object_add_uint (&node, "domain_id", ntohl (mp->domain_id)); + vat_json_object_add_uint (&node, "src_port", ntohs (mp->src_port)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + vam->retval = 0; + vam->result_ready = 1; } static int -api_ip_mfib_dump (vat_main_t * vam) +api_ipfix_classify_table_dump (vat_main_t * vam) { - vl_api_ip_mfib_dump_t *mp; + vl_api_ipfix_classify_table_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; - M (IP_MFIB_DUMP, mp); + if (!vam->json_output) + { + print (vam->ofp, "%15s%15s%20s", "table_id", "ip_version", + "transport_protocol"); + } + + /* Construct the API message */ + M (IPFIX_CLASSIFY_TABLE_DUMP, mp); + + /* send it... */ S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); return ret; } -static void vl_api_ip_neighbor_details_t_handler - (vl_api_ip_neighbor_details_t * mp) +static void + vl_api_ipfix_classify_table_details_t_handler + (vl_api_ipfix_classify_table_details_t * mp) { vat_main_t *vam = &vat_main; - - print (vam->ofp, "%c %U %U", - (mp->is_static) ? 'S' : 'D', - format_ethernet_address, &mp->mac_address, - (mp->is_ipv6) ? format_ip6_address : format_ip4_address, - &mp->ip_address); + print (vam->ofp, "%15d%15d%20d", ntohl (mp->table_id), mp->ip_version, + mp->transport_protocol); } -static void vl_api_ip_neighbor_details_t_handler_json - (vl_api_ip_neighbor_details_t * mp) +static void + vl_api_ipfix_classify_table_details_t_handler_json + (vl_api_ipfix_classify_table_details_t * mp) { - + vat_json_node_t *node = NULL; vat_main_t *vam = &vat_main; - vat_json_node_t *node; - struct in_addr ip4; - struct in6_addr ip6; if (VAT_JSON_ARRAY != vam->json_tree.type) { ASSERT (VAT_JSON_NONE == vam->json_tree.type); vat_json_init_array (&vam->json_tree); } - node = vat_json_array_add (&vam->json_tree); + node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - vat_json_object_add_string_copy (node, "flag", - (mp->is_static) ? (u8 *) "static" : (u8 *) - "dynamic"); - - vat_json_object_add_string_copy (node, "link_layer", - format (0, "%U", format_ethernet_address, - &mp->mac_address)); - if (mp->is_ipv6) - { - clib_memcpy (&ip6, &mp->ip_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "ip_address", ip6); - } - else - { - clib_memcpy (&ip4, &mp->ip_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "ip_address", ip4); - } + vat_json_object_add_uint (node, "table_id", ntohl (mp->table_id)); + vat_json_object_add_uint (node, "ip_version", mp->ip_version); + vat_json_object_add_uint (node, "transport_protocol", + mp->transport_protocol); } static int -api_ip_neighbor_dump (vat_main_t * vam) +api_sw_interface_span_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ip_neighbor_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 is_ipv6 = 0; - u32 sw_if_index = ~0; + vl_api_sw_interface_span_enable_disable_t *mp; + u32 src_sw_if_index = ~0; + u32 dst_sw_if_index = ~0; + u8 state = 3; int ret; + u8 is_l2 = 0; - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + if (unformat + (i, "src %U", api_unformat_sw_if_index, vam, &src_sw_if_index)) ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "src_sw_if_index %d", &src_sw_if_index)) ; - else if (unformat (i, "ip6")) - is_ipv6 = 1; + else + if (unformat + (i, "dst %U", api_unformat_sw_if_index, vam, &dst_sw_if_index)) + ; + else if (unformat (i, "dst_sw_if_index %d", &dst_sw_if_index)) + ; + else if (unformat (i, "disable")) + state = 0; + else if (unformat (i, "rx")) + state = 1; + else if (unformat (i, "tx")) + state = 2; + else if (unformat (i, "both")) + state = 3; + else if (unformat (i, "l2")) + is_l2 = 1; else break; } - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (IP_NEIGHBOR_DUMP, mp); - mp->is_ipv6 = (u8) is_ipv6; - mp->sw_if_index = ntohl (sw_if_index); - S (mp); + M (SW_INTERFACE_SPAN_ENABLE_DISABLE, mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + mp->sw_if_index_from = htonl (src_sw_if_index); + mp->sw_if_index_to = htonl (dst_sw_if_index); + mp->state = state; + mp->is_l2 = is_l2; + S (mp); W (ret); return ret; } -#define vl_api_ip6_fib_details_t_endian vl_noop_handler -#define vl_api_ip6_fib_details_t_print vl_noop_handler - static void -vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp) +vl_api_sw_interface_span_details_t_handler (vl_api_sw_interface_span_details_t + * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); - vl_api_fib_path_t *fp; - int i; + u8 *sw_if_from_name = 0; + u8 *sw_if_to_name = 0; + u32 sw_if_index_from = ntohl (mp->sw_if_index_from); + u32 sw_if_index_to = ntohl (mp->sw_if_index_to); + char *states[] = { "none", "rx", "tx", "both" }; + hash_pair_t *p; - print (vam->ofp, - "table-id %d, prefix %U/%d", - ntohl (mp->table_id), format_ip6_address, mp->address, - mp->address_length); - fp = mp->path; - for (i = 0; i < count; i++) - { - if (fp->afi == IP46_TYPE_IP6) - print (vam->ofp, - " weight %d, sw_if_index %d, is_local %d, is_drop %d, " - "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", - ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, - fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, - format_ip6_address, fp->next_hop); - else if (fp->afi == IP46_TYPE_IP4) - print (vam->ofp, - " weight %d, sw_if_index %d, is_local %d, is_drop %d, " - "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U", - ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local, - fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi, - format_ip4_address, fp->next_hop); - fp++; - } + /* *INDENT-OFF* */ + hash_foreach_pair (p, vam->sw_if_index_by_interface_name, + ({ + if ((u32) p->value[0] == sw_if_index_from) + { + sw_if_from_name = (u8 *)(p->key); + if (sw_if_to_name) + break; + } + if ((u32) p->value[0] == sw_if_index_to) + { + sw_if_to_name = (u8 *)(p->key); + if (sw_if_from_name) + break; + } + })); + /* *INDENT-ON* */ + print (vam->ofp, "%20s => %20s (%s)", + sw_if_from_name, sw_if_to_name, states[mp->state]); } -static void vl_api_ip6_fib_details_t_handler_json - (vl_api_ip6_fib_details_t * mp) +static void + vl_api_sw_interface_span_details_t_handler_json + (vl_api_sw_interface_span_details_t * mp) { - vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); - vat_json_node_t *node = NULL; - struct in_addr ip4; - struct in6_addr ip6; - vl_api_fib_path_t *fp; - int i; + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + u8 *sw_if_from_name = 0; + u8 *sw_if_to_name = 0; + u32 sw_if_index_from = ntohl (mp->sw_if_index_from); + u32 sw_if_index_to = ntohl (mp->sw_if_index_to); + hash_pair_t *p; + + /* *INDENT-OFF* */ + hash_foreach_pair (p, vam->sw_if_index_by_interface_name, + ({ + if ((u32) p->value[0] == sw_if_index_from) + { + sw_if_from_name = (u8 *)(p->key); + if (sw_if_to_name) + break; + } + if ((u32) p->value[0] == sw_if_index_to) + { + sw_if_to_name = (u8 *)(p->key); + if (sw_if_from_name) + break; + } + })); + /* *INDENT-ON* */ if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -18100,64 +20458,39 @@ static void vl_api_ip6_fib_details_t_handler_json node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - vat_json_object_add_uint (node, "table", ntohl (mp->table_id)); - clib_memcpy (&ip6, &mp->address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "prefix", ip6); - vat_json_object_add_uint (node, "mask_length", mp->address_length); - vat_json_object_add_uint (node, "path_count", count); - fp = mp->path; - for (i = 0; i < count; i++) + vat_json_object_add_uint (node, "src-if-index", sw_if_index_from); + vat_json_object_add_string_copy (node, "src-if-name", sw_if_from_name); + vat_json_object_add_uint (node, "dst-if-index", sw_if_index_to); + if (0 != sw_if_to_name) { - vat_json_object_add_uint (node, "weight", ntohl (fp->weight)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (fp->sw_if_index)); - vat_json_object_add_uint (node, "is_local", fp->is_local); - vat_json_object_add_uint (node, "is_drop", fp->is_drop); - vat_json_object_add_uint (node, "is_unreach", fp->is_unreach); - vat_json_object_add_uint (node, "is_prohibit", fp->is_prohibit); - vat_json_object_add_uint (node, "next_hop_afi", fp->afi); - if (fp->afi == IP46_TYPE_IP4) - { - clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4)); - vat_json_object_add_ip4 (node, "next_hop", ip4); - } - else if (fp->afi == IP46_TYPE_IP6) - { - clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6)); - vat_json_object_add_ip6 (node, "next_hop", ip6); - } + vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name); } + vat_json_object_add_uint (node, "state", mp->state); } static int -api_ip6_fib_dump (vat_main_t * vam) +api_sw_interface_span_dump (vat_main_t * vam) { - vl_api_ip6_fib_dump_t *mp; + unformat_input_t *input = vam->input; + vl_api_sw_interface_span_dump_t *mp; vl_api_control_ping_t *mp_ping; + u8 is_l2 = 0; int ret; - M (IP6_FIB_DUMP, mp); - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_ip6_mfib_dump (vat_main_t * vam) -{ - vl_api_ip6_mfib_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "l2")) + is_l2 = 1; + else + break; + } - M (IP6_MFIB_DUMP, mp); + M (SW_INTERFACE_SPAN_DUMP, mp); + mp->is_l2 = is_l2; S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -18165,14 +20498,30 @@ api_ip6_mfib_dump (vat_main_t * vam) } int -api_classify_table_ids (vat_main_t * vam) +api_pg_create_interface (vat_main_t * vam) { - vl_api_classify_table_ids_t *mp; + unformat_input_t *input = vam->input; + vl_api_pg_create_interface_t *mp; + + u32 if_id = ~0; int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "if_id %d", &if_id)) + ; + else + break; + } + if (if_id == ~0) + { + errmsg ("missing pg interface index"); + return -99; + } /* Construct the API message */ - M (CLASSIFY_TABLE_IDS, mp); + M (PG_CREATE_INTERFACE, mp); mp->context = 0; + mp->interface_id = ntohl (if_id); S (mp); W (ret); @@ -18180,32 +20529,57 @@ api_classify_table_ids (vat_main_t * vam) } int -api_classify_table_by_interface (vat_main_t * vam) +api_pg_capture (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_classify_table_by_interface_t *mp; + vl_api_pg_capture_t *mp; - u32 sw_if_index = ~0; + u32 if_id = ~0; + u8 enable = 1; + u32 count = 1; + u8 pcap_file_set = 0; + u8 *pcap_file = 0; int ret; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + if (unformat (input, "if_id %d", &if_id)) ; - else if (unformat (input, "sw_if_index %d", &sw_if_index)) + else if (unformat (input, "pcap %s", &pcap_file)) + pcap_file_set = 1; + else if (unformat (input, "count %d", &count)) ; + else if (unformat (input, "disable")) + enable = 0; else break; } - if (sw_if_index == ~0) + if (if_id == ~0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing pg interface index"); return -99; } + if (pcap_file_set > 0) + { + if (vec_len (pcap_file) > 255) + { + errmsg ("pcap file name is too long"); + return -99; + } + } + u32 name_len = vec_len (pcap_file); /* Construct the API message */ - M (CLASSIFY_TABLE_BY_INTERFACE, mp); + M (PG_CAPTURE, mp); mp->context = 0; - mp->sw_if_index = ntohl (sw_if_index); + mp->interface_id = ntohl (if_id); + mp->is_enabled = enable; + mp->count = ntohl (count); + mp->pcap_name_length = ntohl (name_len); + if (pcap_file_set != 0) + { + clib_memcpy (mp->pcap_file_name, pcap_file, name_len); + } + vec_free (pcap_file); S (mp); W (ret); @@ -18213,30 +20587,45 @@ api_classify_table_by_interface (vat_main_t * vam) } int -api_classify_table_info (vat_main_t * vam) +api_pg_enable_disable (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_classify_table_info_t *mp; + vl_api_pg_enable_disable_t *mp; - u32 table_id = ~0; + u8 enable = 1; + u8 stream_name_set = 0; + u8 *stream_name = 0; int ret; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "table_id %d", &table_id)) - ; + if (unformat (input, "stream %s", &stream_name)) + stream_name_set = 1; + else if (unformat (input, "disable")) + enable = 0; else break; } - if (table_id == ~0) + + if (stream_name_set > 0) { - errmsg ("missing table id"); - return -99; + if (vec_len (stream_name) > 255) + { + errmsg ("stream name too long"); + return -99; + } } + u32 name_len = vec_len (stream_name); /* Construct the API message */ - M (CLASSIFY_TABLE_INFO, mp); + M (PG_ENABLE_DISABLE, mp); mp->context = 0; - mp->table_id = ntohl (table_id); + mp->is_enabled = enable; + if (stream_name_set != 0) + { + mp->stream_name_length = ntohl (name_len); + clib_memcpy (mp->stream_name, stream_name, name_len); + } + vec_free (stream_name); S (mp); W (ret); @@ -18244,318 +20633,307 @@ api_classify_table_info (vat_main_t * vam) } int -api_classify_session_dump (vat_main_t * vam) +api_ip_source_and_port_range_check_add_del (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_classify_session_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_ip_source_and_port_range_check_add_del_t *mp; - u32 table_id = ~0; + u16 *low_ports = 0; + u16 *high_ports = 0; + u16 this_low; + u16 this_hi; + ip4_address_t ip4_addr; + ip6_address_t ip6_addr; + u32 length; + u32 tmp, tmp2; + u8 prefix_set = 0; + u32 vrf_id = ~0; + u8 is_add = 1; + u8 is_ipv6 = 0; int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "table_id %d", &table_id)) + if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length)) + { + prefix_set = 1; + } + else + if (unformat + (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length)) + { + prefix_set = 1; + is_ipv6 = 1; + } + else if (unformat (input, "vrf %d", &vrf_id)) ; + else if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "port %d", &tmp)) + { + if (tmp == 0 || tmp > 65535) + { + errmsg ("port %d out of range", tmp); + return -99; + } + this_low = tmp; + this_hi = this_low + 1; + vec_add1 (low_ports, this_low); + vec_add1 (high_ports, this_hi); + } + else if (unformat (input, "range %d - %d", &tmp, &tmp2)) + { + if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535)) + { + errmsg ("incorrect range parameters"); + return -99; + } + this_low = tmp; + /* Note: in debug CLI +1 is added to high before + passing to real fn that does "the work" + (ip_source_and_port_range_check_add_del). + This fn is a wrapper around the binary API fn a + control plane will call, which expects this increment + to have occurred. Hence letting the binary API control + plane fn do the increment for consistency between VAT + and other control planes. + */ + this_hi = tmp2; + vec_add1 (low_ports, this_low); + vec_add1 (high_ports, this_hi); + } else break; } - if (table_id == ~0) + + if (prefix_set == 0) { - errmsg ("missing table id"); + errmsg ("
/ not specified"); return -99; } - /* Construct the API message */ - M (CLASSIFY_SESSION_DUMP, mp); - mp->context = 0; - mp->table_id = ntohl (table_id); - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + if (vrf_id == ~0) + { + errmsg ("VRF ID required, not specified"); + return -99; + } - W (ret); - return ret; -} + if (vrf_id == 0) + { + errmsg + ("VRF ID should not be default. Should be distinct VRF for this purpose."); + return -99; + } -static void -vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_details_t * mp) -{ - vat_main_t *vam = &vat_main; + if (vec_len (low_ports) == 0) + { + errmsg ("At least one port or port range required"); + return -99; + } - print (vam->ofp, "collector_address %U, collector_port %d, " - "src_address %U, vrf_id %d, path_mtu %u, " - "template_interval %u, udp_checksum %d", - format_ip4_address, mp->collector_address, - ntohs (mp->collector_port), - format_ip4_address, mp->src_address, - ntohl (mp->vrf_id), ntohl (mp->path_mtu), - ntohl (mp->template_interval), mp->udp_checksum); + M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, mp); - vam->retval = 0; - vam->result_ready = 1; -} + mp->is_add = is_add; -static void - vl_api_ipfix_exporter_details_t_handler_json - (vl_api_ipfix_exporter_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - struct in_addr collector_address; - struct in_addr src_address; + if (is_ipv6) + { + mp->is_ipv6 = 1; + clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr)); + } + else + { + mp->is_ipv6 = 0; + clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr)); + } - vat_json_init_object (&node); - clib_memcpy (&collector_address, &mp->collector_address, - sizeof (collector_address)); - vat_json_object_add_ip4 (&node, "collector_address", collector_address); - vat_json_object_add_uint (&node, "collector_port", - ntohs (mp->collector_port)); - clib_memcpy (&src_address, &mp->src_address, sizeof (src_address)); - vat_json_object_add_ip4 (&node, "src_address", src_address); - vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id)); - vat_json_object_add_uint (&node, "path_mtu", ntohl (mp->path_mtu)); - vat_json_object_add_uint (&node, "template_interval", - ntohl (mp->template_interval)); - vat_json_object_add_int (&node, "udp_checksum", mp->udp_checksum); + mp->mask_length = length; + mp->number_of_ranges = vec_len (low_ports); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - vam->retval = 0; - vam->result_ready = 1; -} + clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports)); + vec_free (low_ports); -int -api_ipfix_exporter_dump (vat_main_t * vam) -{ - vl_api_ipfix_exporter_dump_t *mp; - int ret; + clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports)); + vec_free (high_ports); - /* Construct the API message */ - M (IPFIX_EXPORTER_DUMP, mp); - mp->context = 0; + mp->vrf_id = ntohl (vrf_id); S (mp); W (ret); return ret; } -static int -api_ipfix_classify_stream_dump (vat_main_t * vam) +int +api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam) { - vl_api_ipfix_classify_stream_dump_t *mp; + unformat_input_t *input = vam->input; + vl_api_ip_source_and_port_range_check_interface_add_del_t *mp; + u32 sw_if_index = ~0; + int vrf_set = 0; + u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0; + u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0; + u8 is_add = 1; int ret; - /* Construct the API message */ - M (IPFIX_CLASSIFY_STREAM_DUMP, mp); - mp->context = 0; - - S (mp); - W (ret); - return ret; - /* NOTREACHED */ - return 0; -} - -static void - vl_api_ipfix_classify_stream_details_t_handler - (vl_api_ipfix_classify_stream_details_t * mp) -{ - vat_main_t *vam = &vat_main; - print (vam->ofp, "domain_id %d, src_port %d", - ntohl (mp->domain_id), ntohs (mp->src_port)); - vam->retval = 0; - vam->result_ready = 1; -} - -static void - vl_api_ipfix_classify_stream_details_t_handler_json - (vl_api_ipfix_classify_stream_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_uint (&node, "domain_id", ntohl (mp->domain_id)); - vat_json_object_add_uint (&node, "src_port", ntohs (mp->src_port)); + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id)) + vrf_set = 1; + else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id)) + vrf_set = 1; + else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id)) + vrf_set = 1; + else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id)) + vrf_set = 1; + else if (unformat (input, "del")) + is_add = 0; + else + break; + } - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - vam->retval = 0; - vam->result_ready = 1; -} + if (sw_if_index == ~0) + { + errmsg ("Interface required but not specified"); + return -99; + } -static int -api_ipfix_classify_table_dump (vat_main_t * vam) -{ - vl_api_ipfix_classify_table_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + if (vrf_set == 0) + { + errmsg ("VRF ID required but not specified"); + return -99; + } - if (!vam->json_output) + if (tcp_out_vrf_id == 0 + || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0) { - print (vam->ofp, "%15s%15s%20s", "table_id", "ip_version", - "transport_protocol"); + errmsg + ("VRF ID should not be default. Should be distinct VRF for this purpose."); + return -99; } /* Construct the API message */ - M (IPFIX_CLASSIFY_TABLE_DUMP, mp); + M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; + mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id); + mp->udp_out_vrf_id = ntohl (udp_out_vrf_id); + mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id); + mp->udp_in_vrf_id = ntohl (udp_in_vrf_id); /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - + /* Wait for a reply... */ W (ret); return ret; } -static void - vl_api_ipfix_classify_table_details_t_handler - (vl_api_ipfix_classify_table_details_t * mp) -{ - vat_main_t *vam = &vat_main; - print (vam->ofp, "%15d%15d%20d", ntohl (mp->table_id), mp->ip_version, - mp->transport_protocol); -} - -static void - vl_api_ipfix_classify_table_details_t_handler_json - (vl_api_ipfix_classify_table_details_t * mp) +static int +api_ipsec_gre_add_del_tunnel (vat_main_t * vam) { - vat_json_node_t *node = NULL; - vat_main_t *vam = &vat_main; + unformat_input_t *i = vam->input; + vl_api_ipsec_gre_add_del_tunnel_t *mp; + u32 local_sa_id = 0; + u32 remote_sa_id = 0; + ip4_address_t src_address; + ip4_address_t dst_address; + u8 is_add = 1; + int ret; - if (VAT_JSON_ARRAY != vam->json_tree.type) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (i, "local_sa %d", &local_sa_id)) + ; + else if (unformat (i, "remote_sa %d", &remote_sa_id)) + ; + else if (unformat (i, "src %U", unformat_ip4_address, &src_address)) + ; + else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address)) + ; + else if (unformat (i, "del")) + is_add = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); + M (IPSEC_GRE_ADD_DEL_TUNNEL, mp); + + mp->local_sa_id = ntohl (local_sa_id); + mp->remote_sa_id = ntohl (remote_sa_id); + clib_memcpy (mp->src_address, &src_address, sizeof (src_address)); + clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address)); + mp->is_add = is_add; - vat_json_object_add_uint (node, "table_id", ntohl (mp->table_id)); - vat_json_object_add_uint (node, "ip_version", mp->ip_version); - vat_json_object_add_uint (node, "transport_protocol", - mp->transport_protocol); + S (mp); + W (ret); + return ret; } static int -api_sw_interface_span_enable_disable (vat_main_t * vam) +api_punt (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_span_enable_disable_t *mp; - u32 src_sw_if_index = ~0; - u32 dst_sw_if_index = ~0; - u8 state = 3; + vl_api_punt_t *mp; + u32 ipv = ~0; + u32 protocol = ~0; + u32 port = ~0; + int is_add = 1; int ret; - u8 is_l2 = 0; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat - (i, "src %U", api_unformat_sw_if_index, vam, &src_sw_if_index)) - ; - else if (unformat (i, "src_sw_if_index %d", &src_sw_if_index)) + if (unformat (i, "ip %d", &ipv)) ; - else - if (unformat - (i, "dst %U", api_unformat_sw_if_index, vam, &dst_sw_if_index)) + else if (unformat (i, "protocol %d", &protocol)) ; - else if (unformat (i, "dst_sw_if_index %d", &dst_sw_if_index)) + else if (unformat (i, "port %d", &port)) ; - else if (unformat (i, "disable")) - state = 0; - else if (unformat (i, "rx")) - state = 1; - else if (unformat (i, "tx")) - state = 2; - else if (unformat (i, "both")) - state = 3; - else if (unformat (i, "l2")) - is_l2 = 1; + else if (unformat (i, "del")) + is_add = 0; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - M (SW_INTERFACE_SPAN_ENABLE_DISABLE, mp); + M (PUNT, mp); - mp->sw_if_index_from = htonl (src_sw_if_index); - mp->sw_if_index_to = htonl (dst_sw_if_index); - mp->state = state; - mp->is_l2 = is_l2; + mp->is_add = (u8) is_add; + mp->ipv = (u8) ipv; + mp->l4_protocol = (u8) protocol; + mp->l4_port = htons ((u16) port); S (mp); W (ret); return ret; } -static void -vl_api_sw_interface_span_details_t_handler (vl_api_sw_interface_span_details_t - * mp) +static void vl_api_ipsec_gre_tunnel_details_t_handler + (vl_api_ipsec_gre_tunnel_details_t * mp) { vat_main_t *vam = &vat_main; - u8 *sw_if_from_name = 0; - u8 *sw_if_to_name = 0; - u32 sw_if_index_from = ntohl (mp->sw_if_index_from); - u32 sw_if_index_to = ntohl (mp->sw_if_index_to); - char *states[] = { "none", "rx", "tx", "both" }; - hash_pair_t *p; - /* *INDENT-OFF* */ - hash_foreach_pair (p, vam->sw_if_index_by_interface_name, - ({ - if ((u32) p->value[0] == sw_if_index_from) - { - sw_if_from_name = (u8 *)(p->key); - if (sw_if_to_name) - break; - } - if ((u32) p->value[0] == sw_if_index_to) - { - sw_if_to_name = (u8 *)(p->key); - if (sw_if_from_name) - break; - } - })); - /* *INDENT-ON* */ - print (vam->ofp, "%20s => %20s (%s)", - sw_if_from_name, sw_if_to_name, states[mp->state]); + print (vam->ofp, "%11d%15U%15U%14d%14d", + ntohl (mp->sw_if_index), + format_ip4_address, &mp->src_address, + format_ip4_address, &mp->dst_address, + ntohl (mp->local_sa_id), ntohl (mp->remote_sa_id)); } -static void - vl_api_sw_interface_span_details_t_handler_json - (vl_api_sw_interface_span_details_t * mp) +static void vl_api_ipsec_gre_tunnel_details_t_handler_json + (vl_api_ipsec_gre_tunnel_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; - u8 *sw_if_from_name = 0; - u8 *sw_if_to_name = 0; - u32 sw_if_index_from = ntohl (mp->sw_if_index_from); - u32 sw_if_index_to = ntohl (mp->sw_if_index_to); - hash_pair_t *p; - - /* *INDENT-OFF* */ - hash_foreach_pair (p, vam->sw_if_index_by_interface_name, - ({ - if ((u32) p->value[0] == sw_if_index_from) - { - sw_if_from_name = (u8 *)(p->key); - if (sw_if_to_name) - break; - } - if ((u32) p->value[0] == sw_if_index_to) - { - sw_if_to_name = (u8 *)(p->key); - if (sw_if_from_name) - break; - } - })); - /* *INDENT-ON* */ + struct in_addr ip4; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -18565,418 +20943,331 @@ static void node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - vat_json_object_add_uint (node, "src-if-index", sw_if_index_from); - vat_json_object_add_string_copy (node, "src-if-name", sw_if_from_name); - vat_json_object_add_uint (node, "dst-if-index", sw_if_index_to); - if (0 != sw_if_to_name) - { - vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name); - } - vat_json_object_add_uint (node, "state", mp->state); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + clib_memcpy (&ip4, &mp->src_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "src_address", ip4); + clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "dst_address", ip4); + vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id)); + vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id)); } static int -api_sw_interface_span_dump (vat_main_t * vam) +api_ipsec_gre_tunnel_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_sw_interface_span_dump_t *mp; + unformat_input_t *i = vam->input; + vl_api_ipsec_gre_tunnel_dump_t *mp; vl_api_control_ping_t *mp_ping; - u8 is_l2 = 0; + u32 sw_if_index; + u8 sw_if_index_set = 0; int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "l2")) - is_l2 = 1; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - M (SW_INTERFACE_SPAN_DUMP, mp); - mp->is_l2 = is_l2; - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -int -api_pg_create_interface (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_pg_create_interface_t *mp; - - u32 if_id = ~0; - int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (sw_if_index_set == 0) { - if (unformat (input, "if_id %d", &if_id)) - ; - else - break; + sw_if_index = ~0; } - if (if_id == ~0) + + if (!vam->json_output) { - errmsg ("missing pg interface index"); - return -99; + print (vam->ofp, "%11s%15s%15s%14s%14s", + "sw_if_index", "src_address", "dst_address", + "local_sa_id", "remote_sa_id"); } - /* Construct the API message */ - M (PG_CREATE_INTERFACE, mp); - mp->context = 0; - mp->interface_id = ntohl (if_id); - - S (mp); - W (ret); - return ret; -} + /* Get list of gre-tunnel interfaces */ + M (IPSEC_GRE_TUNNEL_DUMP, mp); -int -api_pg_capture (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_pg_capture_t *mp; + mp->sw_if_index = htonl (sw_if_index); - u32 if_id = ~0; - u8 enable = 1; - u32 count = 1; - u8 pcap_file_set = 0; - u8 *pcap_file = 0; - int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "if_id %d", &if_id)) - ; - else if (unformat (input, "pcap %s", &pcap_file)) - pcap_file_set = 1; - else if (unformat (input, "count %d", &count)) - ; - else if (unformat (input, "disable")) - enable = 0; - else - break; - } - if (if_id == ~0) - { - errmsg ("missing pg interface index"); - return -99; - } - if (pcap_file_set > 0) - { - if (vec_len (pcap_file) > 255) - { - errmsg ("pcap file name is too long"); - return -99; - } - } + S (mp); - u32 name_len = vec_len (pcap_file); - /* Construct the API message */ - M (PG_CAPTURE, mp); - mp->context = 0; - mp->interface_id = ntohl (if_id); - mp->is_enabled = enable; - mp->count = ntohl (count); - mp->pcap_name_length = ntohl (name_len); - if (pcap_file_set != 0) - { - clib_memcpy (mp->pcap_file_name, pcap_file, name_len); - } - vec_free (pcap_file); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); W (ret); return ret; } -int -api_pg_enable_disable (vat_main_t * vam) +static int +api_delete_subif (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_pg_enable_disable_t *mp; - - u8 enable = 1; - u8 stream_name_set = 0; - u8 *stream_name = 0; + unformat_input_t *i = vam->input; + vl_api_delete_subif_t *mp; + u32 sw_if_index = ~0; int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "stream %s", &stream_name)) - stream_name_set = 1; - else if (unformat (input, "disable")) - enable = 0; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; else break; } - if (stream_name_set > 0) + if (sw_if_index == ~0) { - if (vec_len (stream_name) > 255) - { - errmsg ("stream name too long"); - return -99; - } + errmsg ("missing sw_if_index"); + return -99; } - u32 name_len = vec_len (stream_name); /* Construct the API message */ - M (PG_ENABLE_DISABLE, mp); - mp->context = 0; - mp->is_enabled = enable; - if (stream_name_set != 0) - { - mp->stream_name_length = ntohl (name_len); - clib_memcpy (mp->stream_name, stream_name, name_len); - } - vec_free (stream_name); + M (DELETE_SUBIF, mp); + mp->sw_if_index = ntohl (sw_if_index); S (mp); W (ret); return ret; } -int -api_ip_source_and_port_range_check_add_del (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_ip_source_and_port_range_check_add_del_t *mp; +#define foreach_pbb_vtr_op \ +_("disable", L2_VTR_DISABLED) \ +_("pop", L2_VTR_POP_2) \ +_("push", L2_VTR_PUSH_2) - u16 *low_ports = 0; - u16 *high_ports = 0; - u16 this_low; - u16 this_hi; - ip4_address_t ip4_addr; - ip6_address_t ip6_addr; - u32 length; - u32 tmp, tmp2; - u8 prefix_set = 0; - u32 vrf_id = ~0; - u8 is_add = 1; - u8 is_ipv6 = 0; +static int +api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_l2_interface_pbb_tag_rewrite_t *mp; + u32 sw_if_index = ~0, vtr_op = ~0; + u16 outer_tag = ~0; + u8 dmac[6], smac[6]; + u8 dmac_set = 0, smac_set = 0; + u16 vlanid = 0; + u32 sid = ~0; + u32 tmp; int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Shut up coverity */ + memset (dmac, 0, sizeof (dmac)); + memset (smac, 0, sizeof (smac)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%U/%d", unformat_ip4_address, &ip4_addr, &length)) - { - prefix_set = 1; - } - else - if (unformat - (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length)) - { - prefix_set = 1; - is_ipv6 = 1; - } - else if (unformat (input, "vrf %d", &vrf_id)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) ; - else if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "port %d", &tmp)) + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (i, "vtr_op %d", &vtr_op)) + ; +#define _(n,v) else if (unformat(i, n)) {vtr_op = v;} + foreach_pbb_vtr_op +#undef _ + else if (unformat (i, "translate_pbb_stag")) { - if (tmp == 0 || tmp > 65535) + if (unformat (i, "%d", &tmp)) { - errmsg ("port %d out of range", tmp); - return -99; + vtr_op = L2_VTR_TRANSLATE_2_1; + outer_tag = tmp; } - this_low = tmp; - this_hi = this_low + 1; - vec_add1 (low_ports, this_low); - vec_add1 (high_ports, this_hi); - } - else if (unformat (input, "range %d - %d", &tmp, &tmp2)) - { - if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535)) + else { - errmsg ("incorrect range parameters"); + errmsg + ("translate_pbb_stag operation requires outer tag definition"); return -99; } - this_low = tmp; - /* Note: in debug CLI +1 is added to high before - passing to real fn that does "the work" - (ip_source_and_port_range_check_add_del). - This fn is a wrapper around the binary API fn a - control plane will call, which expects this increment - to have occurred. Hence letting the binary API control - plane fn do the increment for consistency between VAT - and other control planes. - */ - this_hi = tmp2; - vec_add1 (low_ports, this_low); - vec_add1 (high_ports, this_hi); } + else if (unformat (i, "dmac %U", unformat_ethernet_address, dmac)) + dmac_set++; + else if (unformat (i, "smac %U", unformat_ethernet_address, smac)) + smac_set++; + else if (unformat (i, "sid %d", &sid)) + ; + else if (unformat (i, "vlanid %d", &tmp)) + vlanid = tmp; else - break; - } - - if (prefix_set == 0) - { - errmsg ("
/ not specified"); - return -99; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (vrf_id == ~0) + if ((sw_if_index == ~0) || (vtr_op == ~0)) { - errmsg ("VRF ID required, not specified"); + errmsg ("missing sw_if_index or vtr operation"); return -99; } - - if (vrf_id == 0) + if (((vtr_op == L2_VTR_PUSH_2) || (vtr_op == L2_VTR_TRANSLATE_2_2)) + && ((dmac_set == 0) || (smac_set == 0) || (sid == ~0))) { errmsg - ("VRF ID should not be default. Should be distinct VRF for this purpose."); - return -99; - } - - if (vec_len (low_ports) == 0) - { - errmsg ("At least one port or port range required"); + ("push and translate_qinq operations require dmac, smac, sid and optionally vlanid"); return -99; } - M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, mp); - - mp->is_add = is_add; - - if (is_ipv6) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr)); - } - else - { - mp->is_ipv6 = 0; - clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr)); - } - - mp->mask_length = length; - mp->number_of_ranges = vec_len (low_ports); - - clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports)); - vec_free (low_ports); - - clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports)); - vec_free (high_ports); - - mp->vrf_id = ntohl (vrf_id); + M (L2_INTERFACE_PBB_TAG_REWRITE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->vtr_op = ntohl (vtr_op); + mp->outer_tag = ntohs (outer_tag); + clib_memcpy (mp->b_dmac, dmac, sizeof (dmac)); + clib_memcpy (mp->b_smac, smac, sizeof (smac)); + mp->b_vlanid = ntohs (vlanid); + mp->i_sid = ntohl (sid); S (mp); W (ret); return ret; } -int -api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam) +static int +api_flow_classify_set_interface (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_ip_source_and_port_range_check_interface_add_del_t *mp; - u32 sw_if_index = ~0; - int vrf_set = 0; - u32 tcp_out_vrf_id = ~0, udp_out_vrf_id = ~0; - u32 tcp_in_vrf_id = ~0, udp_in_vrf_id = ~0; + unformat_input_t *i = vam->input; + vl_api_flow_classify_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; u8 is_add = 1; int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) ; - else if (unformat (input, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "ip6-table %d", &ip6_table_index)) ; - else if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id)) - vrf_set = 1; - else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id)) - vrf_set = 1; - else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id)) - vrf_set = 1; - else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id)) - vrf_set = 1; - else if (unformat (input, "del")) - is_add = 0; else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("Interface required but not specified"); - return -99; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (vrf_set == 0) + if (sw_if_index_set == 0) { - errmsg ("VRF ID required but not specified"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (tcp_out_vrf_id == 0 - || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0) + M (FLOW_CLASSIFY_SET_INTERFACE, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->is_add = is_add; + + S (mp); + W (ret); + return ret; +} + +static int +api_flow_classify_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_flow_classify_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 type = FLOW_CLASSIFY_N_TABLES; + int ret; + + if (unformat (i, "type %U", unformat_flow_classify_table_type, &type)) + ; + else { - errmsg - ("VRF ID should not be default. Should be distinct VRF for this purpose."); + errmsg ("classify table type must be specified"); return -99; } - /* Construct the API message */ - M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = is_add; - mp->tcp_out_vrf_id = ntohl (tcp_out_vrf_id); - mp->udp_out_vrf_id = ntohl (udp_out_vrf_id); - mp->tcp_in_vrf_id = ntohl (tcp_in_vrf_id); - mp->udp_in_vrf_id = ntohl (udp_in_vrf_id); + if (!vam->json_output) + { + print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); + } + M (FLOW_CLASSIFY_DUMP, mp); + mp->type = type; /* send it... */ S (mp); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + /* Wait for a reply... */ W (ret); return ret; } static int -api_ipsec_gre_add_del_tunnel (vat_main_t * vam) +api_feature_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipsec_gre_add_del_tunnel_t *mp; - u32 local_sa_id = 0; - u32 remote_sa_id = 0; - ip4_address_t src_address; - ip4_address_t dst_address; - u8 is_add = 1; + vl_api_feature_enable_disable_t *mp; + u8 *arc_name = 0; + u8 *feature_name = 0; + u32 sw_if_index = ~0; + u8 enable = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "local_sa %d", &local_sa_id)) + if (unformat (i, "arc_name %s", &arc_name)) ; - else if (unformat (i, "remote_sa %d", &remote_sa_id)) + else if (unformat (i, "feature_name %s", &feature_name)) ; - else if (unformat (i, "src %U", unformat_ip4_address, &src_address)) + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) ; - else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address)) + else if (unformat (i, "sw_if_index %d", &sw_if_index)) ; - else if (unformat (i, "del")) - is_add = 0; + else if (unformat (i, "disable")) + enable = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - M (IPSEC_GRE_ADD_DEL_TUNNEL, mp); + if (arc_name == 0) + { + errmsg ("missing arc name"); + return -99; + } + if (vec_len (arc_name) > 63) + { + errmsg ("arc name too long"); + } - mp->local_sa_id = ntohl (local_sa_id); - mp->remote_sa_id = ntohl (remote_sa_id); - clib_memcpy (mp->src_address, &src_address, sizeof (src_address)); - clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address)); - mp->is_add = is_add; + if (feature_name == 0) + { + errmsg ("missing feature name"); + return -99; + } + if (vec_len (feature_name) > 63) + { + errmsg ("feature name too long"); + } + + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + /* Construct the API message */ + M (FEATURE_ENABLE_DISABLE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->enable = enable; + clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name)); + clib_memcpy (mp->feature_name, feature_name, vec_len (feature_name)); + vec_free (arc_name); + vec_free (feature_name); S (mp); W (ret); @@ -18984,63 +21275,68 @@ api_ipsec_gre_add_del_tunnel (vat_main_t * vam) } static int -api_punt (vat_main_t * vam) +api_sw_interface_tag_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_punt_t *mp; - u32 ipv = ~0; - u32 protocol = ~0; - u32 port = ~0; - int is_add = 1; + vl_api_sw_interface_tag_add_del_t *mp; + u32 sw_if_index = ~0; + u8 *tag = 0; + u8 enable = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ip %d", &ipv)) + if (unformat (i, "tag %s", &tag)) ; - else if (unformat (i, "protocol %d", &protocol)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) ; - else if (unformat (i, "port %d", &port)) + else if (unformat (i, "sw_if_index %d", &sw_if_index)) ; else if (unformat (i, "del")) - is_add = 0; + enable = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - M (PUNT, mp); + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - mp->is_add = (u8) is_add; - mp->ipv = (u8) ipv; - mp->l4_protocol = (u8) protocol; - mp->l4_port = htons ((u16) port); + if (enable && (tag == 0)) + { + errmsg ("no tag specified"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_TAG_ADD_DEL, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = enable; + if (enable) + strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); + vec_free (tag); S (mp); W (ret); return ret; } -static void vl_api_ipsec_gre_tunnel_details_t_handler - (vl_api_ipsec_gre_tunnel_details_t * mp) +static void vl_api_l2_xconnect_details_t_handler + (vl_api_l2_xconnect_details_t * mp) { vat_main_t *vam = &vat_main; - print (vam->ofp, "%11d%15U%15U%14d%14d", - ntohl (mp->sw_if_index), - format_ip4_address, &mp->src_address, - format_ip4_address, &mp->dst_address, - ntohl (mp->local_sa_id), ntohl (mp->remote_sa_id)); + print (vam->ofp, "%15d%15d", + ntohl (mp->rx_sw_if_index), ntohl (mp->tx_sw_if_index)); } -static void vl_api_ipsec_gre_tunnel_details_t_handler_json - (vl_api_ipsec_gre_tunnel_details_t * mp) +static void vl_api_l2_xconnect_details_t_handler_json + (vl_api_l2_xconnect_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; - struct in_addr ip4; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -19050,150 +21346,202 @@ static void vl_api_ipsec_gre_tunnel_details_t_handler_json node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - clib_memcpy (&ip4, &mp->src_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "src_address", ip4); - clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "dst_address", ip4); - vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id)); - vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id)); + vat_json_object_add_uint (node, "rx_sw_if_index", + ntohl (mp->rx_sw_if_index)); + vat_json_object_add_uint (node, "tx_sw_if_index", + ntohl (mp->tx_sw_if_index)); +} + +static int +api_l2_xconnect_dump (vat_main_t * vam) +{ + vl_api_l2_xconnect_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%15s%15s", "rx_sw_if_index", "tx_sw_if_index"); + } + + M (L2_XCONNECT_DUMP, mp); + + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static int +api_sw_interface_set_mtu (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_mtu_t *mp; + u32 sw_if_index = ~0; + u32 mtu = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "mtu %d", &mtu)) + ; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } + + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + if (mtu == 0) + { + errmsg ("no mtu specified"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_SET_MTU, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->mtu = ntohs ((u16) mtu); + + S (mp); + W (ret); + return ret; } static int -api_ipsec_gre_tunnel_dump (vat_main_t * vam) +api_p2p_ethernet_add (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipsec_gre_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index; - u8 sw_if_index_set = 0; + vl_api_p2p_ethernet_add_t *mp; + u32 parent_if_index = ~0; + u32 sub_id = ~0; + u8 remote_mac[6]; + u8 mac_set = 0; int ret; - /* Parse args required to build the message */ + memset (remote_mac, 0, sizeof (remote_mac)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index)) + ; + else if (unformat (i, "sw_if_index %d", &parent_if_index)) + ; else - break; + if (unformat + (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) + mac_set++; + else if (unformat (i, "sub_id %d", &sub_id)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index_set == 0) + if (parent_if_index == ~0) { - sw_if_index = ~0; + errmsg ("missing interface name or sw_if_index"); + return -99; } - - if (!vam->json_output) + if (mac_set == 0) { - print (vam->ofp, "%11s%15s%15s%14s%14s", - "sw_if_index", "src_address", "dst_address", - "local_sa_id", "remote_sa_id"); + errmsg ("missing remote mac address"); + return -99; + } + if (sub_id == ~0) + { + errmsg ("missing sub-interface id"); + return -99; } - /* Get list of gre-tunnel interfaces */ - M (IPSEC_GRE_TUNNEL_DUMP, mp); - - mp->sw_if_index = htonl (sw_if_index); + M (P2P_ETHERNET_ADD, mp); + mp->parent_if_index = ntohl (parent_if_index); + mp->subif_id = ntohl (sub_id); + clib_memcpy (mp->remote_mac, remote_mac, sizeof (remote_mac)); S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); return ret; } static int -api_delete_subif (vat_main_t * vam) +api_p2p_ethernet_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_delete_subif_t *mp; - u32 sw_if_index = ~0; + vl_api_p2p_ethernet_del_t *mp; + u32 parent_if_index = ~0; + u8 remote_mac[6]; + u8 mac_set = 0; int ret; + memset (remote_mac, 0, sizeof (remote_mac)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index)) ; - if (unformat (i, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "sw_if_index %d", &parent_if_index)) ; else - break; + if (unformat + (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) + mac_set++; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index == ~0) + if (parent_if_index == ~0) { - errmsg ("missing sw_if_index"); + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (mac_set == 0) + { + errmsg ("missing remote mac address"); return -99; } - /* Construct the API message */ - M (DELETE_SUBIF, mp); - mp->sw_if_index = ntohl (sw_if_index); + M (P2P_ETHERNET_DEL, mp); + mp->parent_if_index = ntohl (parent_if_index); + clib_memcpy (mp->remote_mac, remote_mac, sizeof (remote_mac)); S (mp); W (ret); return ret; } -#define foreach_pbb_vtr_op \ -_("disable", L2_VTR_DISABLED) \ -_("pop", L2_VTR_POP_2) \ -_("push", L2_VTR_PUSH_2) - static int -api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) +api_lldp_config (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2_interface_pbb_tag_rewrite_t *mp; - u32 sw_if_index = ~0, vtr_op = ~0; - u16 outer_tag = ~0; - u8 dmac[6], smac[6]; - u8 dmac_set = 0, smac_set = 0; - u16 vlanid = 0; - u32 sid = ~0; - u32 tmp; + vl_api_lldp_config_t *mp; + int tx_hold = 0; + int tx_interval = 0; + u8 *sys_name = NULL; int ret; - /* Shut up coverity */ - memset (dmac, 0, sizeof (dmac)); - memset (smac, 0, sizeof (smac)); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) + if (unformat (i, "system-name %s", &sys_name)) ; - else if (unformat (i, "vtr_op %d", &vtr_op)) + else if (unformat (i, "tx-hold %d", &tx_hold)) ; -#define _(n,v) else if (unformat(i, n)) {vtr_op = v;} - foreach_pbb_vtr_op -#undef _ - else if (unformat (i, "translate_pbb_stag")) - { - if (unformat (i, "%d", &tmp)) - { - vtr_op = L2_VTR_TRANSLATE_2_1; - outer_tag = tmp; - } - else - { - errmsg - ("translate_pbb_stag operation requires outer tag definition"); - return -99; - } - } - else if (unformat (i, "dmac %U", unformat_ethernet_address, dmac)) - dmac_set++; - else if (unformat (i, "smac %U", unformat_ethernet_address, smac)) - smac_set++; - else if (unformat (i, "sid %d", &sid)) + else if (unformat (i, "tx-interval %d", &tx_interval)) ; - else if (unformat (i, "vlanid %d", &tmp)) - vlanid = tmp; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -19201,27 +21549,73 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) } } - if ((sw_if_index == ~0) || (vtr_op == ~0)) + vec_add1 (sys_name, 0); + + M (LLDP_CONFIG, mp); + mp->tx_hold = htonl (tx_hold); + mp->tx_interval = htonl (tx_interval); + clib_memcpy (mp->system_name, sys_name, vec_len (sys_name)); + vec_free (sys_name); + + S (mp); + W (ret); + return ret; +} + +static int +api_sw_interface_set_lldp (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_lldp_t *mp; + u32 sw_if_index = ~0; + u32 enable = 1; + u8 *port_desc = NULL, *mgmt_oid = NULL; + ip4_address_t ip4_addr; + ip6_address_t ip6_addr; + int ret; + + memset (&ip4_addr, 0, sizeof (ip4_addr)); + memset (&ip6_addr, 0, sizeof (ip6_addr)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("missing sw_if_index or vtr operation"); - return -99; + if (unformat (i, "disable")) + enable = 0; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + ; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (i, "port-desc %s", &port_desc)) + ; + else if (unformat (i, "mgmt-ip4 %U", unformat_ip4_address, &ip4_addr)) + ; + else if (unformat (i, "mgmt-ip6 %U", unformat_ip6_address, &ip6_addr)) + ; + else if (unformat (i, "mgmt-oid %s", &mgmt_oid)) + ; + else + break; } - if (((vtr_op == L2_VTR_PUSH_2) || (vtr_op == L2_VTR_TRANSLATE_2_2)) - && ((dmac_set == 0) || (smac_set == 0) || (sid == ~0))) + + if (sw_if_index == ~0) { - errmsg - ("push and translate_qinq operations require dmac, smac, sid and optionally vlanid"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (L2_INTERFACE_PBB_TAG_REWRITE, mp); + /* Construct the API message */ + vec_add1 (port_desc, 0); + vec_add1 (mgmt_oid, 0); + M (SW_INTERFACE_SET_LLDP, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->vtr_op = ntohl (vtr_op); - mp->outer_tag = ntohs (outer_tag); - clib_memcpy (mp->b_dmac, dmac, sizeof (dmac)); - clib_memcpy (mp->b_smac, smac, sizeof (smac)); - mp->b_vlanid = ntohs (vlanid); - mp->i_sid = ntohl (sid); + mp->enable = enable; + clib_memcpy (mp->port_desc, port_desc, vec_len (port_desc)); + clib_memcpy (mp->mgmt_oid, mgmt_oid, vec_len (mgmt_oid)); + clib_memcpy (mp->mgmt_ip4, &ip4_addr, sizeof (ip4_addr)); + clib_memcpy (mp->mgmt_ip6, &ip6_addr, sizeof (ip6_addr)); + vec_free (port_desc); + vec_free (mgmt_oid); S (mp); W (ret); @@ -19229,327 +21623,309 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) } static int -api_flow_classify_set_interface (vat_main_t * vam) +api_tcp_configure_src_addresses (vat_main_t * vam) { + vl_api_tcp_configure_src_addresses_t *mp; unformat_input_t *i = vam->input; - vl_api_flow_classify_set_interface_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u8 is_add = 1; + ip4_address_t v4first, v4last; + ip6_address_t v6first, v6last; + u8 range_set = 0; + u32 vrf_id = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else + if (unformat (i, "%U - %U", + unformat_ip4_address, &v4first, + unformat_ip4_address, &v4last)) + { + if (range_set) + { + errmsg ("one range per message (range already set)"); + return -99; + } + range_set = 1; + } + else if (unformat (i, "%U - %U", + unformat_ip6_address, &v6first, + unformat_ip6_address, &v6last)) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + if (range_set) + { + errmsg ("one range per message (range already set)"); + return -99; + } + range_set = 2; } + else if (unformat (i, "vrf %d", &vrf_id)) + ; + else + break; } - if (sw_if_index_set == 0) + if (range_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("address range not set"); return -99; } - M (FLOW_CLASSIFY_SET_INTERFACE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->is_add = is_add; - + M (TCP_CONFIGURE_SRC_ADDRESSES, mp); + mp->vrf_id = ntohl (vrf_id); + /* ipv6? */ + if (range_set == 2) + { + mp->is_ipv6 = 1; + clib_memcpy (mp->first_address, &v6first, sizeof (v6first)); + clib_memcpy (mp->last_address, &v6last, sizeof (v6last)); + } + else + { + mp->is_ipv6 = 0; + clib_memcpy (mp->first_address, &v4first, sizeof (v4first)); + clib_memcpy (mp->last_address, &v4last, sizeof (v4last)); + } S (mp); W (ret); return ret; } -static int -api_flow_classify_dump (vat_main_t * vam) +static void vl_api_app_namespace_add_del_reply_t_handler + (vl_api_app_namespace_add_del_reply_t * mp) { - unformat_input_t *i = vam->input; - vl_api_flow_classify_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 type = FLOW_CLASSIFY_N_TABLES; - int ret; - - if (unformat (i, "type %U", unformat_flow_classify_table_type, &type)) - ; - else + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - errmsg ("classify table type must be specified"); - return -99; + vam->async_errors += (retval < 0); } - - if (!vam->json_output) + else { - print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); + vam->retval = retval; + if (retval == 0) + errmsg ("app ns index %d\n", ntohl (mp->appns_index)); + vam->result_ready = 1; } +} - M (FLOW_CLASSIFY_DUMP, mp); - mp->type = type; - /* send it... */ - S (mp); +static void vl_api_app_namespace_add_del_reply_t_handler_json + (vl_api_app_namespace_add_del_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "appns_index", ntohl (mp->appns_index)); - /* Wait for a reply... */ - W (ret); - return ret; + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } static int -api_feature_enable_disable (vat_main_t * vam) +api_app_namespace_add_del (vat_main_t * vam) { + vl_api_app_namespace_add_del_t *mp; unformat_input_t *i = vam->input; - vl_api_feature_enable_disable_t *mp; - u8 *arc_name = 0; - u8 *feature_name = 0; - u32 sw_if_index = ~0; - u8 enable = 1; + u8 *ns_id = 0, secret_set = 0, sw_if_index_set = 0; + u32 sw_if_index, ip4_fib_id, ip6_fib_id; + u64 secret; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "arc_name %s", &arc_name)) - ; - else if (unformat (i, "feature_name %s", &feature_name)) - ; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + if (unformat (i, "id %_%v%_", &ns_id)) ; + else if (unformat (i, "secret %lu", &secret)) + secret_set = 1; else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "ip4_fib_id %d", &ip4_fib_id)) + ; + else if (unformat (i, "ip6_fib_id %d", &ip6_fib_id)) ; - else if (unformat (i, "disable")) - enable = 0; else break; } - - if (arc_name == 0) - { - errmsg ("missing arc name"); - return -99; - } - if (vec_len (arc_name) > 63) - { - errmsg ("arc name too long"); - } - - if (feature_name == 0) + if (!ns_id || !secret_set || !sw_if_index_set) { - errmsg ("missing feature name"); + errmsg ("namespace id, secret and sw_if_index must be set"); return -99; } - if (vec_len (feature_name) > 63) - { - errmsg ("feature name too long"); - } - - if (sw_if_index == ~0) + if (vec_len (ns_id) > 64) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("namespace id too long"); return -99; } + M (APP_NAMESPACE_ADD_DEL, mp); - /* Construct the API message */ - M (FEATURE_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; - clib_memcpy (mp->arc_name, arc_name, vec_len (arc_name)); - clib_memcpy (mp->feature_name, feature_name, vec_len (feature_name)); - vec_free (arc_name); - vec_free (feature_name); - + clib_memcpy (mp->namespace_id, ns_id, vec_len (ns_id)); + mp->namespace_id_len = vec_len (ns_id); + mp->secret = clib_host_to_net_u64 (secret); + mp->sw_if_index = clib_host_to_net_u32 (sw_if_index); + mp->ip4_fib_id = clib_host_to_net_u32 (ip4_fib_id); + mp->ip6_fib_id = clib_host_to_net_u32 (ip6_fib_id); + vec_free (ns_id); S (mp); W (ret); return ret; } static int -api_sw_interface_tag_add_del (vat_main_t * vam) +api_memfd_segment_create (vat_main_t * vam) { +#if VPP_API_TEST_BUILTIN == 0 unformat_input_t *i = vam->input; - vl_api_sw_interface_tag_add_del_t *mp; - u32 sw_if_index = ~0; - u8 *tag = 0; - u8 enable = 1; + vl_api_memfd_segment_create_t *mp; + u64 size = 64 << 20; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "tag %s", &tag)) - ; - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) + if (unformat (i, "size %U", unformat_memory_size, &size)) ; - else if (unformat (i, "del")) - enable = 0; else break; } - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (enable && (tag == 0)) - { - errmsg ("no tag specified"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_TAG_ADD_DEL, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = enable; - if (enable) - strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); - vec_free (tag); - + M (MEMFD_SEGMENT_CREATE, mp); + mp->requested_size = size; S (mp); W (ret); return ret; -} - -static void vl_api_l2_xconnect_details_t_handler - (vl_api_l2_xconnect_details_t * mp) -{ - vat_main_t *vam = &vat_main; - print (vam->ofp, "%15d%15d", - ntohl (mp->rx_sw_if_index), ntohl (mp->tx_sw_if_index)); +#else + errmsg ("memfd_segment_create (builtin) not supported"); + return -99; +#endif } -static void vl_api_l2_xconnect_details_t_handler_json - (vl_api_l2_xconnect_details_t * mp) +static int +api_dns_enable_disable (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + unformat_input_t *line_input = vam->input; + vl_api_dns_enable_disable_t *mp; + u8 enable_disable = 1; + int ret; - if (VAT_JSON_ARRAY != vam->json_tree.type) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (line_input, "disable")) + enable_disable = 0; + if (unformat (line_input, "enable")) + enable_disable = 1; + else + break; } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "rx_sw_if_index", - ntohl (mp->rx_sw_if_index)); - vat_json_object_add_uint (node, "tx_sw_if_index", - ntohl (mp->tx_sw_if_index)); + /* Construct the API message */ + M (DNS_ENABLE_DISABLE, mp); + mp->enable = enable_disable; + + /* send it... */ + S (mp); + /* Wait for the reply */ + W (ret); + return ret; } static int -api_l2_xconnect_dump (vat_main_t * vam) +api_dns_resolve_name (vat_main_t * vam) { - vl_api_l2_xconnect_dump_t *mp; - vl_api_control_ping_t *mp_ping; + unformat_input_t *line_input = vam->input; + vl_api_dns_resolve_name_t *mp; + u8 *name = 0; int ret; - if (!vam->json_output) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%15s%15s", "rx_sw_if_index", "tx_sw_if_index"); + if (unformat (line_input, "%s", &name)) + ; + else + break; } - M (L2_XCONNECT_DUMP, mp); - - S (mp); + if (vec_len (name) > 127) + { + errmsg ("name too long"); + return -99; + } - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + /* Construct the API message */ + M (DNS_RESOLVE_NAME, mp); + memcpy (mp->name, name, vec_len (name)); + vec_free (name); + /* send it... */ + S (mp); + /* Wait for the reply */ W (ret); return ret; } static int -api_sw_interface_set_mtu (vat_main_t * vam) +api_dns_resolve_ip (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_mtu_t *mp; - u32 sw_if_index = ~0; - u32 mtu = 0; + unformat_input_t *line_input = vam->input; + vl_api_dns_resolve_ip_t *mp; + int is_ip6 = -1; + ip4_address_t addr4; + ip6_address_t addr6; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "mtu %d", &mtu)) - ; - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; + if (unformat (line_input, "%U", unformat_ip6_address, &addr6)) + is_ip6 = 1; + else if (unformat (line_input, "%U", unformat_ip4_address, &addr4)) + is_ip6 = 0; else break; } - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (mtu == 0) + if (is_ip6 == -1) { - errmsg ("no mtu specified"); + errmsg ("missing address"); return -99; } /* Construct the API message */ - M (SW_INTERFACE_SET_MTU, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->mtu = ntohs ((u16) mtu); + M (DNS_RESOLVE_IP, mp); + mp->is_ip6 = is_ip6; + if (is_ip6) + memcpy (mp->address, &addr6, sizeof (addr6)); + else + memcpy (mp->address, &addr4, sizeof (addr4)); + /* send it... */ S (mp); + /* Wait for the reply */ W (ret); return ret; } static int -api_p2p_ethernet_add (vat_main_t * vam) +api_dns_name_server_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_p2p_ethernet_add_t *mp; - u32 parent_if_index = ~0; - u32 sub_id = ~0; - u8 remote_mac[6]; - u8 mac_set = 0; - int ret; + vl_api_dns_name_server_add_del_t *mp; + u8 is_add = 1; + ip6_address_t ip6_server; + ip4_address_t ip4_server; + int ip6_set = 0; + int ip4_set = 0; + int ret = 0; - memset (remote_mac, 0, sizeof (remote_mac)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &parent_if_index)) - ; - else - if (unformat - (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) - mac_set++; - else if (unformat (i, "sub_id %d", &sub_id)) - ; + if (unformat (i, "%U", unformat_ip6_address, &ip6_server)) + ip6_set = 1; + else if (unformat (i, "%U", unformat_ip4_address, &ip4_server)) + ip4_set = 1; + else if (unformat (i, "del")) + is_add = 0; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -19557,112 +21933,206 @@ api_p2p_ethernet_add (vat_main_t * vam) } } - if (parent_if_index == ~0) + if (ip4_set && ip6_set) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("Only one server address allowed per message"); return -99; } - if (mac_set == 0) + if ((ip4_set + ip6_set) == 0) { - errmsg ("missing remote mac address"); + errmsg ("Server address required"); return -99; } - if (sub_id == ~0) + + /* Construct the API message */ + M (DNS_NAME_SERVER_ADD_DEL, mp); + + if (ip6_set) { - errmsg ("missing sub-interface id"); - return -99; + memcpy (mp->server_address, &ip6_server, sizeof (ip6_address_t)); + mp->is_ip6 = 1; + } + else + { + memcpy (mp->server_address, &ip4_server, sizeof (ip4_address_t)); + mp->is_ip6 = 0; } - M (P2P_ETHERNET_ADD, mp); - mp->parent_if_index = ntohl (parent_if_index); - mp->subif_id = ntohl (sub_id); - clib_memcpy (mp->remote_mac, remote_mac, sizeof (remote_mac)); + mp->is_add = is_add; + /* send it... */ S (mp); + + /* Wait for a reply, return good/bad news */ W (ret); return ret; } -static int -api_p2p_ethernet_del (vat_main_t * vam) +static void +vl_api_session_rules_details_t_handler (vl_api_session_rules_details_t * mp) { - unformat_input_t *i = vam->input; - vl_api_p2p_ethernet_del_t *mp; - u32 parent_if_index = ~0; - u8 remote_mac[6]; - u8 mac_set = 0; - int ret; + vat_main_t *vam = &vat_main; - memset (remote_mac, 0, sizeof (remote_mac)); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (mp->is_ip4) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &parent_if_index)) - ; - else - if (unformat - (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) - mac_set++; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + print (vam->ofp, + "appns %u tp %u scope %d %U/%d %d %U/%d %d action: %d tag: %s", + clib_net_to_host_u32 (mp->appns_index), mp->transport_proto, + mp->scope, format_ip4_address, &mp->lcl_ip, mp->lcl_plen, + clib_net_to_host_u16 (mp->lcl_port), format_ip4_address, + &mp->rmt_ip, mp->rmt_plen, clib_net_to_host_u16 (mp->rmt_port), + clib_net_to_host_u32 (mp->action_index), mp->tag); } - - if (parent_if_index == ~0) + else { - errmsg ("missing interface name or sw_if_index"); - return -99; + print (vam->ofp, + "appns %u tp %u scope %d %U/%d %d %U/%d %d action: %d tag: %s", + clib_net_to_host_u32 (mp->appns_index), mp->transport_proto, + mp->scope, format_ip6_address, &mp->lcl_ip, mp->lcl_plen, + clib_net_to_host_u16 (mp->lcl_port), format_ip6_address, + &mp->rmt_ip, mp->rmt_plen, clib_net_to_host_u16 (mp->rmt_port), + clib_net_to_host_u32 (mp->action_index), mp->tag); } - if (mac_set == 0) +} + +static void +vl_api_session_rules_details_t_handler_json (vl_api_session_rules_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) { - errmsg ("missing remote mac address"); - return -99; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); + vat_json_init_object (node); - M (P2P_ETHERNET_DEL, mp); - mp->parent_if_index = ntohl (parent_if_index); - clib_memcpy (mp->remote_mac, remote_mac, sizeof (remote_mac)); - - S (mp); - W (ret); - return ret; + vat_json_object_add_uint (node, "is_ip4", mp->is_ip4 ? 1 : 0); + vat_json_object_add_uint (node, "appns_index", + clib_net_to_host_u32 (mp->appns_index)); + vat_json_object_add_uint (node, "transport_proto", mp->transport_proto); + vat_json_object_add_uint (node, "scope", mp->scope); + vat_json_object_add_uint (node, "action_index", + clib_net_to_host_u32 (mp->action_index)); + vat_json_object_add_uint (node, "lcl_port", + clib_net_to_host_u16 (mp->lcl_port)); + vat_json_object_add_uint (node, "rmt_port", + clib_net_to_host_u16 (mp->rmt_port)); + vat_json_object_add_uint (node, "lcl_plen", mp->lcl_plen); + vat_json_object_add_uint (node, "rmt_plen", mp->rmt_plen); + vat_json_object_add_string_copy (node, "tag", mp->tag); + if (mp->is_ip4) + { + clib_memcpy (&ip4, mp->lcl_ip, sizeof (ip4)); + vat_json_object_add_ip4 (node, "lcl_ip", ip4); + clib_memcpy (&ip4, mp->rmt_ip, sizeof (ip4)); + vat_json_object_add_ip4 (node, "rmt_ip", ip4); + } + else + { + clib_memcpy (&ip6, mp->lcl_ip, sizeof (ip6)); + vat_json_object_add_ip6 (node, "lcl_ip", ip6); + clib_memcpy (&ip6, mp->rmt_ip, sizeof (ip6)); + vat_json_object_add_ip6 (node, "rmt_ip", ip6); + } } static int -api_lldp_config (vat_main_t * vam) +api_session_rule_add_del (vat_main_t * vam) { + vl_api_session_rule_add_del_t *mp; unformat_input_t *i = vam->input; - vl_api_lldp_config_t *mp; - int tx_hold = 0; - int tx_interval = 0; - u8 *sys_name = NULL; + u32 proto = ~0, lcl_port, rmt_port, action = 0, lcl_plen, rmt_plen; + u32 appns_index = 0, scope = 0; + ip4_address_t lcl_ip4, rmt_ip4; + ip6_address_t lcl_ip6, rmt_ip6; + u8 is_ip4 = 1, conn_set = 0; + u8 is_add = 1, *tag = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "system-name %s", &sys_name)) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) ; - else if (unformat (i, "tx-hold %d", &tx_hold)) + else if (unformat (i, "proto tcp")) + proto = 0; + else if (unformat (i, "proto udp")) + proto = 1; + else if (unformat (i, "appns %d", &appns_index)) ; - else if (unformat (i, "tx-interval %d", &tx_interval)) + else if (unformat (i, "scope %d", &scope)) + ; + else if (unformat (i, "tag %_%v%_", &tag)) ; else + if (unformat + (i, "%U/%d %d %U/%d %d", unformat_ip4_address, &lcl_ip4, + &lcl_plen, &lcl_port, unformat_ip4_address, &rmt_ip4, &rmt_plen, + &rmt_port)) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + is_ip4 = 1; + conn_set = 1; + } + else + if (unformat + (i, "%U/%d %d %U/%d %d", unformat_ip6_address, &lcl_ip6, + &lcl_plen, &lcl_port, unformat_ip6_address, &rmt_ip6, &rmt_plen, + &rmt_port)) + { + is_ip4 = 0; + conn_set = 1; } + else if (unformat (i, "action %d", &action)) + ; + else + break; + } + if (proto == ~0 || !conn_set || action == ~0) + { + errmsg ("transport proto, connection and action must be set"); + return -99; } - vec_add1 (sys_name, 0); + if (scope > 3) + { + errmsg ("scope should be 0-3"); + return -99; + } - M (LLDP_CONFIG, mp); - mp->tx_hold = htonl (tx_hold); - mp->tx_interval = htonl (tx_interval); - clib_memcpy (mp->system_name, sys_name, vec_len (sys_name)); - vec_free (sys_name); + M (SESSION_RULE_ADD_DEL, mp); + + mp->is_ip4 = is_ip4; + mp->transport_proto = proto; + mp->lcl_port = clib_host_to_net_u16 ((u16) lcl_port); + mp->rmt_port = clib_host_to_net_u16 ((u16) rmt_port); + mp->lcl_plen = lcl_plen; + mp->rmt_plen = rmt_plen; + mp->action_index = clib_host_to_net_u32 (action); + mp->appns_index = clib_host_to_net_u32 (appns_index); + mp->scope = scope; + mp->is_add = is_add; + if (is_ip4) + { + clib_memcpy (mp->lcl_ip, &lcl_ip4, sizeof (lcl_ip4)); + clib_memcpy (mp->rmt_ip, &rmt_ip4, sizeof (rmt_ip4)); + } + else + { + clib_memcpy (mp->lcl_ip, &lcl_ip6, sizeof (lcl_ip6)); + clib_memcpy (mp->rmt_ip, &rmt_ip6, sizeof (rmt_ip6)); + } + if (tag) + { + clib_memcpy (mp->tag, tag, vec_len (tag)); + vec_free (tag); + } S (mp); W (ret); @@ -19670,111 +22140,80 @@ api_lldp_config (vat_main_t * vam) } static int -api_sw_interface_set_lldp (vat_main_t * vam) +api_session_rules_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_lldp_t *mp; - u32 sw_if_index = ~0; - u32 enable = 1; - u8 *port_desc = NULL; + vl_api_session_rules_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (!vam->json_output) { - if (unformat (i, "disable")) - enable = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (i, "port-desc %s", &port_desc)) - ; - else - break; + print (vam->ofp, "%=20s", "Session Rules"); } - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + M (SESSION_RULES_DUMP, mp); + /* send it... */ + S (mp); - /* Construct the API message */ - vec_add1 (port_desc, 0); - M (SW_INTERFACE_SET_LLDP, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; - clib_memcpy (mp->port_desc, port_desc, vec_len (port_desc)); - vec_free (port_desc); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); + /* Wait for a reply... */ W (ret); return ret; } static int -api_tcp_configure_src_addresses (vat_main_t * vam) +api_ip_container_proxy_add_del (vat_main_t * vam) { - vl_api_tcp_configure_src_addresses_t *mp; + vl_api_ip_container_proxy_add_del_t *mp; unformat_input_t *i = vam->input; - ip4_address_t v4first, v4last; - ip6_address_t v6first, v6last; - u8 range_set = 0; - u32 vrf_id = 0; + u32 plen = ~0, sw_if_index = ~0; + ip4_address_t ip4; + ip6_address_t ip6; + u8 is_ip4 = 1; + u8 is_add = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U - %U", - unformat_ip4_address, &v4first, - unformat_ip4_address, &v4last)) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + ; + if (unformat (i, "%U", unformat_ip4_address, &ip4)) { - if (range_set) - { - errmsg ("one range per message (range already set)"); - return -99; - } - range_set = 1; + is_ip4 = 1; + plen = 32; } - else if (unformat (i, "%U - %U", - unformat_ip6_address, &v6first, - unformat_ip6_address, &v6last)) + else if (unformat (i, "%U", unformat_ip6_address, &ip6)) { - if (range_set) - { - errmsg ("one range per message (range already set)"); - return -99; - } - range_set = 2; + is_ip4 = 0; + plen = 128; } - else if (unformat (i, "vrf %d", &vrf_id)) + else if (unformat (i, "sw_if_index %u", &sw_if_index)) ; else break; } - - if (range_set == 0) + if (sw_if_index == ~0 || plen == ~0) { - errmsg ("address range not set"); + errmsg ("address and sw_if_index must be set"); return -99; } - M (TCP_CONFIGURE_SRC_ADDRESSES, mp); - mp->vrf_id = ntohl (vrf_id); - /* ipv6? */ - if (range_set == 2) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->first_address, &v6first, sizeof (v6first)); - clib_memcpy (mp->last_address, &v6last, sizeof (v6last)); - } + M (IP_CONTAINER_PROXY_ADD_DEL, mp); + + mp->is_ip4 = is_ip4; + mp->sw_if_index = clib_host_to_net_u32 (sw_if_index); + mp->plen = plen; + mp->is_add = is_add; + if (is_ip4) + clib_memcpy (mp->ip, &ip4, sizeof (ip4)); else - { - mp->is_ipv6 = 0; - clib_memcpy (mp->first_address, &v4first, sizeof (v4first)); - clib_memcpy (mp->last_address, &v4last, sizeof (v4last)); - } + clib_memcpy (mp->ip, &ip6, sizeof (ip6)); + S (mp); W (ret); return ret; @@ -20152,6 +22591,8 @@ _(sw_interface_set_flags, \ " | sw_if_index admin-up | admin-down link-up | link down") \ _(sw_interface_add_del_address, \ " | sw_if_index | [del] [del-all] ") \ +_(sw_interface_set_rx_mode, \ + " | sw_if_index [queue ] ") \ _(sw_interface_set_table, \ " | sw_if_index vrf [ipv6]") \ _(sw_interface_set_mpls_enable, \ @@ -20160,6 +22601,8 @@ _(sw_interface_set_vpath, \ " | sw_if_index enable | disable") \ _(sw_interface_set_vxlan_bypass, \ " | sw_if_index [ip4 | ip6] [enable | disable]") \ +_(sw_interface_set_geneve_bypass, \ + " | sw_if_index [ip4 | ip6] [enable | disable]") \ _(sw_interface_set_l2_xconnect, \ "rx | rx_sw_if_index tx | tx_sw_if_index \n" \ "enable | disable") \ @@ -20169,7 +22612,7 @@ _(sw_interface_set_l2_bridge, \ "enable | disable") \ _(bridge_domain_set_mac_age, "bd_id mac-age 0-255") \ _(bridge_domain_add_del, \ - "bd_id [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [mac-age 0-255] [bd-tag ] [del]\n") \ + "bd_id [flood 1|0] [uu-flood 1|0] [forward 1|0] [learn 1|0] [arp-term 1|0] [mac-age 0-255] [bd-tag ] [del]\n") \ _(bridge_domain_dump, "[bd_id ]\n") \ _(l2fib_add_del, \ "mac bd_id [del] | sw_if | sw_if_index [static] [filter] [bvi] [count ]\n") \ @@ -20186,6 +22629,11 @@ _(tap_modify, \ _(tap_delete, \ " | sw_if_index ") \ _(sw_interface_tap_dump, "") \ +_(tap_create_v2, \ + "name [hw-addr ] [host-ns ] [rx-ring-size [tx-ring-size ]") \ +_(tap_delete_v2, \ + " | sw_if_index ") \ +_(sw_interface_tap_v2_dump, "") \ _(ip_table_add_del, \ "table-id [ipv6]\n") \ _(ip_add_del_route, \ @@ -20208,6 +22656,12 @@ _(mpls_ip_bind_unbind, \ _(mpls_tunnel_add_del, \ " via [table-id ]\n" \ "sw_if_index ] [l2] [del]") \ +_(bier_table_add_del, \ + "