X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=dd3cbf72660463541be45d23214fe263e429be4e;hb=9a9adb2db318ca8043a7f337fedb020137d56610;hp=28b227b491426a0f966d6cbf25898ff5074119d0;hpb=b0972cbb35550619483b90004a00566f9641f983;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 28b227b4914..dd3cbf72660 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 @@ -73,6 +75,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) { @@ -403,46 +435,6 @@ api_unformat_sw_if_index (unformat_input_t * input, va_list * args) } #endif /* VPP_API_TEST_BUILTIN */ -#define VHOST_USER_POLLING_MODE 0 -#define VHOST_USER_INTERRUPT_MODE 1 -#define VHOST_USER_ADAPTIVE_MODE 2 - -static u8 * -api_format_vhost_user_operation_mode (u8 * s, va_list * va) -{ - int operation_mode = va_arg (*va, int); - - switch (operation_mode) - { - case VHOST_USER_POLLING_MODE: - s = format (s, "%-9s", "polling"); - break; - case VHOST_USER_INTERRUPT_MODE: - s = format (s, "%-9s", "interrupt"); - break; - default: - s = format (s, "%-9s", "invalid"); - } - return s; -} - -static uword -api_unformat_vhost_user_operation_mode (unformat_input_t * input, - va_list * args) -{ - u8 *operation_mode = va_arg (*args, u8 *); - uword rc = 1; - - if (unformat (input, "interrupt")) - *operation_mode = VHOST_USER_INTERRUPT_MODE; - else if (unformat (input, "polling")) - *operation_mode = VHOST_USER_POLLING_MODE; - else - rc = 0; - - return rc; -} - static uword unformat_policer_rate_type (unformat_input_t * input, va_list * args) { @@ -1012,8 +1004,8 @@ static void vl_api_sw_interface_details_t_handler_json } #if VPP_API_TEST_BUILTIN == 0 -static void vl_api_sw_interface_set_flags_t_handler - (vl_api_sw_interface_set_flags_t * mp) +static void vl_api_sw_interface_event_t_handler + (vl_api_sw_interface_event_t * mp) { vat_main_t *vam = &vat_main; if (vam->interface_event_display) @@ -1024,8 +1016,8 @@ static void vl_api_sw_interface_set_flags_t_handler } #endif -static void vl_api_sw_interface_set_flags_t_handler_json - (vl_api_sw_interface_set_flags_t * mp) +static void vl_api_sw_interface_event_t_handler_json + (vl_api_sw_interface_event_t * mp) { /* JSON output not supported */ } @@ -1037,7 +1029,7 @@ vl_api_cli_reply_t_handler (vl_api_cli_reply_t * mp) i32 retval = ntohl (mp->retval); vam->retval = retval; - vam->shmem_result = (u8 *) mp->reply_in_shmem; + vam->shmem_result = uword_to_pointer (mp->reply_in_shmem, u8 *); vam->result_ready = 1; } @@ -1058,7 +1050,7 @@ vl_api_cli_reply_t_handler_json (vl_api_cli_reply_t * mp) pthread_mutex_lock (&am->vlib_rp->mutex); oldheap = svm_push_data_heap (am->vlib_rp); - reply = (u8 *) (mp->reply_in_shmem); + reply = uword_to_pointer (mp->reply_in_shmem, u8 *); vec_free (reply); svm_pop_heap (oldheap); @@ -1076,9 +1068,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; } @@ -1088,6 +1088,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); @@ -1323,6 +1325,33 @@ vl_api_ip6_nd_event_t_handler_json (vl_api_ip6_nd_event_t * mp) /* JSON output not supported */ } +static void +vl_api_l2_macs_event_t_handler (vl_api_l2_macs_event_t * mp) +{ + u32 n_macs = ntohl (mp->n_macs); + errmsg ("L2MAC event recived with pid %d cl-idx %d for %d macs: \n", + ntohl (mp->pid), mp->client_index, n_macs); + int i; + for (i = 0; i < n_macs; i++) + { + vl_api_mac_entry_t *mac = &mp->mac[i]; + errmsg (" [%d] sw_if_index %d mac_addr %U is_del %d \n", + i + 1, ntohl (mac->sw_if_index), + format_ethernet_address, mac->mac_addr, mac->is_del); + if (i == 1000) + break; + } +} + +static void +vl_api_l2_macs_event_t_handler_json (vl_api_l2_macs_event_t * mp) +{ + /* JSON output not supported */ +} + +#define vl_api_bridge_domain_details_t_endian vl_noop_handler +#define vl_api_bridge_domain_details_t_print vl_noop_handler + /* * Special-case: build the bridge domain table, maintain * the next bd id vbl. @@ -1332,6 +1361,7 @@ static void vl_api_bridge_domain_details_t_handler { vat_main_t *vam = &vat_main; u32 n_sw_ifs = ntohl (mp->n_sw_ifs); + int i; print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s", " ID", "LRN", "FWD", "FLD", "BVI", "#IF"); @@ -1341,7 +1371,37 @@ static void vl_api_bridge_domain_details_t_handler mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs); if (n_sw_ifs) - print (vam->ofp, "\n\n%s %s %s", "sw_if_index", "SHG", "Interface Name"); + { + vl_api_bridge_domain_sw_if_t *sw_ifs; + print (vam->ofp, "\n\n%s %s %s", "sw_if_index", "SHG", + "Interface Name"); + + sw_ifs = mp->sw_if_details; + for (i = 0; i < n_sw_ifs; i++) + { + u8 *sw_if_name = 0; + u32 sw_if_index; + hash_pair_t *p; + + sw_if_index = ntohl (sw_ifs->sw_if_index); + + /* *INDENT-OFF* */ + hash_foreach_pair (p, vam->sw_if_index_by_interface_name, + ({ + if ((u32) p->value[0] == sw_if_index) + { + sw_if_name = (u8 *)(p->key); + break; + } + })); + /* *INDENT-ON* */ + print (vam->ofp, "%7d %3d %s", sw_if_index, + sw_ifs->shg, sw_if_name ? (char *) sw_if_name : + "sw_if_index not found!"); + + sw_ifs++; + } + } } static void vl_api_bridge_domain_details_t_handler_json @@ -1349,6 +1409,7 @@ static void vl_api_bridge_domain_details_t_handler_json { vat_main_t *vam = &vat_main; vat_json_node_t *node, *array = NULL; + u32 n_sw_ifs = ntohl (mp->n_sw_ifs); if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -1364,58 +1425,28 @@ static void vl_api_bridge_domain_details_t_handler_json vat_json_object_add_uint (node, "learn", mp->learn); vat_json_object_add_uint (node, "bvi_sw_if_index", ntohl (mp->bvi_sw_if_index)); - vat_json_object_add_uint (node, "n_sw_ifs", ntohl (mp->n_sw_ifs)); + vat_json_object_add_uint (node, "n_sw_ifs", n_sw_ifs); array = vat_json_object_add (node, "sw_if"); vat_json_init_array (array); -} - -/* - * Special-case: build the bridge domain sw if table. - */ -static void vl_api_bridge_domain_sw_if_details_t_handler - (vl_api_bridge_domain_sw_if_details_t * mp) -{ - vat_main_t *vam = &vat_main; - hash_pair_t *p; - u8 *sw_if_name = 0; - u32 sw_if_index; - - sw_if_index = ntohl (mp->sw_if_index); - /* *INDENT-OFF* */ - hash_foreach_pair (p, vam->sw_if_index_by_interface_name, - ({ - if ((u32) p->value[0] == sw_if_index) - { - sw_if_name = (u8 *)(p->key); - break; - } - })); - /* *INDENT-ON* */ - print (vam->ofp, "%7d %3d %s", sw_if_index, - mp->shg, sw_if_name ? (char *) sw_if_name : - "sw_if_index not found!"); -} -static void vl_api_bridge_domain_sw_if_details_t_handler_json - (vl_api_bridge_domain_sw_if_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - uword last_index = 0; - ASSERT (VAT_JSON_ARRAY == vam->json_tree.type); - ASSERT (vec_len (vam->json_tree.array) >= 1); - last_index = vec_len (vam->json_tree.array) - 1; - node = &vam->json_tree.array[last_index]; - node = vat_json_object_get_element (node, "sw_if"); - ASSERT (NULL != node); - node = vat_json_array_add (node); + if (n_sw_ifs) + { + vl_api_bridge_domain_sw_if_t *sw_ifs; + int i; - vat_json_init_object (node); - vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "shg", mp->shg); + sw_ifs = mp->sw_if_details; + for (i = 0; i < n_sw_ifs; i++) + { + node = vat_json_array_add (array); + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", + ntohl (sw_ifs->sw_if_index)); + vat_json_object_add_uint (node, "shg", sw_ifs->shg); + sw_ifs++; + } + } } static void vl_api_control_ping_reply_t_handler @@ -1432,6 +1463,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 @@ -1729,6 +1761,97 @@ static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json vam->result_ready = 1; } +static void vl_api_gpe_add_del_fwd_entry_reply_t_handler + (vl_api_gpe_add_del_fwd_entry_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_gpe_add_del_fwd_entry_reply_t_handler_json + (vl_api_gpe_add_del_fwd_entry_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, "fwd_entry_index", + clib_net_to_host_u32 (mp->fwd_entry_index)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + 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) @@ -1797,8 +1920,8 @@ static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_gre_add_del_tunnel_reply_t_handler - (vl_api_gre_add_del_tunnel_reply_t * mp) +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); @@ -1814,8 +1937,8 @@ static void vl_api_gre_add_del_tunnel_reply_t_handler } } -static void vl_api_gre_add_del_tunnel_reply_t_handler_json - (vl_api_gre_add_del_tunnel_reply_t * mp) +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; @@ -1831,8 +1954,8 @@ static void vl_api_gre_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_create_vhost_user_if_reply_t_handler - (vl_api_create_vhost_user_if_reply_t * mp) +static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler + (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1848,8 +1971,8 @@ static void vl_api_create_vhost_user_if_reply_t_handler } } -static void vl_api_create_vhost_user_if_reply_t_handler_json - (vl_api_create_vhost_user_if_reply_t * mp) +static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler_json + (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; @@ -1865,74 +1988,328 @@ 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 void vl_api_gre_add_del_tunnel_reply_t_handler + (vl_api_gre_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; - 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) + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - errmsg ("ip address details arrived but not stored"); - errmsg ("ip_dump should be called first"); - return; + vam->async_errors += (retval < 0); } + else + { + vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; + } +} - current_ip_details = vec_elt_at_index (details, vam->current_sw_if_index); - -#define addresses (current_ip_details->addr) +static void vl_api_gre_add_del_tunnel_reply_t_handler_json + (vl_api_gre_add_del_tunnel_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; - vec_validate_init_empty (addresses, vec_len (addresses), - empty_ip_address_details); + 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)); - address = vec_elt_at_index (addresses, vec_len (addresses) - 1); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - clib_memcpy (&address->ip, &mp->ip, sizeof (address->ip)); - address->prefix_length = mp->prefix_length; -#undef addresses + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void vl_api_ip_address_details_t_handler_json - (vl_api_ip_address_details_t * mp) +static void vl_api_create_vhost_user_if_reply_t_handler + (vl_api_create_vhost_user_if_reply_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) + i32 retval = ntohl (mp->retval); + 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->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; } - 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) +static void vl_api_create_vhost_user_if_reply_t_handler_json + (vl_api_create_vhost_user_if_reply_t * mp) { vat_main_t *vam = &vat_main; - static ip_details_t empty_ip_details = { 0 }; - ip_details_t *ip = NULL; + 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 clib_error_t * +receive_fd_msg (int socket_fd, int *my_fd) +{ + 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)); + + 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); + + memset (ctl, 0, sizeof (ctl)); + + /* receive the incoming message */ + size = recvmsg (socket_fd, &mh, 0); + if (size != 5) + { + return (size == 0) ? clib_error_return (0, "disconnected") : + clib_error_return_unix (0, "recvmsg: malformed message (fd %d)", + socket_fd); + } + + 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_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; + 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 (retval == 0) + { + 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 */ ); + } + +out: + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->result_ready = 1; + } +#endif +} + +static void vl_api_memfd_segment_create_reply_t_handler_json + (vl_api_memfd_segment_create_reply_t * mp) +{ + clib_warning ("no"); +} + +static void vl_api_dns_resolve_name_reply_t_handler + (vl_api_dns_resolve_name_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) + { + 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); @@ -2098,17 +2475,21 @@ set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index, vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter; } -static void vl_api_vnet_interface_counters_t_handler - (vl_api_vnet_interface_counters_t * mp) +static void vl_api_vnet_interface_simple_counters_t_handler + (vl_api_vnet_interface_simple_counters_t * mp) { /* not supported */ } -static void vl_api_vnet_interface_counters_t_handler_json - (vl_api_vnet_interface_counters_t * mp) +static void vl_api_vnet_interface_combined_counters_t_handler + (vl_api_vnet_interface_combined_counters_t * mp) +{ + /* not supported */ +} + +static void vl_api_vnet_interface_simple_counters_t_handler_json + (vl_api_vnet_interface_simple_counters_t * mp) { - interface_counter_t counter; - vlib_counter_t *v; u64 *v_packets; u64 packets; u32 count; @@ -2118,31 +2499,38 @@ static void vl_api_vnet_interface_counters_t_handler_json count = ntohl (mp->count); first_sw_if_index = ntohl (mp->first_sw_if_index); - if (!mp->is_combined) + v_packets = (u64 *) & mp->data; + for (i = 0; i < count; i++) { - v_packets = (u64 *) & mp->data; - for (i = 0; i < count; i++) - { - packets = - clib_net_to_host_u64 (clib_mem_unaligned (v_packets, u64)); - set_simple_interface_counter (mp->vnet_counter_type, - first_sw_if_index + i, packets); - v_packets++; - } + packets = clib_net_to_host_u64 (clib_mem_unaligned (v_packets, u64)); + set_simple_interface_counter (mp->vnet_counter_type, + first_sw_if_index + i, packets); + v_packets++; } - else +} + +static void vl_api_vnet_interface_combined_counters_t_handler_json + (vl_api_vnet_interface_combined_counters_t * mp) +{ + interface_counter_t counter; + vlib_counter_t *v; + u32 first_sw_if_index; + int i; + u32 count; + + count = ntohl (mp->count); + first_sw_if_index = ntohl (mp->first_sw_if_index); + + v = (vlib_counter_t *) & mp->data; + for (i = 0; i < count; i++) { - v = (vlib_counter_t *) & mp->data; - for (i = 0; i < count; i++) - { - counter.packets = - clib_net_to_host_u64 (clib_mem_unaligned (&v->packets, u64)); - counter.bytes = - clib_net_to_host_u64 (clib_mem_unaligned (&v->bytes, u64)); - set_combined_interface_counter (mp->vnet_counter_type, - first_sw_if_index + i, counter); - v++; - } + counter.packets = + clib_net_to_host_u64 (clib_mem_unaligned (&v->packets, u64)); + counter.bytes = + clib_net_to_host_u64 (clib_mem_unaligned (&v->bytes, u64)); + set_combined_interface_counter (mp->vnet_counter_type, + first_sw_if_index + i, counter); + v++; } } @@ -2405,7 +2793,7 @@ static void vl_api_get_node_graph_reply_t_handler if (retval != 0) return; - reply = (u8 *) (mp->reply_in_shmem); + reply = uword_to_pointer (mp->reply_in_shmem, u8 *); pvt_copy = vec_dup (reply); /* Toss the shared-memory original... */ @@ -2456,7 +2844,7 @@ static void vl_api_get_node_graph_reply_t_handler_json vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); vat_json_object_add_uint (&node, "reply_in_shmem", mp->reply_in_shmem); - reply = (u8 *) (mp->reply_in_shmem); + reply = uword_to_pointer (mp->reply_in_shmem, u8 *); /* Toss the shared-memory original... */ pthread_mutex_lock (&am->vlib_rp->mutex); @@ -2574,6 +2962,26 @@ static void vec_free (ls_name); } +typedef struct +{ + u32 spi; + u8 si; +} __attribute__ ((__packed__)) lisp_nsh_api_t; + +uword +unformat_nsh_address (unformat_input_t * input, va_list * args) +{ + lisp_nsh_api_t *nsh = va_arg (*args, lisp_nsh_api_t *); + return unformat (input, "SPI:%d SI:%d", &nsh->spi, &nsh->si); +} + +u8 * +format_nsh_address_vat (u8 * s, va_list * args) +{ + nsh_t *a = va_arg (*args, nsh_t *); + return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); +} + static u8 * format_lisp_flat_eid (u8 * s, va_list * args) { @@ -2589,6 +2997,8 @@ format_lisp_flat_eid (u8 * s, va_list * args) return format (s, "%U/%d", format_ip6_address, eid, eid_len); case 2: return format (s, "%U", format_ethernet_address, eid); + case 3: + return format (s, "%U", format_nsh_address_vat, eid); } return 0; } @@ -2663,13 +3073,26 @@ vl_api_one_eid_table_details_t_handler_json (vl_api_one_eid_table_details_t clib_net_to_host_u32 (mp->locator_set_index)); vat_json_object_add_uint (node, "is_local", mp->is_local ? 1 : 0); - eid = format (0, "%U", format_lisp_eid_vat, - mp->eid_type, - mp->eid, - mp->eid_prefix_len, - mp->seid, mp->seid_prefix_len, mp->is_src_dst); - vec_add1 (eid, 0); - vat_json_object_add_string_copy (node, "eid", eid); + if (mp->eid_type == 3) + { + vat_json_node_t *nsh_json = vat_json_object_add (node, "eid"); + vat_json_init_object (nsh_json); + lisp_nsh_api_t *nsh = (lisp_nsh_api_t *) mp->eid; + vat_json_object_add_uint (nsh_json, "spi", + clib_net_to_host_u32 (nsh->spi)); + vat_json_object_add_uint (nsh_json, "si", nsh->si); + } + else + { + eid = format (0, "%U", format_lisp_eid_vat, + mp->eid_type, + mp->eid, + mp->eid_prefix_len, + mp->seid, mp->seid_prefix_len, mp->is_src_dst); + vec_add1 (eid, 0); + vat_json_object_add_string_copy (node, "eid", eid); + vec_free (eid); + } vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); vat_json_object_add_uint (node, "ttl", clib_net_to_host_u32 (mp->ttl)); vat_json_object_add_uint (node, "authoritative", (mp->authoritative)); @@ -2680,7 +3103,6 @@ vl_api_one_eid_table_details_t_handler_json (vl_api_one_eid_table_details_t clib_net_to_host_u16 (mp->key_id)); vat_json_object_add_string_copy (node, "key", mp->key); } - vec_free (eid); } static void @@ -2830,58 +3252,91 @@ static void } static void - vl_api_show_one_map_register_state_reply_t_handler - (vl_api_show_one_map_register_state_reply_t * mp) + vl_api_show_one_map_register_fallback_threshold_reply_t_handler + (vl_api_show_one_map_register_fallback_threshold_reply_t * mp) { vat_main_t *vam = &vat_main; int retval = clib_net_to_host_u32 (mp->retval); - print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled"); + vl_api_show_one_map_register_fallback_threshold_reply_t_endian (mp); + print (vam->ofp, "fallback threshold value: %d", mp->value); vam->retval = retval; vam->result_ready = 1; } static void - vl_api_show_one_map_register_state_reply_t_handler_json - (vl_api_show_one_map_register_state_reply_t * mp) + vl_api_show_one_map_register_fallback_threshold_reply_t_handler_json + (vl_api_show_one_map_register_fallback_threshold_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t _node, *node = &_node; int retval = clib_net_to_host_u32 (mp->retval); - u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled"); - + vl_api_show_one_map_register_fallback_threshold_reply_t_endian (mp); vat_json_init_object (node); - vat_json_object_add_string_copy (node, "state", s); + vat_json_object_add_uint (node, "value", mp->value); vat_json_print (vam->ofp, node); vat_json_free (node); vam->retval = retval; vam->result_ready = 1; - vec_free (s); } static void - vl_api_show_one_rloc_probe_state_reply_t_handler - (vl_api_show_one_rloc_probe_state_reply_t * mp) + vl_api_show_one_map_register_state_reply_t_handler + (vl_api_show_one_map_register_state_reply_t * mp) { vat_main_t *vam = &vat_main; int retval = clib_net_to_host_u32 (mp->retval); - if (retval) - goto end; - print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled"); -end: + vam->retval = retval; vam->result_ready = 1; } static void - vl_api_show_one_rloc_probe_state_reply_t_handler_json - (vl_api_show_one_rloc_probe_state_reply_t * mp) + vl_api_show_one_map_register_state_reply_t_handler_json + (vl_api_show_one_map_register_state_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t _node, *node = &_node; + int retval = clib_net_to_host_u32 (mp->retval); + + u8 *s = format (0, "%s", mp->is_enabled ? "enabled" : "disabled"); + + vat_json_init_object (node); + vat_json_object_add_string_copy (node, "state", s); + + vat_json_print (vam->ofp, node); + vat_json_free (node); + + vam->retval = retval; + vam->result_ready = 1; + vec_free (s); +} + +static void + vl_api_show_one_rloc_probe_state_reply_t_handler + (vl_api_show_one_rloc_probe_state_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled"); +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_rloc_probe_state_reply_t_handler_json + (vl_api_show_one_rloc_probe_state_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t _node, *node = &_node; @@ -2940,6 +3395,7 @@ api_gpe_fwd_entry_net_to_host (vl_api_gpe_fwd_entry_t * e) { e->dp_table = clib_net_to_host_u32 (e->dp_table); e->fwd_entry_index = clib_net_to_host_u32 (e->fwd_entry_index); + e->vni = clib_net_to_host_u32 (e->vni); } static void @@ -3115,6 +3571,8 @@ static void vat_json_init_object (e); vat_json_object_add_int (e, "fwd_entry_index", fwd->fwd_entry_index); vat_json_object_add_int (e, "dp_table", fwd->dp_table); + vat_json_object_add_int (e, "vni", fwd->vni); + vat_json_object_add_int (e, "action", fwd->action); s = format (0, "%U", format_lisp_flat_eid, fwd->eid_type, fwd->leid, fwd->leid_prefix_len); @@ -3138,13 +3596,13 @@ end: } static void - vl_api_one_adjacencies_get_reply_t_handler - (vl_api_one_adjacencies_get_reply_t * mp) + vl_api_gpe_native_fwd_rpaths_get_reply_t_handler + (vl_api_gpe_native_fwd_rpaths_get_reply_t * mp) { vat_main_t *vam = &vat_main; u32 i, n; int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_adjacency_t *a; + vl_api_gpe_native_fwd_rpath_t *r; if (retval) goto end; @@ -3153,10 +3611,11 @@ static void for (i = 0; i < n; i++) { - a = &mp->adjacencies[i]; - print (vam->ofp, "%U %40U", - format_lisp_flat_eid, a->eid_type, a->leid, a->leid_prefix_len, - format_lisp_flat_eid, a->eid_type, a->reid, a->reid_prefix_len); + r = &mp->entries[i]; + print (vam->ofp, "fib_index: %d sw_if_index %d nh %U", + clib_net_to_host_u32 (r->fib_index), + clib_net_to_host_u32 (r->nh_sw_if_index), + r->is_ip4 ? format_ip4_address : format_ip6_address, r->nh_addr); } end: @@ -3165,15 +3624,15 @@ end: } static void - vl_api_one_adjacencies_get_reply_t_handler_json - (vl_api_one_adjacencies_get_reply_t * mp) + vl_api_gpe_native_fwd_rpaths_get_reply_t_handler_json + (vl_api_gpe_native_fwd_rpaths_get_reply_t * mp) { - u8 *s = 0; vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; + vat_json_node_t root, *e; u32 i, n; int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_adjacency_t *a; + vl_api_gpe_native_fwd_rpath_t *r; + u8 *s; if (retval) goto end; @@ -3184,20 +3643,19 @@ static void for (i = 0; i < n; i++) { e = vat_json_array_add (&root); - a = &mp->adjacencies[i]; - vat_json_init_object (e); - s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->leid, - a->leid_prefix_len); + r = &mp->entries[i]; + s = + format (0, "%U", r->is_ip4 ? format_ip4_address : format_ip6_address, + r->nh_addr); vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "leid", s); + vat_json_object_add_string_copy (e, "ip4", s); vec_free (s); - s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->reid, - a->reid_prefix_len); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "reid", s); - vec_free (s); + vat_json_object_add_uint (e, "fib_index", + clib_net_to_host_u32 (r->fib_index)); + vat_json_object_add_uint (e, "nh_sw_if_index", + clib_net_to_host_u32 (r->nh_sw_if_index)); } vat_json_print (vam->ofp, &root); @@ -3209,297 +3667,446 @@ end: } static void -vl_api_one_map_server_details_t_handler (vl_api_one_map_server_details_t * mp) + vl_api_gpe_fwd_entry_vnis_get_reply_t_handler + (vl_api_gpe_fwd_entry_vnis_get_reply_t * mp) { vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); - print (vam->ofp, "%=20U", - mp->is_ipv6 ? format_ip6_address : format_ip4_address, - mp->ip_address); + 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->vnis[i])); + +end: + vam->retval = retval; + vam->result_ready = 1; } static void - vl_api_one_map_server_details_t_handler_json - (vl_api_one_map_server_details_t * mp) + vl_api_gpe_fwd_entry_vnis_get_reply_t_handler_json + (vl_api_gpe_fwd_entry_vnis_get_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; + vat_json_node_t root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); - 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); + if (retval) + goto end; - vat_json_init_object (node); - if (mp->is_ipv6) - { - clib_memcpy (&ip6, mp->ip_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "map-server", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "map-server", ip4); - } + 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->vnis[i])); + + vat_json_print (vam->ofp, &root); + vat_json_free (&root); + +end: + vam->retval = retval; + vam->result_ready = 1; } static void -vl_api_one_map_resolver_details_t_handler (vl_api_one_map_resolver_details_t - * mp) + 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); - print (vam->ofp, "%=20U", - mp->is_ipv6 ? format_ip6_address : format_ip4_address, - mp->ip_address); + 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_map_resolver_details_t_handler_json - (vl_api_one_map_resolver_details_t * mp) + 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 *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; + 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 (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); + if (retval) + goto end; - vat_json_init_object (node); - if (mp->is_ipv6) - { - clib_memcpy (&ip6, mp->ip_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "map resolver", ip6); - } - else + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); + + for (i = 0; i < n; i++) { - clib_memcpy (&ip4, mp->ip_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "map resolver", ip4); + 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_show_one_status_reply_t_handler (vl_api_show_one_status_reply_t * mp) + vl_api_one_l2_arp_entries_get_reply_t_handler + (vl_api_one_l2_arp_entries_get_reply_t * mp) { vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); - if (0 <= retval) - { - print (vam->ofp, "feature: %s\ngpe: %s", - mp->feature_status ? "enabled" : "disabled", - mp->gpe_status ? "enabled" : "disabled"); - } + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + print (vam->ofp, "%U -> %U", format_ip4_address, &mp->entries[i].ip4, + format_ethernet_address, mp->entries[i].mac); +end: vam->retval = retval; vam->result_ready = 1; } static void - vl_api_show_one_status_reply_t_handler_json - (vl_api_show_one_status_reply_t * mp) + vl_api_one_l2_arp_entries_get_reply_t_handler_json + (vl_api_one_l2_arp_entries_get_reply_t * mp) { + u8 *s = 0; vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *gpe_status = NULL; - u8 *feature_status = NULL; + vat_json_node_t *e = 0, root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_one_l2_arp_entry_t *arp_entry; - gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled"); - feature_status = format (0, "%s", - mp->feature_status ? "enabled" : "disabled"); - vec_add1 (gpe_status, 0); - vec_add1 (feature_status, 0); + if (retval) + goto end; - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "gpe_status", gpe_status); - vat_json_object_add_string_copy (&node, "feature_status", feature_status); + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); - vec_free (gpe_status); - vec_free (feature_status); + for (i = 0; i < n; i++) + { + e = vat_json_array_add (&root); + arp_entry = &mp->entries[i]; - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + vat_json_init_object (e); + s = format (0, "%U", format_ethernet_address, arp_entry->mac); + vec_add1 (s, 0); - vam->retval = ntohl (mp->retval); + vat_json_object_add_string_copy (e, "mac", s); + vec_free (s); + + s = format (0, "%U", format_ip4_address, &arp_entry->ip4); + vec_add1 (s, 0); + vat_json_object_add_string_copy (e, "ip4", 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_get_map_request_itr_rlocs_reply_t_handler - (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) +vl_api_one_ndp_bd_get_reply_t_handler (vl_api_one_ndp_bd_get_reply_t * mp) { vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); - if (retval >= 0) + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) { - print (vam->ofp, "%=20s", mp->locator_set_name); + 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_get_map_request_itr_rlocs_reply_t_handler_json - (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) + 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 *node = NULL; + vat_json_node_t root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); - 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); + if (retval) + goto end; - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "itr-rlocs", mp->locator_set_name); + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); - vat_json_print (vam->ofp, node); - vat_json_free (node); + for (i = 0; i < n; i++) + { + vat_json_array_add_uint (&root, + clib_net_to_host_u32 (mp->bridge_domains[i])); + } - vam->retval = ntohl (mp->retval); + vat_json_print (vam->ofp, &root); + vat_json_free (&root); + +end: + vam->retval = retval; vam->result_ready = 1; } -static u8 * -format_lisp_map_request_mode (u8 * s, va_list * args) +static void + vl_api_one_l2_arp_bd_get_reply_t_handler + (vl_api_one_l2_arp_bd_get_reply_t * mp) { - u32 mode = va_arg (*args, u32); + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); - switch (mode) + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) { - case 0: - return format (0, "dst-only"); - case 1: - return format (0, "src-dst"); + print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); } - return 0; + +end: + vam->retval = retval; + vam->result_ready = 1; } static void - vl_api_show_one_map_request_mode_reply_t_handler - (vl_api_show_one_map_request_mode_reply_t * mp) + vl_api_one_l2_arp_bd_get_reply_t_handler_json + (vl_api_one_l2_arp_bd_get_reply_t * mp) { vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); + vat_json_node_t root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); - if (0 <= retval) + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); + + for (i = 0; i < n; i++) { - u32 mode = mp->mode; - print (vam->ofp, "map_request_mode: %U", - format_lisp_map_request_mode, mode); + 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_show_one_map_request_mode_reply_t_handler_json - (vl_api_show_one_map_request_mode_reply_t * mp) + vl_api_one_adjacencies_get_reply_t_handler + (vl_api_one_adjacencies_get_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *s = 0; - u32 mode; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_one_adjacency_t *a; - mode = mp->mode; - s = format (0, "%U", format_lisp_map_request_mode, mode); - vec_add1 (s, 0); + if (retval) + goto end; - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "map_request_mode", s); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + n = clib_net_to_host_u32 (mp->count); - vec_free (s); - vam->retval = ntohl (mp->retval); + for (i = 0; i < n; i++) + { + a = &mp->adjacencies[i]; + print (vam->ofp, "%U %40U", + format_lisp_flat_eid, a->eid_type, a->leid, a->leid_prefix_len, + format_lisp_flat_eid, a->eid_type, a->reid, a->reid_prefix_len); + } + +end: + vam->retval = retval; vam->result_ready = 1; } static void - vl_api_show_one_use_petr_reply_t_handler - (vl_api_show_one_use_petr_reply_t * mp) + vl_api_one_adjacencies_get_reply_t_handler_json + (vl_api_one_adjacencies_get_reply_t * mp) { + u8 *s = 0; vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); + vat_json_node_t *e = 0, root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_one_adjacency_t *a; - if (0 <= retval) + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); + + for (i = 0; i < n; i++) { - 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); - } + e = vat_json_array_add (&root); + a = &mp->adjacencies[i]; + + vat_json_init_object (e); + s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->leid, + a->leid_prefix_len); + vec_add1 (s, 0); + vat_json_object_add_string_copy (e, "leid", s); + vec_free (s); + + s = format (0, "%U", format_lisp_flat_eid, a->eid_type, a->reid, + a->reid_prefix_len); + vec_add1 (s, 0); + vat_json_object_add_string_copy (e, "reid", s); + vec_free (s); } + vat_json_print (vam->ofp, &root); + vat_json_free (&root); + +end: vam->retval = retval; vam->result_ready = 1; } static void - vl_api_show_one_use_petr_reply_t_handler_json - (vl_api_show_one_use_petr_reply_t * mp) +vl_api_one_map_server_details_t_handler (vl_api_one_map_server_details_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - struct in_addr ip4; + + print (vam->ofp, "%=20U", + mp->is_ipv6 ? format_ip6_address : format_ip4_address, + mp->ip_address); +} + +static void + vl_api_one_map_server_details_t_handler_json + (vl_api_one_map_server_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; struct in6_addr ip6; + struct in_addr ip4; - status = format (0, "%s", mp->status ? "enabled" : "disabled"); - vec_add1 (status, 0); + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - if (mp->status) + vat_json_init_object (node); + if (mp->is_ipv6) { - if (mp->is_ip4) - { - clib_memcpy (&ip6, mp->address, sizeof (ip6)); - vat_json_object_add_ip6 (&node, "address", ip6); - } - else - { - clib_memcpy (&ip4, mp->address, sizeof (ip4)); - vat_json_object_add_ip4 (&node, "address", ip4); - } + clib_memcpy (&ip6, mp->ip_address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "map-server", ip6); } + else + { + clib_memcpy (&ip4, mp->ip_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "map-server", ip4); + } +} - vec_free (status); +static void +vl_api_one_map_resolver_details_t_handler (vl_api_one_map_resolver_details_t + * mp) +{ + vat_main_t *vam = &vat_main; - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + print (vam->ofp, "%=20U", + mp->is_ipv6 ? format_ip6_address : format_ip4_address, + mp->ip_address); +} - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; +static void + vl_api_one_map_resolver_details_t_handler_json + (vl_api_one_map_resolver_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in6_addr ip6; + struct in_addr ip4; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + if (mp->is_ipv6) + { + clib_memcpy (&ip6, mp->ip_address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "map resolver", ip6); + } + else + { + clib_memcpy (&ip4, mp->ip_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "map resolver", ip4); + } } static void -vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) +vl_api_show_one_status_reply_t_handler (vl_api_show_one_status_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); if (0 <= retval) { - print (vam->ofp, "%-20s%-16s", - mp->status ? "enabled" : "disabled", - mp->status ? (char *) mp->locator_set_name : ""); + print (vam->ofp, "feature: %s\ngpe: %s", + mp->feature_status ? "enabled" : "disabled", + mp->gpe_status ? "enabled" : "disabled"); } vam->retval = retval; @@ -3507,24 +4114,26 @@ vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) } static void -vl_api_show_one_pitr_reply_t_handler_json (vl_api_show_one_pitr_reply_t * mp) + vl_api_show_one_status_reply_t_handler_json + (vl_api_show_one_status_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; - u8 *status = 0; + u8 *gpe_status = NULL; + u8 *feature_status = NULL; - status = format (0, "%s", mp->status ? "enabled" : "disabled"); - vec_add1 (status, 0); + gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled"); + feature_status = format (0, "%s", + mp->feature_status ? "enabled" : "disabled"); + vec_add1 (gpe_status, 0); + vec_add1 (feature_status, 0); vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - if (mp->status) - { - vat_json_object_add_string_copy (&node, "locator_set", - mp->locator_set_name); - } + vat_json_object_add_string_copy (&node, "gpe_status", gpe_status); + vat_json_object_add_string_copy (&node, "feature_status", feature_status); - vec_free (status); + vec_free (gpe_status); + vec_free (feature_status); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -3533,308 +4142,200 @@ vl_api_show_one_pitr_reply_t_handler_json (vl_api_show_one_pitr_reply_t * mp) vam->result_ready = 1; } -static u8 * -format_policer_type (u8 * s, va_list * va) +static void + vl_api_one_get_map_request_itr_rlocs_reply_t_handler + (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) { - u32 i = va_arg (*va, u32); + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); - if (i == SSE2_QOS_POLICER_TYPE_1R2C) - s = format (s, "1r2c"); - else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697) - s = format (s, "1r3c"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) - s = format (s, "2r3c-2698"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115) - s = format (s, "2r3c-4115"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1) - s = format (s, "2r3c-mef5cf1"); - else - s = format (s, "ILLEGAL"); - return s; + if (retval >= 0) + { + print (vam->ofp, "%=20s", mp->locator_set_name); + } + + vam->retval = retval; + vam->result_ready = 1; } -static u8 * -format_policer_rate_type (u8 * s, va_list * va) +static void + vl_api_one_get_map_request_itr_rlocs_reply_t_handler_json + (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) { - u32 i = va_arg (*va, u32); + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - if (i == SSE2_QOS_RATE_KBPS) - s = format (s, "kbps"); - else if (i == SSE2_QOS_RATE_PPS) - s = format (s, "pps"); - else - s = format (s, "ILLEGAL"); - return s; -} + 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); -static u8 * -format_policer_round_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); + vat_json_init_object (node); + vat_json_object_add_string_copy (node, "itr-rlocs", mp->locator_set_name); - if (i == SSE2_QOS_ROUND_TO_CLOSEST) - s = format (s, "closest"); - else if (i == SSE2_QOS_ROUND_TO_UP) - s = format (s, "up"); - else if (i == SSE2_QOS_ROUND_TO_DOWN) - s = format (s, "down"); - else - s = format (s, "ILLEGAL"); - return s; + vat_json_print (vam->ofp, node); + vat_json_free (node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } static u8 * -format_policer_action_type (u8 * s, va_list * va) +format_lisp_map_request_mode (u8 * s, va_list * args) { - u32 i = va_arg (*va, u32); + u32 mode = va_arg (*args, u32); - if (i == SSE2_QOS_ACTION_DROP) - s = format (s, "drop"); - else if (i == SSE2_QOS_ACTION_TRANSMIT) - s = format (s, "transmit"); - else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - s = format (s, "mark-and-transmit"); - else - s = format (s, "ILLEGAL"); - return s; + switch (mode) + { + case 0: + return format (0, "dst-only"); + case 1: + return format (0, "src-dst"); + } + return 0; } -static u8 * -format_dscp (u8 * s, va_list * va) +static void + vl_api_show_one_map_request_mode_reply_t_handler + (vl_api_show_one_map_request_mode_reply_t * mp) { - u32 i = va_arg (*va, u32); - char *t = 0; + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); - switch (i) + if (0 <= retval) { -#define _(v,f,str) case VNET_DSCP_##f: t = str; break; - foreach_vnet_dscp -#undef _ - default: - return format (s, "ILLEGAL"); + u32 mode = mp->mode; + print (vam->ofp, "map_request_mode: %U", + format_lisp_map_request_mode, mode); } - s = format (s, "%s", t); - return s; + + vam->retval = retval; + vam->result_ready = 1; } static void -vl_api_policer_details_t_handler (vl_api_policer_details_t * mp) + vl_api_show_one_map_request_mode_reply_t_handler_json + (vl_api_show_one_map_request_mode_reply_t * mp) { vat_main_t *vam = &vat_main; - u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str; + vat_json_node_t node; + u8 *s = 0; + u32 mode; - if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - conform_dscp_str = format (0, "%U", format_dscp, mp->conform_dscp); - else - conform_dscp_str = format (0, ""); + mode = mp->mode; + s = format (0, "%U", format_lisp_map_request_mode, mode); + vec_add1 (s, 0); - if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp); - else - exceed_dscp_str = format (0, ""); + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "map_request_mode", s); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - violate_dscp_str = format (0, "%U", format_dscp, mp->violate_dscp); - else - violate_dscp_str = format (0, ""); + vec_free (s); + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} - print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, " - "rate type %U, round type %U, %s rate, %s color-aware, " - "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, " - "cur bkt %u, ext lim %u, ext bkt %u, last update %llu" - "conform action %U%s, exceed action %U%s, violate action %U%s", - mp->name, - format_policer_type, mp->type, - ntohl (mp->cir), - ntohl (mp->eir), - clib_net_to_host_u64 (mp->cb), - clib_net_to_host_u64 (mp->eb), - format_policer_rate_type, mp->rate_type, - format_policer_round_type, mp->round_type, - mp->single_rate ? "single" : "dual", - mp->color_aware ? "is" : "not", - ntohl (mp->cir_tokens_per_period), - ntohl (mp->pir_tokens_per_period), - ntohl (mp->scale), - ntohl (mp->current_limit), - ntohl (mp->current_bucket), - ntohl (mp->extended_limit), - ntohl (mp->extended_bucket), - clib_net_to_host_u64 (mp->last_update_time), - format_policer_action_type, mp->conform_action_type, - conform_dscp_str, - format_policer_action_type, mp->exceed_action_type, - exceed_dscp_str, - format_policer_action_type, mp->violate_action_type, - violate_dscp_str); +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); - vec_free (conform_dscp_str); - vec_free (exceed_dscp_str); - vec_free (violate_dscp_str); + 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_policer_details_t_handler_json - (vl_api_policer_details_t * mp) +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 *rate_type_str, *round_type_str, *type_str; - u8 *conform_action_str, *exceed_action_str, *violate_action_str; + vat_json_node_t node; + u8 *status = 0; + struct in_addr ip4; + struct in6_addr ip6; - rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type); - round_type_str = - format (0, "%U", format_policer_round_type, mp->round_type); - type_str = format (0, "%U", format_policer_type, mp->type); - conform_action_str = format (0, "%U", format_policer_action_type, - mp->conform_action_type); - exceed_action_str = format (0, "%U", format_policer_action_type, - mp->exceed_action_type); - violate_action_str = format (0, "%U", format_policer_action_type, - mp->violate_action_type); + status = format (0, "%s", mp->status ? "enabled" : "disabled"); + vec_add1 (status, 0); - if (VAT_JSON_ARRAY != vam->json_tree.type) + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "status", status); + if (mp->status) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (mp->is_ip4) + { + clib_memcpy (&ip6, mp->address, sizeof (ip6)); + vat_json_object_add_ip6 (&node, "address", ip6); + } + else + { + clib_memcpy (&ip4, mp->address, sizeof (ip4)); + vat_json_object_add_ip4 (&node, "address", ip4); + } } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "name", mp->name); - vat_json_object_add_uint (node, "cir", ntohl (mp->cir)); - vat_json_object_add_uint (node, "eir", ntohl (mp->eir)); - vat_json_object_add_uint (node, "cb", clib_net_to_host_u64 (mp->cb)); - vat_json_object_add_uint (node, "eb", clib_net_to_host_u64 (mp->eb)); - vat_json_object_add_string_copy (node, "rate_type", rate_type_str); - vat_json_object_add_string_copy (node, "round_type", round_type_str); - vat_json_object_add_string_copy (node, "type", type_str); - vat_json_object_add_uint (node, "single_rate", mp->single_rate); - vat_json_object_add_uint (node, "color_aware", mp->color_aware); - vat_json_object_add_uint (node, "scale", ntohl (mp->scale)); - vat_json_object_add_uint (node, "cir_tokens_per_period", - ntohl (mp->cir_tokens_per_period)); - vat_json_object_add_uint (node, "eir_tokens_per_period", - ntohl (mp->pir_tokens_per_period)); - vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit)); - vat_json_object_add_uint (node, "current_bucket", - ntohl (mp->current_bucket)); - vat_json_object_add_uint (node, "extended_limit", - ntohl (mp->extended_limit)); - vat_json_object_add_uint (node, "extended_bucket", - ntohl (mp->extended_bucket)); - vat_json_object_add_uint (node, "last_update_time", - ntohl (mp->last_update_time)); - vat_json_object_add_string_copy (node, "conform_action", - conform_action_str); - if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_dscp); - vat_json_object_add_string_copy (node, "conform_dscp", dscp_str); - vec_free (dscp_str); - } - vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str); - if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp); - vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str); - vec_free (dscp_str); - } - vat_json_object_add_string_copy (node, "violate_action", - violate_action_str); - if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_dscp); - vat_json_object_add_string_copy (node, "violate_dscp", dscp_str); - vec_free (dscp_str); - } - - vec_free (rate_type_str); - vec_free (round_type_str); - vec_free (type_str); - vec_free (conform_action_str); - vec_free (exceed_action_str); - vec_free (violate_action_str); -} + vec_free (status); -static void -vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t * - mp) -{ - vat_main_t *vam = &vat_main; - int i, count = ntohl (mp->count); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - if (count > 0) - print (vam->ofp, "classify table ids (%d) : ", count); - for (i = 0; i < count; i++) - { - print (vam->ofp, "%d", ntohl (mp->ids[i])); - print (vam->ofp, (i < count - 1) ? "," : ""); - } vam->retval = ntohl (mp->retval); vam->result_ready = 1; } static void - vl_api_classify_table_ids_reply_t_handler_json - (vl_api_classify_table_ids_reply_t * mp) + vl_api_show_one_nsh_mapping_reply_t_handler + (vl_api_show_one_nsh_mapping_reply_t * mp) { vat_main_t *vam = &vat_main; - int i, count = ntohl (mp->count); + i32 retval = ntohl (mp->retval); - if (count > 0) + if (0 <= retval) { - vat_json_node_t node; - - vat_json_init_object (&node); - for (i = 0; i < count; i++) - { - vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i])); - } - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + print (vam->ofp, "%-20s%-16s", + mp->is_set ? "set" : "not-set", + mp->is_set ? (char *) mp->locator_set_name : ""); } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_classify_table_by_interface_reply_t_handler - (vl_api_classify_table_by_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 table_id; - table_id = ntohl (mp->l2_table_id); - if (table_id != ~0) - print (vam->ofp, "l2 table id : %d", table_id); - else - print (vam->ofp, "l2 table id : No input ACL tables configured"); - table_id = ntohl (mp->ip4_table_id); - if (table_id != ~0) - print (vam->ofp, "ip4 table id : %d", table_id); - else - print (vam->ofp, "ip4 table id : No input ACL tables configured"); - table_id = ntohl (mp->ip6_table_id); - if (table_id != ~0) - print (vam->ofp, "ip6 table id : %d", table_id); - else - print (vam->ofp, "ip6 table id : No input ACL tables configured"); - vam->retval = ntohl (mp->retval); + vam->retval = retval; vam->result_ready = 1; } static void - vl_api_classify_table_by_interface_reply_t_handler_json - (vl_api_classify_table_by_interface_reply_t * mp) + vl_api_show_one_nsh_mapping_reply_t_handler_json + (vl_api_show_one_nsh_mapping_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; + u8 *status = 0; + + status = format (0, "%s", mp->is_set ? "yes" : "no"); + vec_add1 (status, 0); vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "is_set", status); + if (mp->is_set) + { + vat_json_object_add_string_copy (&node, "locator_set", + mp->locator_set_name); + } - vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id)); - vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id)); - vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id)); + vec_free (status); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -3843,38 +4344,34 @@ static void vam->result_ready = 1; } -static void vl_api_policer_add_del_reply_t_handler - (vl_api_policer_add_del_reply_t * mp) +static void + vl_api_show_one_map_register_ttl_reply_t_handler + (vl_api_show_one_map_register_ttl_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else + + vl_api_show_one_map_register_ttl_reply_t_endian (mp); + + if (0 <= retval) { - vam->retval = retval; - vam->result_ready = 1; - if (retval == 0 && mp->policer_index != 0xFFFFFFFF) - /* - * Note: this is just barely thread-safe, depends on - * the main thread spinning waiting for an answer... - */ - errmsg ("policer index %d", ntohl (mp->policer_index)); + print (vam->ofp, "ttl: %u", mp->ttl); } + + vam->retval = retval; + vam->result_ready = 1; } -static void vl_api_policer_add_del_reply_t_handler_json - (vl_api_policer_add_del_reply_t * mp) +static void + vl_api_show_one_map_register_ttl_reply_t_handler_json + (vl_api_show_one_map_register_ttl_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; + vl_api_show_one_map_register_ttl_reply_t_endian (mp); vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "policer_index", - ntohl (mp->policer_index)); + vat_json_object_add_uint (&node, "ttl", mp->ttl); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -3883,167 +4380,208 @@ static void vl_api_policer_add_del_reply_t_handler_json vam->result_ready = 1; } -/* Format hex dump. */ -u8 * -format_hex_bytes (u8 * s, va_list * va) -{ - u8 *bytes = va_arg (*va, u8 *); - int n_bytes = va_arg (*va, int); - uword i; - - /* Print short or long form depending on byte count. */ - uword short_form = n_bytes <= 32; - uword indent = format_get_indent (s); - - if (n_bytes == 0) - return s; - - for (i = 0; i < n_bytes; i++) - { - if (!short_form && (i % 32) == 0) - s = format (s, "%08x: ", i); - s = format (s, "%02x", bytes[i]); - if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes) - s = format (s, "\n%U", format_white_space, indent); - } - - return s; -} - static void -vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t - * mp) +vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); - if (retval == 0) + + if (0 <= retval) { - print (vam->ofp, "classify table info :"); - print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d", - ntohl (mp->active_sessions), ntohl (mp->next_table_index), - ntohl (mp->miss_next_index)); - print (vam->ofp, "nbuckets: %d skip: %d match: %d", - ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors), - ntohl (mp->match_n_vectors)); - print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask, - ntohl (mp->mask_length)); + print (vam->ofp, "%-20s%-16s", + mp->status ? "enabled" : "disabled", + mp->status ? (char *) mp->locator_set_name : ""); } + vam->retval = retval; vam->result_ready = 1; } static void - vl_api_classify_table_info_reply_t_handler_json - (vl_api_classify_table_info_reply_t * mp) +vl_api_show_one_pitr_reply_t_handler_json (vl_api_show_one_pitr_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; + u8 *status = 0; - i32 retval = ntohl (mp->retval); - if (retval == 0) + 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) { - vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "locator_set", + mp->locator_set_name); + } - vat_json_object_add_int (&node, "sessions", - ntohl (mp->active_sessions)); - vat_json_object_add_int (&node, "nexttbl", - ntohl (mp->next_table_index)); - vat_json_object_add_int (&node, "nextnode", - ntohl (mp->miss_next_index)); - vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets)); - vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors)); - vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors)); - u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask, - ntohl (mp->mask_length), 0); - vat_json_object_add_string_copy (&node, "mask", s); + vec_free (status); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - } vam->retval = ntohl (mp->retval); vam->result_ready = 1; } -static void -vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * - mp) +static u8 * +format_policer_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; + u32 i = va_arg (*va, u32); - print (vam->ofp, "next_index: %d advance: %d opaque: %d ", - ntohl (mp->hit_next_index), ntohl (mp->advance), - ntohl (mp->opaque_index)); - print (vam->ofp, "mask: %U", format_hex_bytes, mp->match, - ntohl (mp->match_length)); + if (i == SSE2_QOS_POLICER_TYPE_1R2C) + s = format (s, "1r2c"); + else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697) + s = format (s, "1r3c"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) + s = format (s, "2r3c-2698"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115) + s = format (s, "2r3c-4115"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1) + s = format (s, "2r3c-mef5cf1"); + else + s = format (s, "ILLEGAL"); + return s; } -static void - vl_api_classify_session_details_t_handler_json - (vl_api_classify_session_details_t * mp) +static u8 * +format_policer_rate_type (u8 * s, va_list * va) { - 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); + u32 i = va_arg (*va, u32); - vat_json_init_object (node); - vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index)); - vat_json_object_add_int (node, "advance", ntohl (mp->advance)); - vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index)); - u8 *s = - format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length), - 0); - vat_json_object_add_string_copy (node, "match", s); + if (i == SSE2_QOS_RATE_KBPS) + s = format (s, "kbps"); + else if (i == SSE2_QOS_RATE_PPS) + s = format (s, "pps"); + else + s = format (s, "ILLEGAL"); + return s; } -static void vl_api_pg_create_interface_reply_t_handler - (vl_api_pg_create_interface_reply_t * mp) +static u8 * +format_policer_round_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; + u32 i = va_arg (*va, u32); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; + if (i == SSE2_QOS_ROUND_TO_CLOSEST) + s = format (s, "closest"); + else if (i == SSE2_QOS_ROUND_TO_UP) + s = format (s, "up"); + else if (i == SSE2_QOS_ROUND_TO_DOWN) + s = format (s, "down"); + else + s = format (s, "ILLEGAL"); + return s; } -static void vl_api_pg_create_interface_reply_t_handler_json - (vl_api_pg_create_interface_reply_t * mp) +static u8 * +format_policer_action_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - vat_json_node_t node; + u32 i = va_arg (*va, u32); - i32 retval = ntohl (mp->retval); - if (retval == 0) - { - vat_json_init_object (&node); + if (i == SSE2_QOS_ACTION_DROP) + s = format (s, "drop"); + else if (i == SSE2_QOS_ACTION_TRANSMIT) + s = format (s, "transmit"); + else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) + s = format (s, "mark-and-transmit"); + else + s = format (s, "ILLEGAL"); + return s; +} - vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index)); +static u8 * +format_dscp (u8 * s, va_list * va) +{ + u32 i = va_arg (*va, u32); + char *t = 0; - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + switch (i) + { +#define _(v,f,str) case VNET_DSCP_##f: t = str; break; + foreach_vnet_dscp +#undef _ + default: + return format (s, "ILLEGAL"); } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; + s = format (s, "%s", t); + return s; } -static void vl_api_policer_classify_details_t_handler - (vl_api_policer_classify_details_t * mp) +static void +vl_api_policer_details_t_handler (vl_api_policer_details_t * mp) { vat_main_t *vam = &vat_main; + u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str; - print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), - ntohl (mp->table_index)); + if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) + conform_dscp_str = format (0, "%U", format_dscp, mp->conform_dscp); + else + conform_dscp_str = format (0, ""); + + if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) + exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp); + else + exceed_dscp_str = format (0, ""); + + if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) + violate_dscp_str = format (0, "%U", format_dscp, mp->violate_dscp); + else + violate_dscp_str = format (0, ""); + + print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, " + "rate type %U, round type %U, %s rate, %s color-aware, " + "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, " + "cur bkt %u, ext lim %u, ext bkt %u, last update %llu" + "conform action %U%s, exceed action %U%s, violate action %U%s", + mp->name, + format_policer_type, mp->type, + ntohl (mp->cir), + ntohl (mp->eir), + clib_net_to_host_u64 (mp->cb), + clib_net_to_host_u64 (mp->eb), + format_policer_rate_type, mp->rate_type, + format_policer_round_type, mp->round_type, + mp->single_rate ? "single" : "dual", + mp->color_aware ? "is" : "not", + ntohl (mp->cir_tokens_per_period), + ntohl (mp->pir_tokens_per_period), + ntohl (mp->scale), + ntohl (mp->current_limit), + ntohl (mp->current_bucket), + ntohl (mp->extended_limit), + ntohl (mp->extended_bucket), + clib_net_to_host_u64 (mp->last_update_time), + format_policer_action_type, mp->conform_action_type, + conform_dscp_str, + format_policer_action_type, mp->exceed_action_type, + exceed_dscp_str, + format_policer_action_type, mp->violate_action_type, + violate_dscp_str); + + vec_free (conform_dscp_str); + vec_free (exceed_dscp_str); + vec_free (violate_dscp_str); } -static void vl_api_policer_classify_details_t_handler_json - (vl_api_policer_classify_details_t * mp) +static void vl_api_policer_details_t_handler_json + (vl_api_policer_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node; + u8 *rate_type_str, *round_type_str, *type_str; + u8 *conform_action_str, *exceed_action_str, *violate_action_str; + + rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type); + round_type_str = + format (0, "%U", format_policer_round_type, mp->round_type); + type_str = format (0, "%U", format_policer_type, mp->type); + conform_action_str = format (0, "%U", format_policer_action_type, + mp->conform_action_type); + exceed_action_str = format (0, "%U", format_policer_action_type, + mp->exceed_action_type); + violate_action_str = format (0, "%U", format_policer_action_type, + mp->violate_action_type); if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -4053,60 +4591,352 @@ static void vl_api_policer_classify_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)); - vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); -} - -static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler - (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) + vat_json_object_add_string_copy (node, "name", mp->name); + vat_json_object_add_uint (node, "cir", ntohl (mp->cir)); + vat_json_object_add_uint (node, "eir", ntohl (mp->eir)); + vat_json_object_add_uint (node, "cb", clib_net_to_host_u64 (mp->cb)); + vat_json_object_add_uint (node, "eb", clib_net_to_host_u64 (mp->eb)); + vat_json_object_add_string_copy (node, "rate_type", rate_type_str); + vat_json_object_add_string_copy (node, "round_type", round_type_str); + vat_json_object_add_string_copy (node, "type", type_str); + vat_json_object_add_uint (node, "single_rate", mp->single_rate); + vat_json_object_add_uint (node, "color_aware", mp->color_aware); + vat_json_object_add_uint (node, "scale", ntohl (mp->scale)); + vat_json_object_add_uint (node, "cir_tokens_per_period", + ntohl (mp->cir_tokens_per_period)); + vat_json_object_add_uint (node, "eir_tokens_per_period", + ntohl (mp->pir_tokens_per_period)); + vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit)); + vat_json_object_add_uint (node, "current_bucket", + ntohl (mp->current_bucket)); + vat_json_object_add_uint (node, "extended_limit", + ntohl (mp->extended_limit)); + vat_json_object_add_uint (node, "extended_bucket", + ntohl (mp->extended_bucket)); + vat_json_object_add_uint (node, "last_update_time", + ntohl (mp->last_update_time)); + vat_json_object_add_string_copy (node, "conform_action", + conform_action_str); + if (mp->conform_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) { - vam->async_errors += (retval < 0); + u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_dscp); + vat_json_object_add_string_copy (node, "conform_dscp", dscp_str); + vec_free (dscp_str); } - else + vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str); + if (mp->exceed_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) { - vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); - vam->result_ready = 1; + u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_dscp); + vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str); + vec_free (dscp_str); + } + vat_json_object_add_string_copy (node, "violate_action", + violate_action_str); + if (mp->violate_action_type == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) + { + u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_dscp); + vat_json_object_add_string_copy (node, "violate_dscp", dscp_str); + vec_free (dscp_str); } + + vec_free (rate_type_str); + vec_free (round_type_str); + vec_free (type_str); + vec_free (conform_action_str); + vec_free (exceed_action_str); + vec_free (violate_action_str); } -static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler_json - (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp) +static void +vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_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); + int i, count = ntohl (mp->count); + if (count > 0) + print (vam->ofp, "classify table ids (%d) : ", count); + for (i = 0; i < count; i++) + { + print (vam->ofp, "%d", ntohl (mp->ids[i])); + print (vam->ofp, (i < count - 1) ? "," : ""); + } vam->retval = ntohl (mp->retval); vam->result_ready = 1; } -static void vl_api_flow_classify_details_t_handler - (vl_api_flow_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), - ntohl (mp->table_index)); -} - -static void vl_api_flow_classify_details_t_handler_json - (vl_api_flow_classify_details_t * mp) +static void + vl_api_classify_table_ids_reply_t_handler_json + (vl_api_classify_table_ids_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t *node; + int i, count = ntohl (mp->count); - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (count > 0) + { + vat_json_node_t node; + + vat_json_init_object (&node); + for (i = 0; i < count; i++) + { + vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i])); + } + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + } + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_classify_table_by_interface_reply_t_handler + (vl_api_classify_table_by_interface_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 table_id; + + table_id = ntohl (mp->l2_table_id); + if (table_id != ~0) + print (vam->ofp, "l2 table id : %d", table_id); + else + print (vam->ofp, "l2 table id : No input ACL tables configured"); + table_id = ntohl (mp->ip4_table_id); + if (table_id != ~0) + print (vam->ofp, "ip4 table id : %d", table_id); + else + print (vam->ofp, "ip4 table id : No input ACL tables configured"); + table_id = ntohl (mp->ip6_table_id); + if (table_id != ~0) + print (vam->ofp, "ip6 table id : %d", table_id); + else + print (vam->ofp, "ip6 table id : No input ACL tables configured"); + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_classify_table_by_interface_reply_t_handler_json + (vl_api_classify_table_by_interface_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, "l2_table_id", ntohl (mp->l2_table_id)); + vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id)); + vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void vl_api_policer_add_del_reply_t_handler + (vl_api_policer_add_del_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 && mp->policer_index != 0xFFFFFFFF) + /* + * Note: this is just barely thread-safe, depends on + * the main thread spinning waiting for an answer... + */ + errmsg ("policer index %d", ntohl (mp->policer_index)); + } +} + +static void vl_api_policer_add_del_reply_t_handler_json + (vl_api_policer_add_del_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "policer_index", + ntohl (mp->policer_index)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +/* Format hex dump. */ +u8 * +format_hex_bytes (u8 * s, va_list * va) +{ + u8 *bytes = va_arg (*va, u8 *); + int n_bytes = va_arg (*va, int); + uword i; + + /* Print short or long form depending on byte count. */ + uword short_form = n_bytes <= 32; + u32 indent = format_get_indent (s); + + if (n_bytes == 0) + return s; + + for (i = 0; i < n_bytes; i++) + { + if (!short_form && (i % 32) == 0) + s = format (s, "%08x: ", i); + s = format (s, "%02x", bytes[i]); + if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes) + s = format (s, "\n%U", format_white_space, indent); + } + + return s; +} + +static void +vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t + * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + print (vam->ofp, "classify table info :"); + print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d", + ntohl (mp->active_sessions), ntohl (mp->next_table_index), + ntohl (mp->miss_next_index)); + print (vam->ofp, "nbuckets: %d skip: %d match: %d", + ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors), + ntohl (mp->match_n_vectors)); + print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask, + ntohl (mp->mask_length)); + } + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_classify_table_info_reply_t_handler_json + (vl_api_classify_table_info_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + vat_json_init_object (&node); + + vat_json_object_add_int (&node, "sessions", + ntohl (mp->active_sessions)); + vat_json_object_add_int (&node, "nexttbl", + ntohl (mp->next_table_index)); + vat_json_object_add_int (&node, "nextnode", + ntohl (mp->miss_next_index)); + vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets)); + vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors)); + vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors)); + u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask, + ntohl (mp->mask_length), 0); + vat_json_object_add_string_copy (&node, "mask", s); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + } + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void +vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * + mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "next_index: %d advance: %d opaque: %d ", + ntohl (mp->hit_next_index), ntohl (mp->advance), + ntohl (mp->opaque_index)); + print (vam->ofp, "mask: %U", format_hex_bytes, mp->match, + ntohl (mp->match_length)); +} + +static void + vl_api_classify_session_details_t_handler_json + (vl_api_classify_session_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_int (node, "next_index", ntohl (mp->hit_next_index)); + vat_json_object_add_int (node, "advance", ntohl (mp->advance)); + vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index)); + u8 *s = + format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length), + 0); + vat_json_object_add_string_copy (node, "match", s); +} + +static void vl_api_pg_create_interface_reply_t_handler + (vl_api_pg_create_interface_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void vl_api_pg_create_interface_reply_t_handler_json + (vl_api_pg_create_interface_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + vat_json_init_object (&node); + + vat_json_object_add_int (&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_policer_classify_details_t_handler + (vl_api_policer_classify_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), + ntohl (mp->table_index)); +} + +static void vl_api_policer_classify_details_t_handler_json + (vl_api_policer_classify_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node; + + if (VAT_JSON_ARRAY != vam->json_tree.type) { ASSERT (VAT_JSON_NONE == vam->json_tree.type); vat_json_init_array (&vam->json_tree); @@ -4118,8 +4948,71 @@ static void vl_api_flow_classify_details_t_handler_json vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); } +static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler + (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; + } +} + +static void vl_api_ipsec_gre_add_del_tunnel_reply_t_handler_json + (vl_api_ipsec_gre_add_del_tunnel_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void vl_api_flow_classify_details_t_handler + (vl_api_flow_classify_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), + ntohl (mp->table_index)); +} + +static void vl_api_flow_classify_details_t_handler_json + (vl_api_flow_classify_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); +} + +#define vl_api_vnet_interface_simple_counters_t_endian vl_noop_handler +#define vl_api_vnet_interface_simple_counters_t_print vl_noop_handler +#define vl_api_vnet_interface_combined_counters_t_endian vl_noop_handler +#define vl_api_vnet_interface_combined_counters_t_print vl_noop_handler #define vl_api_vnet_ip4_fib_counters_t_endian vl_noop_handler #define vl_api_vnet_ip4_fib_counters_t_print vl_noop_handler #define vl_api_vnet_ip6_fib_counters_t_endian vl_noop_handler @@ -4130,6 +5023,14 @@ static void vl_api_flow_classify_details_t_handler_json #define vl_api_vnet_ip6_nbr_counters_t_print vl_noop_handler #define vl_api_one_adjacencies_get_reply_t_endian vl_noop_handler #define vl_api_one_adjacencies_get_reply_t_print vl_noop_handler +#define vl_api_one_l2_arp_bd_get_reply_t_print vl_noop_handler +#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 @@ -4147,6 +5048,8 @@ _(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) \ _(sw_interface_set_l2_xconnect_reply) \ @@ -4154,8 +5057,10 @@ _(l2fib_add_del_reply) \ _(l2fib_flush_int_reply) \ _(l2fib_flush_bd_reply) \ _(ip_add_del_route_reply) \ +_(ip_table_add_del_reply) \ _(ip_mroute_add_del_reply) \ _(mpls_route_add_del_reply) \ +_(mpls_table_add_del_reply) \ _(mpls_ip_bind_unbind_reply) \ _(proxy_arp_add_del_reply) \ _(proxy_arp_intfc_enable_disable_reply) \ @@ -4193,6 +5098,7 @@ _(modify_vhost_user_if_reply) \ _(delete_vhost_user_if_reply) \ _(want_ip4_arp_events_reply) \ _(want_ip6_nd_events_reply) \ +_(want_l2_macs_events_reply) \ _(input_acl_set_interface_reply) \ _(ipsec_spd_add_del_reply) \ _(ipsec_interface_add_del_spd_reply) \ @@ -4200,6 +5106,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) \ @@ -4222,8 +5130,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) \ @@ -4233,18 +5141,22 @@ _(one_add_del_map_server_reply) \ _(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) \ _(one_add_del_map_request_itr_rlocs_reply) \ _(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) \ -_(gpe_add_del_fwd_entry_reply) \ _(gpe_enable_disable_reply) \ _(gpe_set_encap_mode_reply) \ _(gpe_add_del_iface_reply) \ -_(vxlan_gpe_add_del_tunnel_reply) \ +_(gpe_add_del_native_fwd_rpath_reply) \ _(af_packet_delete_reply) \ _(policer_classify_set_interface_reply) \ _(netmap_create_reply) \ @@ -4263,7 +5175,15 @@ _(l2_interface_pbb_tag_rewrite_reply) \ _(punt_reply) \ _(feature_enable_disable_reply) \ _(sw_interface_tag_add_del_reply) \ -_(sw_interface_set_mtu_reply) +_(sw_interface_set_mtu_reply) \ +_(p2p_ethernet_add_reply) \ +_(p2p_ethernet_del_reply) \ +_(lldp_config_reply) \ +_(sw_interface_set_lldp_reply) \ +_(tcp_configure_src_addresses_reply) \ +_(app_namespace_add_del_reply) \ +_(dns_enable_disable_reply) \ +_(dns_name_server_add_del_reply) #define _(n) \ static void vl_api_##n##_t_handler \ @@ -4315,13 +5235,14 @@ _(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) \ _(SW_INTERFACE_SET_L2_BRIDGE_REPLY, \ sw_interface_set_l2_bridge_reply) \ _(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply) \ _(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \ -_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details) \ _(BRIDGE_DOMAIN_SET_MAC_AGE_REPLY, bridge_domain_set_mac_age_reply) \ _(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply) \ _(L2FIB_FLUSH_INT_REPLY, l2fib_flush_int_reply) \ @@ -4333,7 +5254,9 @@ _(TAP_MODIFY_REPLY, tap_modify_reply) \ _(TAP_DELETE_REPLY, tap_delete_reply) \ _(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_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) \ _(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply) \ @@ -4385,7 +5308,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) \ @@ -4396,7 +5321,7 @@ _(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply) \ _(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply) \ _(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \ _(SHOW_VERSION_REPLY, show_version_reply) \ -_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry) \ +_(L2_FIB_TABLE_DETAILS, l2_fib_table_details) \ _(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \ _(VXLAN_GPE_TUNNEL_DETAILS, vxlan_gpe_tunnel_details) \ _(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \ @@ -4404,6 +5329,8 @@ _(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply) \ _(IP4_ARP_EVENT, ip4_arp_event) \ _(WANT_IP6_ND_EVENTS_REPLY, want_ip6_nd_events_reply) \ _(IP6_ND_EVENT, ip6_nd_event) \ +_(WANT_L2_MACS_EVENTS_REPLY, want_l2_macs_events_reply) \ +_(L2_MACS_EVENT, l2_macs_event) \ _(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply) \ _(IP_ADDRESS_DETAILS, ip_address_details) \ _(IP_DETAILS, ip_details) \ @@ -4411,8 +5338,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) \ @@ -4453,6 +5383,11 @@ _(ONE_ADD_DEL_MAP_SERVER_REPLY, one_add_del_map_server_reply) \ _(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, \ one_rloc_probe_enable_disable_reply) \ _(ONE_PITR_SET_LOCATOR_SET_REPLY, one_pitr_set_locator_set_reply) \ @@ -4472,12 +5407,22 @@ _(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) \ _(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) \ _(GPE_ENABLE_DISABLE_REPLY, gpe_enable_disable_reply) \ _(GPE_ADD_DEL_FWD_ENTRY_REPLY, gpe_add_del_fwd_entry_reply) \ +_(GPE_FWD_ENTRY_VNIS_GET_REPLY, gpe_fwd_entry_vnis_get_reply) \ _(GPE_FWD_ENTRIES_GET_REPLY, gpe_fwd_entries_get_reply) \ +_(GPE_NATIVE_FWD_RPATHS_GET_REPLY, gpe_native_fwd_rpaths_get_reply) \ +_(GPE_ADD_DEL_NATIVE_FWD_RPATH_REPLY, \ + gpe_add_del_native_fwd_rpath_reply) \ _(GPE_FWD_ENTRY_PATH_DETAILS, \ gpe_fwd_entry_path_details) \ _(SHOW_ONE_STATUS_REPLY, show_one_status_reply) \ @@ -4485,12 +5430,16 @@ _(ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY, \ one_add_del_map_request_itr_rlocs_reply) \ _(ONE_GET_MAP_REQUEST_ITR_RLOCS_REPLY, \ one_get_map_request_itr_rlocs_reply) \ +_(SHOW_ONE_NSH_MAPPING_REPLY, show_one_nsh_mapping_reply) \ _(SHOW_ONE_PITR_REPLY, show_one_pitr_reply) \ _(SHOW_ONE_USE_PETR_REPLY, show_one_use_petr_reply) \ _(SHOW_ONE_MAP_REQUEST_MODE_REPLY, show_one_map_request_mode_reply) \ _(SHOW_ONE_RLOC_PROBE_STATE_REPLY, show_one_rloc_probe_state_reply) \ _(SHOW_ONE_MAP_REGISTER_STATE_REPLY, \ show_one_map_register_state_reply) \ +_(SHOW_ONE_MAP_REGISTER_TTL_REPLY, show_one_map_register_ttl_reply) \ +_(SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, \ + show_one_map_register_fallback_threshold_reply) \ _(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \ _(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \ _(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \ @@ -4535,15 +5484,27 @@ _(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \ _(L2_XCONNECT_DETAILS, l2_xconnect_details) \ _(SW_INTERFACE_SET_MTU_REPLY, sw_interface_set_mtu_reply) \ _(IP_NEIGHBOR_DETAILS, ip_neighbor_details) \ -_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) +_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \ +_(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) \ +_(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) #define foreach_standalone_reply_msg \ -_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \ -_(VNET_INTERFACE_COUNTERS, vnet_interface_counters) \ +_(SW_INTERFACE_EVENT, sw_interface_event) \ +_(VNET_INTERFACE_SIMPLE_COUNTERS, vnet_interface_simple_counters) \ +_(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 { @@ -4917,76 +5878,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_request_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_REQUEST, 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 = (u64) 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) @@ -5020,10 +5914,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) { @@ -5236,6 +6139,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; @@ -5269,7 +6178,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); @@ -5283,7 +6192,7 @@ api_sw_interface_set_flags (vat_main_t * vam) vl_api_sw_interface_set_flags_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; - u8 admin_up = 0, link_up = 0; + u8 admin_up = 0; int ret; /* Parse args required to build the message */ @@ -5293,10 +6202,6 @@ api_sw_interface_set_flags (vat_main_t * vam) admin_up = 1; else if (unformat (i, "admin-down")) admin_up = 0; - else if (unformat (i, "link-up")) - link_up = 1; - else if (unformat (i, "link-down")) - link_up = 0; else if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) sw_if_index_set = 1; @@ -5316,7 +6221,6 @@ api_sw_interface_set_flags (vat_main_t * vam) M (SW_INTERFACE_SET_FLAGS, mp); mp->sw_if_index = ntohl (sw_if_index); mp->admin_up_down = admin_up; - mp->link_up_down = link_up; /* send it... */ S (mp); @@ -5693,6 +6597,57 @@ api_sw_interface_set_vxlan_bypass (vat_main_t * vam) return ret; } +static int +api_sw_interface_set_geneve_bypass (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + 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, "%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) { @@ -5850,7 +6805,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); @@ -5865,6 +6820,7 @@ api_bridge_domain_add_del (vat_main_t * vam) u32 bd_id = ~0; u8 is_add = 1; u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0; + u8 *bd_tag = NULL; u32 mac_age = 0; int ret; @@ -5885,6 +6841,8 @@ api_bridge_domain_add_del (vat_main_t * vam) ; else if (unformat (i, "mac-age %d", &mac_age)) ; + else if (unformat (i, "bd-tag %s", &bd_tag)) + ; else if (unformat (i, "del")) { is_add = 0; @@ -5897,13 +6855,22 @@ api_bridge_domain_add_del (vat_main_t * vam) if (bd_id == ~0) { errmsg ("missing bridge domain"); - return -99; + ret = -99; + goto done; } if (mac_age > 255) { errmsg ("mac age must be less than 256 "); - return -99; + ret = -99; + goto done; + } + + if ((bd_tag) && (strlen ((char *) bd_tag) > 63)) + { + errmsg ("bd-tag cannot be longer than 63"); + ret = -99; + goto done; } M (BRIDGE_DOMAIN_ADD_DEL, mp); @@ -5916,9 +6883,14 @@ api_bridge_domain_add_del (vat_main_t * vam) mp->arp_term = arp_term; mp->is_add = is_add; mp->mac_age = (u8) mac_age; + if (bd_tag) + strcpy ((char *) mp->bd_tag, (char *) bd_tag); S (mp); W (ret); + +done: + vec_free (bd_tag); return ret; } @@ -6100,7 +7072,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; @@ -6182,8 +7154,9 @@ api_l2_flags (vat_main_t * vam) unformat_input_t *i = vam->input; vl_api_l2_flags_t *mp; u32 sw_if_index; - u32 feature_bitmap = 0; + u32 flags = 0; u8 sw_if_index_set = 0; + u8 is_set = 0; int ret; /* Parse args required to build the message */ @@ -6203,13 +7176,19 @@ api_l2_flags (vat_main_t * vam) break; } else if (unformat (i, "learn")) - feature_bitmap |= L2INPUT_FEAT_LEARN; + flags |= L2_LEARN; else if (unformat (i, "forward")) - feature_bitmap |= L2INPUT_FEAT_FWD; + flags |= L2_FWD; else if (unformat (i, "flood")) - feature_bitmap |= L2INPUT_FEAT_FLOOD; + flags |= L2_FLOOD; else if (unformat (i, "uu-flood")) - feature_bitmap |= L2INPUT_FEAT_UU_FLOOD; + flags |= L2_UU_FLOOD; + else if (unformat (i, "arp-term")) + flags |= L2_ARP_TERM; + else if (unformat (i, "off")) + is_set = 0; + else if (unformat (i, "disable")) + is_set = 0; else break; } @@ -6223,7 +7202,8 @@ api_l2_flags (vat_main_t * vam) M (L2_FLAGS, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->feature_bitmap = ntohl (feature_bitmap); + mp->feature_bitmap = ntohl (flags); + mp->is_set = is_set; S (mp); W (ret); @@ -6555,6 +7535,56 @@ api_tap_delete (vat_main_t * vam) return ret; } +static int +api_ip_table_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ip_table_add_del_t *mp; + u32 table_id = ~0; + u8 is_ipv6 = 0; + u8 is_add = 1; + int ret = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "ipv6")) + is_ipv6 = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "table %d", &table_id)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (~0 == table_id) + { + errmsg ("missing table-ID"); + return -99; + } + + /* Construct the API message */ + M (IP_TABLE_ADD_DEL, mp); + + mp->table_id = ntohl (table_id); + mp->is_ipv6 = is_ipv6; + mp->is_add = is_add; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + + return ret; +} + static int api_ip_add_del_route (vat_main_t * vam) { @@ -6567,7 +7597,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; @@ -6651,8 +7680,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")) @@ -6761,7 +7788,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); @@ -6814,7 +7840,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; @@ -6973,6 +7999,52 @@ api_ip_mroute_add_del (vat_main_t * vam) return ret; } +static int +api_mpls_table_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_mpls_table_add_del_t *mp; + u32 table_id = ~0; + u8 is_add = 1; + int ret = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "table %d", &table_id)) + ; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (~0 == table_id) + { + errmsg ("missing table-ID"); + return -99; + } + + /* Construct the API message */ + M (MPLS_TABLE_ADD_DEL, mp); + + mp->mt_table_id = ntohl (table_id); + mp->mt_is_add = is_add; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + + return ret; +} + static int api_mpls_route_add_del (vat_main_t * vam) { @@ -7000,7 +8072,7 @@ api_mpls_route_add_del (vat_main_t * vam) mpls_label_t *next_hop_out_label_stack = NULL; mpls_label_t local_label = MPLS_LABEL_INVALID; u8 is_eos = 0; - u8 next_hop_proto_is_ip4 = 1; + dpo_proto_t next_hop_proto = DPO_PROTO_IP4; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) @@ -7019,13 +8091,13 @@ api_mpls_route_add_del (vat_main_t * vam) &v4_next_hop_address)) { next_hop_set = 1; - next_hop_proto_is_ip4 = 1; + next_hop_proto = DPO_PROTO_IP4; } else if (unformat (i, "via %U", unformat_ip6_address, &v6_next_hop_address)) { next_hop_set = 1; - next_hop_proto_is_ip4 = 0; + next_hop_proto = DPO_PROTO_IP6; } else if (unformat (i, "weight %d", &next_hop_weight)) ; @@ -7050,12 +8122,12 @@ api_mpls_route_add_del (vat_main_t * vam) else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id)) { next_hop_set = 1; - next_hop_proto_is_ip4 = 1; + next_hop_proto = DPO_PROTO_IP4; } else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id)) { next_hop_set = 1; - next_hop_proto_is_ip4 = 0; + next_hop_proto = DPO_PROTO_IP6; } else if (unformat (i, "next-hop-table %d", &next_hop_table_id)) ; @@ -7101,7 +8173,7 @@ api_mpls_route_add_del (vat_main_t * vam) mp->mr_create_table_if_needed = create_table_if_needed; mp->mr_is_add = is_add; - mp->mr_next_hop_proto_is_ip4 = next_hop_proto_is_ip4; + mp->mr_next_hop_proto = next_hop_proto; mp->mr_is_classify = is_classify; mp->mr_is_multipath = is_multipath; mp->mr_is_resolve_host = resolve_host; @@ -7124,13 +8196,14 @@ api_mpls_route_add_del (vat_main_t * vam) if (next_hop_set) { - if (next_hop_proto_is_ip4) + if (DPO_PROTO_IP4 == next_hop_proto) { clib_memcpy (mp->mr_next_hop, &v4_next_hop_address, sizeof (v4_next_hop_address)); } - else + else if (DPO_PROTO_IP6 == next_hop_proto) + { clib_memcpy (mp->mr_next_hop, &v6_next_hop_address, @@ -7156,7 +8229,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; @@ -8066,7 +9139,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); @@ -8418,7 +9491,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); @@ -8890,1212 +9963,1505 @@ unformat_tcp_mask (unformat_input_t * input, va_list * args) foreach_tcp_proto_field; #undef _ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (0); + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (0); +#define _(a) else if (unformat (input, #a)) a=1; + foreach_tcp_proto_field +#undef _ + else + break; + } + +#define _(a) found_something += a; + foreach_tcp_proto_field; +#undef _ + + if (found_something == 0) + return 0; + + vec_validate (mask, sizeof (*tcp) - 1); + + tcp = (tcp_header_t *) mask; + +#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a)); + foreach_tcp_proto_field; +#undef _ + + *maskp = mask; + return 1; +} + +uword +unformat_udp_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + udp_header_t *udp; + +#define _(a) u8 a=0; + foreach_udp_proto_field; +#undef _ + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (0); +#define _(a) else if (unformat (input, #a)) a=1; + foreach_udp_proto_field +#undef _ + else + break; + } + +#define _(a) found_something += a; + foreach_udp_proto_field; +#undef _ + + if (found_something == 0) + return 0; + + vec_validate (mask, sizeof (*udp) - 1); + + udp = (udp_header_t *) mask; + +#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a)); + foreach_udp_proto_field; +#undef _ + + *maskp = mask; + return 1; +} + +uword +unformat_l4_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u16 src_port = 0, dst_port = 0; + tcpudp_header_t *tcpudp; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "tcp %U", unformat_tcp_mask, maskp)) + return 1; + else if (unformat (input, "udp %U", unformat_udp_mask, maskp)) + return 1; + else if (unformat (input, "src_port")) + src_port = 0xFFFF; + else if (unformat (input, "dst_port")) + dst_port = 0xFFFF; + else + return 0; + } + + if (!src_port && !dst_port) + return 0; + + u8 *mask = 0; + vec_validate (mask, sizeof (tcpudp_header_t) - 1); + + tcpudp = (tcpudp_header_t *) mask; + tcpudp->src_port = src_port; + tcpudp->dst_port = dst_port; + + *maskp = mask; + + return 1; +} + +uword +unformat_ip4_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + ip4_header_t *ip; + +#define _(a) u8 a=0; + foreach_ip4_proto_field; +#undef _ + u8 version = 0; + u8 hdr_length = 0; + + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "version")) + version = 1; + else if (unformat (input, "hdr_length")) + hdr_length = 1; + else if (unformat (input, "src")) + src_address = 1; + else if (unformat (input, "dst")) + dst_address = 1; + else if (unformat (input, "proto")) + protocol = 1; + +#define _(a) else if (unformat (input, #a)) a=1; + foreach_ip4_proto_field +#undef _ + else + break; + } + +#define _(a) found_something += a; + foreach_ip4_proto_field; +#undef _ + + if (found_something == 0) + return 0; + + vec_validate (mask, sizeof (*ip) - 1); + + ip = (ip4_header_t *) mask; + +#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a)); + foreach_ip4_proto_field; +#undef _ + + ip->ip_version_and_header_length = 0; + + if (version) + ip->ip_version_and_header_length |= 0xF0; + + if (hdr_length) + ip->ip_version_and_header_length |= 0x0F; + + *maskp = mask; + return 1; +} + +#define foreach_ip6_proto_field \ +_(src_address) \ +_(dst_address) \ +_(payload_length) \ +_(hop_limit) \ +_(protocol) + +uword +unformat_ip6_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + ip6_header_t *ip; + u32 ip_version_traffic_class_and_flow_label; + +#define _(a) u8 a=0; + foreach_ip6_proto_field; +#undef _ + u8 version = 0; + u8 traffic_class = 0; + u8 flow_label = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "version")) + version = 1; + else if (unformat (input, "traffic-class")) + traffic_class = 1; + else if (unformat (input, "flow-label")) + flow_label = 1; + else if (unformat (input, "src")) + src_address = 1; + else if (unformat (input, "dst")) + dst_address = 1; + else if (unformat (input, "proto")) + protocol = 1; + #define _(a) else if (unformat (input, #a)) a=1; - foreach_tcp_proto_field + foreach_ip6_proto_field #undef _ else break; } #define _(a) found_something += a; - foreach_tcp_proto_field; + foreach_ip6_proto_field; #undef _ if (found_something == 0) return 0; - vec_validate (mask, sizeof (*tcp) - 1); + vec_validate (mask, sizeof (*ip) - 1); - tcp = (tcp_header_t *) mask; + ip = (ip6_header_t *) mask; -#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a)); - foreach_tcp_proto_field; +#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a)); + foreach_ip6_proto_field; #undef _ + ip_version_traffic_class_and_flow_label = 0; + + if (version) + ip_version_traffic_class_and_flow_label |= 0xF0000000; + + if (traffic_class) + ip_version_traffic_class_and_flow_label |= 0x0FF00000; + + if (flow_label) + ip_version_traffic_class_and_flow_label |= 0x000FFFFF; + + ip->ip_version_traffic_class_and_flow_label = + clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + *maskp = mask; return 1; } uword -unformat_udp_mask (unformat_input_t * input, va_list * args) +unformat_l3_mask (unformat_input_t * input, va_list * args) { u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - udp_header_t *udp; - -#define _(a) u8 a=0; - foreach_udp_proto_field; -#undef _ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (0); -#define _(a) else if (unformat (input, #a)) a=1; - foreach_udp_proto_field -#undef _ - else + if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp)) + return 1; + else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp)) + return 1; + else break; } + return 0; +} -#define _(a) found_something += a; - foreach_udp_proto_field; -#undef _ +uword +unformat_l2_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 src = 0; + u8 dst = 0; + u8 proto = 0; + u8 tag1 = 0; + u8 tag2 = 0; + u8 ignore_tag1 = 0; + u8 ignore_tag2 = 0; + u8 cos1 = 0; + u8 cos2 = 0; + u8 dot1q = 0; + u8 dot1ad = 0; + int len = 14; - if (found_something == 0) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "src")) + src = 1; + else if (unformat (input, "dst")) + dst = 1; + else if (unformat (input, "proto")) + proto = 1; + else if (unformat (input, "tag1")) + tag1 = 1; + else if (unformat (input, "tag2")) + tag2 = 1; + else if (unformat (input, "ignore-tag1")) + ignore_tag1 = 1; + else if (unformat (input, "ignore-tag2")) + ignore_tag2 = 1; + else if (unformat (input, "cos1")) + cos1 = 1; + else if (unformat (input, "cos2")) + cos2 = 1; + else if (unformat (input, "dot1q")) + dot1q = 1; + else if (unformat (input, "dot1ad")) + dot1ad = 1; + else + break; + } + if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad + + ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) return 0; - vec_validate (mask, sizeof (*udp) - 1); + if (tag1 || ignore_tag1 || cos1 || dot1q) + len = 18; + if (tag2 || ignore_tag2 || cos2 || dot1ad) + len = 22; - udp = (udp_header_t *) mask; + vec_validate (mask, len - 1); -#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a)); - foreach_udp_proto_field; -#undef _ + if (dst) + memset (mask, 0xff, 6); + + if (src) + memset (mask + 6, 0xff, 6); + + if (tag2 || dot1ad) + { + /* inner vlan tag */ + if (tag2) + { + mask[19] = 0xff; + mask[18] = 0x0f; + } + if (cos2) + mask[18] |= 0xe0; + if (proto) + mask[21] = mask[20] = 0xff; + if (tag1) + { + mask[15] = 0xff; + mask[14] = 0x0f; + } + if (cos1) + mask[14] |= 0xe0; + *maskp = mask; + return 1; + } + if (tag1 | dot1q) + { + if (tag1) + { + mask[15] = 0xff; + mask[14] = 0x0f; + } + if (cos1) + mask[14] |= 0xe0; + if (proto) + mask[16] = mask[17] = 0xff; + + *maskp = mask; + return 1; + } + if (cos2) + mask[18] |= 0xe0; + if (cos1) + mask[14] |= 0xe0; + if (proto) + mask[12] = mask[13] = 0xff; *maskp = mask; return 1; } uword -unformat_l4_mask (unformat_input_t * input, va_list * args) +unformat_classify_mask (unformat_input_t * input, va_list * args) { u8 **maskp = va_arg (*args, u8 **); - u16 src_port = 0, dst_port = 0; - tcpudp_header_t *tcpudp; + u32 *skipp = va_arg (*args, u32 *); + u32 *matchp = va_arg (*args, u32 *); + u32 match; + u8 *mask = 0; + u8 *l2 = 0; + u8 *l3 = 0; + u8 *l4 = 0; + int i; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "tcp %U", unformat_tcp_mask, maskp)) - return 1; - else if (unformat (input, "udp %U", unformat_udp_mask, maskp)) - return 1; - else if (unformat (input, "src_port")) - src_port = 0xFFFF; - else if (unformat (input, "dst_port")) - dst_port = 0xFFFF; + if (unformat (input, "hex %U", unformat_hex_string, &mask)) + ; + else if (unformat (input, "l2 %U", unformat_l2_mask, &l2)) + ; + else if (unformat (input, "l3 %U", unformat_l3_mask, &l3)) + ; + else if (unformat (input, "l4 %U", unformat_l4_mask, &l4)) + ; else - return 0; + break; } - if (!src_port && !dst_port) - return 0; + if (l4 && !l3) + { + vec_free (mask); + vec_free (l2); + vec_free (l4); + return 0; + } - u8 *mask = 0; - vec_validate (mask, sizeof (tcpudp_header_t) - 1); + if (mask || l2 || l3 || l4) + { + if (l2 || l3 || l4) + { + /* "With a free Ethernet header in every package" */ + if (l2 == 0) + vec_validate (l2, 13); + mask = l2; + if (vec_len (l3)) + { + vec_append (mask, l3); + vec_free (l3); + } + if (vec_len (l4)) + { + vec_append (mask, l4); + vec_free (l4); + } + } - tcpudp = (tcpudp_header_t *) mask; - tcpudp->src_port = src_port; - tcpudp->dst_port = dst_port; + /* Scan forward looking for the first significant mask octet */ + for (i = 0; i < vec_len (mask); i++) + if (mask[i]) + break; - *maskp = mask; + /* compute (skip, match) params */ + *skipp = i / sizeof (u32x4); + vec_delete (mask, *skipp * sizeof (u32x4), 0); - return 1; + /* Pad mask to an even multiple of the vector size */ + while (vec_len (mask) % sizeof (u32x4)) + vec_add1 (mask, 0); + + match = vec_len (mask) / sizeof (u32x4); + + for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4)) + { + u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4))); + if (*tmp || *(tmp + 1)) + break; + match--; + } + if (match == 0) + clib_warning ("BUG: match 0"); + + _vec_len (mask) = match * sizeof (u32x4); + + *matchp = match; + *maskp = mask; + + return 1; + } + + return 0; } +#endif /* VPP_API_TEST_BUILTIN */ + +#define foreach_l2_next \ +_(drop, DROP) \ +_(ethernet, ETHERNET_INPUT) \ +_(ip4, IP4_INPUT) \ +_(ip6, IP6_INPUT) uword -unformat_ip4_mask (unformat_input_t * input, va_list * args) +unformat_l2_next_index (unformat_input_t * input, va_list * args) { - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - ip4_header_t *ip; + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; -#define _(a) u8 a=0; - foreach_ip4_proto_field; +#define _(n,N) \ + if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;} + foreach_l2_next; #undef _ - u8 version = 0; - u8 hdr_length = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (unformat (input, "%d", &tmp)) { - if (unformat (input, "version")) - version = 1; - else if (unformat (input, "hdr_length")) - hdr_length = 1; - else if (unformat (input, "src")) - src_address = 1; - else if (unformat (input, "dst")) - dst_address = 1; - else if (unformat (input, "proto")) - protocol = 1; - -#define _(a) else if (unformat (input, #a)) a=1; - foreach_ip4_proto_field -#undef _ - else - break; + next_index = tmp; + goto out; } -#define _(a) found_something += a; - foreach_ip4_proto_field; -#undef _ + return 0; - if (found_something == 0) - return 0; +out: + *miss_next_indexp = next_index; + return 1; +} - vec_validate (mask, sizeof (*ip) - 1); +#define foreach_ip_next \ +_(drop, DROP) \ +_(local, LOCAL) \ +_(rewrite, REWRITE) - ip = (ip4_header_t *) mask; +uword +api_unformat_ip_next_index (unformat_input_t * input, va_list * args) +{ + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; -#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a)); - foreach_ip4_proto_field; +#define _(n,N) \ + if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;} + foreach_ip_next; #undef _ - ip->ip_version_and_header_length = 0; - - if (version) - ip->ip_version_and_header_length |= 0xF0; + if (unformat (input, "%d", &tmp)) + { + next_index = tmp; + goto out; + } - if (hdr_length) - ip->ip_version_and_header_length |= 0x0F; + return 0; - *maskp = mask; +out: + *miss_next_indexp = next_index; return 1; } -#define foreach_ip6_proto_field \ -_(src_address) \ -_(dst_address) \ -_(payload_length) \ -_(hop_limit) \ -_(protocol) +#define foreach_acl_next \ +_(deny, DENY) uword -unformat_ip6_mask (unformat_input_t * input, va_list * args) +api_unformat_acl_next_index (unformat_input_t * input, va_list * args) { - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - ip6_header_t *ip; - u32 ip_version_traffic_class_and_flow_label; + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; -#define _(a) u8 a=0; - foreach_ip6_proto_field; +#define _(n,N) \ + if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;} + foreach_acl_next; #undef _ - u8 version = 0; - u8 traffic_class = 0; - u8 flow_label = 0; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (unformat (input, "permit")) { - if (unformat (input, "version")) - version = 1; - else if (unformat (input, "traffic-class")) - traffic_class = 1; - else if (unformat (input, "flow-label")) - flow_label = 1; - else if (unformat (input, "src")) - src_address = 1; - else if (unformat (input, "dst")) - dst_address = 1; - else if (unformat (input, "proto")) - protocol = 1; - -#define _(a) else if (unformat (input, #a)) a=1; - foreach_ip6_proto_field -#undef _ - else - break; + next_index = ~0; + goto out; + } + else if (unformat (input, "%d", &tmp)) + { + next_index = tmp; + goto out; } -#define _(a) found_something += a; - foreach_ip6_proto_field; -#undef _ + return 0; - if (found_something == 0) +out: + *miss_next_indexp = next_index; + return 1; +} + +uword +unformat_policer_precolor (unformat_input_t * input, va_list * args) +{ + u32 *r = va_arg (*args, u32 *); + + if (unformat (input, "conform-color")) + *r = POLICE_CONFORM; + else if (unformat (input, "exceed-color")) + *r = POLICE_EXCEED; + else return 0; - vec_validate (mask, sizeof (*ip) - 1); + return 1; +} - ip = (ip6_header_t *) mask; +static int +api_classify_add_del_table (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_classify_add_del_table_t *mp; -#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a)); - foreach_ip6_proto_field; -#undef _ + u32 nbuckets = 2; + u32 skip = ~0; + u32 match = ~0; + int is_add = 1; + int del_chain = 0; + u32 table_index = ~0; + u32 next_table_index = ~0; + u32 miss_next_index = ~0; + u32 memory_size = 32 << 20; + u8 *mask = 0; + u32 current_data_flag = 0; + int current_data_offset = 0; + int ret; - ip_version_traffic_class_and_flow_label = 0; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "del-chain")) + { + is_add = 0; + del_chain = 1; + } + else if (unformat (i, "buckets %d", &nbuckets)) + ; + else if (unformat (i, "memory_size %d", &memory_size)) + ; + else if (unformat (i, "skip %d", &skip)) + ; + else if (unformat (i, "match %d", &match)) + ; + else if (unformat (i, "table %d", &table_index)) + ; + else if (unformat (i, "mask %U", unformat_classify_mask, + &mask, &skip, &match)) + ; + else if (unformat (i, "next-table %d", &next_table_index)) + ; + else if (unformat (i, "miss-next %U", api_unformat_ip_next_index, + &miss_next_index)) + ; + else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index, + &miss_next_index)) + ; + else if (unformat (i, "acl-miss-next %U", api_unformat_acl_next_index, + &miss_next_index)) + ; + else if (unformat (i, "current-data-flag %d", ¤t_data_flag)) + ; + else if (unformat (i, "current-data-offset %d", ¤t_data_offset)) + ; + else + break; + } - if (version) - ip_version_traffic_class_and_flow_label |= 0xF0000000; + if (is_add && mask == 0) + { + errmsg ("Mask required"); + return -99; + } - if (traffic_class) - ip_version_traffic_class_and_flow_label |= 0x0FF00000; + if (is_add && skip == ~0) + { + errmsg ("skip count required"); + return -99; + } - if (flow_label) - ip_version_traffic_class_and_flow_label |= 0x000FFFFF; + if (is_add && match == ~0) + { + errmsg ("match count required"); + return -99; + } + + if (!is_add && table_index == ~0) + { + errmsg ("table index required for delete"); + return -99; + } + + M2 (CLASSIFY_ADD_DEL_TABLE, mp, vec_len (mask)); + + mp->is_add = is_add; + mp->del_chain = del_chain; + mp->table_index = ntohl (table_index); + mp->nbuckets = ntohl (nbuckets); + mp->memory_size = ntohl (memory_size); + mp->skip_n_vectors = ntohl (skip); + mp->match_n_vectors = ntohl (match); + mp->next_table_index = ntohl (next_table_index); + mp->miss_next_index = ntohl (miss_next_index); + mp->current_data_flag = ntohl (current_data_flag); + mp->current_data_offset = ntohl (current_data_offset); + clib_memcpy (mp->mask, mask, vec_len (mask)); - ip->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + vec_free (mask); - *maskp = mask; - return 1; + S (mp); + W (ret); + return ret; } +#if VPP_API_TEST_BUILTIN == 0 uword -unformat_l3_mask (unformat_input_t * input, va_list * args) +unformat_l4_match (unformat_input_t * input, va_list * args) { - u8 **maskp = va_arg (*args, u8 **); + u8 **matchp = va_arg (*args, u8 **); - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp)) - return 1; - else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp)) - return 1; - else - break; - } - return 0; -} + u8 *proto_header = 0; + int src_port = 0; + int dst_port = 0; -uword -unformat_l2_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 src = 0; - u8 dst = 0; - u8 proto = 0; - u8 tag1 = 0; - u8 tag2 = 0; - u8 ignore_tag1 = 0; - u8 ignore_tag2 = 0; - u8 cos1 = 0; - u8 cos2 = 0; - u8 dot1q = 0; - u8 dot1ad = 0; - int len = 14; + tcpudp_header_t h; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "src")) - src = 1; - else if (unformat (input, "dst")) - dst = 1; - else if (unformat (input, "proto")) - proto = 1; - else if (unformat (input, "tag1")) - tag1 = 1; - else if (unformat (input, "tag2")) - tag2 = 1; - else if (unformat (input, "ignore-tag1")) - ignore_tag1 = 1; - else if (unformat (input, "ignore-tag2")) - ignore_tag2 = 1; - else if (unformat (input, "cos1")) - cos1 = 1; - else if (unformat (input, "cos2")) - cos2 = 1; - else if (unformat (input, "dot1q")) - dot1q = 1; - else if (unformat (input, "dot1ad")) - dot1ad = 1; + if (unformat (input, "src_port %d", &src_port)) + ; + else if (unformat (input, "dst_port %d", &dst_port)) + ; else - break; + return 0; } - if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad + - ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) - return 0; - - if (tag1 || ignore_tag1 || cos1 || dot1q) - len = 18; - if (tag2 || ignore_tag2 || cos2 || dot1ad) - len = 22; - - vec_validate (mask, len - 1); - - if (dst) - memset (mask, 0xff, 6); - - if (src) - memset (mask + 6, 0xff, 6); - if (tag2 || dot1ad) - { - /* inner vlan tag */ - if (tag2) - { - mask[19] = 0xff; - mask[18] = 0x0f; - } - if (cos2) - mask[18] |= 0xe0; - if (proto) - mask[21] = mask[20] = 0xff; - if (tag1) - { - mask[15] = 0xff; - mask[14] = 0x0f; - } - if (cos1) - mask[14] |= 0xe0; - *maskp = mask; - return 1; - } - if (tag1 | dot1q) - { - if (tag1) - { - mask[15] = 0xff; - mask[14] = 0x0f; - } - if (cos1) - mask[14] |= 0xe0; - if (proto) - mask[16] = mask[17] = 0xff; + h.src_port = clib_host_to_net_u16 (src_port); + h.dst_port = clib_host_to_net_u16 (dst_port); + vec_validate (proto_header, sizeof (h) - 1); + memcpy (proto_header, &h, sizeof (h)); - *maskp = mask; - return 1; - } - if (cos2) - mask[18] |= 0xe0; - if (cos1) - mask[14] |= 0xe0; - if (proto) - mask[12] = mask[13] = 0xff; + *matchp = proto_header; - *maskp = mask; return 1; } uword -unformat_classify_mask (unformat_input_t * input, va_list * args) +unformat_ip4_match (unformat_input_t * input, va_list * args) { - u8 **maskp = va_arg (*args, u8 **); - u32 *skipp = va_arg (*args, u32 *); - u32 *matchp = va_arg (*args, u32 *); - u32 match; - u8 *mask = 0; - u8 *l2 = 0; - u8 *l3 = 0; - u8 *l4 = 0; - int i; + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + ip4_header_t *ip; + int version = 0; + u32 version_val; + int hdr_length = 0; + u32 hdr_length_val; + int src = 0, dst = 0; + ip4_address_t src_val, dst_val; + int proto = 0; + u32 proto_val; + int tos = 0; + u32 tos_val; + int length = 0; + u32 length_val; + int fragment_id = 0; + u32 fragment_id_val; + int ttl = 0; + int ttl_val; + int checksum = 0; + u32 checksum_val; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "hex %U", unformat_hex_string, &mask)) - ; - else if (unformat (input, "l2 %U", unformat_l2_mask, &l2)) - ; - else if (unformat (input, "l3 %U", unformat_l3_mask, &l3)) - ; - else if (unformat (input, "l4 %U", unformat_l4_mask, &l4)) - ; + if (unformat (input, "version %d", &version_val)) + version = 1; + else if (unformat (input, "hdr_length %d", &hdr_length_val)) + hdr_length = 1; + else if (unformat (input, "src %U", unformat_ip4_address, &src_val)) + src = 1; + else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %d", &proto_val)) + proto = 1; + else if (unformat (input, "tos %d", &tos_val)) + tos = 1; + else if (unformat (input, "length %d", &length_val)) + length = 1; + else if (unformat (input, "fragment_id %d", &fragment_id_val)) + fragment_id = 1; + else if (unformat (input, "ttl %d", &ttl_val)) + ttl = 1; + else if (unformat (input, "checksum %d", &checksum_val)) + checksum = 1; else break; } - if (l4 && !l3) - { - vec_free (mask); - vec_free (l2); - vec_free (l4); - return 0; - } - - if (mask || l2 || l3 || l4) - { - if (l2 || l3 || l4) - { - /* "With a free Ethernet header in every package" */ - if (l2 == 0) - vec_validate (l2, 13); - mask = l2; - if (vec_len (l3)) - { - vec_append (mask, l3); - vec_free (l3); - } - if (vec_len (l4)) - { - vec_append (mask, l4); - vec_free (l4); - } - } - - /* Scan forward looking for the first significant mask octet */ - for (i = 0; i < vec_len (mask); i++) - if (mask[i]) - break; - - /* compute (skip, match) params */ - *skipp = i / sizeof (u32x4); - vec_delete (mask, *skipp * sizeof (u32x4), 0); + if (version + hdr_length + src + dst + proto + tos + length + fragment_id + + ttl + checksum == 0) + return 0; - /* Pad mask to an even multiple of the vector size */ - while (vec_len (mask) % sizeof (u32x4)) - vec_add1 (mask, 0); + /* + * Aligned because we use the real comparison functions + */ + vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - match = vec_len (mask) / sizeof (u32x4); + ip = (ip4_header_t *) match; - for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4)) - { - u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4))); - if (*tmp || *(tmp + 1)) - break; - match--; - } - if (match == 0) - clib_warning ("BUG: match 0"); + /* These are realistically matched in practice */ + if (src) + ip->src_address.as_u32 = src_val.as_u32; - _vec_len (mask) = match * sizeof (u32x4); + if (dst) + ip->dst_address.as_u32 = dst_val.as_u32; - *matchp = match; - *maskp = mask; + if (proto) + ip->protocol = proto_val; - return 1; - } - return 0; -} -#endif /* VPP_API_TEST_BUILTIN */ + /* These are not, but they're included for completeness */ + if (version) + ip->ip_version_and_header_length |= (version_val & 0xF) << 4; -#define foreach_l2_next \ -_(drop, DROP) \ -_(ethernet, ETHERNET_INPUT) \ -_(ip4, IP4_INPUT) \ -_(ip6, IP6_INPUT) + if (hdr_length) + ip->ip_version_and_header_length |= (hdr_length_val & 0xF); -uword -unformat_l2_next_index (unformat_input_t * input, va_list * args) -{ - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; + if (tos) + ip->tos = tos_val; -#define _(n,N) \ - if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;} - foreach_l2_next; -#undef _ + if (length) + ip->length = clib_host_to_net_u16 (length_val); - if (unformat (input, "%d", &tmp)) - { - next_index = tmp; - goto out; - } + if (ttl) + ip->ttl = ttl_val; - return 0; + if (checksum) + ip->checksum = clib_host_to_net_u16 (checksum_val); -out: - *miss_next_indexp = next_index; + *matchp = match; return 1; } -#define foreach_ip_next \ -_(drop, DROP) \ -_(local, LOCAL) \ -_(rewrite, REWRITE) - uword -api_unformat_ip_next_index (unformat_input_t * input, va_list * args) +unformat_ip6_match (unformat_input_t * input, va_list * args) { - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; - -#define _(n,N) \ - if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;} - foreach_ip_next; -#undef _ + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + ip6_header_t *ip; + int version = 0; + u32 version_val; + u8 traffic_class = 0; + u32 traffic_class_val = 0; + u8 flow_label = 0; + u8 flow_label_val; + int src = 0, dst = 0; + ip6_address_t src_val, dst_val; + int proto = 0; + u32 proto_val; + int payload_length = 0; + u32 payload_length_val; + int hop_limit = 0; + int hop_limit_val; + u32 ip_version_traffic_class_and_flow_label; - if (unformat (input, "%d", &tmp)) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - next_index = tmp; - goto out; + if (unformat (input, "version %d", &version_val)) + version = 1; + else if (unformat (input, "traffic_class %d", &traffic_class_val)) + traffic_class = 1; + else if (unformat (input, "flow_label %d", &flow_label_val)) + flow_label = 1; + else if (unformat (input, "src %U", unformat_ip6_address, &src_val)) + src = 1; + else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %d", &proto_val)) + proto = 1; + else if (unformat (input, "payload_length %d", &payload_length_val)) + payload_length = 1; + else if (unformat (input, "hop_limit %d", &hop_limit_val)) + hop_limit = 1; + else + break; } - return 0; - -out: - *miss_next_indexp = next_index; - return 1; -} + if (version + traffic_class + flow_label + src + dst + proto + + payload_length + hop_limit == 0) + return 0; -#define foreach_acl_next \ -_(deny, DENY) + /* + * Aligned because we use the real comparison functions + */ + vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); -uword -api_unformat_acl_next_index (unformat_input_t * input, va_list * args) -{ - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; + ip = (ip6_header_t *) match; -#define _(n,N) \ - if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;} - foreach_acl_next; -#undef _ + if (src) + clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); - if (unformat (input, "permit")) - { - next_index = ~0; - goto out; - } - else if (unformat (input, "%d", &tmp)) - { - next_index = tmp; - goto out; - } + if (dst) + clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); - return 0; + if (proto) + ip->protocol = proto_val; -out: - *miss_next_indexp = next_index; - return 1; -} + ip_version_traffic_class_and_flow_label = 0; -uword -unformat_policer_precolor (unformat_input_t * input, va_list * args) -{ - u32 *r = va_arg (*args, u32 *); + if (version) + ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28; - if (unformat (input, "conform-color")) - *r = POLICE_CONFORM; - else if (unformat (input, "exceed-color")) - *r = POLICE_EXCEED; - else - return 0; + if (traffic_class) + ip_version_traffic_class_and_flow_label |= + (traffic_class_val & 0xFF) << 20; - return 1; -} + if (flow_label) + ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF); -static int -api_classify_add_del_table (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_classify_add_del_table_t *mp; + ip->ip_version_traffic_class_and_flow_label = + clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); - u32 nbuckets = 2; - u32 skip = ~0; - u32 match = ~0; - int is_add = 1; - int del_chain = 0; - u32 table_index = ~0; - u32 next_table_index = ~0; - u32 miss_next_index = ~0; - u32 memory_size = 32 << 20; - u8 *mask = 0; - u32 current_data_flag = 0; - int current_data_offset = 0; - int ret; + if (payload_length) + ip->payload_length = clib_host_to_net_u16 (payload_length_val); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "del-chain")) - { - is_add = 0; - del_chain = 1; - } - else if (unformat (i, "buckets %d", &nbuckets)) - ; - else if (unformat (i, "memory_size %d", &memory_size)) - ; - else if (unformat (i, "skip %d", &skip)) - ; - else if (unformat (i, "match %d", &match)) - ; - else if (unformat (i, "table %d", &table_index)) - ; - else if (unformat (i, "mask %U", unformat_classify_mask, - &mask, &skip, &match)) - ; - else if (unformat (i, "next-table %d", &next_table_index)) - ; - else if (unformat (i, "miss-next %U", api_unformat_ip_next_index, - &miss_next_index)) - ; - else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index, - &miss_next_index)) - ; - else if (unformat (i, "acl-miss-next %U", api_unformat_acl_next_index, - &miss_next_index)) - ; - else if (unformat (i, "current-data-flag %d", ¤t_data_flag)) - ; - else if (unformat (i, "current-data-offset %d", ¤t_data_offset)) - ; - else - break; - } + if (hop_limit) + ip->hop_limit = hop_limit_val; - if (is_add && mask == 0) - { - errmsg ("Mask required"); - return -99; - } + *matchp = match; + return 1; +} - if (is_add && skip == ~0) - { - errmsg ("skip count required"); - return -99; - } +uword +unformat_l3_match (unformat_input_t * input, va_list * args) +{ + u8 **matchp = va_arg (*args, u8 **); - if (is_add && match == ~0) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - errmsg ("match count required"); - return -99; + if (unformat (input, "ip4 %U", unformat_ip4_match, matchp)) + return 1; + else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp)) + return 1; + else + break; } + return 0; +} - if (!is_add && table_index == ~0) +uword +unformat_vlan_tag (unformat_input_t * input, va_list * args) +{ + u8 *tagp = va_arg (*args, u8 *); + u32 tag; + + if (unformat (input, "%d", &tag)) { - errmsg ("table index required for delete"); - return -99; + tagp[0] = (tag >> 8) & 0x0F; + tagp[1] = tag & 0xFF; + return 1; } - M2 (CLASSIFY_ADD_DEL_TABLE, mp, vec_len (mask)); - - mp->is_add = is_add; - mp->del_chain = del_chain; - mp->table_index = ntohl (table_index); - mp->nbuckets = ntohl (nbuckets); - mp->memory_size = ntohl (memory_size); - mp->skip_n_vectors = ntohl (skip); - mp->match_n_vectors = ntohl (match); - mp->next_table_index = ntohl (next_table_index); - mp->miss_next_index = ntohl (miss_next_index); - mp->current_data_flag = ntohl (current_data_flag); - mp->current_data_offset = ntohl (current_data_offset); - clib_memcpy (mp->mask, mask, vec_len (mask)); - - vec_free (mask); - - S (mp); - W (ret); - return ret; + return 0; } -#if VPP_API_TEST_BUILTIN == 0 uword -unformat_l4_match (unformat_input_t * input, va_list * args) +unformat_l2_match (unformat_input_t * input, va_list * args) { u8 **matchp = va_arg (*args, u8 **); - - u8 *proto_header = 0; - int src_port = 0; - int dst_port = 0; - - tcpudp_header_t h; + u8 *match = 0; + u8 src = 0; + u8 src_val[6]; + u8 dst = 0; + u8 dst_val[6]; + u8 proto = 0; + u16 proto_val; + u8 tag1 = 0; + u8 tag1_val[2]; + u8 tag2 = 0; + u8 tag2_val[2]; + int len = 14; + u8 ignore_tag1 = 0; + u8 ignore_tag2 = 0; + u8 cos1 = 0; + u8 cos2 = 0; + u32 cos1_val = 0; + u32 cos2_val = 0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "src_port %d", &src_port)) - ; - else if (unformat (input, "dst_port %d", &dst_port)) - ; + if (unformat (input, "src %U", unformat_ethernet_address, &src_val)) + src = 1; else - return 0; + if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %U", + unformat_ethernet_type_host_byte_order, &proto_val)) + proto = 1; + else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val)) + tag1 = 1; + else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val)) + tag2 = 1; + else if (unformat (input, "ignore-tag1")) + ignore_tag1 = 1; + else if (unformat (input, "ignore-tag2")) + ignore_tag2 = 1; + else if (unformat (input, "cos1 %d", &cos1_val)) + cos1 = 1; + else if (unformat (input, "cos2 %d", &cos2_val)) + cos2 = 1; + else + break; } + if ((src + dst + proto + tag1 + tag2 + + ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) + return 0; - h.src_port = clib_host_to_net_u16 (src_port); - h.dst_port = clib_host_to_net_u16 (dst_port); - vec_validate (proto_header, sizeof (h) - 1); - memcpy (proto_header, &h, sizeof (h)); + if (tag1 || ignore_tag1 || cos1) + len = 18; + if (tag2 || ignore_tag2 || cos2) + len = 22; - *matchp = proto_header; + vec_validate_aligned (match, len - 1, sizeof (u32x4)); + + if (dst) + clib_memcpy (match, dst_val, 6); + + if (src) + clib_memcpy (match + 6, src_val, 6); + + if (tag2) + { + /* inner vlan tag */ + match[19] = tag2_val[1]; + match[18] = tag2_val[0]; + if (cos2) + match[18] |= (cos2_val & 0x7) << 5; + if (proto) + { + match[21] = proto_val & 0xff; + match[20] = proto_val >> 8; + } + if (tag1) + { + match[15] = tag1_val[1]; + match[14] = tag1_val[0]; + } + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; + *matchp = match; + return 1; + } + if (tag1) + { + match[15] = tag1_val[1]; + match[14] = tag1_val[0]; + if (proto) + { + match[17] = proto_val & 0xff; + match[16] = proto_val >> 8; + } + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; + + *matchp = match; + return 1; + } + if (cos2) + match[18] |= (cos2_val & 0x7) << 5; + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; + if (proto) + { + match[13] = proto_val & 0xff; + match[12] = proto_val >> 8; + } + *matchp = match; return 1; } +#endif uword -unformat_ip4_match (unformat_input_t * input, va_list * args) +api_unformat_classify_match (unformat_input_t * input, va_list * args) { u8 **matchp = va_arg (*args, u8 **); + u32 skip_n_vectors = va_arg (*args, u32); + u32 match_n_vectors = va_arg (*args, u32); + u8 *match = 0; - ip4_header_t *ip; - int version = 0; - u32 version_val; - int hdr_length = 0; - u32 hdr_length_val; - int src = 0, dst = 0; - ip4_address_t src_val, dst_val; - int proto = 0; - u32 proto_val; - int tos = 0; - u32 tos_val; - int length = 0; - u32 length_val; - int fragment_id = 0; - u32 fragment_id_val; - int ttl = 0; - int ttl_val; - int checksum = 0; - u32 checksum_val; + u8 *l2 = 0; + u8 *l3 = 0; + u8 *l4 = 0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "version %d", &version_val)) - version = 1; - else if (unformat (input, "hdr_length %d", &hdr_length_val)) - hdr_length = 1; - else if (unformat (input, "src %U", unformat_ip4_address, &src_val)) - src = 1; - else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %d", &proto_val)) - proto = 1; - else if (unformat (input, "tos %d", &tos_val)) - tos = 1; - else if (unformat (input, "length %d", &length_val)) - length = 1; - else if (unformat (input, "fragment_id %d", &fragment_id_val)) - fragment_id = 1; - else if (unformat (input, "ttl %d", &ttl_val)) - ttl = 1; - else if (unformat (input, "checksum %d", &checksum_val)) - checksum = 1; + if (unformat (input, "hex %U", unformat_hex_string, &match)) + ; + else if (unformat (input, "l2 %U", unformat_l2_match, &l2)) + ; + else if (unformat (input, "l3 %U", unformat_l3_match, &l3)) + ; + else if (unformat (input, "l4 %U", unformat_l4_match, &l4)) + ; else break; } - if (version + hdr_length + src + dst + proto + tos + length + fragment_id - + ttl + checksum == 0) - return 0; + if (l4 && !l3) + { + vec_free (match); + vec_free (l2); + vec_free (l4); + return 0; + } + + if (match || l2 || l3 || l4) + { + if (l2 || l3 || l4) + { + /* "Win a free Ethernet header in every packet" */ + if (l2 == 0) + vec_validate_aligned (l2, 13, sizeof (u32x4)); + match = l2; + if (vec_len (l3)) + { + vec_append_aligned (match, l3, sizeof (u32x4)); + vec_free (l3); + } + if (vec_len (l4)) + { + vec_append_aligned (match, l4, sizeof (u32x4)); + vec_free (l4); + } + } - /* - * Aligned because we use the real comparison functions - */ - vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); + /* Make sure the vector is big enough even if key is all 0's */ + vec_validate_aligned + (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1, + sizeof (u32x4)); - ip = (ip4_header_t *) match; + /* Set size, include skipped vectors */ + _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4); - /* These are realistically matched in practice */ - if (src) - ip->src_address.as_u32 = src_val.as_u32; + *matchp = match; - if (dst) - ip->dst_address.as_u32 = dst_val.as_u32; + return 1; + } - if (proto) - ip->protocol = proto_val; + return 0; +} +static int +api_classify_add_del_session (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_classify_add_del_session_t *mp; + int is_add = 1; + u32 table_index = ~0; + u32 hit_next_index = ~0; + u32 opaque_index = ~0; + u8 *match = 0; + i32 advance = 0; + u32 skip_n_vectors = 0; + u32 match_n_vectors = 0; + u32 action = 0; + u32 metadata = 0; + int ret; - /* These are not, but they're included for completeness */ - if (version) - ip->ip_version_and_header_length |= (version_val & 0xF) << 4; + /* + * Warning: you have to supply skip_n and match_n + * because the API client cant simply look at the classify + * table object. + */ - if (hdr_length) - ip->ip_version_and_header_length |= (hdr_length_val & 0xF); + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "hit-next %U", api_unformat_ip_next_index, + &hit_next_index)) + ; + else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index, + &hit_next_index)) + ; + else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index, + &hit_next_index)) + ; + else if (unformat (i, "policer-hit-next %d", &hit_next_index)) + ; + else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index)) + ; + else if (unformat (i, "opaque-index %d", &opaque_index)) + ; + else if (unformat (i, "skip_n %d", &skip_n_vectors)) + ; + else if (unformat (i, "match_n %d", &match_n_vectors)) + ; + else if (unformat (i, "match %U", api_unformat_classify_match, + &match, skip_n_vectors, match_n_vectors)) + ; + else if (unformat (i, "advance %d", &advance)) + ; + else if (unformat (i, "table-index %d", &table_index)) + ; + else if (unformat (i, "action set-ip4-fib-id %d", &metadata)) + action = 1; + else if (unformat (i, "action set-ip6-fib-id %d", &metadata)) + action = 2; + else if (unformat (i, "action %d", &action)) + ; + else if (unformat (i, "metadata %d", &metadata)) + ; + else + break; + } - if (tos) - ip->tos = tos_val; + if (table_index == ~0) + { + errmsg ("Table index required"); + return -99; + } - if (length) - ip->length = clib_host_to_net_u16 (length_val); + if (is_add && match == 0) + { + errmsg ("Match value required"); + return -99; + } - if (ttl) - ip->ttl = ttl_val; + M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match)); - if (checksum) - ip->checksum = clib_host_to_net_u16 (checksum_val); + mp->is_add = is_add; + mp->table_index = ntohl (table_index); + mp->hit_next_index = ntohl (hit_next_index); + mp->opaque_index = ntohl (opaque_index); + mp->advance = ntohl (advance); + mp->action = action; + mp->metadata = ntohl (metadata); + clib_memcpy (mp->match, match, vec_len (match)); + vec_free (match); - *matchp = match; - return 1; + S (mp); + W (ret); + return ret; } -uword -unformat_ip6_match (unformat_input_t * input, va_list * args) +static int +api_classify_set_interface_ip_table (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - ip6_header_t *ip; - int version = 0; - u32 version_val; - u8 traffic_class = 0; - u32 traffic_class_val = 0; - u8 flow_label = 0; - u8 flow_label_val; - int src = 0, dst = 0; - ip6_address_t src_val, dst_val; - int proto = 0; - u32 proto_val; - int payload_length = 0; - u32 payload_length_val; - int hop_limit = 0; - int hop_limit_val; - u32 ip_version_traffic_class_and_flow_label; + unformat_input_t *i = vam->input; + vl_api_classify_set_interface_ip_table_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 table_index = ~0; + u8 is_ipv6 = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "version %d", &version_val)) - version = 1; - else if (unformat (input, "traffic_class %d", &traffic_class_val)) - traffic_class = 1; - else if (unformat (input, "flow_label %d", &flow_label_val)) - flow_label = 1; - else if (unformat (input, "src %U", unformat_ip6_address, &src_val)) - src = 1; - else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %d", &proto_val)) - proto = 1; - else if (unformat (input, "payload_length %d", &payload_length_val)) - payload_length = 1; - else if (unformat (input, "hop_limit %d", &hop_limit_val)) - hop_limit = 1; + if (unformat (i, "%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, "table %d", &table_index)) + ; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (version + traffic_class + flow_label + src + dst + proto + - payload_length + hop_limit == 0) - return 0; - - /* - * Aligned because we use the real comparison functions - */ - vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - - ip = (ip6_header_t *) match; - - if (src) - clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - if (dst) - clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); - if (proto) - ip->protocol = proto_val; + M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp); - ip_version_traffic_class_and_flow_label = 0; + mp->sw_if_index = ntohl (sw_if_index); + mp->table_index = ntohl (table_index); + mp->is_ipv6 = is_ipv6; - if (version) - ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28; + S (mp); + W (ret); + return ret; +} - if (traffic_class) - ip_version_traffic_class_and_flow_label |= - (traffic_class_val & 0xFF) << 20; +static int +api_classify_set_interface_l2_tables (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_classify_set_interface_l2_tables_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 other_table_index = ~0; + u32 is_input = 1; + int ret; - if (flow_label) - ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF); + 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, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "other-table %d", &other_table_index)) + ; + else if (unformat (i, "is-input %d", &is_input)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } - ip->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - if (payload_length) - ip->payload_length = clib_host_to_net_u16 (payload_length_val); - if (hop_limit) - ip->hop_limit = hop_limit_val; + M (CLASSIFY_SET_INTERFACE_L2_TABLES, mp); - *matchp = match; - return 1; + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->other_table_index = ntohl (other_table_index); + mp->is_input = (u8) is_input; + + S (mp); + W (ret); + return ret; } -uword -unformat_l3_match (unformat_input_t * input, va_list * args) +static int +api_set_ipfix_exporter (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); + unformat_input_t *i = vam->input; + vl_api_set_ipfix_exporter_t *mp; + ip4_address_t collector_address; + u8 collector_address_set = 0; + u32 collector_port = ~0; + ip4_address_t src_address; + u8 src_address_set = 0; + u32 vrf_id = ~0; + u32 path_mtu = ~0; + u32 template_interval = ~0; + u8 udp_checksum = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ip4 %U", unformat_ip4_match, matchp)) - return 1; - else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp)) - return 1; + if (unformat (i, "collector_address %U", unformat_ip4_address, + &collector_address)) + collector_address_set = 1; + else if (unformat (i, "collector_port %d", &collector_port)) + ; + else if (unformat (i, "src_address %U", unformat_ip4_address, + &src_address)) + src_address_set = 1; + else if (unformat (i, "vrf_id %d", &vrf_id)) + ; + else if (unformat (i, "path_mtu %d", &path_mtu)) + ; + else if (unformat (i, "template_interval %d", &template_interval)) + ; + else if (unformat (i, "udp_checksum")) + udp_checksum = 1; else break; } - return 0; -} -uword -unformat_vlan_tag (unformat_input_t * input, va_list * args) -{ - u8 *tagp = va_arg (*args, u8 *); - u32 tag; - - if (unformat (input, "%d", &tag)) + if (collector_address_set == 0) { - tagp[0] = (tag >> 8) & 0x0F; - tagp[1] = tag & 0xFF; - return 1; + errmsg ("collector_address required"); + return -99; } - return 0; -} - -uword -unformat_l2_match (unformat_input_t * input, va_list * args) -{ - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - u8 src = 0; - u8 src_val[6]; - u8 dst = 0; - u8 dst_val[6]; - u8 proto = 0; - u16 proto_val; - u8 tag1 = 0; - u8 tag1_val[2]; - u8 tag2 = 0; - u8 tag2_val[2]; - int len = 14; - u8 ignore_tag1 = 0; - u8 ignore_tag2 = 0; - u8 cos1 = 0; - u8 cos2 = 0; - u32 cos1_val = 0; - u32 cos2_val = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (src_address_set == 0) { - if (unformat (input, "src %U", unformat_ethernet_address, &src_val)) - src = 1; - else - if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %U", - unformat_ethernet_type_host_byte_order, &proto_val)) - proto = 1; - else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val)) - tag1 = 1; - else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val)) - tag2 = 1; - else if (unformat (input, "ignore-tag1")) - ignore_tag1 = 1; - else if (unformat (input, "ignore-tag2")) - ignore_tag2 = 1; - else if (unformat (input, "cos1 %d", &cos1_val)) - cos1 = 1; - else if (unformat (input, "cos2 %d", &cos2_val)) - cos2 = 1; - else - break; + errmsg ("src_address required"); + return -99; } - if ((src + dst + proto + tag1 + tag2 + - ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) - return 0; - if (tag1 || ignore_tag1 || cos1) - len = 18; - if (tag2 || ignore_tag2 || cos2) - len = 22; + M (SET_IPFIX_EXPORTER, mp); - vec_validate_aligned (match, len - 1, sizeof (u32x4)); + memcpy (mp->collector_address, collector_address.data, + sizeof (collector_address.data)); + mp->collector_port = htons ((u16) collector_port); + memcpy (mp->src_address, src_address.data, sizeof (src_address.data)); + mp->vrf_id = htonl (vrf_id); + mp->path_mtu = htonl (path_mtu); + mp->template_interval = htonl (template_interval); + mp->udp_checksum = udp_checksum; - if (dst) - clib_memcpy (match, dst_val, 6); + S (mp); + W (ret); + return ret; +} - if (src) - clib_memcpy (match + 6, src_val, 6); +static int +api_set_ipfix_classify_stream (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_set_ipfix_classify_stream_t *mp; + u32 domain_id = 0; + u32 src_port = UDP_DST_PORT_ipfix; + int ret; - if (tag2) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - /* inner vlan tag */ - match[19] = tag2_val[1]; - match[18] = tag2_val[0]; - if (cos2) - match[18] |= (cos2_val & 0x7) << 5; - if (proto) - { - match[21] = proto_val & 0xff; - match[20] = proto_val >> 8; - } - if (tag1) + if (unformat (i, "domain %d", &domain_id)) + ; + else if (unformat (i, "src_port %d", &src_port)) + ; + else { - match[15] = tag1_val[1]; - match[14] = tag1_val[0]; + errmsg ("unknown input `%U'", format_unformat_error, i); + return -99; } - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - *matchp = match; - return 1; } - if (tag1) - { - match[15] = tag1_val[1]; - match[14] = tag1_val[0]; - if (proto) - { - match[17] = proto_val & 0xff; - match[16] = proto_val >> 8; - } - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - *matchp = match; - return 1; - } - if (cos2) - match[18] |= (cos2_val & 0x7) << 5; - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - if (proto) - { - match[13] = proto_val & 0xff; - match[12] = proto_val >> 8; - } + M (SET_IPFIX_CLASSIFY_STREAM, mp); - *matchp = match; - return 1; + mp->domain_id = htonl (domain_id); + mp->src_port = htons ((u16) src_port); + + S (mp); + W (ret); + return ret; } -#endif -uword -api_unformat_classify_match (unformat_input_t * input, va_list * args) +static int +api_ipfix_classify_table_add_del (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u32 skip_n_vectors = va_arg (*args, u32); - u32 match_n_vectors = va_arg (*args, u32); - - u8 *match = 0; - u8 *l2 = 0; - u8 *l3 = 0; - u8 *l4 = 0; + unformat_input_t *i = vam->input; + vl_api_ipfix_classify_table_add_del_t *mp; + int is_add = -1; + u32 classify_table_index = ~0; + u8 ip_version = 0; + u8 transport_protocol = 255; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "hex %U", unformat_hex_string, &match)) - ; - else if (unformat (input, "l2 %U", unformat_l2_match, &l2)) - ; - else if (unformat (input, "l3 %U", unformat_l3_match, &l3)) - ; - else if (unformat (input, "l4 %U", unformat_l4_match, &l4)) + if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "table %d", &classify_table_index)) ; + else if (unformat (i, "ip4")) + ip_version = 4; + else if (unformat (i, "ip6")) + ip_version = 6; + else if (unformat (i, "tcp")) + transport_protocol = 6; + else if (unformat (i, "udp")) + transport_protocol = 17; else - break; + { + errmsg ("unknown input `%U'", format_unformat_error, i); + return -99; + } } - if (l4 && !l3) + if (is_add == -1) { - vec_free (match); - vec_free (l2); - vec_free (l4); - return 0; + errmsg ("expecting: add|del"); + return -99; } - - if (match || l2 || l3 || l4) + if (classify_table_index == ~0) { - if (l2 || l3 || l4) - { - /* "Win a free Ethernet header in every packet" */ - if (l2 == 0) - vec_validate_aligned (l2, 13, sizeof (u32x4)); - match = l2; - if (vec_len (l3)) - { - vec_append_aligned (match, l3, sizeof (u32x4)); - vec_free (l3); - } - if (vec_len (l4)) - { - vec_append_aligned (match, l4, sizeof (u32x4)); - vec_free (l4); - } - } - - /* Make sure the vector is big enough even if key is all 0's */ - vec_validate_aligned - (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1, - sizeof (u32x4)); - - /* Set size, include skipped vectors */ - _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4); + errmsg ("classifier table not specified"); + return -99; + } + if (ip_version == 0) + { + errmsg ("IP version not specified"); + return -99; + } - *matchp = match; + M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp); - return 1; - } + mp->is_add = is_add; + mp->table_id = htonl (classify_table_index); + mp->ip_version = ip_version; + mp->transport_protocol = transport_protocol; - return 0; + S (mp); + W (ret); + return ret; } static int -api_classify_add_del_session (vat_main_t * vam) +api_get_node_index (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_add_del_session_t *mp; - int is_add = 1; - u32 table_index = ~0; - u32 hit_next_index = ~0; - u32 opaque_index = ~0; - u8 *match = 0; - i32 advance = 0; - u32 skip_n_vectors = 0; - u32 match_n_vectors = 0; - u32 action = 0; - u32 metadata = 0; + vl_api_get_node_index_t *mp; + u8 *name = 0; int ret; - /* - * Warning: you have to supply skip_n and match_n - * because the API client cant simply look at the classify - * table object. - */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "hit-next %U", api_unformat_ip_next_index, - &hit_next_index)) - ; - else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index, - &hit_next_index)) - ; - else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index, - &hit_next_index)) - ; - else if (unformat (i, "policer-hit-next %d", &hit_next_index)) - ; - else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index)) - ; - else if (unformat (i, "opaque-index %d", &opaque_index)) - ; - else if (unformat (i, "skip_n %d", &skip_n_vectors)) - ; - else if (unformat (i, "match_n %d", &match_n_vectors)) - ; - else if (unformat (i, "match %U", api_unformat_classify_match, - &match, skip_n_vectors, match_n_vectors)) - ; - else if (unformat (i, "advance %d", &advance)) - ; - else if (unformat (i, "table-index %d", &table_index)) - ; - else if (unformat (i, "action set-ip4-fib-id %d", &metadata)) - action = 1; - else if (unformat (i, "action set-ip6-fib-id %d", &metadata)) - action = 2; - else if (unformat (i, "action %d", &action)) - ; - else if (unformat (i, "metadata %d", &metadata)) + if (unformat (i, "node %s", &name)) ; else break; } - - if (table_index == ~0) + if (name == 0) { - errmsg ("Table index required"); + errmsg ("node name required"); return -99; } - - if (is_add && match == 0) + if (vec_len (name) >= ARRAY_LEN (mp->node_name)) { - errmsg ("Match value required"); + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); return -99; } - M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match)); - - mp->is_add = is_add; - mp->table_index = ntohl (table_index); - mp->hit_next_index = ntohl (hit_next_index); - mp->opaque_index = ntohl (opaque_index); - mp->advance = ntohl (advance); - mp->action = action; - mp->metadata = ntohl (metadata); - clib_memcpy (mp->match, match, vec_len (match)); - vec_free (match); + M (GET_NODE_INDEX, mp); + clib_memcpy (mp->node_name, name, vec_len (name)); + vec_free (name); S (mp); W (ret); @@ -10103,43 +11469,48 @@ api_classify_add_del_session (vat_main_t * vam) } static int -api_classify_set_interface_ip_table (vat_main_t * vam) +api_get_next_index (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_set_interface_ip_table_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 table_index = ~0; - u8 is_ipv6 = 0; + vl_api_get_next_index_t *mp; + u8 *node_name = 0, *next_node_name = 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, "table %d", &table_index)) + if (unformat (i, "node-name %s", &node_name)) ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + else if (unformat (i, "next-node-name %s", &next_node_name)) + break; } - if (sw_if_index_set == 0) + if (node_name == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("node name required"); + return -99; + } + if (vec_len (node_name) >= ARRAY_LEN (mp->node_name)) + { + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); return -99; } + if (next_node_name == 0) + { + errmsg ("next node name required"); + return -99; + } + if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name)) + { + errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name)); + return -99; + } - M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->table_index = ntohl (table_index); - mp->is_ipv6 = is_ipv6; + M (GET_NEXT_INDEX, mp); + clib_memcpy (mp->node_name, node_name, vec_len (node_name)); + clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name)); + vec_free (node_name); + vec_free (next_node_name); S (mp); W (ret); @@ -10147,53 +11518,49 @@ api_classify_set_interface_ip_table (vat_main_t * vam) } static int -api_classify_set_interface_l2_tables (vat_main_t * vam) +api_add_node_next (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_set_interface_l2_tables_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 other_table_index = ~0; - u32 is_input = 1; + vl_api_add_node_next_t *mp; + u8 *name = 0; + u8 *next = 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, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "other-table %d", &other_table_index)) + if (unformat (i, "node %s", &name)) ; - else if (unformat (i, "is-input %d", &is_input)) + else if (unformat (i, "next %s", &next)) ; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - - if (sw_if_index_set == 0) + if (name == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("node name required"); + return -99; + } + if (vec_len (name) >= ARRAY_LEN (mp->node_name)) + { + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + return -99; + } + if (next == 0) + { + errmsg ("next node required"); + return -99; + } + if (vec_len (next) >= ARRAY_LEN (mp->next_name)) + { + errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name)); return -99; } - - M (CLASSIFY_SET_INTERFACE_L2_TABLES, 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->other_table_index = ntohl (other_table_index); - mp->is_input = (u8) is_input; + M (ADD_NODE_NEXT, mp); + clib_memcpy (mp->node_name, name, vec_len (name)); + clib_memcpy (mp->next_name, next, vec_len (next)); + vec_free (name); + vec_free (next); S (mp); W (ret); @@ -10201,65 +11568,67 @@ api_classify_set_interface_l2_tables (vat_main_t * vam) } static int -api_set_ipfix_exporter (vat_main_t * vam) +api_l2tpv3_create_tunnel (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_set_ipfix_exporter_t *mp; - ip4_address_t collector_address; - u8 collector_address_set = 0; - u32 collector_port = ~0; - ip4_address_t src_address; - u8 src_address_set = 0; - u32 vrf_id = ~0; - u32 path_mtu = ~0; - u32 template_interval = ~0; - u8 udp_checksum = 0; + ip6_address_t client_address, our_address; + int client_address_set = 0; + int our_address_set = 0; + u32 local_session_id = 0; + u32 remote_session_id = 0; + u64 local_cookie = 0; + u64 remote_cookie = 0; + u8 l2_sublayer_present = 0; + vl_api_l2tpv3_create_tunnel_t *mp; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "collector_address %U", unformat_ip4_address, - &collector_address)) - collector_address_set = 1; - else if (unformat (i, "collector_port %d", &collector_port)) + if (unformat (i, "client_address %U", unformat_ip6_address, + &client_address)) + client_address_set = 1; + else if (unformat (i, "our_address %U", unformat_ip6_address, + &our_address)) + our_address_set = 1; + else if (unformat (i, "local_session_id %d", &local_session_id)) ; - else if (unformat (i, "src_address %U", unformat_ip4_address, - &src_address)) - src_address_set = 1; - else if (unformat (i, "vrf_id %d", &vrf_id)) + else if (unformat (i, "remote_session_id %d", &remote_session_id)) ; - else if (unformat (i, "path_mtu %d", &path_mtu)) + else if (unformat (i, "local_cookie %lld", &local_cookie)) ; - else if (unformat (i, "template_interval %d", &template_interval)) + else if (unformat (i, "remote_cookie %lld", &remote_cookie)) ; - else if (unformat (i, "udp_checksum")) - udp_checksum = 1; + else if (unformat (i, "l2-sublayer-present")) + l2_sublayer_present = 1; else break; } - if (collector_address_set == 0) + if (client_address_set == 0) { - errmsg ("collector_address required"); + errmsg ("client_address required"); return -99; } - if (src_address_set == 0) + if (our_address_set == 0) { - errmsg ("src_address required"); + errmsg ("our_address required"); return -99; } - M (SET_IPFIX_EXPORTER, mp); + M (L2TPV3_CREATE_TUNNEL, mp); - memcpy (mp->collector_address, collector_address.data, - sizeof (collector_address.data)); - mp->collector_port = htons ((u16) collector_port); - memcpy (mp->src_address, src_address.data, sizeof (src_address.data)); - mp->vrf_id = htonl (vrf_id); - mp->path_mtu = htonl (path_mtu); - mp->template_interval = htonl (template_interval); - mp->udp_checksum = udp_checksum; + clib_memcpy (mp->client_address, client_address.as_u8, + sizeof (mp->client_address)); + + clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address)); + + mp->local_session_id = ntohl (local_session_id); + mp->remote_session_id = ntohl (remote_session_id); + mp->local_cookie = clib_host_to_net_u64 (local_cookie); + mp->remote_cookie = clib_host_to_net_u64 (remote_cookie); + mp->l2_sublayer_present = l2_sublayer_present; + mp->is_ipv6 = 1; S (mp); W (ret); @@ -10267,31 +11636,41 @@ api_set_ipfix_exporter (vat_main_t * vam) } static int -api_set_ipfix_classify_stream (vat_main_t * vam) +api_l2tpv3_set_tunnel_cookies (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_set_ipfix_classify_stream_t *mp; - u32 domain_id = 0; - u32 src_port = UDP_DST_PORT_ipfix; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u64 new_local_cookie = 0; + u64 new_remote_cookie = 0; + vl_api_l2tpv3_set_tunnel_cookies_t *mp; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "domain %d", &domain_id)) + 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, "new_local_cookie %lld", &new_local_cookie)) ; - else if (unformat (i, "src_port %d", &src_port)) + else if (unformat (i, "new_remote_cookie %lld", &new_remote_cookie)) ; else - { - errmsg ("unknown input `%U'", format_unformat_error, i); - return -99; - } + break; } - M (SET_IPFIX_CLASSIFY_STREAM, mp); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - mp->domain_id = htonl (domain_id); - mp->src_port = htons ((u16) src_port); + M (L2TPV3_SET_TUNNEL_COOKIES, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie); + mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie); S (mp); W (ret); @@ -10299,61 +11678,39 @@ api_set_ipfix_classify_stream (vat_main_t * vam) } static int -api_ipfix_classify_table_add_del (vat_main_t * vam) +api_l2tpv3_interface_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipfix_classify_table_add_del_t *mp; - int is_add = -1; - u32 classify_table_index = ~0; - u8 ip_version = 0; - u8 transport_protocol = 255; + vl_api_l2tpv3_interface_enable_disable_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 enable_disable = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "table %d", &classify_table_index)) - ; - else if (unformat (i, "ip4")) - ip_version = 4; - else if (unformat (i, "ip6")) - ip_version = 6; - else if (unformat (i, "tcp")) - transport_protocol = 6; - else if (unformat (i, "udp")) - transport_protocol = 17; + 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_disable = 1; + else if (unformat (i, "disable")) + enable_disable = 0; else - { - errmsg ("unknown input `%U'", format_unformat_error, i); - return -99; - } + break; } - if (is_add == -1) - { - errmsg ("expecting: add|del"); - return -99; - } - if (classify_table_index == ~0) - { - errmsg ("classifier table not specified"); - return -99; - } - if (ip_version == 0) + if (sw_if_index_set == 0) { - errmsg ("IP version not specified"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp); + M (L2TPV3_INTERFACE_ENABLE_DISABLE, mp); - mp->is_add = is_add; - mp->table_id = htonl (classify_table_index); - mp->ip_version = ip_version; - mp->transport_protocol = transport_protocol; + mp->sw_if_index = ntohl (sw_if_index); + mp->enable_disable = enable_disable; S (mp); W (ret); @@ -10361,355 +11718,362 @@ api_ipfix_classify_table_add_del (vat_main_t * vam) } static int -api_get_node_index (vat_main_t * vam) +api_l2tpv3_set_lookup_key (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_get_node_index_t *mp; - u8 *name = 0; + vl_api_l2tpv3_set_lookup_key_t *mp; + u8 key = ~0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "node %s", &name)) - ; + if (unformat (i, "lookup_v6_src")) + key = L2T_LOOKUP_SRC_ADDRESS; + else if (unformat (i, "lookup_v6_dst")) + key = L2T_LOOKUP_DST_ADDRESS; + else if (unformat (i, "lookup_session_id")) + key = L2T_LOOKUP_SESSION_ID; else break; } - if (name == 0) - { - errmsg ("node name required"); - return -99; - } - if (vec_len (name) >= ARRAY_LEN (mp->node_name)) + + if (key == (u8) ~ 0) { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + errmsg ("l2tp session lookup key unset"); return -99; } - M (GET_NODE_INDEX, mp); - clib_memcpy (mp->node_name, name, vec_len (name)); - vec_free (name); + M (L2TPV3_SET_LOOKUP_KEY, mp); + + mp->key = key; S (mp); W (ret); return ret; } -static int -api_get_next_index (vat_main_t * vam) +static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler + (vl_api_sw_if_l2tpv3_tunnel_details_t * mp) { - unformat_input_t *i = vam->input; - vl_api_get_next_index_t *mp; - u8 *node_name = 0, *next_node_name = 0; - int ret; + vat_main_t *vam = &vat_main; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "node-name %s", &node_name)) - ; - else if (unformat (i, "next-node-name %s", &next_node_name)) - break; - } + print (vam->ofp, "* %U (our) %U (client) (sw_if_index %d)", + format_ip6_address, mp->our_address, + format_ip6_address, mp->client_address, + clib_net_to_host_u32 (mp->sw_if_index)); - if (node_name == 0) - { - errmsg ("node name required"); - return -99; - } - if (vec_len (node_name) >= ARRAY_LEN (mp->node_name)) - { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); - return -99; - } + print (vam->ofp, + " local cookies %016llx %016llx remote cookie %016llx", + clib_net_to_host_u64 (mp->local_cookie[0]), + clib_net_to_host_u64 (mp->local_cookie[1]), + clib_net_to_host_u64 (mp->remote_cookie)); + + print (vam->ofp, " local session-id %d remote session-id %d", + clib_net_to_host_u32 (mp->local_session_id), + clib_net_to_host_u32 (mp->remote_session_id)); + + print (vam->ofp, " l2 specific sublayer %s\n", + mp->l2_sublayer_present ? "preset" : "absent"); + +} + +static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler_json + (vl_api_sw_if_l2tpv3_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in6_addr addr; - if (next_node_name == 0) - { - errmsg ("next node name required"); - return -99; - } - if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name)) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name)); - return -99; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - M (GET_NEXT_INDEX, mp); - clib_memcpy (mp->node_name, node_name, vec_len (node_name)); - clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name)); - vec_free (node_name); - vec_free (next_node_name); + vat_json_init_object (node); - S (mp); - W (ret); - return ret; + clib_memcpy (&addr, mp->our_address, sizeof (addr)); + vat_json_object_add_ip6 (node, "our_address", addr); + clib_memcpy (&addr, mp->client_address, sizeof (addr)); + vat_json_object_add_ip6 (node, "client_address", addr); + + vat_json_node_t *lc = vat_json_object_add (node, "local_cookie"); + vat_json_init_array (lc); + vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0])); + vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1])); + vat_json_object_add_uint (node, "remote_cookie", + clib_net_to_host_u64 (mp->remote_cookie)); + + printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id)); + vat_json_object_add_uint (node, "local_session_id", + clib_net_to_host_u32 (mp->local_session_id)); + vat_json_object_add_uint (node, "remote_session_id", + clib_net_to_host_u32 (mp->remote_session_id)); + vat_json_object_add_string_copy (node, "l2_sublayer", + mp->l2_sublayer_present ? (u8 *) "present" + : (u8 *) "absent"); } static int -api_add_node_next (vat_main_t * vam) +api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_add_node_next_t *mp; - u8 *name = 0; - u8 *next = 0; + vl_api_sw_if_l2tpv3_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "node %s", &name)) - ; - else if (unformat (i, "next %s", &next)) - ; - else - break; - } - if (name == 0) - { - errmsg ("node name required"); - return -99; - } - if (vec_len (name) >= ARRAY_LEN (mp->node_name)) - { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); - return -99; - } - if (next == 0) - { - errmsg ("next node required"); - return -99; - } - if (vec_len (next) >= ARRAY_LEN (mp->next_name)) - { - errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name)); - return -99; - } + /* Get list of l2tpv3-tunnel interfaces */ + M (SW_IF_L2TPV3_TUNNEL_DUMP, mp); + S (mp); - M (ADD_NODE_NEXT, mp); - clib_memcpy (mp->node_name, name, vec_len (name)); - clib_memcpy (mp->next_name, next, vec_len (next)); - vec_free (name); - vec_free (next); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); W (ret); return ret; } -static int -api_l2tpv3_create_tunnel (vat_main_t * vam) + +static void vl_api_sw_interface_tap_details_t_handler + (vl_api_sw_interface_tap_details_t * mp) { - unformat_input_t *i = vam->input; - ip6_address_t client_address, our_address; - int client_address_set = 0; - int our_address_set = 0; - u32 local_session_id = 0; - u32 remote_session_id = 0; - u64 local_cookie = 0; - u64 remote_cookie = 0; - u8 l2_sublayer_present = 0; - vl_api_l2tpv3_create_tunnel_t *mp; - int ret; + vat_main_t *vam = &vat_main; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "client_address %U", unformat_ip6_address, - &client_address)) - client_address_set = 1; - else if (unformat (i, "our_address %U", unformat_ip6_address, - &our_address)) - our_address_set = 1; - else if (unformat (i, "local_session_id %d", &local_session_id)) - ; - else if (unformat (i, "remote_session_id %d", &remote_session_id)) - ; - else if (unformat (i, "local_cookie %lld", &local_cookie)) - ; - else if (unformat (i, "remote_cookie %lld", &remote_cookie)) - ; - else if (unformat (i, "l2-sublayer-present")) - l2_sublayer_present = 1; - else - break; - } + print (vam->ofp, "%-16s %d", + mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index)); +} - if (client_address_set == 0) - { - errmsg ("client_address required"); - return -99; - } +static void vl_api_sw_interface_tap_details_t_handler_json + (vl_api_sw_interface_tap_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - if (our_address_set == 0) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - errmsg ("our_address required"); - return -99; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - M (L2TPV3_CREATE_TUNNEL, mp); + 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); +} - clib_memcpy (mp->client_address, client_address.as_u8, - sizeof (mp->client_address)); +static int +api_sw_interface_tap_dump (vat_main_t * vam) +{ + vl_api_sw_interface_tap_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; - clib_memcpy (mp->our_address, our_address.as_u8, sizeof (mp->our_address)); + print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index"); + /* Get list of tap interfaces */ + M (SW_INTERFACE_TAP_DUMP, mp); + S (mp); - mp->local_session_id = ntohl (local_session_id); - mp->remote_session_id = ntohl (remote_session_id); - mp->local_cookie = clib_host_to_net_u64 (local_cookie); - mp->remote_cookie = clib_host_to_net_u64 (remote_cookie); - mp->l2_sublayer_present = l2_sublayer_present; - mp->is_ipv6 = 1; + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); W (ret); return ret; } +static uword unformat_vxlan_decap_next + (unformat_input_t * input, va_list * args) +{ + u32 *result = va_arg (*args, u32 *); + u32 tmp; + + if (unformat (input, "l2")) + *result = VXLAN_INPUT_NEXT_L2_INPUT; + else if (unformat (input, "%d", &tmp)) + *result = tmp; + else + return 0; + return 1; +} + static int -api_l2tpv3_set_tunnel_cookies (vat_main_t * vam) +api_vxlan_add_del_tunnel (vat_main_t * vam) { - unformat_input_t *i = vam->input; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u64 new_local_cookie = 0; - u64 new_remote_cookie = 0; - vl_api_l2tpv3_set_tunnel_cookies_t *mp; + unformat_input_t *line_input = vam->input; + vl_api_vxlan_add_del_tunnel_t *mp; + ip46_address_t src, dst; + u8 is_add = 1; + u8 ipv4_set = 0, ipv6_set = 0; + u8 src_set = 0; + u8 dst_set = 0; + u8 grp_set = 0; + u32 mcast_sw_if_index = ~0; + u32 encap_vrf_id = 0; + u32 decap_next_index = ~0; + u32 vni = 0; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ + memset (&src, 0, sizeof src); + memset (&dst, 0, sizeof dst); + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%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, "new_local_cookie %lld", &new_local_cookie)) + if (unformat (line_input, "del")) + is_add = 0; + else + if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) + { + ipv4_set = 1; + src_set = 1; + } + else + if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4)) + { + ipv4_set = 1; + dst_set = 1; + } + else + if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6)) + { + ipv6_set = 1; + src_set = 1; + } + else + if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6)) + { + ipv6_set = 1; + dst_set = 1; + } + else if (unformat (line_input, "group %U %U", + unformat_ip4_address, &dst.ip4, + 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 (i, "new_remote_cookie %lld", &new_remote_cookie)) + else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + ; + else if (unformat (line_input, "decap-next %U", + unformat_vxlan_decap_next, &decap_next_index)) + ; + else if (unformat (line_input, "vni %d", &vni)) ; else - break; + { + errmsg ("parse error '%U'", format_unformat_error, line_input); + return -99; + } } - if (sw_if_index_set == 0) + if (src_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("tunnel src address not specified"); return -99; } - - M (L2TPV3_SET_TUNNEL_COOKIES, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->new_local_cookie = clib_host_to_net_u64 (new_local_cookie); - mp->new_remote_cookie = clib_host_to_net_u64 (new_remote_cookie); - - S (mp); - W (ret); - return ret; -} - -static int -api_l2tpv3_interface_enable_disable (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2tpv3_interface_enable_disable_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 enable_disable = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (dst_set == 0) { - 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_disable = 1; - else if (unformat (i, "disable")) - enable_disable = 0; - else - break; + errmsg ("tunnel dst address not specified"); + return -99; } - if (sw_if_index_set == 0) + if (grp_set && !ip46_address_is_multicast (&dst)) { - errmsg ("missing interface name or sw_if_index"); + 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; } - M (L2TPV3_INTERFACE_ENABLE_DISABLE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable_disable; - - S (mp); - W (ret); - return ret; -} - -static int -api_l2tpv3_set_lookup_key (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2tpv3_set_lookup_key_t *mp; - u8 key = ~0; - int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (ipv4_set && ipv6_set) { - if (unformat (i, "lookup_v6_src")) - key = L2T_LOOKUP_SRC_ADDRESS; - else if (unformat (i, "lookup_v6_dst")) - key = L2T_LOOKUP_DST_ADDRESS; - else if (unformat (i, "lookup_session_id")) - key = L2T_LOOKUP_SESSION_ID; - else - break; + errmsg ("both IPv4 and IPv6 addresses specified"); + return -99; } - if (key == (u8) ~ 0) + if ((vni == 0) || (vni >> 24)) { - errmsg ("l2tp session lookup key unset"); + errmsg ("vni not specified or out of range"); return -99; } - M (L2TPV3_SET_LOOKUP_KEY, mp); + M (VXLAN_ADD_DEL_TUNNEL, mp); - mp->key = key; + if (ipv6_set) + { + clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6)); + clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6)); + } + else + { + clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4)); + clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4)); + } + mp->encap_vrf_id = ntohl (encap_vrf_id); + mp->decap_next_index = ntohl (decap_next_index); + mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); + mp->vni = ntohl (vni); + mp->is_add = is_add; + mp->is_ipv6 = ipv6_set; S (mp); W (ret); return ret; } -static void vl_api_sw_if_l2tpv3_tunnel_details_t_handler - (vl_api_sw_if_l2tpv3_tunnel_details_t * mp) +static void vl_api_vxlan_tunnel_details_t_handler + (vl_api_vxlan_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, "* %U (our) %U (client) (sw_if_index %d)", - format_ip6_address, mp->our_address, - format_ip6_address, mp->client_address, - clib_net_to_host_u32 (mp->sw_if_index)); - - print (vam->ofp, - " local cookies %016llx %016llx remote cookie %016llx", - clib_net_to_host_u64 (mp->local_cookie[0]), - clib_net_to_host_u64 (mp->local_cookie[1]), - clib_net_to_host_u64 (mp->remote_cookie)); - - print (vam->ofp, " local session-id %d remote session-id %d", - clib_net_to_host_u32 (mp->local_session_id), - clib_net_to_host_u32 (mp->remote_session_id)); - - print (vam->ofp, " l2 specific sublayer %s\n", - mp->l2_sublayer_present ? "preset" : "absent"); - + 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_sw_if_l2tpv3_tunnel_details_t_handler_json - (vl_api_sw_if_l2tpv3_tunnel_details_t * mp) +static void vl_api_vxlan_tunnel_details_t_handler_json + (vl_api_vxlan_tunnel_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; - struct in6_addr addr; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -10719,104 +12083,88 @@ static void vl_api_sw_if_l2tpv3_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)); + if (mp->is_ipv6) + { + struct in6_addr ip6; - clib_memcpy (&addr, mp->our_address, sizeof (addr)); - vat_json_object_add_ip6 (node, "our_address", addr); - clib_memcpy (&addr, mp->client_address, sizeof (addr)); - vat_json_object_add_ip6 (node, "client_address", addr); - - vat_json_node_t *lc = vat_json_object_add (node, "local_cookie"); - vat_json_init_array (lc); - vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[0])); - vat_json_array_add_uint (lc, clib_net_to_host_u64 (mp->local_cookie[1])); - vat_json_object_add_uint (node, "remote_cookie", - clib_net_to_host_u64 (mp->remote_cookie)); + 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; - printf ("local id: %u", clib_net_to_host_u32 (mp->local_session_id)); - vat_json_object_add_uint (node, "local_session_id", - clib_net_to_host_u32 (mp->local_session_id)); - vat_json_object_add_uint (node, "remote_session_id", - clib_net_to_host_u32 (mp->remote_session_id)); - vat_json_object_add_string_copy (node, "l2_sublayer", - mp->l2_sublayer_present ? (u8 *) "present" - : (u8 *) "absent"); + 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_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam) +api_vxlan_tunnel_dump (vat_main_t * vam) { - vl_api_sw_if_l2tpv3_tunnel_dump_t *mp; + unformat_input_t *i = vam->input; + vl_api_vxlan_tunnel_dump_t *mp; vl_api_control_ping_t *mp_ping; + u32 sw_if_index; + u8 sw_if_index_set = 0; int ret; - /* Get list of l2tpv3-tunnel interfaces */ - M (SW_IF_L2TPV3_TUNNEL_DUMP, mp); - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - - -static void vl_api_sw_interface_tap_details_t_handler - (vl_api_sw_interface_tap_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)); -} + /* 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; + } -static void vl_api_sw_interface_tap_details_t_handler_json - (vl_api_sw_interface_tap_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + if (sw_if_index_set == 0) + { + sw_if_index = ~0; + } - 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, "%11s%24s%24s%14s%18s%13s%19s", + "sw_if_index", "src_address", "dst_address", + "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); } - 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); -} + /* Get list of vxlan-tunnel interfaces */ + M (VXLAN_TUNNEL_DUMP, mp); -static int -api_sw_interface_tap_dump (vat_main_t * vam) -{ - vl_api_sw_interface_tap_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + mp->sw_if_index = htonl (sw_if_index); - print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index"); - /* Get list of tap interfaces */ - M (SW_INTERFACE_TAP_DUMP, mp); 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_vxlan_decap_next +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 = VXLAN_INPUT_NEXT_L2_INPUT; + *result = GENEVE_INPUT_NEXT_L2_INPUT; else if (unformat (input, "%d", &tmp)) *result = tmp; else @@ -10825,10 +12173,10 @@ static uword unformat_vxlan_decap_next } static int -api_vxlan_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_vxlan_add_del_tunnel_t *mp; + vl_api_geneve_add_del_tunnel_t *mp; ip46_address_t src, dst; u8 is_add = 1; u8 ipv4_set = 0, ipv6_set = 0; @@ -10905,7 +12253,7 @@ api_vxlan_add_del_tunnel (vat_main_t * vam) else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) ; else if (unformat (line_input, "decap-next %U", - unformat_vxlan_decap_next, &decap_next_index)) + unformat_geneve_decap_next, &decap_next_index)) ; else if (unformat (line_input, "vni %d", &vni)) ; @@ -10956,17 +12304,17 @@ api_vxlan_add_del_tunnel (vat_main_t * vam) return -99; } - M (VXLAN_ADD_DEL_TUNNEL, mp); + M (GENEVE_ADD_DEL_TUNNEL, mp); if (ipv6_set) { - clib_memcpy (mp->src_address, &src.ip6, sizeof (src.ip6)); - clib_memcpy (mp->dst_address, &dst.ip6, sizeof (dst.ip6)); + clib_memcpy (mp->local_address, &src.ip6, sizeof (src.ip6)); + clib_memcpy (mp->remote_address, &dst.ip6, sizeof (dst.ip6)); } else { - clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4)); - clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4)); + 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); @@ -10980,8 +12328,8 @@ api_vxlan_add_del_tunnel (vat_main_t * vam) return ret; } -static void vl_api_vxlan_tunnel_details_t_handler - (vl_api_vxlan_tunnel_details_t * mp) +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); @@ -10996,8 +12344,8 @@ static void vl_api_vxlan_tunnel_details_t_handler ntohl (mp->mcast_sw_if_index)); } -static void vl_api_vxlan_tunnel_details_t_handler_json - (vl_api_vxlan_tunnel_details_t * mp) +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; @@ -11039,10 +12387,10 @@ static void vl_api_vxlan_tunnel_details_t_handler_json } static int -api_vxlan_tunnel_dump (vat_main_t * vam) +api_geneve_tunnel_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_vxlan_tunnel_dump_t *mp; + vl_api_geneve_tunnel_dump_t *mp; vl_api_control_ping_t *mp_ping; u32 sw_if_index; u8 sw_if_index_set = 0; @@ -11065,12 +12413,12 @@ api_vxlan_tunnel_dump (vat_main_t * vam) if (!vam->json_output) { print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s", - "sw_if_index", "src_address", "dst_address", + "sw_if_index", "local_address", "remote_address", "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); } - /* Get list of vxlan-tunnel interfaces */ - M (VXLAN_TUNNEL_DUMP, mp); + /* Get list of geneve-tunnel interfaces */ + M (GENEVE_TUNNEL_DUMP, mp); mp->sw_if_index = htonl (sw_if_index); @@ -11268,7 +12616,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); @@ -11412,7 +12760,6 @@ api_create_vhost_user_if (vat_main_t * vam) u8 use_custom_mac = 0; u8 *tag = 0; int ret; - u8 operation_mode = VHOST_USER_POLLING_MODE; /* Shut up coverity */ memset (hwaddr, 0, sizeof (hwaddr)); @@ -11431,10 +12778,6 @@ api_create_vhost_user_if (vat_main_t * vam) is_server = 1; else if (unformat (i, "tag %s", &tag)) ; - else if (unformat (i, "mode %U", - api_unformat_vhost_user_operation_mode, - &operation_mode)) - ; else break; } @@ -11454,7 +12797,6 @@ api_create_vhost_user_if (vat_main_t * vam) M (CREATE_VHOST_USER_IF, mp); - mp->operation_mode = operation_mode; mp->is_server = is_server; clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); vec_free (file_name); @@ -11486,7 +12828,6 @@ api_modify_vhost_user_if (vat_main_t * vam) u8 sw_if_index_set = 0; u32 sw_if_index = (u32) ~ 0; int ret; - u8 operation_mode = VHOST_USER_POLLING_MODE; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -11502,10 +12843,6 @@ api_modify_vhost_user_if (vat_main_t * vam) ; else if (unformat (i, "server")) is_server = 1; - else if (unformat (i, "mode %U", - api_unformat_vhost_user_operation_mode, - &operation_mode)) - ; else break; } @@ -11531,7 +12868,6 @@ api_modify_vhost_user_if (vat_main_t * vam) M (MODIFY_VHOST_USER_IF, mp); - mp->operation_mode = operation_mode; mp->sw_if_index = ntohl (sw_if_index); mp->is_server = is_server; clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); @@ -11587,12 +12923,11 @@ static void vl_api_sw_interface_vhost_user_details_t_handler { vat_main_t *vam = &vat_main; - print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %U %s", + print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s", (char *) mp->interface_name, ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz), clib_net_to_host_u64 (mp->features), mp->is_server, - ntohl (mp->num_regions), api_format_vhost_user_operation_mode, - mp->operation_mode, (char *) mp->sock_filename); + ntohl (mp->num_regions), (char *) mp->sock_filename); print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno))); } @@ -11621,7 +12956,6 @@ static void vl_api_sw_interface_vhost_user_details_t_handler_json vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename); vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions)); vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno)); - vat_json_object_add_uint (node, "mode", mp->operation_mode); } static int @@ -11631,15 +12965,14 @@ api_sw_interface_vhost_user_dump (vat_main_t * vam) vl_api_control_ping_t *mp_ping; int ret; print (vam->ofp, - "Interface name idx hdr_sz features server regions mode" - " filename"); + "Interface name idx hdr_sz features server regions filename"); /* Get list of vhost-user interfaces */ M (SW_INTERFACE_VHOST_USER_DUMP, mp); S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -11671,6 +13004,8 @@ api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) u8 ipv4_set = 0, ipv6_set = 0; u8 local_set = 0; u8 remote_set = 0; + u8 grp_set = 0; + u32 mcast_sw_if_index = ~0; u32 encap_vrf_id = 0; u32 decap_vrf_id = 0; u8 protocol = ~0; @@ -11678,6 +13013,12 @@ api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) u8 vni_set = 0; int ret; + /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ + memset (&local4, 0, sizeof local4); + memset (&remote4, 0, sizeof remote4); + memset (&local6, 0, sizeof local6); + memset (&remote6, 0, sizeof remote6); + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { if (unformat (line_input, "del")) @@ -11706,6 +13047,35 @@ api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) remote_set = 1; ipv6_set = 1; } + else if (unformat (line_input, "group %U %U", + unformat_ip4_address, &remote4, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + { + grp_set = remote_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "group %U", + unformat_ip4_address, &remote4)) + { + grp_set = remote_set = 1; + ipv4_set = 1; + } + else if (unformat (line_input, "group %U %U", + unformat_ip6_address, &remote6, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + { + grp_set = remote_set = 1; + ipv6_set = 1; + } + else if (unformat (line_input, "group %U", + unformat_ip6_address, &remote6)) + { + grp_set = remote_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-vrf-id %d", &decap_vrf_id)) @@ -11737,6 +13107,11 @@ api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) errmsg ("tunnel remote address not specified"); return -99; } + if (grp_set && mcast_sw_if_index == ~0) + { + errmsg ("tunnel nonexistent multicast device"); + return -99; + } if (ipv4_set && ipv6_set) { errmsg ("both IPv4 and IPv6 addresses specified"); @@ -11763,6 +13138,7 @@ api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) clib_memcpy (&mp->remote, &remote4, sizeof (remote4)); } + mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); mp->encap_vrf_id = ntohl (encap_vrf_id); mp->decap_vrf_id = ntohl (decap_vrf_id); mp->protocol = protocol; @@ -11779,16 +13155,19 @@ static void vl_api_vxlan_gpe_tunnel_details_t_handler (vl_api_vxlan_gpe_tunnel_details_t * mp) { vat_main_t *vam = &vat_main; + ip46_address_t local = to_ip46 (mp->is_ipv6, mp->local); + ip46_address_t remote = to_ip46 (mp->is_ipv6, mp->remote); - print (vam->ofp, "%11d%24U%24U%13d%12d%14d%14d", + print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d", ntohl (mp->sw_if_index), - format_ip46_address, &(mp->local[0]), - format_ip46_address, &(mp->remote[0]), - ntohl (mp->vni), - ntohl (mp->protocol), + format_ip46_address, &local, IP46_TYPE_ANY, + format_ip46_address, &remote, IP46_TYPE_ANY, + ntohl (mp->vni), mp->protocol, + ntohl (mp->mcast_sw_if_index), ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id)); } + static void vl_api_vxlan_gpe_tunnel_details_t_handler_json (vl_api_vxlan_gpe_tunnel_details_t * mp) { @@ -11822,6 +13201,8 @@ static void vl_api_vxlan_gpe_tunnel_details_t_handler_json } vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol)); + vat_json_object_add_uint (node, "mcast_sw_if_index", + ntohl (mp->mcast_sw_if_index)); vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id)); vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); @@ -11853,9 +13234,9 @@ api_vxlan_gpe_tunnel_dump (vat_main_t * vam) if (!vam->json_output) { - print (vam->ofp, "%11s%24s%24s%13s%15s%14s%14s", + print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s", "sw_if_index", "local", "remote", "vni", - "protocol", "encap_vrf_id", "decap_vrf_id"); + "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id"); } /* Get list of vxlan-tunnel interfaces */ @@ -11866,13 +13247,14 @@ 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) { @@ -11882,8 +13264,8 @@ format_l2_fib_mac_address (u8 * s, va_list * args) a[2], a[3], a[4], a[5], a[6], a[7]); } -static void vl_api_l2_fib_table_entry_t_handler - (vl_api_l2_fib_table_entry_t * mp) +static void vl_api_l2_fib_table_details_t_handler + (vl_api_l2_fib_table_details_t * mp) { vat_main_t *vam = &vat_main; @@ -11894,8 +13276,8 @@ static void vl_api_l2_fib_table_entry_t_handler mp->bvi_mac); } -static void vl_api_l2_fib_table_entry_t_handler_json - (vl_api_l2_fib_table_entry_t * mp) +static void vl_api_l2_fib_table_details_t_handler_json + (vl_api_l2_fib_table_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; @@ -11950,7 +13332,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); @@ -12075,6 +13457,42 @@ api_want_ip6_nd_events (vat_main_t * vam) return ret; } +static int +api_want_l2_macs_events (vat_main_t * vam) +{ + unformat_input_t *line_input = vam->input; + vl_api_want_l2_macs_events_t *mp; + u8 enable_disable = 1; + u32 scan_delay = 0; + u32 max_macs_in_event = 0; + u32 learn_limit = 0; + int ret; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "learn-limit %d", &learn_limit)) + ; + else if (unformat (line_input, "scan-delay %d", &scan_delay)) + ; + else if (unformat (line_input, "max-entries %d", &max_macs_in_event)) + ; + else if (unformat (line_input, "disable")) + enable_disable = 0; + else + break; + } + + M (WANT_L2_MACS_EVENTS, mp); + mp->enable_disable = enable_disable; + mp->pid = htonl (getpid ()); + mp->learn_limit = htonl (learn_limit); + mp->scan_delay = (u8) scan_delay; + mp->max_macs_in_event = (u8) (max_macs_in_event / 10); + S (mp); + W (ret); + return ret; +} + static int api_input_acl_set_interface (vat_main_t * vam) { @@ -12182,7 +13600,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); @@ -12238,7 +13656,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); @@ -12763,37 +14181,276 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) clib_memcpy (mp->local_crypto_key, lck, mp->local_crypto_key_len); } - mp->remote_crypto_key_len = 0; - if (rck) + mp->remote_crypto_key_len = 0; + if (rck) + { + mp->remote_crypto_key_len = vec_len (rck); + if (mp->remote_crypto_key_len > sizeof (mp->remote_crypto_key)) + mp->remote_crypto_key_len = sizeof (mp->remote_crypto_key); + clib_memcpy (mp->remote_crypto_key, rck, mp->remote_crypto_key_len); + } + + mp->integ_alg = (u8) integ_alg; + + mp->local_integ_key_len = 0; + if (lik) + { + mp->local_integ_key_len = vec_len (lik); + if (mp->local_integ_key_len > sizeof (mp->local_integ_key)) + mp->local_integ_key_len = sizeof (mp->local_integ_key); + clib_memcpy (mp->local_integ_key, lik, mp->local_integ_key_len); + } + + mp->remote_integ_key_len = 0; + if (rik) + { + mp->remote_integ_key_len = vec_len (rik); + if (mp->remote_integ_key_len > sizeof (mp->remote_integ_key)) + mp->remote_integ_key_len = sizeof (mp->remote_integ_key); + clib_memcpy (mp->remote_integ_key, rik, mp->remote_integ_key_len); + } + + S (mp); + W (ret); + 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) { - mp->remote_crypto_key_len = vec_len (rck); - if (mp->remote_crypto_key_len > sizeof (mp->remote_crypto_key)) - mp->remote_crypto_key_len = sizeof (mp->remote_crypto_key); - clib_memcpy (mp->remote_crypto_key, rck, mp->remote_crypto_key_len); + 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; + } } - mp->integ_alg = (u8) integ_alg; - - mp->local_integ_key_len = 0; - if (lik) + if (sw_if_index == ~0) { - mp->local_integ_key_len = vec_len (lik); - if (mp->local_integ_key_len > sizeof (mp->local_integ_key)) - mp->local_integ_key_len = sizeof (mp->local_integ_key); - clib_memcpy (mp->local_integ_key, lik, mp->local_integ_key_len); + errmsg ("interface must be specified"); + return -99; } - mp->remote_integ_key_len = 0; - if (rik) + if (sa_id == ~0) { - mp->remote_integ_key_len = vec_len (rik); - if (mp->remote_integ_key_len > sizeof (mp->remote_integ_key)) - mp->remote_integ_key_len = sizeof (mp->remote_integ_key); - clib_memcpy (mp->remote_integ_key, rik, mp->remote_integ_key_len); + 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; } @@ -13617,7 +15274,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); @@ -13656,7 +15313,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); @@ -13869,6 +15526,12 @@ unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) { a->type = 2; /* mac type */ } + else if (unformat (input, "%U", unformat_nsh_address, a->addr)) + { + a->type = 3; /* NSH type */ + lisp_nsh_api_t *nsh = (lisp_nsh_api_t *) a->addr; + nsh->spi = clib_host_to_net_u32 (nsh->spi); + } else { return 0; @@ -13893,6 +15556,8 @@ lisp_eid_size_vat (u8 type) return 16; case 2: return 6; + case 3: + return 5; } return 0; } @@ -14722,6 +16387,217 @@ api_show_one_rloc_probe_state (vat_main_t * vam) #define api_show_lisp_rloc_probe_state api_show_one_rloc_probe_state +static int +api_one_add_del_ndp_entry (vat_main_t * vam) +{ + vl_api_one_add_del_ndp_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, }; + u8 ip6[16] = { 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, "del")) + is_add = 0; + 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); + return -99; + } + } + + if (!bd_set || !ip_set || (!mac_set && is_add)) + { + errmsg ("Missing BD, IP or MAC!"); + return -99; + } + + M (ONE_ADD_DEL_NDP_ENTRY, mp); + mp->is_add = is_add; + 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); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_add_del_l2_arp_entry (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; + 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 + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!bd_set || !ip_set || (!mac_set && is_add)) + { + errmsg ("Missing BD, IP or MAC!"); + 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; + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_ndp_bd_get (vat_main_t * vam) +{ + vl_api_one_ndp_bd_get_t *mp; + int ret; + + M (ONE_NDP_BD_GET, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_ndp_entries_get (vat_main_t * vam) +{ + vl_api_one_ndp_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_NDP_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_l2_arp_bd_get (vat_main_t * vam) +{ + vl_api_one_l2_arp_bd_get_t *mp; + int ret; + + M (ONE_L2_ARP_BD_GET, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_l2_arp_entries_get (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) { @@ -14886,6 +16762,50 @@ api_one_pitr_set_locator_set (vat_main_t * vam) #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) +{ + u8 ls_name_set = 0; + unformat_input_t *input = vam->input; + vl_api_one_nsh_set_locator_set_t *mp; + u8 is_add = 1; + u8 *ls_name = 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, "ls %s", &ls_name)) + ls_name_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!ls_name_set && is_add) + { + errmsg ("locator-set name not set!"); + return -99; + } + + M (ONE_NSH_SET_LOCATOR_SET, mp); + + mp->is_add = is_add; + clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); + vec_free (ls_name); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + static int api_show_one_pitr (vat_main_t * vam) { @@ -14955,16 +16875,36 @@ api_one_use_petr (vat_main_t * vam) clib_memcpy (mp->address, &ip, 16); } - /* send */ + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_lisp_use_petr api_one_use_petr + +static int +api_show_one_nsh_mapping (vat_main_t * vam) +{ + vl_api_show_one_use_petr_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "local ONE NSH mapping:"); + } + + M (SHOW_ONE_NSH_MAPPING, mp); + /* send it... */ S (mp); - /* wait for reply */ + /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_use_petr api_one_use_petr - static int api_show_one_use_petr (vat_main_t * vam) { @@ -15442,9 +17382,186 @@ api_lisp_gpe_add_del_iface (vat_main_t * vam) M (GPE_ADD_DEL_IFACE, mp); mp->is_add = is_add; - mp->dp_table = dp_table; + mp->dp_table = clib_host_to_net_u32 (dp_table); mp->is_l2 = is_l2; - mp->vni = vni; + mp->vni = clib_host_to_net_u32 (vni); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_map_register_fallback_threshold (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; + 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) + { + 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); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_show_one_map_register_fallback_threshold (vat_main_t * vam) +{ + vl_api_show_one_map_register_fallback_threshold_t *mp; + int ret; + + M (SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +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_one_set_transport_protocol (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_set_transport_protocol_t *mp; + u8 is_set = 0; + u32 protocol = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U", unformat_lisp_transport_protocol, &protocol)) + is_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!is_set) + { + errmsg ("Transport protocol missing!"); + return -99; + } + + M (ONE_SET_TRANSPORT_PROTOCOL, mp); + mp->protocol = (u8) protocol; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_get_transport_protocol (vat_main_t * vam) +{ + vl_api_one_get_transport_protocol_t *mp; + int ret; + + M (ONE_GET_TRANSPORT_PROTOCOL, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + 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; + 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; + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!is_set) + { + errmsg ("TTL value missing!"); + return -99; + } + + M (ONE_MAP_REGISTER_SET_TTL, mp); + mp->ttl = clib_host_to_net_u32 (ttl); + + /* send it... */ + S (mp); + + /* Wait for a 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; + + M (SHOW_ONE_MAP_REGISTER_TTL, mp); /* send it... */ S (mp); @@ -15592,7 +17709,7 @@ api_one_locator_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); /* Wait for a reply... */ @@ -15642,7 +17759,7 @@ api_one_locator_set_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); /* Wait for a reply... */ @@ -15700,7 +17817,7 @@ api_one_eid_table_map_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); /* Wait for a reply... */ @@ -15728,7 +17845,7 @@ api_one_eid_table_vni_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); /* Wait for a reply... */ @@ -15751,6 +17868,7 @@ api_one_eid_table_dump (vat_main_t * vam) u32 prefix_length = ~0, t, vni = 0; u8 filter = 0; int ret; + lisp_nsh_api_t nsh; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -15771,6 +17889,11 @@ api_one_eid_table_dump (vat_main_t * vam) 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; @@ -15817,6 +17940,9 @@ api_one_eid_table_dump (vat_main_t * vam) 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; @@ -15826,31 +17952,136 @@ api_one_eid_table_dump (vat_main_t * vam) /* send it... */ S (mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - + /* 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_lisp_gpe_fwd_entries_get (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; + 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, "%10s %10s %s %40s", "fwd_index", "dp_table", + "leid", "reid"); + } + + 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_one_adjacencies_get (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_one_adjacencies_get_t *mp; + u8 vni_set = 0; + u32 vni = ~0; + 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); + + /* send it... */ + S (mp); + /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_eid_table_dump api_one_eid_table_dump +#define api_lisp_adjacencies_get api_one_adjacencies_get static int -api_lisp_gpe_fwd_entries_get (vat_main_t * vam) +api_gpe_native_fwd_rpaths_get (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; + 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, "vni %d", &vni)) + if (unformat (i, "ip4")) { - vni_set = 1; + ip_family_set = 1; + is_ip4 = 1; + } + else if (unformat (i, "ip6")) + { + ip_family_set = 1; + is_ip4 = 0; } else { @@ -15859,20 +18090,35 @@ api_lisp_gpe_fwd_entries_get (vat_main_t * vam) } } - if (!vni_set) + if (!ip_family_set) { - errmsg ("vni not set!"); + errmsg ("ip family not set!"); return -99; } + M (GPE_NATIVE_FWD_RPATHS_GET, mp); + mp->is_ip4 = is_ip4; + + /* send it... */ + S (mp); + + /* 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, "%10s %10s %s %40s", "fwd_index", "dp_table", - "leid", "reid"); + print (vam->ofp, "VNIs"); } - M (GPE_FWD_ENTRIES_GET, mp); - mp->vni = clib_host_to_net_u32 (vni); + M (GPE_FWD_ENTRY_VNIS_GET, mp); /* send it... */ S (mp); @@ -15882,26 +18128,50 @@ api_lisp_gpe_fwd_entries_get (vat_main_t * vam) return ret; } -#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_gpe_add_del_native_fwd_rpath (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_one_adjacencies_get_t *mp; - u8 vni_set = 0; - u32 vni = ~0; - 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, "vni %d", &vni)) + 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)) { - vni_set = 1; + 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 { errmsg ("parse error '%U'", format_unformat_error, i); @@ -15909,19 +18179,21 @@ api_one_adjacencies_get (vat_main_t * vam) } } - if (!vni_set) + if (!ip_set) { - errmsg ("vni not set!"); + errmsg ("nh addr 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 (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); @@ -15931,8 +18203,6 @@ api_one_adjacencies_get (vat_main_t * vam) return ret; } -#define api_lisp_adjacencies_get api_one_adjacencies_get - static int api_one_map_server_dump (vat_main_t * vam) { @@ -15950,7 +18220,7 @@ api_one_map_server_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); /* Wait for a reply... */ @@ -15977,7 +18247,7 @@ api_one_map_resolver_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); /* Wait for a reply... */ @@ -16011,7 +18281,7 @@ api_one_stats_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); /* Wait for a reply... */ @@ -16073,7 +18343,7 @@ api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam) /* 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... */ @@ -16273,10 +18543,10 @@ api_policer_add_del (vat_main_t * vam) 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->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; @@ -16322,7 +18592,7 @@ api_policer_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); /* Wait for a reply... */ @@ -16411,7 +18681,7 @@ api_policer_classify_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); /* Wait for a reply... */ @@ -16461,134 +18731,398 @@ api_netmap_create (vat_main_t * vam) 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); + 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; } -static int -api_netmap_delete (vat_main_t * vam) +#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) { - unformat_input_t *i = vam->input; - vl_api_netmap_delete_t *mp; - u8 *if_name = 0; - int ret; + vat_main_t *vam = &vat_main; + int count = ntohl (mp->count); + vl_api_fib_path2_t *fp; + int i; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + 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++) { - if (unformat (i, "name %s", &if_name)) - vec_add1 (if_name, 0); - else - break; + vl_api_mpls_fib_path_print (vam, fp); + fp++; } +} - if (!vec_len (if_name)) +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) { - errmsg ("interface name must be specified"); - return -99; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - if (vec_len (if_name) > 64) + 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++) { - errmsg ("interface name too long"); - return -99; + vl_api_mpls_fib_path_json_print (node, fp); + fp++; } +} - M (NETMAP_DELETE, mp); - - clib_memcpy (mp->netmap_if_name, if_name, vec_len (if_name)); - vec_free (if_name); +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_mpls_fib_path_print (vat_main_t * vam, vl_api_fib_path2_t * fp) +vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp) { - 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); + 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_mpls_fib_path_json_print (vat_json_node_t * node, - vl_api_fib_path2_t * 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; - 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) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - clib_memcpy (&ip4, &fp->next_hop, sizeof (ip4)); - vat_json_object_add_ip4 (node, "next_hop", ip4); + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } - else if (fp->afi == IP46_TYPE_IP6) + 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++) { - clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6)); - vat_json_object_add_ip6 (node, "next_hop", 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) +static int +api_ip_fib_dump (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - int count = ntohl (mp->mt_count); - vl_api_fib_path2_t *fp; - i32 i; + vl_api_ip_fib_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; - 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++; - } + M (IP_FIB_DUMP, mp); + S (mp); - print (vam->ofp, ""); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; } -#define vl_api_mpls_tunnel_details_t_endian vl_noop_handler -#define vl_api_mpls_tunnel_details_t_print vl_noop_handler +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; -static void -vl_api_mpls_tunnel_details_t_handler_json (vl_api_mpls_tunnel_details_t * mp) + 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; - vat_json_node_t *node = NULL; - int count = ntohl (mp->mt_count); - vl_api_fib_path2_t *fp; - i32 i; + + 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) { @@ -16598,82 +19132,113 @@ vl_api_mpls_tunnel_details_t_handler_json (vl_api_mpls_tunnel_details_t * mp) 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_string_copy (node, "flag", + (mp->is_static) ? (u8 *) "static" : (u8 *) + "dynamic"); - vat_json_object_add_uint (node, "l2_only", mp->mt_l2_only); + vat_json_object_add_string_copy (node, "link_layer", + format (0, "%U", format_ethernet_address, + &mp->mac_address)); - fp = mp->mt_paths; - for (i = 0; i < count; i++) + if (mp->is_ipv6) { - vl_api_mpls_fib_path_json_print (node, fp); - fp++; + 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_mpls_tunnel_dump (vat_main_t * vam) +api_ip_neighbor_dump (vat_main_t * vam) { - vl_api_mpls_tunnel_dump_t *mp; + unformat_input_t *i = vam->input; + vl_api_ip_neighbor_dump_t *mp; vl_api_control_ping_t *mp_ping; - i32 index = -1; + u8 is_ipv6 = 0; + u32 sw_if_index = ~0; int ret; /* Parse args required to build the message */ - while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (!unformat (vam->input, "tunnel_index %d", &index)) - { - index = -1; - break; - } + 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; } - print (vam->ofp, " tunnel_index %d", index); + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - M (MPLS_TUNNEL_DUMP, mp); - mp->tunnel_index = htonl (index); + 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 */ - M (CONTROL_PING, mp_ping); + 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 - +#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_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp) +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_path2_t *fp; + vl_api_fib_path_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); + "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++) { - vl_api_mpls_fib_path_print (vam, 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); fp++; } } -static void vl_api_mpls_fib_details_t_handler_json - (vl_api_mpls_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); vat_json_node_t *node = NULL; - vl_api_fib_path2_t *fp; + struct in_addr ip4; + struct in6_addr ip6; + vl_api_fib_path_t *fp; int i; if (VAT_JSON_ARRAY != vam->json_tree.type) @@ -16685,291 +19250,461 @@ static void vl_api_mpls_fib_details_t_handler_json 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)); + 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++) { - vl_api_mpls_fib_path_json_print (node, fp); - fp++; + 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_mpls_fib_dump (vat_main_t * vam) +api_ip6_fib_dump (vat_main_t * vam) { - vl_api_mpls_fib_dump_t *mp; + vl_api_ip6_fib_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; - M (MPLS_FIB_DUMP, mp); + 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 */ - M (CONTROL_PING, mp_ping); + 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) +vl_api_ipfix_exporter_details_t_handler (vl_api_ipfix_exporter_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++; - } + 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_ip_fib_details_t_handler_json - (vl_api_ip_fib_details_t * mp) +static void + vl_api_ipfix_exporter_details_t_handler_json + (vl_api_ipfix_exporter_details_t * mp) { vat_main_t *vam = &vat_main; - 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_json_node_t node; + struct in_addr collector_address; + struct in_addr src_address; - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); + vat_json_init_object (&node); + clib_memcpy (&collector_address, &mp->collector_address, + sizeof (collector_address)); + vat_json_object_add_ip4 (&node, "collector_address", collector_address); + vat_json_object_add_uint (&node, "collector_port", + ntohs (mp->collector_port)); + clib_memcpy (&src_address, &mp->src_address, sizeof (src_address)); + vat_json_object_add_ip4 (&node, "src_address", src_address); + vat_json_object_add_int (&node, "vrf_id", ntohl (mp->vrf_id)); + vat_json_object_add_uint (&node, "path_mtu", ntohl (mp->path_mtu)); + vat_json_object_add_uint (&node, "template_interval", + ntohl (mp->template_interval)); + vat_json_object_add_int (&node, "udp_checksum", mp->udp_checksum); - vat_json_init_object (node); - vat_json_object_add_uint (node, "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); - } - } + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + vam->retval = 0; + vam->result_ready = 1; } -static int -api_ip_fib_dump (vat_main_t * vam) +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; + 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) { @@ -16979,64 +19714,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); @@ -17044,14 +19754,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); @@ -17059,32 +19785,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); @@ -17092,30 +19843,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); @@ -17123,724 +19889,641 @@ 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); - - 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_ipfix_exporter_dump_t *mp; - int ret; - - /* Construct the API message */ - M (IPFIX_EXPORTER_DUMP, mp); - mp->context = 0; - - S (mp); - W (ret); - return ret; -} - -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; -} + if (vrf_id == ~0) + { + errmsg ("VRF ID required, not specified"); + return -99; + } -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; + if (vrf_id == 0) + { + errmsg + ("VRF ID should not be default. Should be distinct VRF for this purpose."); + return -99; + } - vat_json_init_object (&node); - vat_json_object_add_uint (&node, "domain_id", ntohl (mp->domain_id)); - vat_json_object_add_uint (&node, "src_port", ntohs (mp->src_port)); + if (vec_len (low_ports) == 0) + { + errmsg ("At least one port or port range required"); + return -99; + } - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - vam->retval = 0; - vam->result_ready = 1; -} + M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, mp); -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; + mp->is_add = is_add; - if (!vam->json_output) + if (is_ipv6) { - print (vam->ofp, "%15s%15s%20s", "table_id", "ip_version", - "transport_protocol"); + 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)); } - /* Construct the API message */ - M (IPFIX_CLASSIFY_TABLE_DUMP, mp); + mp->mask_length = length; + mp->number_of_ranges = vec_len (low_ports); - /* send it... */ - S (mp); + 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); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + mp->vrf_id = ntohl (vrf_id); + S (mp); W (ret); return ret; } -static void - vl_api_ipfix_classify_table_details_t_handler - (vl_api_ipfix_classify_table_details_t * mp) +int +api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - print (vam->ofp, "%15d%15d%20d", ntohl (mp->table_id), mp->ip_version, - mp->transport_protocol); -} + 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; -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; + 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; + } - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (sw_if_index == ~0) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + errmsg ("Interface required but not specified"); + return -99; } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); + if (vrf_set == 0) + { + errmsg ("VRF ID required but not specified"); + return -99; + } - 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); + if (tcp_out_vrf_id == 0 + || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0) + { + errmsg + ("VRF ID should not be default. Should be distinct VRF for this purpose."); + 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); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_sw_interface_span_enable_disable (vat_main_t * vam) +api_ipsec_gre_add_del_tunnel (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_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; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat - (i, "src %U", api_unformat_sw_if_index, vam, &src_sw_if_index)) + if (unformat (i, "local_sa %d", &local_sa_id)) ; - else if (unformat (i, "src_sw_if_index %d", &src_sw_if_index)) + else if (unformat (i, "remote_sa %d", &remote_sa_id)) ; - else - if (unformat - (i, "dst %U", api_unformat_sw_if_index, vam, &dst_sw_if_index)) + else if (unformat (i, "src %U", unformat_ip4_address, &src_address)) ; - else if (unformat (i, "dst_sw_if_index %d", &dst_sw_if_index)) + else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address)) ; - 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, "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 (IPSEC_GRE_ADD_DEL_TUNNEL, 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->local_sa_id = ntohl (local_sa_id); + mp->remote_sa_id = ntohl (remote_sa_id); + clib_memcpy (mp->src_address, &src_address, sizeof (src_address)); + clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address)); + mp->is_add = is_add; S (mp); W (ret); return ret; } -static void -vl_api_sw_interface_span_details_t_handler (vl_api_sw_interface_span_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]); -} - -static void - vl_api_sw_interface_span_details_t_handler_json - (vl_api_sw_interface_span_details_t * mp) +static int +api_punt (vat_main_t * vam) { - 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* */ + unformat_input_t *i = vam->input; + vl_api_punt_t *mp; + u32 ipv = ~0; + u32 protocol = ~0; + u32 port = ~0; + int 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, "ip %d", &ipv)) + ; + else if (unformat (i, "protocol %d", &protocol)) + ; + else if (unformat (i, "port %d", &port)) + ; + else if (unformat (i, "del")) + is_add = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - 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); -} + M (PUNT, mp); -static int -api_sw_interface_span_dump (vat_main_t * vam) -{ - vl_api_sw_interface_span_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + mp->is_add = (u8) is_add; + mp->ipv = (u8) ipv; + mp->l4_protocol = (u8) protocol; + mp->l4_port = htons ((u16) port); - M (SW_INTERFACE_SPAN_DUMP, mp); S (mp); + W (ret); + return ret; +} - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); +static void vl_api_ipsec_gre_tunnel_details_t_handler + (vl_api_ipsec_gre_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; - W (ret); - return ret; + 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)); } -int -api_pg_create_interface (vat_main_t * vam) +static void vl_api_ipsec_gre_tunnel_details_t_handler_json + (vl_api_ipsec_gre_tunnel_details_t * mp) { - unformat_input_t *input = vam->input; - vl_api_pg_create_interface_t *mp; + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in_addr ip4; - 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) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - errmsg ("missing pg interface index"); - 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); - /* Construct the API message */ - M (PG_CREATE_INTERFACE, mp); - mp->context = 0; - mp->interface_id = ntohl (if_id); - - S (mp); - W (ret); - return ret; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + clib_memcpy (&ip4, &mp->src_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "src_address", ip4); + clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4)); + vat_json_object_add_ip4 (node, "dst_address", ip4); + vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id)); + vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id)); } -int -api_pg_capture (vat_main_t * vam) +static int +api_ipsec_gre_tunnel_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_pg_capture_t *mp; - - u32 if_id = ~0; - u8 enable = 1; - u32 count = 1; - u8 pcap_file_set = 0; - u8 *pcap_file = 0; + 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; 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, "if_id %d", &if_id)) - ; - else if (unformat (input, "pcap %s", &pcap_file)) - pcap_file_set = 1; - else if (unformat (input, "count %d", &count)) - ; - else if (unformat (input, "disable")) - enable = 0; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - if (if_id == ~0) - { - errmsg ("missing pg interface index"); - return -99; - } - if (pcap_file_set > 0) + + if (sw_if_index_set == 0) { - if (vec_len (pcap_file) > 255) - { - errmsg ("pcap file name is too long"); - return -99; - } + sw_if_index = ~0; } - 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) + if (!vam->json_output) { - clib_memcpy (mp->pcap_file_name, pcap_file, name_len); + print (vam->ofp, "%11s%15s%15s%14s%14s", + "sw_if_index", "src_address", "dst_address", + "local_sa_id", "remote_sa_id"); } - vec_free (pcap_file); + + /* Get list of gre-tunnel interfaces */ + M (IPSEC_GRE_TUNNEL_DUMP, mp); + + mp->sw_if_index = htonl (sw_if_index); S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + 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"); - 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); + 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, "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; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index == ~0) + if (sw_if_index_set == 0) { - errmsg ("Interface required but not specified"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (vrf_set == 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 required but not specified"); + errmsg ("classify table type must be specified"); return -99; } - if (tcp_out_vrf_id == 0 - || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0) + if (!vam->json_output) { - errmsg - ("VRF ID should not be default. Should be distinct VRF for this purpose."); - return -99; + print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); } - /* 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); - + 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); @@ -17848,63 +20531,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) { @@ -17914,55 +20602,30 @@ 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_ipsec_gre_tunnel_dump (vat_main_t * vam) +api_l2_xconnect_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_ipsec_gre_tunnel_dump_t *mp; + vl_api_l2_xconnect_dump_t *mp; 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%15s%15s%14s%14s", - "sw_if_index", "src_address", "dst_address", - "local_sa_id", "remote_sa_id"); + print (vam->ofp, "%15s%15s", "rx_sw_if_index", "tx_sw_if_index"); } - /* Get list of gre-tunnel interfaces */ - M (IPSEC_GRE_TUNNEL_DUMP, mp); - - mp->sw_if_index = htonl (sw_if_index); + M (L2_XCONNECT_DUMP, mp); S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -17970,18 +20633,21 @@ api_ipsec_gre_tunnel_dump (vat_main_t * vam) } static int -api_delete_subif (vat_main_t * vam) +api_sw_interface_set_mtu (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_delete_subif_t *mp; + vl_api_sw_interface_set_mtu_t *mp; 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)) ; - if (unformat (i, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "sw_if_index %d", &sw_if_index)) ; else break; @@ -17989,75 +20655,104 @@ api_delete_subif (vat_main_t * vam) if (sw_if_index == ~0) { - errmsg ("missing sw_if_index"); + errmsg ("missing interface name or sw_if_index"); + return -99; + } + + if (mtu == 0) + { + errmsg ("no mtu specified"); return -99; } /* Construct the API message */ - M (DELETE_SUBIF, mp); + 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; } -#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_p2p_ethernet_add (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_p2p_ethernet_add_t *mp; + u32 parent_if_index = ~0; + u32 sub_id = ~0; + u8 remote_mac[6]; + u8 mac_set = 0; int ret; - /* Shut up coverity */ - memset (dmac, 0, sizeof (dmac)); - memset (smac, 0, sizeof (smac)); - + 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)) ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "sw_if_index %d", &parent_if_index)) ; - else if (unformat (i, "vtr_op %d", &vtr_op)) + else + if (unformat + (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) + mac_set++; + else if (unformat (i, "sub_id %d", &sub_id)) ; -#define _(n,v) else if (unformat(i, n)) {vtr_op = v;} - foreach_pbb_vtr_op -#undef _ - else if (unformat (i, "translate_pbb_stag")) + else { - 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; - } + clib_warning ("parse error '%U'", format_unformat_error, i); + 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)) + } + + if (parent_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (mac_set == 0) + { + errmsg ("missing remote mac address"); + return -99; + } + if (sub_id == ~0) + { + errmsg ("missing sub-interface id"); + return -99; + } + + 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); + W (ret); + return ret; +} + +static int +api_p2p_ethernet_del (vat_main_t * vam) +{ + 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; + + 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, "vlanid %d", &tmp)) - vlanid = tmp; + 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); @@ -18065,27 +20760,20 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) } } - if ((sw_if_index == ~0) || (vtr_op == ~0)) + if (parent_if_index == ~0) { - errmsg ("missing sw_if_index or vtr operation"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (((vtr_op == L2_VTR_PUSH_2) || (vtr_op == L2_VTR_TRANSLATE_2_2)) - && ((dmac_set == 0) || (smac_set == 0) || (sid == ~0))) + if (mac_set == 0) { - errmsg - ("push and translate_qinq operations require dmac, smac, sid and optionally vlanid"); + errmsg ("missing remote mac address"); return -99; } - 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); + 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); @@ -18093,28 +20781,22 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) } static int -api_flow_classify_set_interface (vat_main_t * vam) +api_lldp_config (vat_main_t * vam) { 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; + vl_api_lldp_config_t *mp; + int tx_hold = 0; + int tx_interval = 0; + u8 *sys_name = NULL; 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)) + if (unformat (i, "system-name %s", &sys_name)) ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) + else if (unformat (i, "tx-hold %d", &tx_hold)) + ; + else if (unformat (i, "tx-interval %d", &tx_interval)) ; else { @@ -18123,18 +20805,73 @@ api_flow_classify_set_interface (vat_main_t * vam) } } - if (sw_if_index_set == 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) + { + 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 (sw_if_index == ~0) { errmsg ("missing interface name or sw_if_index"); return -99; } - M (FLOW_CLASSIFY_SET_INTERFACE, 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->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->is_add = is_add; + 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); @@ -18142,250 +20879,312 @@ api_flow_classify_set_interface (vat_main_t * vam) } static int -api_flow_classify_dump (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_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 type = FLOW_CLASSIFY_N_TABLES; + ip4_address_t v4first, v4last; + ip6_address_t v6first, v6last; + u8 range_set = 0; + u32 vrf_id = 0; int ret; - if (unformat (i, "type %U", unformat_flow_classify_table_type, &type)) - ; - else + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("classify table type must be specified"); - return -99; + 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)) + { + 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 (!vam->json_output) + if (range_set == 0) { - print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); + errmsg ("address range not set"); + return -99; } - M (FLOW_CLASSIFY_DUMP, mp); - mp->type = type; - /* send it... */ + 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); - - /* 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_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; - } + M (MEMFD_SEGMENT_CREATE, mp); + mp->requested_size = size; + S (mp); + W (ret); + return ret; - if (enable && (tag == 0)) +#else + errmsg ("memfd_segment_create (builtin) not supported"); + return -99; +#endif +} + +static int +api_dns_enable_disable (vat_main_t * vam) +{ + unformat_input_t *line_input = vam->input; + vl_api_dns_enable_disable_t *mp; + u8 enable_disable = 1; + int ret; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - errmsg ("no tag specified"); - return -99; + if (unformat (line_input, "disable")) + enable_disable = 0; + if (unformat (line_input, "enable")) + enable_disable = 1; + else + break; } /* 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 (DNS_ENABLE_DISABLE, mp); + mp->enable = enable_disable; + /* send it... */ S (mp); + /* Wait for the reply */ W (ret); return ret; } -static void vl_api_l2_xconnect_details_t_handler - (vl_api_l2_xconnect_details_t * mp) +static int +api_dns_resolve_name (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%15d%15d", - ntohl (mp->rx_sw_if_index), ntohl (mp->tx_sw_if_index)); -} + unformat_input_t *line_input = vam->input; + vl_api_dns_resolve_name_t *mp; + u8 *name = 0; + int ret; -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; + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "%s", &name)) + ; + else + break; + } - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (vec_len (name) > 127) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + errmsg ("name too long"); + return -99; } - 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_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_l2_xconnect_dump (vat_main_t * vam) +api_dns_resolve_ip (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_ip_t *mp; + int is_ip6 = -1; + ip4_address_t addr4; + ip6_address_t addr6; 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, "%U", unformat_ip6_address, &addr6)) + is_ip6 = 1; + else if (unformat (line_input, "%U", unformat_ip4_address, &addr4)) + is_ip6 = 0; + else + break; } - M (L2_XCONNECT_DUMP, mp); - - S (mp); + if (is_ip6 == -1) + { + errmsg ("missing address"); + return -99; + } - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + /* Construct the API message */ + 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_sw_interface_set_mtu (vat_main_t * vam) +api_dns_name_server_add_del (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; + 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; 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)) - ; + 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 - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_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 (mtu == 0) + if ((ip4_set + ip6_set) == 0) { - errmsg ("no mtu specified"); + errmsg ("Server address required"); 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_NAME_SERVER_ADD_DEL, mp); + + if (ip6_set) + { + 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; + } + + mp->is_add = is_add; + /* send it... */ S (mp); + + /* Wait for a reply, return good/bad news */ W (ret); return ret; } @@ -18771,6 +21570,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") \ @@ -18780,14 +21581,14 @@ _(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] [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") \ _(l2fib_flush_bd, "bd_id ") \ _(l2fib_flush_int, " | sw_if_index ") \ _(l2_flags, \ - "sw_if | sw_if_index [learn] [forward] [uu-flood] [flood]\n") \ + "sw_if | sw_if_index [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \ _(bridge_flags, \ "bd_id [learn] [forward] [uu-flood] [flood] [arp-term] [disable]\n") \ _(tap_connect, \ @@ -18797,6 +21598,8 @@ _(tap_modify, \ _(tap_delete, \ " | sw_if_index ") \ _(sw_interface_tap_dump, "") \ +_(ip_table_add_del, \ + "table-id [ipv6]\n") \ _(ip_add_del_route, \ "/ via [table-id ]\n" \ "[ | sw_if_index ] [resolve-attempts ]\n" \ @@ -18805,6 +21608,8 @@ _(ip_add_del_route, \ _(ip_mroute_add_del, \ " / [table-id ]\n" \ "[ | sw_if_index ] [local] [del]") \ +_(mpls_table_add_del, \ + "table-id \n") \ _(mpls_route_add_del, \ "