X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=eebad05fa3c3159a849bcc6371e980124ebbfb17;hb=e0792fdff;hp=bbd97ba115f3810364c536e9ca8d14aee51498c8;hpb=1e553a00389fb0eb2d54b950a3cfd91dd1a72644;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index bbd97ba115f..9f02507e4f7 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -18,13 +18,18 @@ */ #include +#include +#include +#include #include #include -#include #include +#include +#include #include #include #include +#include #include #include #include @@ -32,14 +37,12 @@ #include #include #include -#include +#include #include #include #include #include -#include #include -#include #include #include #include @@ -48,8 +51,13 @@ #include #include #include - +#include +#include +#include +#include #include "vat/json_format.h" +#include +#include #include #include @@ -65,7 +73,11 @@ #undef vl_endianfun /* instantiate all the print functions we know about */ +#if VPP_API_TEST_BUILTIN == 0 #define vl_print(handle, ...) +#else +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) +#endif #define vl_printfun #include #undef vl_printfun @@ -73,6 +85,60 @@ #define __plugin_msg_base 0 #include +#include + +void vl_api_set_elog_main (elog_main_t * m); +int vl_api_set_elog_trace_api_messages (int enable); + +#if VPP_API_TEST_BUILTIN == 0 +#include + +u32 +vl (void *p) +{ + return vec_len (p); +} + +int +vat_socket_connect (vat_main_t * vam) +{ + int rv; + vam->socket_client_main = &socket_client_main; + if ((rv = vl_socket_client_connect ((char *) vam->socket_name, + "vpp_api_test", + 0 /* default socket rx, tx buffer */ ))) + return rv; + /* vpp expects the client index in network order */ + vam->my_client_index = htonl (socket_client_main.client_index); + return 0; +} +#else /* vpp built-in case, we don't do sockets... */ +int +vat_socket_connect (vat_main_t * vam) +{ + return 0; +} + +int +vl_socket_client_read (int wait) +{ + return -1; +}; + +int +vl_socket_client_write () +{ + return -1; +}; + +void * +vl_socket_client_msg_alloc (int nbytes) +{ + return 0; +} +#endif + + f64 vat_time_now (vat_main_t * vam) { @@ -103,7 +169,8 @@ errmsg (char *fmt, ...) if (vam->ifp != stdin) fformat (vam->ofp, "%s(%d): \n", vam->current_file, vam->input_line_number); - fformat (vam->ofp, (char *) s); + else + fformat (vam->ofp, "%s\n", (char *) s); fflush (vam->ofp); } #endif @@ -130,6 +197,12 @@ api_unformat_sw_if_index (unformat_input_t * input, va_list * args) return 1; } +static uword +api_unformat_hw_if_index (unformat_input_t * input, va_list * args) +{ + return 0; +} + /* Parse an IP4 address %d.%d.%d.%d. */ uword unformat_ip4_address (unformat_input_t * input, va_list * args) @@ -297,20 +370,6 @@ unformat_ipsec_policy_action (unformat_input_t * input, va_list * args) return 1; } -uword -unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args) -{ - u32 *r = va_arg (*args, u32 *); - - if (0); -#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f; - foreach_ipsec_crypto_alg -#undef _ - else - return 0; - return 1; -} - u8 * format_ipsec_crypto_alg (u8 * s, va_list * args) { @@ -328,20 +387,6 @@ format_ipsec_crypto_alg (u8 * s, va_list * args) return format (s, "%s", t); } -uword -unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args) -{ - u32 *r = va_arg (*args, u32 *); - - if (0); -#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f; - foreach_ipsec_integ_alg -#undef _ - else - return 0; - return 1; -} - u8 * format_ipsec_integ_alg (u8 * s, va_list * args) { @@ -359,14 +404,37 @@ format_ipsec_integ_alg (u8 * s, va_list * args) return format (s, "%s", t); } +#else /* VPP_API_TEST_BUILTIN == 1 */ +static uword +api_unformat_sw_if_index (unformat_input_t * input, va_list * args) +{ + vat_main_t *vam __clib_unused = va_arg (*args, vat_main_t *); + vnet_main_t *vnm = vnet_get_main (); + u32 *result = va_arg (*args, u32 *); + + return unformat (input, "%U", unformat_vnet_sw_interface, vnm, result); +} + +static uword +api_unformat_hw_if_index (unformat_input_t * input, va_list * args) +{ + vat_main_t *vam __clib_unused = va_arg (*args, vat_main_t *); + vnet_main_t *vnm = vnet_get_main (); + u32 *result = va_arg (*args, u32 *); + + return unformat (input, "%U", unformat_vnet_hw_interface, vnm, result); +} + +#endif /* VPP_API_TEST_BUILTIN */ + uword -unformat_ikev2_auth_method (unformat_input_t * input, va_list * args) +unformat_ipsec_api_crypto_alg (unformat_input_t * input, va_list * args) { u32 *r = va_arg (*args, u32 *); if (0); -#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_AUTH_METHOD_##f; - foreach_ikev2_auth_method +#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_API_CRYPTO_ALG_##f; + foreach_ipsec_crypto_alg #undef _ else return 0; @@ -374,34 +442,18 @@ unformat_ikev2_auth_method (unformat_input_t * input, va_list * args) } uword -unformat_ikev2_id_type (unformat_input_t * input, va_list * args) +unformat_ipsec_api_integ_alg (unformat_input_t * input, va_list * args) { u32 *r = va_arg (*args, u32 *); if (0); -#define _(v,f,s) else if (unformat (input, s)) *r = IKEV2_ID_TYPE_##f; - foreach_ikev2_id_type +#define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_API_INTEG_ALG_##f; + foreach_ipsec_integ_alg #undef _ else return 0; return 1; } -#else /* VPP_API_TEST_BUILTIN == 1 */ -static uword -api_unformat_sw_if_index (unformat_input_t * input, va_list * args) -{ - vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *); - vnet_main_t *vnm = vnet_get_main (); - u32 *result = va_arg (*args, u32 *); - u32 sw_if_index; - - if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index)) - return 0; - - *result = sw_if_index; - return 1; -} -#endif /* VPP_API_TEST_BUILTIN */ static uword unformat_policer_rate_type (unformat_input_t * input, va_list * args) @@ -520,12 +572,13 @@ unformat_flow_classify_table_type (unformat_input_t * input, va_list * va) return 1; } +#if (VPP_API_TEST_BUILTIN==0) + static const char *mfib_flag_names[] = MFIB_ENTRY_NAMES_SHORT; static const char *mfib_flag_long_names[] = MFIB_ENTRY_NAMES_LONG; static const char *mfib_itf_flag_long_names[] = MFIB_ITF_NAMES_LONG; static const char *mfib_itf_flag_names[] = MFIB_ITF_NAMES_SHORT; -#if (VPP_API_TEST_BUILTIN==0) uword unformat_mfib_itf_flags (unformat_input_t * input, va_list * args) { @@ -662,8 +715,9 @@ format_ethernet_address (u8 * s, va_list * args) #endif static void -increment_v4_address (ip4_address_t * a) +increment_v4_address (vl_api_ip4_address_t * i) { + ip4_address_t *a = (ip4_address_t *) i; u32 v; v = ntohl (a->as_u32) + 1; @@ -671,8 +725,9 @@ increment_v4_address (ip4_address_t * a) } static void -increment_v6_address (ip6_address_t * a) +increment_v6_address (vl_api_ip6_address_t * i) { + ip6_address_t *a = (ip6_address_t *) i; u64 v0, v1; v0 = clib_net_to_host_u64 (a->as_u64[0]); @@ -686,14 +741,61 @@ increment_v6_address (ip6_address_t * a) } static void -increment_mac_address (u64 * mac) +increment_address (vl_api_address_t * a) +{ + if (clib_net_to_host_u32 (a->af) == ADDRESS_IP4) + increment_v4_address (&a->un.ip4); + else if (clib_net_to_host_u32 (a->af) == ADDRESS_IP6) + increment_v6_address (&a->un.ip6); +} + +static void +set_ip4_address (vl_api_address_t * a, u32 v) { - u64 tmp = *mac; + if (a->af == ADDRESS_IP4) + { + ip4_address_t *i = (ip4_address_t *) & a->un.ip4; + i->as_u32 = v; + } +} +static void +increment_mac_address (u8 * mac) +{ + u64 tmp = *((u64 *) mac); tmp = clib_net_to_host_u64 (tmp); tmp += 1 << 16; /* skip unused (least significant) octets */ tmp = clib_host_to_net_u64 (tmp); - *mac = tmp; + + clib_memcpy (mac, &tmp, 6); +} + +static void +vat_json_object_add_address (vat_json_node_t * node, + const char *str, const vl_api_address_t * addr) +{ + if (ADDRESS_IP6 == addr->af) + { + struct in6_addr ip6; + + clib_memcpy (&ip6, &addr->un.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, str, ip6); + } + else + { + struct in_addr ip4; + + clib_memcpy (&ip4, &addr->un.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, str, ip4); + } +} + +static void +vat_json_object_add_prefix (vat_json_node_t * node, + const vl_api_prefix_t * prefix) +{ + vat_json_object_add_uint (node, "len", prefix->len); + vat_json_object_add_address (node, "address", &prefix->address); } static void vl_api_create_loopback_reply_t_handler @@ -892,14 +994,11 @@ static void vl_api_sw_interface_details_t_handler sub->sw_if_index = ntohl (mp->sw_if_index); sub->sub_id = ntohl (mp->sub_id); - sub->sub_dot1ad = mp->sub_dot1ad; + sub->raw_flags = ntohl (mp->sub_if_flags & SUB_IF_API_FLAG_MASK_VNET); + sub->sub_number_of_tags = mp->sub_number_of_tags; sub->sub_outer_vlan_id = ntohs (mp->sub_outer_vlan_id); sub->sub_inner_vlan_id = ntohs (mp->sub_inner_vlan_id); - sub->sub_exact_match = mp->sub_exact_match; - sub->sub_default = mp->sub_default; - sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any; - sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any; /* vlan tag rewrite */ sub->vtr_op = ntohl (mp->vtr_op); @@ -926,37 +1025,28 @@ static void vl_api_sw_interface_details_t_handler_json vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); vat_json_object_add_uint (node, "sup_sw_if_index", ntohl (mp->sup_sw_if_index)); - vat_json_object_add_uint (node, "l2_address_length", - ntohl (mp->l2_address_length)); vat_json_object_add_bytes (node, "l2_address", mp->l2_address, sizeof (mp->l2_address)); vat_json_object_add_string_copy (node, "interface_name", mp->interface_name); - vat_json_object_add_uint (node, "admin_up_down", mp->admin_up_down); - vat_json_object_add_uint (node, "link_up_down", mp->link_up_down); + vat_json_object_add_uint (node, "flags", mp->flags); vat_json_object_add_uint (node, "link_duplex", mp->link_duplex); vat_json_object_add_uint (node, "link_speed", mp->link_speed); vat_json_object_add_uint (node, "mtu", ntohs (mp->link_mtu)); vat_json_object_add_uint (node, "sub_id", ntohl (mp->sub_id)); - vat_json_object_add_uint (node, "sub_dot1ad", mp->sub_dot1ad); vat_json_object_add_uint (node, "sub_number_of_tags", mp->sub_number_of_tags); vat_json_object_add_uint (node, "sub_outer_vlan_id", ntohs (mp->sub_outer_vlan_id)); vat_json_object_add_uint (node, "sub_inner_vlan_id", ntohs (mp->sub_inner_vlan_id)); - vat_json_object_add_uint (node, "sub_exact_match", mp->sub_exact_match); - vat_json_object_add_uint (node, "sub_default", mp->sub_default); - vat_json_object_add_uint (node, "sub_outer_vlan_id_any", - mp->sub_outer_vlan_id_any); - vat_json_object_add_uint (node, "sub_inner_vlan_id_any", - mp->sub_inner_vlan_id_any); + vat_json_object_add_uint (node, "sub_if_flags", ntohl (mp->sub_if_flags)); vat_json_object_add_uint (node, "vtr_op", ntohl (mp->vtr_op)); vat_json_object_add_uint (node, "vtr_push_dot1q", ntohl (mp->vtr_push_dot1q)); vat_json_object_add_uint (node, "vtr_tag1", ntohl (mp->vtr_tag1)); vat_json_object_add_uint (node, "vtr_tag2", ntohl (mp->vtr_tag2)); - if (mp->sub_dot1ah) + if (ntohl (mp->sub_if_flags) & SUB_IF_API_FLAG_DOT1AH) { vat_json_object_add_string_copy (node, "pbb_vtr_dmac", format (0, "%U", @@ -972,20 +1062,22 @@ 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) errmsg ("interface flags: sw_if_index %d %s %s", ntohl (mp->sw_if_index), - mp->admin_up_down ? "admin-up" : "admin-down", - mp->link_up_down ? "link-up" : "link-down"); + ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_ADMIN_UP) ? + "admin-up" : "admin-down", + ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_LINK_UP) ? + "link-up" : "link-down"); } #endif -static void vl_api_sw_interface_set_flags_t_handler_json - (vl_api_sw_interface_set_flags_t * mp) +__clib_unused static void +vl_api_sw_interface_event_t_handler_json (vl_api_sw_interface_event_t * mp) { /* JSON output not supported */ } @@ -1036,9 +1128,18 @@ 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 = vl_api_string_len (&mp->reply); + + 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), + vl_api_from_api_string (&mp->reply), length); + vam->cmd_reply[length] = 0; + } vam->result_ready = 1; } @@ -1048,9 +1149,12 @@ 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); + vat_json_object_add_string_copy (&node, "reply", + vl_api_from_api_string (&mp->reply)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -1251,14 +1355,88 @@ static void vl_api_show_version_reply_t_handler_json vam->result_ready = 1; } +static void vl_api_show_threads_reply_t_handler + (vl_api_show_threads_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + int i, count = 0; + + if (retval >= 0) + count = ntohl (mp->count); + + for (i = 0; i < count; i++) + print (vam->ofp, + "\n%-2d %-11s %-11s %-5d %-6d %-4d %-6d", + ntohl (mp->thread_data[i].id), mp->thread_data[i].name, + mp->thread_data[i].type, ntohl (mp->thread_data[i].pid), + ntohl (mp->thread_data[i].cpu_id), ntohl (mp->thread_data[i].core), + ntohl (mp->thread_data[i].cpu_socket)); + + vam->retval = retval; + vam->result_ready = 1; +} + +static void vl_api_show_threads_reply_t_handler_json + (vl_api_show_threads_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + vl_api_thread_data_t *td; + i32 retval = ntohl (mp->retval); + int i, count = 0; + + if (retval >= 0) + count = ntohl (mp->count); + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", retval); + vat_json_object_add_uint (&node, "count", count); + + for (i = 0; i < count; i++) + { + td = &mp->thread_data[i]; + vat_json_object_add_uint (&node, "id", ntohl (td->id)); + vat_json_object_add_string_copy (&node, "name", td->name); + vat_json_object_add_string_copy (&node, "type", td->type); + vat_json_object_add_uint (&node, "pid", ntohl (td->pid)); + vat_json_object_add_int (&node, "cpu_id", ntohl (td->cpu_id)); + vat_json_object_add_int (&node, "core", ntohl (td->id)); + vat_json_object_add_int (&node, "cpu_socket", ntohl (td->cpu_socket)); + } + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = retval; + vam->result_ready = 1; +} + +static int +api_show_threads (vat_main_t * vam) +{ + vl_api_show_threads_t *mp; + int ret; + + print (vam->ofp, + "\n%-2s %-11s %-11s %-5s %-6s %-4s %-6s", + "ID", "Name", "Type", "LWP", "cpu_id", "Core", "Socket"); + + M (SHOW_THREADS, mp); + + S (mp); + W (ret); + return ret; +} + static void vl_api_ip4_arp_event_t_handler (vl_api_ip4_arp_event_t * mp) { u32 sw_if_index = ntohl (mp->sw_if_index); errmsg ("arp %s event: pid %d address %U new mac %U sw_if_index %d\n", mp->mac_ip ? "mac/ip binding" : "address resolution", - ntohl (mp->pid), format_ip4_address, &mp->address, - format_ethernet_address, mp->new_mac, sw_if_index); + ntohl (mp->pid), format_ip4_address, mp->ip, + format_vl_api_mac_address, &mp->mac, sw_if_index); } static void @@ -1273,8 +1451,8 @@ vl_api_ip6_nd_event_t_handler (vl_api_ip6_nd_event_t * mp) u32 sw_if_index = ntohl (mp->sw_if_index); errmsg ("ip6 nd %s event: pid %d address %U new mac %U sw_if_index %d\n", mp->mac_ip ? "mac/ip binding" : "address resolution", - ntohl (mp->pid), format_ip6_address, mp->address, - format_ethernet_address, mp->new_mac, sw_if_index); + ntohl (mp->pid), format_vl_api_ip6_address, mp->ip, + format_vl_api_mac_address, mp->mac, sw_if_index); } static void @@ -1283,6 +1461,30 @@ 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 received 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 action %d \n", + i + 1, ntohl (mac->sw_if_index), + format_ethernet_address, mac->mac_addr, mac->action); + 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 @@ -1297,12 +1499,13 @@ static void vl_api_bridge_domain_details_t_handler 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"); + print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-6s %-3s", + " ID", "LRN", "FWD", "FLD", "BVI", "UU-FWD", "#IF"); - print (vam->ofp, "%3d %3d %3d %3d %3d %3d", + print (vam->ofp, "%3d %3d %3d %3d %3d %6d %3d", ntohl (mp->bd_id), mp->learn, mp->forward, - mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs); + mp->flood, ntohl (mp->bvi_sw_if_index), + ntohl (mp->uu_fwd_sw_if_index), n_sw_ifs); if (n_sw_ifs) { @@ -1397,6 +1600,8 @@ static void vl_api_control_ping_reply_t_handler vam->retval = retval; vam->result_ready = 1; } + if (vam->socket_client_main) + vam->socket_client_main->control_pings_outstanding--; } static void vl_api_control_ping_reply_t_handler_json @@ -1524,8 +1729,8 @@ static void vl_api_bridge_flags_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_tap_connect_reply_t_handler - (vl_api_tap_connect_reply_t * mp) +static void +vl_api_tap_create_v2_reply_t_handler (vl_api_tap_create_v2_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1542,8 +1747,8 @@ static void vl_api_tap_connect_reply_t_handler } -static void vl_api_tap_connect_reply_t_handler_json - (vl_api_tap_connect_reply_t * mp) +static void vl_api_tap_create_v2_reply_t_handler_json + (vl_api_tap_create_v2_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; @@ -1561,7 +1766,7 @@ static void vl_api_tap_connect_reply_t_handler_json } static void -vl_api_tap_modify_reply_t_handler (vl_api_tap_modify_reply_t * mp) +vl_api_tap_delete_v2_reply_t_handler (vl_api_tap_delete_v2_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1572,20 +1777,18 @@ vl_api_tap_modify_reply_t_handler (vl_api_tap_modify_reply_t * mp) else { vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } } -static void vl_api_tap_modify_reply_t_handler_json - (vl_api_tap_modify_reply_t * mp) +static void vl_api_tap_delete_v2_reply_t_handler_json + (vl_api_tap_delete_v2_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -1595,7 +1798,8 @@ static void vl_api_tap_modify_reply_t_handler_json } static void -vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_reply_t * mp) +vl_api_virtio_pci_create_reply_t_handler (vl_api_virtio_pci_create_reply_t * + mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1606,28 +1810,32 @@ vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_reply_t * mp) else { vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } } -static void vl_api_tap_delete_reply_t_handler_json - (vl_api_tap_delete_reply_t * mp) +static void vl_api_virtio_pci_create_reply_t_handler_json + (vl_api_virtio_pci_create_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_mpls_tunnel_add_del_reply_t_handler - (vl_api_mpls_tunnel_add_del_reply_t * mp) +static void +vl_api_virtio_pci_delete_reply_t_handler (vl_api_virtio_pci_delete_reply_t * + mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1642,16 +1850,14 @@ static void vl_api_mpls_tunnel_add_del_reply_t_handler } } -static void vl_api_mpls_tunnel_add_del_reply_t_handler_json - (vl_api_mpls_tunnel_add_del_reply_t * mp) +static void vl_api_virtio_pci_delete_reply_t_handler_json + (vl_api_virtio_pci_delete_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, "tunnel_sw_if_index", - ntohl (mp->sw_if_index)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -1660,11 +1866,12 @@ static void vl_api_mpls_tunnel_add_del_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_l2tpv3_create_tunnel_reply_t_handler - (vl_api_l2tpv3_create_tunnel_reply_t * mp) +static void +vl_api_bond_create_reply_t_handler (vl_api_bond_create_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); + if (vam->async_mode) { vam->async_errors += (retval < 0); @@ -1677,8 +1884,8 @@ static void vl_api_l2tpv3_create_tunnel_reply_t_handler } } -static void vl_api_l2tpv3_create_tunnel_reply_t_handler_json - (vl_api_l2tpv3_create_tunnel_reply_t * mp) +static void vl_api_bond_create_reply_t_handler_json + (vl_api_bond_create_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; @@ -1694,11 +1901,12 @@ 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) +static void +vl_api_bond_delete_reply_t_handler (vl_api_bond_delete_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); + if (vam->async_mode) { vam->async_errors += (retval < 0); @@ -1710,16 +1918,14 @@ static void vl_api_gpe_add_del_fwd_entry_reply_t_handler } } -static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json - (vl_api_gpe_add_del_fwd_entry_reply_t * mp) +static void vl_api_bond_delete_reply_t_handler_json + (vl_api_bond_delete_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); @@ -1728,11 +1934,12 @@ static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json 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) +static void +vl_api_bond_enslave_reply_t_handler (vl_api_bond_enslave_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); + if (vam->async_mode) { vam->async_errors += (retval < 0); @@ -1744,15 +1951,14 @@ static void vl_api_one_add_del_locator_set_reply_t_handler } } -static void vl_api_one_add_del_locator_set_reply_t_handler_json - (vl_api_one_add_del_locator_set_reply_t * mp) +static void vl_api_bond_enslave_reply_t_handler_json + (vl_api_bond_enslave_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, "locator_set_index", ntohl (mp->ls_index)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -1761,11 +1967,13 @@ static void vl_api_one_add_del_locator_set_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_vxlan_add_del_tunnel_reply_t_handler - (vl_api_vxlan_add_del_tunnel_reply_t * mp) +static void +vl_api_bond_detach_slave_reply_t_handler (vl_api_bond_detach_slave_reply_t * + mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); + if (vam->async_mode) { vam->async_errors += (retval < 0); @@ -1773,20 +1981,18 @@ static void vl_api_vxlan_add_del_tunnel_reply_t_handler else { vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } } -static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json - (vl_api_vxlan_add_del_tunnel_reply_t * mp) +static void vl_api_bond_detach_slave_reply_t_handler_json + (vl_api_bond_detach_slave_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); @@ -1795,32 +2001,215 @@ static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler - (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) +static int +api_sw_interface_set_bond_weight (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_bond_weight_t *mp; + u32 sw_if_index = ~0; + u32 weight = 0; + u8 weight_enter = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - vam->async_errors += (retval < 0); + 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, "weight %u", &weight)) + weight_enter = 1; + else + break; } - else + + if (sw_if_index == ~0) { - vam->retval = retval; + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (weight_enter == 0) + { + errmsg ("missing valid weight"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_SET_BOND_WEIGHT, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->weight = ntohl (weight); + + S (mp); + W (ret); + return ret; +} + +static void vl_api_sw_interface_bond_details_t_handler + (vl_api_sw_interface_bond_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, + "%-16s %-12d %-12U %-13U %-14u %-14u", + mp->interface_name, ntohl (mp->sw_if_index), + format_bond_mode, ntohl (mp->mode), format_bond_load_balance, + ntohl (mp->lb), ntohl (mp->active_slaves), ntohl (mp->slaves)); +} + +static void vl_api_sw_interface_bond_details_t_handler_json + (vl_api_sw_interface_bond_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_string_copy (node, "interface_name", + mp->interface_name); + vat_json_object_add_uint (node, "mode", ntohl (mp->mode)); + vat_json_object_add_uint (node, "load_balance", ntohl (mp->lb)); + vat_json_object_add_uint (node, "active_slaves", ntohl (mp->active_slaves)); + vat_json_object_add_uint (node, "slaves", ntohl (mp->slaves)); +} + +static int +api_sw_interface_bond_dump (vat_main_t * vam) +{ + vl_api_sw_interface_bond_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + print (vam->ofp, + "\n%-16s %-12s %-12s %-13s %-14s %-14s", + "interface name", "sw_if_index", "mode", "load balance", + "active slaves", "slaves"); + + /* Get list of bond interfaces */ + M (SW_INTERFACE_BOND_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_sw_interface_slave_details_t_handler + (vl_api_sw_interface_slave_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, + "%-25s %-12d %-7d %-12d %-10d %-10d", mp->interface_name, + ntohl (mp->sw_if_index), mp->is_passive, mp->is_long_timeout, + ntohl (mp->weight), mp->is_local_numa); +} + +static void vl_api_sw_interface_slave_details_t_handler_json + (vl_api_sw_interface_slave_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_string_copy (node, "interface_name", + mp->interface_name); + vat_json_object_add_uint (node, "passive", mp->is_passive); + vat_json_object_add_uint (node, "long_timeout", mp->is_long_timeout); + vat_json_object_add_uint (node, "weight", ntohl (mp->weight)); + vat_json_object_add_uint (node, "is_local_numa", mp->is_local_numa); +} + +static int +api_sw_interface_slave_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_slave_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } + + print (vam->ofp, + "\n%-25s %-12s %-7s %-12s %-10s %-10s", + "slave interface name", "sw_if_index", "passive", "long_timeout", + "weight", "local numa"); + + /* Get list of bond interfaces */ + M (SW_INTERFACE_SLAVE_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static void vl_api_mpls_tunnel_add_del_reply_t_handler + (vl_api_mpls_tunnel_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->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } + vam->regenerate_interface_table = 1; } -static void vl_api_vxlan_gpe_add_del_tunnel_reply_t_handler_json - (vl_api_vxlan_gpe_add_del_tunnel_reply_t * mp) +static void vl_api_mpls_tunnel_add_del_reply_t_handler_json + (vl_api_mpls_tunnel_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, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (&node, "tunnel_sw_if_index", + ntohl (mp->sw_if_index)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -1829,8 +2218,8 @@ static void vl_api_vxlan_gpe_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_l2tpv3_create_tunnel_reply_t_handler + (vl_api_l2tpv3_create_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); @@ -1846,8 +2235,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_l2tpv3_create_tunnel_reply_t_handler_json + (vl_api_l2tpv3_create_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; @@ -1863,8 +2252,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_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); @@ -1875,20 +2264,20 @@ static void vl_api_create_vhost_user_if_reply_t_handler else { vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } } -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_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, "sw_if_index", ntohl (mp->sw_if_index)); + 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); @@ -1897,499 +2286,238 @@ 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) +u8 * +format_lisp_transport_protocol (u8 * s, va_list * args) { - 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]; + u32 proto = va_arg (*args, u32); - if (!details || vam->current_sw_if_index >= vec_len (details) - || !details[vam->current_sw_if_index].present) + switch (proto) { - errmsg ("ip address details arrived but not stored"); - errmsg ("ip_dump should be called first"); - return; + case 1: + return format (s, "udp"); + case 2: + return format (s, "api"); + default: + return 0; } - - 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 + return 0; } -static void vl_api_ip_address_details_t_handler_json - (vl_api_ip_address_details_t * mp) +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; - 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); + u32 proto = mp->protocol; + print (vam->ofp, "Transport protocol: %U", + format_lisp_transport_protocol, proto); + vam->retval = retval; + 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_one_get_transport_protocol_reply_t_handler_json + (vl_api_one_get_transport_protocol_reply_t * mp) { vat_main_t *vam = &vat_main; - static ip_details_t empty_ip_details = { 0 }; - ip_details_t *ip = NULL; - u32 sw_if_index = ~0; + vat_json_node_t node; + u8 *s; - sw_if_index = ntohl (mp->sw_if_index); + s = format (0, "%U", format_lisp_transport_protocol, mp->protocol); + vec_add1 (s, 0); - vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6], - sw_if_index, empty_ip_details); + 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); - ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6], - sw_if_index); + vec_free (s); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - ip->present = 1; + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void -vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp) +static void vl_api_one_add_del_locator_set_reply_t_handler + (vl_api_one_add_del_locator_set_reply_t * mp) { vat_main_t *vam = &vat_main; - - if (VAT_JSON_ARRAY != vam->json_tree.type) + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + vam->async_errors += (retval < 0); } - vat_json_array_add_uint (&vam->json_tree, - clib_net_to_host_u32 (mp->sw_if_index)); -} - -static void vl_api_map_domain_details_t_handler_json - (vl_api_map_domain_details_t * mp) -{ - vat_json_node_t *node = NULL; - vat_main_t *vam = &vat_main; - struct in6_addr ip6; - struct in_addr ip4; - - if (VAT_JSON_ARRAY != vam->json_tree.type) + else { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + vam->retval = retval; + vam->result_ready = 1; } - - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - - vat_json_object_add_uint (node, "domain_index", - clib_net_to_host_u32 (mp->domain_index)); - clib_memcpy (&ip6, mp->ip6_prefix, sizeof (ip6)); - vat_json_object_add_ip6 (node, "ip6_prefix", ip6); - clib_memcpy (&ip4, mp->ip4_prefix, sizeof (ip4)); - vat_json_object_add_ip4 (node, "ip4_prefix", ip4); - clib_memcpy (&ip6, mp->ip6_src, sizeof (ip6)); - vat_json_object_add_ip6 (node, "ip6_src", ip6); - vat_json_object_add_int (node, "ip6_prefix_len", mp->ip6_prefix_len); - vat_json_object_add_int (node, "ip4_prefix_len", mp->ip4_prefix_len); - vat_json_object_add_int (node, "ip6_src_len", mp->ip6_src_len); - vat_json_object_add_int (node, "ea_bits_len", mp->ea_bits_len); - vat_json_object_add_int (node, "psid_offset", mp->psid_offset); - vat_json_object_add_int (node, "psid_length", mp->psid_length); - vat_json_object_add_uint (node, "flags", mp->flags); - vat_json_object_add_uint (node, "mtu", clib_net_to_host_u16 (mp->mtu)); - vat_json_object_add_int (node, "is_translation", mp->is_translation); } -static void vl_api_map_domain_details_t_handler - (vl_api_map_domain_details_t * mp) +static void vl_api_one_add_del_locator_set_reply_t_handler_json + (vl_api_one_add_del_locator_set_reply_t * mp) { vat_main_t *vam = &vat_main; + vat_json_node_t node; - if (mp->is_translation) - { - print (vam->ofp, - "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U/%d (ip6-src) index: %u", - format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len, - format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len, - format_ip6_address, mp->ip6_src, mp->ip6_src_len, - clib_net_to_host_u32 (mp->domain_index)); - } - else - { - print (vam->ofp, - "* %U/%d (ipv4-prefix) %U/%d (ipv6-prefix) %U (ip6-src) index: %u", - format_ip4_address, mp->ip4_prefix, mp->ip4_prefix_len, - format_ip6_address, mp->ip6_prefix, mp->ip6_prefix_len, - format_ip6_address, mp->ip6_src, - clib_net_to_host_u32 (mp->domain_index)); - } - print (vam->ofp, " ea-len %d psid-offset %d psid-len %d mtu %d %s", - mp->ea_bits_len, mp->psid_offset, mp->psid_length, mp->mtu, - mp->is_translation ? "map-t" : ""); + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "locator_set_index", ntohl (mp->ls_index)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void vl_api_map_rule_details_t_handler_json - (vl_api_map_rule_details_t * mp) +static void vl_api_vxlan_add_del_tunnel_reply_t_handler + (vl_api_vxlan_add_del_tunnel_reply_t * mp) { - struct in6_addr ip6; - vat_json_node_t *node = NULL; vat_main_t *vam = &vat_main; - - if (VAT_JSON_ARRAY != vam->json_tree.type) + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + vam->async_errors += (retval < 0); } - - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - - vat_json_object_add_uint (node, "psid", clib_net_to_host_u16 (mp->psid)); - clib_memcpy (&ip6, mp->ip6_dst, sizeof (ip6)); - vat_json_object_add_ip6 (node, "ip6_dst", ip6); + else + { + vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; + } + vam->regenerate_interface_table = 1; } -static void -vl_api_map_rule_details_t_handler (vl_api_map_rule_details_t * mp) +static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json + (vl_api_vxlan_add_del_tunnel_reply_t * mp) { vat_main_t *vam = &vat_main; - print (vam->ofp, " %d (psid) %U (ip6-dst)", - clib_net_to_host_u16 (mp->psid), format_ip6_address, mp->ip6_dst); -} - -static void -vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp) -{ - errmsg ("DHCP compl event: pid %d %s hostname %s host_addr %U " - "router_addr %U host_mac %U", - ntohl (mp->pid), mp->is_ipv6 ? "ipv6" : "ipv4", mp->hostname, - format_ip4_address, &mp->host_address, - format_ip4_address, &mp->router_address, - format_ethernet_address, mp->host_mac); -} + vat_json_node_t node; -static void vl_api_dhcp_compl_event_t_handler_json - (vl_api_dhcp_compl_event_t * mp) -{ - /* JSON output not supported */ -} + 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)); -static void -set_simple_interface_counter (u8 vnet_counter_type, u32 sw_if_index, - u32 counter) -{ - vat_main_t *vam = &vat_main; - static u64 default_counter = 0; + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - vec_validate_init_empty (vam->simple_interface_counters, vnet_counter_type, - NULL); - vec_validate_init_empty (vam->simple_interface_counters[vnet_counter_type], - sw_if_index, default_counter); - vam->simple_interface_counters[vnet_counter_type][sw_if_index] = counter; + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void -set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index, - interface_counter_t counter) +static void vl_api_vxlan_offload_rx_reply_t_handler + (vl_api_vxlan_offload_rx_reply_t * mp) { vat_main_t *vam = &vat_main; - static interface_counter_t default_counter = { 0, }; - - vec_validate_init_empty (vam->combined_interface_counters, - vnet_counter_type, NULL); - vec_validate_init_empty (vam->combined_interface_counters - [vnet_counter_type], sw_if_index, default_counter); - vam->combined_interface_counters[vnet_counter_type][sw_if_index] = counter; -} - -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_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) -{ - u64 *v_packets; - u64 packets; - u32 count; - u32 first_sw_if_index; - int i; - - count = ntohl (mp->count); - first_sw_if_index = ntohl (mp->first_sw_if_index); - - v_packets = (u64 *) & mp->data; - for (i = 0; i < count; i++) + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - 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++; + vam->async_errors += (retval < 0); } -} - -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++) + else { - 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++; + vam->retval = retval; + vam->result_ready = 1; } } -static u32 -ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id) +static void vl_api_vxlan_offload_rx_reply_t_handler_json + (vl_api_vxlan_offload_rx_reply_t * mp) { vat_main_t *vam = &vat_main; - u32 i; - - for (i = 0; i < vec_len (vam->ip4_fib_counters_vrf_id_by_index); i++) - { - if (vam->ip4_fib_counters_vrf_id_by_index[i] == vrf_id) - { - return i; - } - } - return ~0; -} + vat_json_node_t node; -static u32 -ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id) -{ - vat_main_t *vam = &vat_main; - u32 i; + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - for (i = 0; i < vec_len (vam->ip6_fib_counters_vrf_id_by_index); i++) - { - if (vam->ip6_fib_counters_vrf_id_by_index[i] == vrf_id) - { - return i; - } - } - return ~0; -} + vat_json_print (vam->ofp, &node); + vat_json_free (&node); -static void vl_api_vnet_ip4_fib_counters_t_handler - (vl_api_vnet_ip4_fib_counters_t * mp) -{ - /* not supported */ + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void vl_api_vnet_ip4_fib_counters_t_handler_json - (vl_api_vnet_ip4_fib_counters_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; - vl_api_ip4_fib_counter_t *v; - ip4_fib_counter_t *counter; - struct in_addr ip4; - u32 vrf_id; - u32 vrf_index; - u32 count; - int i; - - vrf_id = ntohl (mp->vrf_id); - vrf_index = ip4_fib_counters_get_vrf_index_by_vrf_id (vrf_id); - if (~0 == vrf_index) + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - vrf_index = vec_len (vam->ip4_fib_counters_vrf_id_by_index); - vec_validate (vam->ip4_fib_counters_vrf_id_by_index, vrf_index); - vam->ip4_fib_counters_vrf_id_by_index[vrf_index] = vrf_id; - vec_validate (vam->ip4_fib_counters, vrf_index); - vam->ip4_fib_counters[vrf_index] = NULL; + vam->async_errors += (retval < 0); } - - vec_free (vam->ip4_fib_counters[vrf_index]); - v = (vl_api_ip4_fib_counter_t *) & mp->c; - count = ntohl (mp->count); - for (i = 0; i < count; i++) + else { - vec_validate (vam->ip4_fib_counters[vrf_index], i); - counter = &vam->ip4_fib_counters[vrf_index][i]; - clib_memcpy (&ip4, &v->address, sizeof (ip4)); - counter->address = ip4; - counter->address_length = v->address_length; - counter->packets = clib_net_to_host_u64 (v->packets); - counter->bytes = clib_net_to_host_u64 (v->bytes); - v++; + vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; } } -static void vl_api_vnet_ip4_nbr_counters_t_handler - (vl_api_vnet_ip4_nbr_counters_t * mp) -{ - /* not supported */ -} - -static void vl_api_vnet_ip4_nbr_counters_t_handler_json - (vl_api_vnet_ip4_nbr_counters_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; - vl_api_ip4_nbr_counter_t *v; - ip4_nbr_counter_t *counter; - u32 sw_if_index; - u32 count; - int i; - - sw_if_index = ntohl (mp->sw_if_index); - count = ntohl (mp->count); - vec_validate (vam->ip4_nbr_counters, sw_if_index); + vat_json_node_t node; - if (mp->begin) - vec_free (vam->ip4_nbr_counters[sw_if_index]); + 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)); - v = (vl_api_ip4_nbr_counter_t *) & mp->c; - for (i = 0; i < count; i++) - { - vec_validate (vam->ip4_nbr_counters[sw_if_index], i); - counter = &vam->ip4_nbr_counters[sw_if_index][i]; - counter->address.s_addr = v->address; - counter->packets = clib_net_to_host_u64 (v->packets); - counter->bytes = clib_net_to_host_u64 (v->bytes); - counter->linkt = v->link_type; - v++; - } -} + vat_json_print (vam->ofp, &node); + vat_json_free (&node); -static void vl_api_vnet_ip6_fib_counters_t_handler - (vl_api_vnet_ip6_fib_counters_t * mp) -{ - /* not supported */ + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void vl_api_vnet_ip6_fib_counters_t_handler_json - (vl_api_vnet_ip6_fib_counters_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; - vl_api_ip6_fib_counter_t *v; - ip6_fib_counter_t *counter; - struct in6_addr ip6; - u32 vrf_id; - u32 vrf_index; - u32 count; - int i; - - vrf_id = ntohl (mp->vrf_id); - vrf_index = ip6_fib_counters_get_vrf_index_by_vrf_id (vrf_id); - if (~0 == vrf_index) + i32 retval = ntohl (mp->retval); + if (vam->async_mode) { - vrf_index = vec_len (vam->ip6_fib_counters_vrf_id_by_index); - vec_validate (vam->ip6_fib_counters_vrf_id_by_index, vrf_index); - vam->ip6_fib_counters_vrf_id_by_index[vrf_index] = vrf_id; - vec_validate (vam->ip6_fib_counters, vrf_index); - vam->ip6_fib_counters[vrf_index] = NULL; + vam->async_errors += (retval < 0); } - - vec_free (vam->ip6_fib_counters[vrf_index]); - v = (vl_api_ip6_fib_counter_t *) & mp->c; - count = ntohl (mp->count); - for (i = 0; i < count; i++) + else { - vec_validate (vam->ip6_fib_counters[vrf_index], i); - counter = &vam->ip6_fib_counters[vrf_index][i]; - clib_memcpy (&ip6, &v->address, sizeof (ip6)); - counter->address = ip6; - counter->address_length = v->address_length; - counter->packets = clib_net_to_host_u64 (v->packets); - counter->bytes = clib_net_to_host_u64 (v->bytes); - v++; + vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); + vam->result_ready = 1; } + vam->regenerate_interface_table = 1; } -static void vl_api_vnet_ip6_nbr_counters_t_handler - (vl_api_vnet_ip6_nbr_counters_t * mp) -{ - /* not supported */ -} - -static void vl_api_vnet_ip6_nbr_counters_t_handler_json - (vl_api_vnet_ip6_nbr_counters_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; - vl_api_ip6_nbr_counter_t *v; - ip6_nbr_counter_t *counter; - struct in6_addr ip6; - u32 sw_if_index; - u32 count; - int i; + vat_json_node_t node; - sw_if_index = ntohl (mp->sw_if_index); - count = ntohl (mp->count); - vec_validate (vam->ip6_nbr_counters, sw_if_index); + 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)); - if (mp->begin) - vec_free (vam->ip6_nbr_counters[sw_if_index]); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - v = (vl_api_ip6_nbr_counter_t *) & mp->c; - for (i = 0; i < count; i++) - { - vec_validate (vam->ip6_nbr_counters[sw_if_index], i); - counter = &vam->ip6_nbr_counters[sw_if_index][i]; - clib_memcpy (&ip6, &v->address, sizeof (ip6)); - counter->address = ip6; - counter->packets = clib_net_to_host_u64 (v->packets); - counter->bytes = clib_net_to_host_u64 (v->bytes); - v++; - } + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } -static void vl_api_get_first_msg_id_reply_t_handler - (vl_api_get_first_msg_id_reply_t * mp) +static void vl_api_gre_tunnel_add_del_reply_t_handler + (vl_api_gre_tunnel_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); @@ -2397,24 +2525,20 @@ static void vl_api_get_first_msg_id_reply_t_handler else { vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } - if (retval >= 0) - { - errmsg ("first message id %d", ntohs (mp->first_msg_id)); - } } -static void vl_api_get_first_msg_id_reply_t_handler_json - (vl_api_get_first_msg_id_reply_t * mp) +static void vl_api_gre_tunnel_add_del_reply_t_handler_json + (vl_api_gre_tunnel_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, "first_msg_id", - (uint) ntohs (mp->first_msg_id)); + vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -2423,17 +2547,11 @@ static void vl_api_get_first_msg_id_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_get_node_graph_reply_t_handler - (vl_api_get_node_graph_reply_t * mp) +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; - api_main_t *am = &api_main; i32 retval = ntohl (mp->retval); - u8 *pvt_copy, *reply; - void *oldheap; - vlib_node_t *node; - int i; - if (vam->async_mode) { vam->async_errors += (retval < 0); @@ -2441,71 +2559,235 @@ static void vl_api_get_node_graph_reply_t_handler else { vam->retval = retval; + vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } - - /* "Should never happen..." */ - if (retval != 0) - return; - - reply = uword_to_pointer (mp->reply_in_shmem, u8 *); - pvt_copy = vec_dup (reply); - - /* Toss the shared-memory original... */ - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); - - vec_free (reply); - - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); - - if (vam->graph_nodes) - { - hash_free (vam->graph_node_index_by_name); - - for (i = 0; i < vec_len (vam->graph_nodes); i++) - { - node = vam->graph_nodes[i]; - vec_free (node->name); - vec_free (node->next_nodes); - vec_free (node); - } - vec_free (vam->graph_nodes); - } - - vam->graph_node_index_by_name = hash_create_string (0, sizeof (uword)); - vam->graph_nodes = vlib_node_unserialize (pvt_copy); - vec_free (pvt_copy); - - for (i = 0; i < vec_len (vam->graph_nodes); i++) - { - node = vam->graph_nodes[i]; - hash_set_mem (vam->graph_node_index_by_name, node->name, i); - } + vam->regenerate_interface_table = 1; } -static void vl_api_get_node_graph_reply_t_handler_json - (vl_api_get_node_graph_reply_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; - api_main_t *am = &api_main; - void *oldheap; vat_json_node_t node; - u8 *reply; - /* $$$$ make this real? */ vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "reply_in_shmem", mp->reply_in_shmem); - - reply = uword_to_pointer (mp->reply_in_shmem, u8 *); + vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); - /* Toss the shared-memory original... */ - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - vec_free (reply); + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +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->prefix.address.un, sizeof (address->ip)); + address->prefix_length = mp->prefix.len; +#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; + + 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_prefix (node, &mp->prefix); +} + +static void +vl_api_ip_details_t_handler (vl_api_ip_details_t * mp) +{ + vat_main_t *vam = &vat_main; + static ip_details_t empty_ip_details = { 0 }; + ip_details_t *ip = NULL; + u32 sw_if_index = ~0; + + sw_if_index = ntohl (mp->sw_if_index); + + vec_validate_init_empty (vam->ip_details_by_sw_if_index[vam->is_ipv6], + sw_if_index, empty_ip_details); + + ip = vec_elt_at_index (vam->ip_details_by_sw_if_index[vam->is_ipv6], + sw_if_index); + + ip->present = 1; +} + +static void +vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + vat_json_array_add_uint (&vam->json_tree, + clib_net_to_host_u32 (mp->sw_if_index)); +} + +static void vl_api_get_first_msg_id_reply_t_handler + (vl_api_get_first_msg_id_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) + { + errmsg ("first message id %d", ntohs (mp->first_msg_id)); + } +} + +static void vl_api_get_first_msg_id_reply_t_handler_json + (vl_api_get_first_msg_id_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, "first_msg_id", + (uint) ntohs (mp->first_msg_id)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void vl_api_get_node_graph_reply_t_handler + (vl_api_get_node_graph_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + api_main_t *am = &api_main; + i32 retval = ntohl (mp->retval); + u8 *pvt_copy, *reply; + void *oldheap; + vlib_node_t *node; + int i; + + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->result_ready = 1; + } + + /* "Should never happen..." */ + if (retval != 0) + return; + + reply = uword_to_pointer (mp->reply_in_shmem, u8 *); + pvt_copy = vec_dup (reply); + + /* Toss the shared-memory original... */ + pthread_mutex_lock (&am->vlib_rp->mutex); + oldheap = svm_push_data_heap (am->vlib_rp); + + vec_free (reply); + + svm_pop_heap (oldheap); + pthread_mutex_unlock (&am->vlib_rp->mutex); + + if (vam->graph_nodes) + { + hash_free (vam->graph_node_index_by_name); + + for (i = 0; i < vec_len (vam->graph_nodes[0]); i++) + { + node = vam->graph_nodes[0][i]; + vec_free (node->name); + vec_free (node->next_nodes); + vec_free (node); + } + vec_free (vam->graph_nodes[0]); + vec_free (vam->graph_nodes); + } + + vam->graph_node_index_by_name = hash_create_string (0, sizeof (uword)); + vam->graph_nodes = vlib_node_unserialize (pvt_copy); + vec_free (pvt_copy); + + for (i = 0; i < vec_len (vam->graph_nodes[0]); i++) + { + node = vam->graph_nodes[0][i]; + hash_set_mem (vam->graph_node_index_by_name, node->name, i); + } +} + +static void vl_api_get_node_graph_reply_t_handler_json + (vl_api_get_node_graph_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + api_main_t *am = &api_main; + void *oldheap; + vat_json_node_t node; + u8 *reply; + + /* $$$$ make this real? */ + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "reply_in_shmem", mp->reply_in_shmem); + + reply = uword_to_pointer (mp->reply_in_shmem, u8 *); + + /* Toss the shared-memory original... */ + pthread_mutex_lock (&am->vlib_rp->mutex); + oldheap = svm_push_data_heap (am->vlib_rp); + + vec_free (reply); svm_pop_heap (oldheap); pthread_mutex_unlock (&am->vlib_rp->mutex); @@ -2906,6 +3188,39 @@ static void vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); } +static void + 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); + + 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_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); + + vl_api_show_one_map_register_fallback_threshold_reply_t_endian (mp); + vat_json_init_object (node); + 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; +} + static void vl_api_show_one_map_register_state_reply_t_handler (vl_api_show_one_map_register_state_reply_t * mp) @@ -3336,8 +3651,8 @@ end: } static void - vl_api_one_l2_arp_entries_get_reply_t_handler - (vl_api_one_l2_arp_entries_get_reply_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; @@ -3349,7 +3664,7 @@ static void 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, + print (vam->ofp, "%U -> %U", format_ip6_address, &mp->entries[i].ip6, format_ethernet_address, mp->entries[i].mac); end: @@ -3358,15 +3673,15 @@ end: } static void - vl_api_one_l2_arp_entries_get_reply_t_handler_json - (vl_api_one_l2_arp_entries_get_reply_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 *e = 0, root; u32 i, n; int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_l2_arp_entry_t *arp_entry; + vl_api_one_ndp_entry_t *arp_entry; if (retval) goto end; @@ -3386,9 +3701,9 @@ static void vat_json_object_add_string_copy (e, "mac", s); vec_free (s); - s = format (0, "%U", format_ip4_address, &arp_entry->ip4); + s = format (0, "%U", format_ip6_address, &arp_entry->ip6); vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "ip4", s); + vat_json_object_add_string_copy (e, "ip6", s); vec_free (s); } @@ -3401,8 +3716,8 @@ end: } static void - vl_api_one_l2_arp_bd_get_reply_t_handler - (vl_api_one_l2_arp_bd_get_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; u32 i, n; @@ -3414,9 +3729,8 @@ static void n = clib_net_to_host_u32 (mp->count); for (i = 0; i < n; i++) - { - print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); - } + print (vam->ofp, "%U -> %U", format_ip4_address, &mp->entries[i].ip4, + format_ethernet_address, mp->entries[i].mac); end: vam->retval = retval; @@ -3424,13 +3738,15 @@ end: } static void - vl_api_one_l2_arp_bd_get_reply_t_handler_json - (vl_api_one_l2_arp_bd_get_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 root; + 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; if (retval) goto end; @@ -3440,10 +3756,125 @@ static void for (i = 0; i < n; i++) { - vat_json_array_add_uint (&root, - clib_net_to_host_u32 (mp->bridge_domains[i])); - } - + e = vat_json_array_add (&root); + arp_entry = &mp->entries[i]; + + vat_json_init_object (e); + s = format (0, "%U", format_ethernet_address, arp_entry->mac); + vec_add1 (s, 0); + + vat_json_object_add_string_copy (e, "mac", s); + vec_free (s); + + s = format (0, "%U", format_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_ndp_bd_get_reply_t_handler (vl_api_one_ndp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_ndp_bd_get_reply_t_handler_json + (vl_api_one_ndp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); + + for (i = 0; i < n; i++) + { + vat_json_array_add_uint (&root, + clib_net_to_host_u32 (mp->bridge_domains[i])); + } + + vat_json_print (vam->ofp, &root); + vat_json_free (&root); + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_l2_arp_bd_get_reply_t_handler + (vl_api_one_l2_arp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_l2_arp_bd_get_reply_t_handler_json + (vl_api_one_l2_arp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t root; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + vat_json_init_array (&root); + + for (i = 0; i < n; i++) + { + vat_json_array_add_uint (&root, + clib_net_to_host_u32 (mp->bridge_domains[i])); + } + vat_json_print (vam->ofp, &root); vat_json_free (&root); @@ -3744,6 +4175,123 @@ static void vam->result_ready = 1; } +static void + vl_api_one_show_xtr_mode_reply_t_handler + (vl_api_one_show_xtr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_xtr_mode_reply_t_handler_json + (vl_api_one_show_xtr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + u8 *status = 0; + + status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); + vec_add1 (status, 0); + + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "status", status); + + vec_free (status); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_one_show_pitr_mode_reply_t_handler + (vl_api_one_show_pitr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_pitr_mode_reply_t_handler_json + (vl_api_one_show_pitr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + u8 *status = 0; + + status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); + vec_add1 (status, 0); + + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "status", status); + + vec_free (status); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_one_show_petr_mode_reply_t_handler + (vl_api_one_show_petr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_en ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_petr_mode_reply_t_handler_json + (vl_api_one_show_petr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + u8 *status = 0; + + status = format (0, "%s", mp->is_en ? "enabled" : "disabled"); + vec_add1 (status, 0); + + vat_json_init_object (&node); + vat_json_object_add_string_copy (&node, "status", status); + + vec_free (status); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + static void vl_api_show_one_use_petr_reply_t_handler (vl_api_show_one_use_petr_reply_t * mp) @@ -4290,7 +4838,7 @@ format_hex_bytes (u8 * s, va_list * va) /* Print short or long form depending on byte count. */ uword short_form = n_bytes <= 32; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); if (n_bytes == 0) return s; @@ -4454,40 +5002,6 @@ static void vl_api_policer_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) { @@ -4515,24 +5029,16 @@ static void vl_api_flow_classify_details_t_handler_json 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 -#define vl_api_vnet_ip6_fib_counters_t_print vl_noop_handler -#define vl_api_vnet_ip4_nbr_counters_t_endian vl_noop_handler -#define vl_api_vnet_ip4_nbr_counters_t_print vl_noop_handler -#define vl_api_vnet_ip6_nbr_counters_t_endian vl_noop_handler -#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 @@ -4546,39 +5052,44 @@ static void vl_api_flow_classify_details_t_handler_json #define foreach_standard_reply_retval_handler \ _(sw_interface_set_flags_reply) \ _(sw_interface_add_del_address_reply) \ +_(sw_interface_set_rx_mode_reply) \ +_(sw_interface_set_rx_placement_reply) \ _(sw_interface_set_table_reply) \ _(sw_interface_set_mpls_enable_reply) \ _(sw_interface_set_vpath_reply) \ _(sw_interface_set_vxlan_bypass_reply) \ +_(sw_interface_set_geneve_bypass_reply) \ _(sw_interface_set_vxlan_gpe_bypass_reply) \ _(sw_interface_set_l2_bridge_reply) \ +_(sw_interface_set_bond_weight_reply) \ _(bridge_domain_add_del_reply) \ _(sw_interface_set_l2_xconnect_reply) \ _(l2fib_add_del_reply) \ _(l2fib_flush_int_reply) \ _(l2fib_flush_bd_reply) \ -_(ip_add_del_route_reply) \ +_(ip_route_add_del_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) \ +_(bier_route_add_del_reply) \ +_(bier_table_add_del_reply) \ _(proxy_arp_add_del_reply) \ _(proxy_arp_intfc_enable_disable_reply) \ _(sw_interface_set_unnumbered_reply) \ _(ip_neighbor_add_del_reply) \ -_(reset_vrf_reply) \ -_(oam_add_del_reply) \ _(reset_fib_reply) \ -_(dhcp_proxy_config_reply) \ -_(dhcp_proxy_set_vss_reply) \ -_(dhcp_client_config_reply) \ _(set_ip_flow_hash_reply) \ _(sw_interface_ip6_enable_disable_reply) \ -_(sw_interface_ip6_set_link_local_address_reply) \ _(ip6nd_proxy_add_del_reply) \ _(sw_interface_ip6nd_ra_prefix_reply) \ _(sw_interface_ip6nd_ra_config_reply) \ _(set_arp_neighbor_limit_reply) \ _(l2_patch_add_del_reply) \ +_(sr_mpls_policy_add_reply) \ +_(sr_mpls_policy_mod_reply) \ +_(sr_mpls_policy_del_reply) \ _(sr_policy_add_reply) \ _(sr_policy_mod_reply) \ _(sr_policy_del_reply) \ @@ -4595,39 +5106,27 @@ _(l2_interface_efp_filter_reply) \ _(l2_interface_vlan_tag_rewrite_reply) \ _(modify_vhost_user_if_reply) \ _(delete_vhost_user_if_reply) \ +_(ip_probe_neighbor_reply) \ +_(ip_scan_neighbor_enable_disable_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) \ -_(ipsec_spd_add_del_entry_reply) \ -_(ipsec_sad_add_del_entry_reply) \ -_(ipsec_sa_set_key_reply) \ +_(ipsec_spd_entry_add_del_reply) \ +_(ipsec_sad_entry_add_del_reply) \ _(ipsec_tunnel_if_add_del_reply) \ -_(ikev2_profile_add_del_reply) \ -_(ikev2_profile_set_auth_reply) \ -_(ikev2_profile_set_id_reply) \ -_(ikev2_profile_set_ts_reply) \ -_(ikev2_set_local_key_reply) \ -_(ikev2_set_responder_reply) \ -_(ikev2_set_ike_transforms_reply) \ -_(ikev2_set_esp_transforms_reply) \ -_(ikev2_set_sa_lifetime_reply) \ -_(ikev2_initiate_sa_init_reply) \ -_(ikev2_initiate_del_ike_sa_reply) \ -_(ikev2_initiate_del_child_sa_reply) \ -_(ikev2_initiate_rekey_child_sa_reply) \ +_(ipsec_tunnel_if_set_sa_reply) \ _(delete_loopback_reply) \ _(bd_ip_mac_add_del_reply) \ -_(map_del_domain_reply) \ -_(map_add_del_rule_reply) \ +_(bd_ip_mac_flush_reply) \ _(want_interface_events_reply) \ -_(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) \ @@ -4638,6 +5137,8 @@ _(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) \ @@ -4645,7 +5146,11 @@ _(one_eid_table_add_del_map_reply) \ _(one_use_petr_reply) \ _(one_stats_enable_disable_reply) \ _(one_add_del_l2_arp_entry_reply) \ +_(one_add_del_ndp_entry_reply) \ _(one_stats_flush_reply) \ +_(one_enable_disable_xtr_mode_reply) \ +_(one_enable_disable_pitr_mode_reply) \ +_(one_enable_disable_petr_mode_reply) \ _(gpe_enable_disable_reply) \ _(gpe_set_encap_mode_reply) \ _(gpe_add_del_iface_reply) \ @@ -4665,14 +5170,20 @@ _(ip_source_and_port_range_check_add_del_reply) \ _(ip_source_and_port_range_check_interface_add_del_reply)\ _(delete_subif_reply) \ _(l2_interface_pbb_tag_rewrite_reply) \ -_(punt_reply) \ +_(set_punt_reply) \ _(feature_enable_disable_reply) \ _(sw_interface_tag_add_del_reply) \ -_(sw_interface_set_mtu_reply) \ +_(sw_interface_add_del_mac_address_reply) \ +_(hw_interface_set_mtu_reply) \ _(p2p_ethernet_add_reply) \ _(p2p_ethernet_del_reply) \ _(lldp_config_reply) \ -_(sw_interface_set_lldp_reply) +_(sw_interface_set_lldp_reply) \ +_(tcp_configure_src_addresses_reply) \ +_(session_rule_add_del_reply) \ +_(ip_container_proxy_add_del_reply) \ +_(output_acl_set_interface_reply) \ +_(qos_record_enable_disable_reply) #define _(n) \ static void vl_api_##n##_t_handler \ @@ -4720,10 +5231,14 @@ _(CLI_REPLY, cli_reply) \ _(CLI_INBAND_REPLY, cli_inband_reply) \ _(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \ sw_interface_add_del_address_reply) \ +_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \ +_(SW_INTERFACE_SET_RX_PLACEMENT_REPLY, sw_interface_set_rx_placement_reply) \ +_(SW_INTERFACE_RX_PLACEMENT_DETAILS, sw_interface_rx_placement_details) \ _(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) \ @@ -4737,14 +5252,27 @@ _(L2FIB_FLUSH_INT_REPLY, l2fib_flush_int_reply) \ _(L2FIB_FLUSH_BD_REPLY, l2fib_flush_bd_reply) \ _(L2_FLAGS_REPLY, l2_flags_reply) \ _(BRIDGE_FLAGS_REPLY, bridge_flags_reply) \ -_(TAP_CONNECT_REPLY, tap_connect_reply) \ -_(TAP_MODIFY_REPLY, tap_modify_reply) \ -_(TAP_DELETE_REPLY, tap_delete_reply) \ -_(SW_INTERFACE_TAP_DETAILS, sw_interface_tap_details) \ -_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply) \ +_(TAP_CREATE_V2_REPLY, tap_create_v2_reply) \ +_(TAP_DELETE_V2_REPLY, tap_delete_v2_reply) \ +_(SW_INTERFACE_TAP_V2_DETAILS, sw_interface_tap_v2_details) \ +_(VIRTIO_PCI_CREATE_REPLY, virtio_pci_create_reply) \ +_(VIRTIO_PCI_DELETE_REPLY, virtio_pci_delete_reply) \ +_(SW_INTERFACE_VIRTIO_PCI_DETAILS, sw_interface_virtio_pci_details) \ +_(BOND_CREATE_REPLY, bond_create_reply) \ +_(BOND_DELETE_REPLY, bond_delete_reply) \ +_(BOND_ENSLAVE_REPLY, bond_enslave_reply) \ +_(BOND_DETACH_SLAVE_REPLY, bond_detach_slave_reply) \ +_(SW_INTERFACE_SET_BOND_WEIGHT_REPLY, sw_interface_set_bond_weight_reply) \ +_(SW_INTERFACE_BOND_DETAILS, sw_interface_bond_details) \ +_(SW_INTERFACE_SLAVE_DETAILS, sw_interface_slave_details) \ +_(IP_ROUTE_ADD_DEL_REPLY, ip_route_add_del_reply) \ +_(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \ _(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \ +_(MPLS_TABLE_ADD_DEL_REPLY, mpls_table_add_del_reply) \ _(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \ _(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \ +_(BIER_ROUTE_ADD_DEL_REPLY, bier_route_add_del_reply) \ +_(BIER_TABLE_ADD_DEL_REPLY, bier_table_add_del_reply) \ _(PROXY_ARP_ADD_DEL_REPLY, proxy_arp_add_del_reply) \ _(PROXY_ARP_INTFC_ENABLE_DISABLE_REPLY, \ proxy_arp_intfc_enable_disable_reply) \ @@ -4752,20 +5280,12 @@ _(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \ _(SW_INTERFACE_SET_UNNUMBERED_REPLY, \ sw_interface_set_unnumbered_reply) \ _(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_reply) \ -_(RESET_VRF_REPLY, reset_vrf_reply) \ _(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply) \ _(CREATE_SUBIF_REPLY, create_subif_reply) \ -_(OAM_ADD_DEL_REPLY, oam_add_del_reply) \ _(RESET_FIB_REPLY, reset_fib_reply) \ -_(DHCP_PROXY_CONFIG_REPLY, dhcp_proxy_config_reply) \ -_(DHCP_PROXY_SET_VSS_REPLY, dhcp_proxy_set_vss_reply) \ -_(DHCP_PROXY_DETAILS, dhcp_proxy_details) \ -_(DHCP_CLIENT_CONFIG_REPLY, dhcp_client_config_reply) \ _(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply) \ _(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, \ sw_interface_ip6_enable_disable_reply) \ -_(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY, \ - sw_interface_ip6_set_link_local_address_reply) \ _(IP6ND_PROXY_ADD_DEL_REPLY, ip6nd_proxy_add_del_reply) \ _(IP6ND_PROXY_DETAILS, ip6nd_proxy_details) \ _(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY, \ @@ -4774,6 +5294,9 @@ _(SW_INTERFACE_IP6ND_RA_CONFIG_REPLY, \ sw_interface_ip6nd_ra_config_reply) \ _(SET_ARP_NEIGHBOR_LIMIT_REPLY, set_arp_neighbor_limit_reply) \ _(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply) \ +_(SR_MPLS_POLICY_ADD_REPLY, sr_mpls_policy_add_reply) \ +_(SR_MPLS_POLICY_MOD_REPLY, sr_mpls_policy_mod_reply) \ +_(SR_MPLS_POLICY_DEL_REPLY, sr_mpls_policy_del_reply) \ _(SR_POLICY_ADD_REPLY, sr_policy_add_reply) \ _(SR_POLICY_MOD_REPLY, sr_policy_mod_reply) \ _(SR_POLICY_DEL_REPLY, sr_policy_del_reply) \ @@ -4794,8 +5317,11 @@ _(L2TPV3_INTERFACE_ENABLE_DISABLE_REPLY, \ _(L2TPV3_SET_LOOKUP_KEY_REPLY, l2tpv3_set_lookup_key_reply) \ _(SW_IF_L2TPV3_TUNNEL_DETAILS, sw_if_l2tpv3_tunnel_details) \ _(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \ +_(VXLAN_OFFLOAD_RX_REPLY, vxlan_offload_rx_reply) \ +_(GENEVE_ADD_DEL_TUNNEL_REPLY, geneve_add_del_tunnel_reply) \ _(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \ -_(GRE_ADD_DEL_TUNNEL_REPLY, gre_add_del_tunnel_reply) \ +_(GENEVE_TUNNEL_DETAILS, geneve_tunnel_details) \ +_(GRE_TUNNEL_ADD_DEL_REPLY, gre_tunnel_add_del_reply) \ _(GRE_TUNNEL_DETAILS, gre_tunnel_details) \ _(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply) \ _(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply) \ @@ -4805,46 +5331,34 @@ _(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) \ +_(SHOW_THREADS_REPLY, show_threads_reply) \ _(L2_FIB_TABLE_DETAILS, l2_fib_table_details) \ -_(VXLAN_GPE_ADD_DEL_TUNNEL_REPLY, vxlan_gpe_add_del_tunnel_reply) \ +_(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) \ +_(IP_PROBE_NEIGHBOR_REPLY, ip_probe_neighbor_reply) \ +_(IP_SCAN_NEIGHBOR_ENABLE_DISABLE_REPLY, ip_scan_neighbor_enable_disable_reply) \ _(WANT_IP4_ARP_EVENTS_REPLY, want_ip4_arp_events_reply) \ _(IP4_ARP_EVENT, ip4_arp_event) \ _(WANT_IP6_ND_EVENTS_REPLY, want_ip6_nd_events_reply) \ _(IP6_ND_EVENT, ip6_nd_event) \ +_(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) \ _(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_SET_KEY_REPLY, ipsec_sa_set_key_reply) \ +_(IPSEC_SPD_ENTRY_ADD_DEL_REPLY, ipsec_spd_entry_add_del_reply) \ +_(IPSEC_SAD_ENTRY_ADD_DEL_REPLY, ipsec_sad_entry_add_del_reply) \ +_(IPSEC_SA_DETAILS, ipsec_sa_details) \ _(IPSEC_TUNNEL_IF_ADD_DEL_REPLY, ipsec_tunnel_if_add_del_reply) \ -_(IKEV2_PROFILE_ADD_DEL_REPLY, ikev2_profile_add_del_reply) \ -_(IKEV2_PROFILE_SET_AUTH_REPLY, ikev2_profile_set_auth_reply) \ -_(IKEV2_PROFILE_SET_ID_REPLY, ikev2_profile_set_id_reply) \ -_(IKEV2_PROFILE_SET_TS_REPLY, ikev2_profile_set_ts_reply) \ -_(IKEV2_SET_LOCAL_KEY_REPLY, ikev2_set_local_key_reply) \ -_(IKEV2_SET_RESPONDER_REPLY, ikev2_set_responder_reply) \ -_(IKEV2_SET_IKE_TRANSFORMS_REPLY, ikev2_set_ike_transforms_reply) \ -_(IKEV2_SET_ESP_TRANSFORMS_REPLY, ikev2_set_esp_transforms_reply) \ -_(IKEV2_SET_SA_LIFETIME_REPLY, ikev2_set_sa_lifetime_reply) \ -_(IKEV2_INITIATE_SA_INIT_REPLY, ikev2_initiate_sa_init_reply) \ -_(IKEV2_INITIATE_DEL_IKE_SA_REPLY, ikev2_initiate_del_ike_sa_reply) \ -_(IKEV2_INITIATE_DEL_CHILD_SA_REPLY, ikev2_initiate_del_child_sa_reply) \ -_(IKEV2_INITIATE_REKEY_CHILD_SA_REPLY, ikev2_initiate_rekey_child_sa_reply) \ +_(IPSEC_TUNNEL_IF_SET_SA_REPLY, ipsec_tunnel_if_set_sa_reply) \ _(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \ _(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \ -_(DHCP_COMPL_EVENT, dhcp_compl_event) \ -_(MAP_ADD_DOMAIN_REPLY, map_add_domain_reply) \ -_(MAP_DEL_DOMAIN_REPLY, map_del_domain_reply) \ -_(MAP_ADD_DEL_RULE_REPLY, map_add_del_rule_reply) \ -_(MAP_DOMAIN_DETAILS, map_domain_details) \ -_(MAP_RULE_DETAILS, map_rule_details) \ +_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \ +_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \ _(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \ -_(WANT_STATS_REPLY, want_stats_reply) \ _(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \ _(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \ _(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \ @@ -4863,6 +5377,10 @@ _(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) \ @@ -4882,9 +5400,20 @@ _(ONE_STATS_FLUSH_REPLY, one_stats_flush_reply) \ _(ONE_STATS_ENABLE_DISABLE_REPLY, one_stats_enable_disable_reply) \ _(SHOW_ONE_STATS_ENABLE_DISABLE_REPLY, \ show_one_stats_enable_disable_reply) \ +_(ONE_ADD_DEL_NDP_ENTRY_REPLY, one_add_del_ndp_entry_reply) \ +_(ONE_NDP_BD_GET_REPLY, one_ndp_bd_get_reply) \ +_(ONE_NDP_ENTRIES_GET_REPLY, one_ndp_entries_get_reply) \ _(ONE_ADD_DEL_L2_ARP_ENTRY_REPLY, one_add_del_l2_arp_entry_reply) \ _(ONE_L2_ARP_BD_GET_REPLY, one_l2_arp_bd_get_reply) \ _(ONE_L2_ARP_ENTRIES_GET_REPLY, one_l2_arp_entries_get_reply) \ +_(ONE_ENABLE_DISABLE_XTR_MODE_REPLY, one_enable_disable_xtr_mode_reply) \ +_(ONE_ENABLE_DISABLE_PITR_MODE_REPLY, \ + one_enable_disable_pitr_mode_reply) \ +_(ONE_ENABLE_DISABLE_PETR_MODE_REPLY, \ + one_enable_disable_petr_mode_reply) \ +_(ONE_SHOW_XTR_MODE_REPLY, one_show_xtr_mode_reply) \ +_(ONE_SHOW_PITR_MODE_REPLY, one_show_pitr_mode_reply) \ +_(ONE_SHOW_PETR_MODE_REPLY, one_show_petr_mode_reply) \ _(GPE_SET_ENCAP_MODE_REPLY, gpe_set_encap_mode_reply) \ _(GPE_GET_ENCAP_MODE_REPLY, gpe_get_encap_mode_reply) \ _(GPE_ADD_DEL_IFACE_REPLY, gpe_add_del_iface_reply) \ @@ -4910,8 +5439,11 @@ _(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) \ +_(AF_PACKET_DETAILS, af_packet_details) \ _(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \ _(POLICER_DETAILS, policer_details) \ _(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \ @@ -4919,7 +5451,8 @@ _(POLICER_CLASSIFY_DETAILS, policer_classify_details) \ _(NETMAP_CREATE_REPLY, netmap_create_reply) \ _(NETMAP_DELETE_REPLY, netmap_delete_reply) \ _(MPLS_TUNNEL_DETAILS, mpls_tunnel_details) \ -_(MPLS_FIB_DETAILS, mpls_fib_details) \ +_(MPLS_TABLE_DETAILS, mpls_table_details) \ +_(MPLS_ROUTE_DETAILS, mpls_route_details) \ _(CLASSIFY_TABLE_IDS_REPLY, classify_table_ids_reply) \ _(CLASSIFY_TABLE_BY_INTERFACE_REPLY, classify_table_by_interface_reply) \ _(CLASSIFY_TABLE_INFO_REPLY, classify_table_info_reply) \ @@ -4942,32 +5475,32 @@ _(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL_REPLY, \ ip_source_and_port_range_check_add_del_reply) \ _(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL_REPLY, \ ip_source_and_port_range_check_interface_add_del_reply) \ -_(IPSEC_GRE_ADD_DEL_TUNNEL_REPLY, ipsec_gre_add_del_tunnel_reply) \ -_(IPSEC_GRE_TUNNEL_DETAILS, ipsec_gre_tunnel_details) \ _(DELETE_SUBIF_REPLY, delete_subif_reply) \ _(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \ -_(PUNT_REPLY, punt_reply) \ -_(IP_FIB_DETAILS, ip_fib_details) \ -_(IP6_FIB_DETAILS, ip6_fib_details) \ +_(SET_PUNT_REPLY, set_punt_reply) \ +_(IP_TABLE_DETAILS, ip_table_details) \ +_(IP_ROUTE_DETAILS, ip_route_details) \ _(FEATURE_ENABLE_DISABLE_REPLY, feature_enable_disable_reply) \ _(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \ +_(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply) \ _(L2_XCONNECT_DETAILS, l2_xconnect_details) \ -_(SW_INTERFACE_SET_MTU_REPLY, sw_interface_set_mtu_reply) \ +_(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \ _(IP_NEIGHBOR_DETAILS, ip_neighbor_details) \ _(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) +_(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) \ +_(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ +_(SESSION_RULES_DETAILS, session_rules_details) \ +_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \ +_(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \ +_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) #define foreach_standalone_reply_msg \ -_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \ -_(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) +_(SW_INTERFACE_EVENT, sw_interface_event) typedef struct { @@ -4975,7 +5508,6 @@ typedef struct u32 value; } name_sort_t; - #define STR_VTR_OP_CASE(op) \ case L2_VTR_ ## op: \ return "" # op; @@ -5142,275 +5674,9 @@ dump_ipv6_table (vat_main_t * vam) return dump_ip_table (vam, 1); } -static char * -counter_type_to_str (u8 counter_type, u8 is_combined) -{ - if (!is_combined) - { - switch (counter_type) - { - case VNET_INTERFACE_COUNTER_DROP: - return "drop"; - case VNET_INTERFACE_COUNTER_PUNT: - return "punt"; - case VNET_INTERFACE_COUNTER_IP4: - return "ip4"; - case VNET_INTERFACE_COUNTER_IP6: - return "ip6"; - case VNET_INTERFACE_COUNTER_RX_NO_BUF: - return "rx-no-buf"; - case VNET_INTERFACE_COUNTER_RX_MISS: - return "rx-miss"; - case VNET_INTERFACE_COUNTER_RX_ERROR: - return "rx-error"; - case VNET_INTERFACE_COUNTER_TX_ERROR: - return "tx-error"; - default: - return "INVALID-COUNTER-TYPE"; - } - } - else - { - switch (counter_type) - { - case VNET_INTERFACE_COUNTER_RX: - return "rx"; - case VNET_INTERFACE_COUNTER_TX: - return "tx"; - default: - return "INVALID-COUNTER-TYPE"; - } - } -} - -static int -dump_stats_table (vat_main_t * vam) -{ - vat_json_node_t node; - vat_json_node_t *msg_array; - vat_json_node_t *msg; - vat_json_node_t *counter_array; - vat_json_node_t *counter; - interface_counter_t c; - u64 packets; - ip4_fib_counter_t *c4; - ip6_fib_counter_t *c6; - ip4_nbr_counter_t *n4; - ip6_nbr_counter_t *n6; - int i, j; - - if (!vam->json_output) - { - clib_warning ("dump_stats_table supported only in JSON format"); - return -99; - } - - vat_json_init_object (&node); - - /* interface counters */ - msg_array = vat_json_object_add (&node, "interface_counters"); - vat_json_init_array (msg_array); - for (i = 0; i < vec_len (vam->simple_interface_counters); i++) - { - msg = vat_json_array_add (msg_array); - vat_json_init_object (msg); - vat_json_object_add_string_copy (msg, "vnet_counter_type", - (u8 *) counter_type_to_str (i, 0)); - vat_json_object_add_int (msg, "is_combined", 0); - counter_array = vat_json_object_add (msg, "data"); - vat_json_init_array (counter_array); - for (j = 0; j < vec_len (vam->simple_interface_counters[i]); j++) - { - packets = vam->simple_interface_counters[i][j]; - vat_json_array_add_uint (counter_array, packets); - } - } - for (i = 0; i < vec_len (vam->combined_interface_counters); i++) - { - msg = vat_json_array_add (msg_array); - vat_json_init_object (msg); - vat_json_object_add_string_copy (msg, "vnet_counter_type", - (u8 *) counter_type_to_str (i, 1)); - vat_json_object_add_int (msg, "is_combined", 1); - counter_array = vat_json_object_add (msg, "data"); - vat_json_init_array (counter_array); - for (j = 0; j < vec_len (vam->combined_interface_counters[i]); j++) - { - c = vam->combined_interface_counters[i][j]; - counter = vat_json_array_add (counter_array); - vat_json_init_object (counter); - vat_json_object_add_uint (counter, "packets", c.packets); - vat_json_object_add_uint (counter, "bytes", c.bytes); - } - } - - /* ip4 fib counters */ - msg_array = vat_json_object_add (&node, "ip4_fib_counters"); - vat_json_init_array (msg_array); - for (i = 0; i < vec_len (vam->ip4_fib_counters); i++) - { - msg = vat_json_array_add (msg_array); - vat_json_init_object (msg); - vat_json_object_add_uint (msg, "vrf_id", - vam->ip4_fib_counters_vrf_id_by_index[i]); - counter_array = vat_json_object_add (msg, "c"); - vat_json_init_array (counter_array); - for (j = 0; j < vec_len (vam->ip4_fib_counters[i]); j++) - { - counter = vat_json_array_add (counter_array); - vat_json_init_object (counter); - c4 = &vam->ip4_fib_counters[i][j]; - vat_json_object_add_ip4 (counter, "address", c4->address); - vat_json_object_add_uint (counter, "address_length", - c4->address_length); - vat_json_object_add_uint (counter, "packets", c4->packets); - vat_json_object_add_uint (counter, "bytes", c4->bytes); - } - } - - /* ip6 fib counters */ - msg_array = vat_json_object_add (&node, "ip6_fib_counters"); - vat_json_init_array (msg_array); - for (i = 0; i < vec_len (vam->ip6_fib_counters); i++) - { - msg = vat_json_array_add (msg_array); - vat_json_init_object (msg); - vat_json_object_add_uint (msg, "vrf_id", - vam->ip6_fib_counters_vrf_id_by_index[i]); - counter_array = vat_json_object_add (msg, "c"); - vat_json_init_array (counter_array); - for (j = 0; j < vec_len (vam->ip6_fib_counters[i]); j++) - { - counter = vat_json_array_add (counter_array); - vat_json_init_object (counter); - c6 = &vam->ip6_fib_counters[i][j]; - vat_json_object_add_ip6 (counter, "address", c6->address); - vat_json_object_add_uint (counter, "address_length", - c6->address_length); - vat_json_object_add_uint (counter, "packets", c6->packets); - vat_json_object_add_uint (counter, "bytes", c6->bytes); - } - } - - /* ip4 nbr counters */ - msg_array = vat_json_object_add (&node, "ip4_nbr_counters"); - vat_json_init_array (msg_array); - for (i = 0; i < vec_len (vam->ip4_nbr_counters); i++) - { - msg = vat_json_array_add (msg_array); - vat_json_init_object (msg); - vat_json_object_add_uint (msg, "sw_if_index", i); - counter_array = vat_json_object_add (msg, "c"); - vat_json_init_array (counter_array); - for (j = 0; j < vec_len (vam->ip4_nbr_counters[i]); j++) - { - counter = vat_json_array_add (counter_array); - vat_json_init_object (counter); - n4 = &vam->ip4_nbr_counters[i][j]; - vat_json_object_add_ip4 (counter, "address", n4->address); - vat_json_object_add_uint (counter, "link-type", n4->linkt); - vat_json_object_add_uint (counter, "packets", n4->packets); - vat_json_object_add_uint (counter, "bytes", n4->bytes); - } - } - - /* ip6 nbr counters */ - msg_array = vat_json_object_add (&node, "ip6_nbr_counters"); - vat_json_init_array (msg_array); - for (i = 0; i < vec_len (vam->ip6_nbr_counters); i++) - { - msg = vat_json_array_add (msg_array); - vat_json_init_object (msg); - vat_json_object_add_uint (msg, "sw_if_index", i); - counter_array = vat_json_object_add (msg, "c"); - vat_json_init_array (counter_array); - for (j = 0; j < vec_len (vam->ip6_nbr_counters[i]); j++) - { - counter = vat_json_array_add (counter_array); - vat_json_init_object (counter); - n6 = &vam->ip6_nbr_counters[i][j]; - vat_json_object_add_ip6 (counter, "address", n6->address); - vat_json_object_add_uint (counter, "packets", n6->packets); - vat_json_object_add_uint (counter, "bytes", n6->bytes); - } - } - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - return 0; -} - -int -exec (vat_main_t * vam) -{ - api_main_t *am = &api_main; - vl_api_cli_t *mp; - f64 timeout; - void *oldheap; - u8 *cmd = 0; - unformat_input_t *i = vam->input; - - if (vec_len (i->buffer) == 0) - return -1; - - if (vam->exec_mode == 0 && unformat (i, "mode")) - { - vam->exec_mode = 1; - return 0; - } - if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit"))) - { - vam->exec_mode = 0; - return 0; - } - - - M (CLI, mp); - - /* - * Copy cmd into shared memory. - * In order for the CLI command to work, it - * must be a vector ending in \n, not a C-string ending - * in \n\0. - */ - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); - - vec_validate (cmd, vec_len (vam->input->buffer) - 1); - clib_memcpy (cmd, vam->input->buffer, vec_len (vam->input->buffer)); - - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); - - mp->cmd_in_shmem = pointer_to_uword (cmd); - S (mp); - timeout = vat_time_now (vam) + 10.0; - - while (vat_time_now (vam) < timeout) - { - if (vam->result_ready == 1) - { - u8 *free_me; - if (vam->shmem_result != NULL) - print (vam->ofp, "%s", vam->shmem_result); - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); - - free_me = (u8 *) vam->shmem_result; - vec_free (free_me); - - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); - return 0; - } - } - return -99; -} - /* - * Future replacement of exec() that passes CLI buffers directly in - * the API messages instead of an additional shared memory area. + * Pass CLI buffers directly in the CLI_INBAND API message, + * instead of an additional shared memory area. */ static int exec_inband (vat_main_t * vam) @@ -5440,14 +5706,22 @@ exec_inband (vat_main_t * vam) */ u32 len = vec_len (vam->input->buffer); M2 (CLI_INBAND, mp, len); - clib_memcpy (mp->cmd, vam->input->buffer, len); - mp->length = htonl (len); + vl_api_to_api_string (len - 1, (const char *) vam->input->buffer, &mp->cmd); 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) { @@ -5460,7 +5734,7 @@ api_create_loopback (vat_main_t * vam) u32 user_instance = 0; int ret; - memset (mac_address, 0, sizeof (mac_address)); + clib_memset (mac_address, 0, sizeof (mac_address)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -5526,38 +5800,6 @@ api_delete_loopback (vat_main_t * vam) return ret; } -static int -api_want_stats (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_want_stats_t *mp; - int enable = -1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; - else - break; - } - - if (enable == -1) - { - errmsg ("missing enable|disable"); - return -99; - } - - M (WANT_STATS, mp); - mp->enable_disable = enable; - - S (mp); - W (ret); - return ret; -} - static int api_want_interface_events (vat_main_t * vam) { @@ -5629,71 +5871,16 @@ api_sw_interface_dump (vat_main_t * vam) /* recreate the interface name hash table */ vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword)); - /* Get list of ethernets */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "Ether", sizeof (mp->name_filter) - 1); - S (mp); - - /* and local / loopback interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "lo", sizeof (mp->name_filter) - 1); - S (mp); - - /* and packet-generator interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "pg", sizeof (mp->name_filter) - 1); - S (mp); - - /* and vxlan-gpe tunnel interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "vxlan_gpe", - sizeof (mp->name_filter) - 1); - S (mp); - - /* and vxlan tunnel interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "vxlan", sizeof (mp->name_filter) - 1); - S (mp); - - /* and host (af_packet) interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "host", sizeof (mp->name_filter) - 1); - S (mp); - - /* and l2tpv3 tunnel interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", - sizeof (mp->name_filter) - 1); - S (mp); - - /* and GRE tunnel interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "gre", sizeof (mp->name_filter) - 1); - S (mp); - - /* and LISP-GPE interfaces */ - M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "lisp_gpe", - sizeof (mp->name_filter) - 1); - S (mp); - - /* and IPSEC tunnel interfaces */ + /* + * Ask for all interface names. Otherwise, the epic catalog of + * name filters becomes ridiculously long, and vat ends up needing + * to be taught about new interface types. + */ M (SW_INTERFACE_DUMP, mp); - mp->name_filter_valid = 1; - strncpy ((char *) mp->name_filter, "ipsec", sizeof (mp->name_filter) - 1); S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -5707,7 +5894,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 */ @@ -5717,10 +5904,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; @@ -5739,8 +5922,7 @@ api_sw_interface_set_flags (vat_main_t * vam) /* Construct the API message */ 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; + mp->flags = ntohl ((admin_up) ? IF_STATUS_API_FLAG_ADMIN_UP : 0); /* send it... */ S (mp); @@ -5751,18 +5933,30 @@ api_sw_interface_set_flags (vat_main_t * vam) } static int -api_sw_interface_clear_stats (vat_main_t * vam) +api_sw_interface_set_rx_mode (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_clear_stats_t *mp; + vl_api_sw_interface_set_rx_mode_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; int ret; + u8 queue_id_valid = 0; + u32 queue_id; + vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + if (unformat (i, "queue %d", &queue_id)) + queue_id_valid = 1; + else if (unformat (i, "polling")) + mode = VNET_HW_INTERFACE_RX_MODE_POLLING; + else if (unformat (i, "interrupt")) + mode = VNET_HW_INTERFACE_RX_MODE_INTERRUPT; + else if (unformat (i, "adaptive")) + mode = VNET_HW_INTERFACE_RX_MODE_ADAPTIVE; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) sw_if_index_set = 1; else if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; @@ -5770,13 +5964,23 @@ api_sw_interface_clear_stats (vat_main_t * vam) break; } - /* Construct the API message */ - M (SW_INTERFACE_CLEAR_STATS, mp); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (mode == VNET_HW_INTERFACE_RX_MODE_UNKNOWN) + { + errmsg ("missing rx-mode"); + return -99; + } - if (sw_if_index_set == 1) - mp->sw_if_index = ntohl (sw_if_index); - else - mp->sw_if_index = ~0; + /* Construct the API message */ + M (SW_INTERFACE_SET_RX_MODE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->mode = (vl_api_rx_mode_t) mode; + mp->queue_id_valid = queue_id_valid; + mp->queue_id = queue_id_valid ? ntohl (queue_id) : ~0; /* send it... */ S (mp); @@ -5787,38 +5991,30 @@ api_sw_interface_clear_stats (vat_main_t * vam) } static int -api_sw_interface_add_del_address (vat_main_t * vam) +api_sw_interface_set_rx_placement (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_add_del_address_t *mp; + vl_api_sw_interface_set_rx_placement_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; - u8 is_add = 1, del_all = 0; - u32 address_length = 0; - u8 v4_address_set = 0; - u8 v6_address_set = 0; - ip4_address_t v4address; - ip6_address_t v6address; int ret; + u8 is_main = 0; + u32 queue_id, thread_index; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del-all")) - del_all = 1; - else if (unformat (i, "del")) - is_add = 0; + if (unformat (i, "queue %d", &queue_id)) + ; + else if (unformat (i, "main")) + is_main = 1; + else if (unformat (i, "worker %d", &thread_index)) + ; else if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) sw_if_index_set = 1; else if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; - else if (unformat (i, "%U/%d", - unformat_ip4_address, &v4address, &address_length)) - v4_address_set = 1; - else if (unformat (i, "%U/%d", - unformat_ip6_address, &v6address, &address_length)) - v6_address_set = 1; else break; } @@ -5828,94 +6024,266 @@ api_sw_interface_add_del_address (vat_main_t * vam) errmsg ("missing interface name or sw_if_index"); return -99; } - if (v4_address_set && v6_address_set) - { - errmsg ("both v4 and v6 addresses set"); - return -99; - } - if (!v4_address_set && !v6_address_set && !del_all) - { - errmsg ("no addresses set"); - return -99; - } + if (is_main) + thread_index = 0; /* Construct the API message */ - M (SW_INTERFACE_ADD_DEL_ADDRESS, mp); - + M (SW_INTERFACE_SET_RX_PLACEMENT, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = is_add; - mp->del_all = del_all; - if (v6_address_set) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->address, &v6address, sizeof (v6address)); - } - else - { - clib_memcpy (mp->address, &v4address, sizeof (v4address)); - } - mp->address_length = address_length; + mp->worker_id = ntohl (thread_index); + mp->queue_id = ntohl (queue_id); + mp->is_main = is_main; /* send it... */ S (mp); - - /* Wait for a reply, return good/bad news */ + /* Wait for a reply, return the good/bad news... */ W (ret); return ret; } +static void vl_api_sw_interface_rx_placement_details_t_handler + (vl_api_sw_interface_rx_placement_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 worker_id = ntohl (mp->worker_id); + + print (vam->ofp, + "\n%-11d %-11s %-6d %-5d %-9s", + ntohl (mp->sw_if_index), (worker_id == 0) ? "main" : "worker", + worker_id, ntohl (mp->queue_id), + (mp->mode == + 1) ? "polling" : ((mp->mode == 2) ? "interrupt" : "adaptive")); +} + +static void vl_api_sw_interface_rx_placement_details_t_handler_json + (vl_api_sw_interface_rx_placement_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "worker_id", ntohl (mp->worker_id)); + vat_json_object_add_uint (node, "queue_id", ntohl (mp->queue_id)); + vat_json_object_add_uint (node, "mode", mp->mode); +} + static int -api_sw_interface_set_mpls_enable (vat_main_t * vam) +api_sw_interface_rx_placement_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_set_mpls_enable_t *mp; + vl_api_sw_interface_rx_placement_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; u32 sw_if_index; u8 sw_if_index_set = 0; - u8 enable = 1; - int ret; - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; + sw_if_index_set++; else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "disable")) - enable = 0; - else if (unformat (i, "dis")) - enable = 0; + sw_if_index_set++; else break; } - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + print (vam->ofp, + "\n%-11s %-11s %-6s %-5s %-4s", + "sw_if_index", "main/worker", "thread", "queue", "mode"); - /* Construct the API message */ - M (SW_INTERFACE_SET_MPLS_ENABLE, mp); + /* Dump Interface rx placement */ + M (SW_INTERFACE_RX_PLACEMENT_DUMP, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; + if (sw_if_index_set) + mp->sw_if_index = htonl (sw_if_index); + else + mp->sw_if_index = ~0; - /* send it... */ S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_sw_interface_set_table (vat_main_t * vam) +api_sw_interface_clear_stats (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_set_table_t *mp; - u32 sw_if_index, vrf_id = 0; - u8 sw_if_index_set = 0; + vl_api_sw_interface_clear_stats_t *mp; + 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, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + /* Construct the API message */ + M (SW_INTERFACE_CLEAR_STATS, mp); + + if (sw_if_index_set == 1) + mp->sw_if_index = ntohl (sw_if_index); + else + mp->sw_if_index = ~0; + + /* send it... */ + S (mp); + + /* Wait for a reply, return the good/bad news... */ + W (ret); + return ret; +} + +static int +api_sw_interface_add_del_address (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_add_del_address_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 is_add = 1, del_all = 0; + u32 address_length = 0; + u8 v4_address_set = 0; + u8 v6_address_set = 0; + ip4_address_t v4address; + ip6_address_t v6address; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "del-all")) + del_all = 1; + else if (unformat (i, "del")) + is_add = 0; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "%U/%d", + unformat_ip4_address, &v4address, &address_length)) + v4_address_set = 1; + else if (unformat (i, "%U/%d", + unformat_ip6_address, &v6address, &address_length)) + v6_address_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (v4_address_set && v6_address_set) + { + errmsg ("both v4 and v6 addresses set"); + return -99; + } + if (!v4_address_set && !v6_address_set && !del_all) + { + errmsg ("no addresses set"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_ADD_DEL_ADDRESS, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; + mp->del_all = del_all; + if (v6_address_set) + { + mp->prefix.address.af = ADDRESS_IP6; + clib_memcpy (mp->prefix.address.un.ip6, &v6address, sizeof (v6address)); + } + else + { + mp->prefix.address.af = ADDRESS_IP4; + clib_memcpy (mp->prefix.address.un.ip4, &v4address, sizeof (v4address)); + } + mp->prefix.len = address_length; + + /* send it... */ + S (mp); + + /* Wait for a reply, return good/bad news */ + W (ret); + return ret; +} + +static int +api_sw_interface_set_mpls_enable (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_mpls_enable_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 enable = 1; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%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, "disable")) + enable = 0; + else if (unformat (i, "dis")) + enable = 0; + 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_MPLS_ENABLE, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->enable = enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_sw_interface_set_table (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_table_t *mp; + u32 sw_if_index, vrf_id = 0; + u8 sw_if_index_set = 0; u8 is_ipv6 = 0; int ret; @@ -6117,6 +6485,56 @@ 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) @@ -6195,15 +6613,17 @@ api_sw_interface_set_l2_bridge (vat_main_t * vam) { unformat_input_t *i = vam->input; vl_api_sw_interface_set_l2_bridge_t *mp; + vl_api_l2_port_type_t port_type; u32 rx_sw_if_index; u8 rx_sw_if_index_set = 0; u32 bd_id; u8 bd_id_set = 0; - u8 bvi = 0; u32 shg = 0; u8 enable = 1; int ret; + port_type = L2_API_PORT_TYPE_NORMAL; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -6218,7 +6638,9 @@ api_sw_interface_set_l2_bridge (vat_main_t * vam) else if (unformat (i, "shg %d", &shg)) ; else if (unformat (i, "bvi")) - bvi = 1; + port_type = L2_API_PORT_TYPE_BVI; + else if (unformat (i, "uu-fwd")) + port_type = L2_API_PORT_TYPE_UU_FWD; else if (unformat (i, "enable")) enable = 1; else if (unformat (i, "disable")) @@ -6244,7 +6666,7 @@ api_sw_interface_set_l2_bridge (vat_main_t * vam) mp->rx_sw_if_index = ntohl (rx_sw_if_index); mp->bd_id = ntohl (bd_id); mp->shg = (u8) shg; - mp->bvi = bvi; + mp->port_type = ntohl (port_type); mp->enable = enable; S (mp); @@ -6275,7 +6697,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); @@ -6290,6 +6712,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; @@ -6310,6 +6733,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; @@ -6322,13 +6747,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) && (vec_len (bd_tag) > 63)) + { + errmsg ("bd-tag cannot be longer than 63"); + ret = -99; + goto done; } M (BRIDGE_DOMAIN_ADD_DEL, mp); @@ -6341,9 +6775,16 @@ 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) + { + clib_memcpy (mp->bd_tag, bd_tag, vec_len (bd_tag)); + mp->bd_tag[vec_len (bd_tag)] = 0; + } S (mp); W (ret); + +done: + vec_free (bd_tag); return ret; } @@ -6417,11 +6858,11 @@ api_l2fib_add_del (vat_main_t * vam) unformat_input_t *i = vam->input; vl_api_l2fib_add_del_t *mp; f64 timeout; - u64 mac = 0; + u8 mac[6] = { 0 }; u8 mac_set = 0; u32 bd_id; u8 bd_id_set = 0; - u32 sw_if_index = ~0; + u32 sw_if_index = 0; u8 sw_if_index_set = 0; u8 is_add = 1; u8 static_mac = 0; @@ -6434,7 +6875,7 @@ api_l2fib_add_del (vat_main_t * vam) /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "mac %U", unformat_ethernet_address, &mac)) + if (unformat (i, "mac %U", unformat_ethernet_address, mac)) mac_set = 1; else if (unformat (i, "bd_id %d", &bd_id)) bd_id_set = 1; @@ -6501,18 +6942,18 @@ api_l2fib_add_del (vat_main_t * vam) { M (L2FIB_ADD_DEL, mp); - mp->mac = mac; + clib_memcpy (mp->mac, mac, 6); mp->bd_id = ntohl (bd_id); mp->is_add = is_add; + mp->sw_if_index = ntohl (sw_if_index); if (is_add) { - mp->sw_if_index = ntohl (sw_if_index); mp->static_mac = static_mac; mp->filter_mac = filter_mac; mp->bvi_mac = bvi_mac; } - increment_mac_address (&mac); + increment_mac_address (mac); /* send it... */ S (mp); } @@ -6525,7 +6966,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; @@ -6607,8 +7048,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 */ @@ -6628,13 +7070,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; } @@ -6648,7 +7096,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); @@ -6663,7 +7112,7 @@ api_bridge_flags (vat_main_t * vam) u32 bd_id; u8 bd_id_set = 0; u8 is_set = 1; - u32 flags = 0; + bd_flags_t flags = 0; int ret; /* Parse args required to build the message */ @@ -6672,15 +7121,15 @@ api_bridge_flags (vat_main_t * vam) if (unformat (i, "bd_id %d", &bd_id)) bd_id_set = 1; else if (unformat (i, "learn")) - flags |= L2_LEARN; + flags |= BRIDGE_API_FLAG_LEARN; else if (unformat (i, "forward")) - flags |= L2_FWD; + flags |= BRIDGE_API_FLAG_FWD; else if (unformat (i, "flood")) - flags |= L2_FLOOD; + flags |= BRIDGE_API_FLAG_FLOOD; else if (unformat (i, "uu-flood")) - flags |= L2_UU_FLOOD; + flags |= BRIDGE_API_FLAG_UU_FLOOD; else if (unformat (i, "arp-term")) - flags |= L2_ARP_TERM; + flags |= BRIDGE_API_FLAG_ARP_TERM; else if (unformat (i, "off")) is_set = 0; else if (unformat (i, "disable")) @@ -6698,7 +7147,7 @@ api_bridge_flags (vat_main_t * vam) M (BRIDGE_FLAGS, mp); mp->bd_id = ntohl (bd_id); - mp->feature_bitmap = ntohl (flags); + mp->flags = ntohl (flags); mp->is_set = is_set; S (mp); @@ -6709,17 +7158,15 @@ api_bridge_flags (vat_main_t * vam) static int api_bd_ip_mac_add_del (vat_main_t * vam) { + vl_api_address_t ip = VL_API_ZERO_ADDRESS; + vl_api_mac_address_t mac = { 0 }; unformat_input_t *i = vam->input; vl_api_bd_ip_mac_add_del_t *mp; u32 bd_id; - u8 is_ipv6 = 0; u8 is_add = 1; u8 bd_id_set = 0; u8 ip_set = 0; u8 mac_set = 0; - ip4_address_t v4addr; - ip6_address_t v6addr; - u8 macaddr[6]; int ret; @@ -6730,16 +7177,11 @@ api_bd_ip_mac_add_del (vat_main_t * vam) { bd_id_set++; } - else if (unformat (i, "%U", unformat_ip4_address, &v4addr)) - { - ip_set++; - } - else if (unformat (i, "%U", unformat_ip6_address, &v6addr)) + else if (unformat (i, "%U", unformat_vl_api_address, &ip)) { ip_set++; - is_ipv6++; } - else if (unformat (i, "%U", unformat_ethernet_address, macaddr)) + else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac)) { mac_set++; } @@ -6767,171 +7209,293 @@ api_bd_ip_mac_add_del (vat_main_t * vam) M (BD_IP_MAC_ADD_DEL, mp); - mp->bd_id = ntohl (bd_id); - mp->is_ipv6 = is_ipv6; + mp->entry.bd_id = ntohl (bd_id); mp->is_add = is_add; - if (is_ipv6) - clib_memcpy (mp->ip_address, &v6addr, sizeof (v6addr)); - else - clib_memcpy (mp->ip_address, &v4addr, sizeof (v4addr)); - clib_memcpy (mp->mac_address, macaddr, 6); + + clib_memcpy (&mp->entry.ip, &ip, sizeof (ip)); + clib_memcpy (&mp->entry.mac, &mac, sizeof (mac)); + S (mp); W (ret); return ret; } static int -api_tap_connect (vat_main_t * vam) +api_bd_ip_mac_flush (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_tap_connect_t *mp; - u8 mac_address[6]; - u8 random_mac = 1; - u8 name_set = 0; - u8 *tap_name; - u8 *tag = 0; - ip4_address_t ip4_address; - u32 ip4_mask_width; - int ip4_address_set = 0; - ip6_address_t ip6_address; - u32 ip6_mask_width; - int ip6_address_set = 0; + vl_api_bd_ip_mac_flush_t *mp; + u32 bd_id; + u8 bd_id_set = 0; int ret; - memset (mac_address, 0, sizeof (mac_address)); - - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) + if (unformat (i, "bd_id %d", &bd_id)) { - random_mac = 0; + bd_id_set++; } - else if (unformat (i, "random-mac")) - random_mac = 1; - else if (unformat (i, "tapname %s", &tap_name)) - name_set = 1; - else if (unformat (i, "tag %s", &tag)) - ; - else if (unformat (i, "address %U/%d", - unformat_ip4_address, &ip4_address, &ip4_mask_width)) - ip4_address_set = 1; - else if (unformat (i, "address %U/%d", - unformat_ip6_address, &ip6_address, &ip6_mask_width)) - ip6_address_set = 1; else break; } - if (name_set == 0) - { - errmsg ("missing tap name"); - return -99; - } - if (vec_len (tap_name) > 63) + if (bd_id_set == 0) { - errmsg ("tap name too long"); + errmsg ("missing bridge domain"); return -99; } - vec_add1 (tap_name, 0); - if (vec_len (tag) > 63) - { - errmsg ("tag too long"); - return -99; - } + M (BD_IP_MAC_FLUSH, mp); - /* Construct the API message */ - M (TAP_CONNECT, mp); + mp->bd_id = ntohl (bd_id); - mp->use_random_mac = random_mac; - clib_memcpy (mp->mac_address, mac_address, 6); - clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name)); - if (tag) - clib_memcpy (mp->tag, tag, vec_len (tag)); + S (mp); + W (ret); + return ret; +} + +static void vl_api_bd_ip_mac_details_t_handler + (vl_api_bd_ip_mac_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, + "\n%-5d %U %U", + ntohl (mp->entry.bd_id), + format_vl_api_mac_address, mp->entry.mac, + format_vl_api_address, &mp->entry.ip); +} + +static void vl_api_bd_ip_mac_details_t_handler_json + (vl_api_bd_ip_mac_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - if (ip4_address_set) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - mp->ip4_address_set = 1; - clib_memcpy (mp->ip4_address, &ip4_address, sizeof (mp->ip4_address)); - mp->ip4_mask_width = ip4_mask_width; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } - if (ip6_address_set) + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "bd_id", ntohl (mp->entry.bd_id)); + vat_json_object_add_string_copy (node, "mac_address", + format (0, "%U", format_vl_api_mac_address, + &mp->entry.mac)); + u8 *ip = 0; + + ip = format (0, "%U", format_vl_api_address, &mp->entry.ip); + vat_json_object_add_string_copy (node, "ip_address", ip); + vec_free (ip); +} + +static int +api_bd_ip_mac_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bd_ip_mac_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + u32 bd_id; + u8 bd_id_set = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - mp->ip6_address_set = 1; - clib_memcpy (mp->ip6_address, &ip6_address, sizeof (mp->ip6_address)); - mp->ip6_mask_width = ip6_mask_width; + if (unformat (i, "bd_id %d", &bd_id)) + { + bd_id_set++; + } + else + break; } - vec_free (tap_name); - vec_free (tag); + print (vam->ofp, + "\n%-5s %-7s %-20s %-30s", + "bd_id", "is_ipv6", "mac_address", "ip_address"); + + /* Dump Bridge Domain Ip to Mac entries */ + M (BD_IP_MAC_DUMP, mp); + + if (bd_id_set) + mp->bd_id = htonl (bd_id); + else + mp->bd_id = ~0; - /* send it... */ S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_tap_modify (vat_main_t * vam) +api_tap_create_v2 (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_tap_modify_t *mp; + vl_api_tap_create_v2_t *mp; +#define TAP_FLAG_GSO (1 << 0) u8 mac_address[6]; u8 random_mac = 1; - u8 name_set = 0; - u8 *tap_name; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; + u32 id = ~0; + u8 *host_if_name = 0; + u8 *host_ns = 0; + u8 host_mac_addr[6]; + u8 host_mac_addr_set = 0; + u8 *host_bridge = 0; + ip4_address_t host_ip4_addr; + ip4_address_t host_ip4_gw; + u8 host_ip4_gw_set = 0; + u32 host_ip4_prefix_len = 0; + ip6_address_t host_ip6_addr; + ip6_address_t host_ip6_gw; + u8 host_ip6_gw_set = 0; + u32 host_ip6_prefix_len = 0; + u8 host_mtu_set = 0; + u32 host_mtu_size = 0; + u32 tap_flags = 0; int ret; + u32 rx_ring_sz = 0, tx_ring_sz = 0; - memset (mac_address, 0, sizeof (mac_address)); + clib_memset (mac_address, 0, sizeof (mac_address)); /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%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, "mac %U", unformat_ethernet_address, mac_address)) + if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) { random_mac = 0; } - else if (unformat (i, "random-mac")) - random_mac = 1; - else if (unformat (i, "tapname %s", &tap_name)) - name_set = 1; + else if (unformat (i, "id %u", &id)) + ; + else if (unformat (i, "host-if-name %s", &host_if_name)) + ; + else if (unformat (i, "host-ns %s", &host_ns)) + ; + else if (unformat (i, "host-mac-addr %U", unformat_ethernet_address, + host_mac_addr)) + host_mac_addr_set = 1; + else if (unformat (i, "host-bridge %s", &host_bridge)) + ; + else if (unformat (i, "host-ip4-addr %U/%d", unformat_ip4_address, + &host_ip4_addr, &host_ip4_prefix_len)) + ; + else if (unformat (i, "host-ip6-addr %U/%d", unformat_ip6_address, + &host_ip6_addr, &host_ip6_prefix_len)) + ; + else if (unformat (i, "host-ip4-gw %U", unformat_ip4_address, + &host_ip4_gw)) + host_ip4_gw_set = 1; + else if (unformat (i, "host-ip6-gw %U", unformat_ip6_address, + &host_ip6_gw)) + host_ip6_gw_set = 1; + else if (unformat (i, "rx-ring-size %d", &rx_ring_sz)) + ; + else if (unformat (i, "tx-ring-size %d", &tx_ring_sz)) + ; + else if (unformat (i, "host-mtu-size %d", &host_mtu_size)) + host_mtu_set = 1; + else if (unformat (i, "no-gso")) + tap_flags &= ~TAP_FLAG_GSO; + else if (unformat (i, "gso")) + tap_flags |= TAP_FLAG_GSO; else break; } - if (sw_if_index_set == 0) + if (vec_len (host_if_name) > 63) { - errmsg ("missing vpp interface name"); + errmsg ("tap name too long. "); return -99; } - if (name_set == 0) + if (vec_len (host_ns) > 63) + { + errmsg ("host name space too long. "); + return -99; + } + if (vec_len (host_bridge) > 63) + { + errmsg ("host bridge name too long. "); + return -99; + } + if (host_ip4_prefix_len > 32) + { + errmsg ("host ip4 prefix length not valid. "); + return -99; + } + if (host_ip6_prefix_len > 128) + { + errmsg ("host ip6 prefix length not valid. "); + return -99; + } + if (!is_pow2 (rx_ring_sz)) + { + errmsg ("rx ring size must be power of 2. "); + return -99; + } + if (rx_ring_sz > 32768) + { + errmsg ("rx ring size must be 32768 or lower. "); + return -99; + } + if (!is_pow2 (tx_ring_sz)) + { + errmsg ("tx ring size must be power of 2. "); + return -99; + } + if (tx_ring_sz > 32768) { - errmsg ("missing tap name"); + errmsg ("tx ring size must be 32768 or lower. "); return -99; } - if (vec_len (tap_name) > 63) + if (host_mtu_set && (host_mtu_size < 64 || host_mtu_size > 65355)) { - errmsg ("tap name too long"); + errmsg ("host MTU size must be in between 64 and 65355. "); + return -99; } - vec_add1 (tap_name, 0); /* Construct the API message */ - M (TAP_MODIFY, mp); + M (TAP_CREATE_V2, mp); mp->use_random_mac = random_mac; - mp->sw_if_index = ntohl (sw_if_index); - clib_memcpy (mp->mac_address, mac_address, 6); - clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name)); - vec_free (tap_name); + + mp->id = ntohl (id); + mp->host_namespace_set = host_ns != 0; + mp->host_bridge_set = host_bridge != 0; + mp->host_ip4_addr_set = host_ip4_prefix_len != 0; + mp->host_ip6_addr_set = host_ip6_prefix_len != 0; + mp->rx_ring_sz = ntohs (rx_ring_sz); + mp->tx_ring_sz = ntohs (tx_ring_sz); + mp->host_mtu_set = host_mtu_set; + mp->host_mtu_size = ntohl (host_mtu_size); + mp->tap_flags = ntohl (tap_flags); + + if (random_mac == 0) + clib_memcpy (mp->mac_address, mac_address, 6); + if (host_mac_addr_set) + clib_memcpy (mp->host_mac_addr, host_mac_addr, 6); + if (host_if_name) + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + if (host_ns) + clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns)); + if (host_bridge) + clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge)); + if (host_ip4_prefix_len) + clib_memcpy (mp->host_ip4_addr, &host_ip4_addr, 4); + if (host_ip6_prefix_len) + clib_memcpy (mp->host_ip6_addr, &host_ip6_addr, 16); + if (host_ip4_gw_set) + clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4); + if (host_ip6_gw_set) + clib_memcpy (mp->host_ip6_gw, &host_ip6_gw, 16); + + vec_free (host_ns); + vec_free (host_if_name); + vec_free (host_bridge); /* send it... */ S (mp); @@ -6942,10 +7506,10 @@ api_tap_modify (vat_main_t * vam) } static int -api_tap_delete (vat_main_t * vam) +api_tap_delete_v2 (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_tap_delete_t *mp; + vl_api_tap_delete_v2_t *mp; u32 sw_if_index = ~0; u8 sw_if_index_set = 0; int ret; @@ -6963,12 +7527,12 @@ api_tap_delete (vat_main_t * vam) if (sw_if_index_set == 0) { - errmsg ("missing vpp interface name"); + errmsg ("missing vpp interface name. "); return -99; } /* Construct the API message */ - M (TAP_DELETE, mp); + M (TAP_DELETE_V2, mp); mp->sw_if_index = ntohl (sw_if_index); @@ -6980,514 +7544,336 @@ api_tap_delete (vat_main_t * vam) return ret; } +uword +unformat_vlib_pci_addr (unformat_input_t * input, va_list * args) +{ + vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *); + u32 x[4]; + + if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3])) + return 0; + + addr->domain = x[0]; + addr->bus = x[1]; + addr->slot = x[2]; + addr->function = x[3]; + + return 1; +} + static int -api_ip_add_del_route (vat_main_t * vam) +api_virtio_pci_create (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ip_add_del_route_t *mp; - u32 sw_if_index = ~0, vrf_id = 0; - u8 is_ipv6 = 0; - u8 is_local = 0, is_drop = 0; - u8 is_unreach = 0, is_prohibit = 0; - 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; - u32 next_hop_table_id = 0; - u32 resolve_attempts = 0; - u32 dst_address_length = 0; - u8 next_hop_set = 0; - ip4_address_t v4_dst_address, v4_next_hop_address; - ip6_address_t v6_dst_address, v6_next_hop_address; - int count = 1; - int j; - f64 before = 0; - u32 random_add_del = 0; - u32 *random_vector = 0; - uword *random_hash; - u32 random_seed = 0xdeaddabe; - u32 classify_table_index = ~0; - u8 is_classify = 0; - u8 resolve_host = 0, resolve_attached = 0; - mpls_label_t *next_hop_out_label_stack = NULL; - mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; - mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID; + vl_api_virtio_pci_create_t *mp; + u8 mac_address[6]; + u8 random_mac = 1; + u8 gso_enabled = 0; + u32 pci_addr = 0; + u64 features = (u64) ~ (0ULL); + int ret; + + clib_memset (mac_address, 0, sizeof (mac_address)); /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%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, "%U", unformat_ip4_address, &v4_dst_address)) - { - address_set = 1; - is_ipv6 = 0; - } - else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address)) - { - address_set = 1; - is_ipv6 = 1; - } - else if (unformat (i, "/%d", &dst_address_length)) - { - address_length_set = 1; - } - - else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address, - &v4_next_hop_address)) - { - next_hop_set = 1; - } - else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address, - &v6_next_hop_address)) - { - next_hop_set = 1; - } - else if (unformat (i, "resolve-attempts %d", &resolve_attempts)) - ; - else if (unformat (i, "weight %d", &next_hop_weight)) - ; - else if (unformat (i, "drop")) - { - is_drop = 1; - } - else if (unformat (i, "null-send-unreach")) - { - is_unreach = 1; - } - else if (unformat (i, "null-send-prohibit")) - { - is_prohibit = 1; - } - else if (unformat (i, "local")) - { - is_local = 1; - } - else if (unformat (i, "classify %d", &classify_table_index)) + if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) { - is_classify = 1; + random_mac = 0; } - else if (unformat (i, "del")) - 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")) - resolve_attached = 1; - else if (unformat (i, "multipath")) - is_multipath = 1; - else if (unformat (i, "vrf %d", &vrf_id)) + else if (unformat (i, "pci-addr %U", unformat_vlib_pci_addr, &pci_addr)) ; - else if (unformat (i, "create-vrf")) - create_vrf_if_needed = 1; - else if (unformat (i, "count %d", &count)) - ; - else if (unformat (i, "lookup-in-vrf %d", &next_hop_table_id)) - ; - else if (unformat (i, "next-hop-table %d", &next_hop_table_id)) - ; - else if (unformat (i, "out-label %d", &next_hop_out_label)) - vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label)); - else if (unformat (i, "via-label %d", &next_hop_via_label)) - ; - else if (unformat (i, "random")) - random_add_del = 1; - else if (unformat (i, "seed %d", &random_seed)) + else if (unformat (i, "features 0x%llx", &features)) ; + else if (unformat (i, "gso-enabled")) + gso_enabled = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (!next_hop_set && !is_drop && !is_local && - !is_classify && !is_unreach && !is_prohibit && - MPLS_LABEL_INVALID == next_hop_via_label) + if (pci_addr == 0) { - errmsg - ("next hop / local / drop / unreach / prohibit / classify not set"); + errmsg ("pci address must be non zero. "); return -99; } - if (next_hop_set && MPLS_LABEL_INVALID != next_hop_via_label) + /* Construct the API message */ + M (VIRTIO_PCI_CREATE, mp); + + mp->use_random_mac = random_mac; + + mp->pci_addr = htonl (pci_addr); + mp->features = clib_host_to_net_u64 (features); + mp->gso_enabled = gso_enabled; + + if (random_mac == 0) + clib_memcpy (mp->mac_address, mac_address, 6); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_virtio_pci_delete (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_virtio_pci_delete_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("next hop and next-hop via label set"); - return -99; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; } - if (address_set == 0) + + if (sw_if_index_set == 0) { - errmsg ("missing addresses"); + errmsg ("missing vpp interface name. "); return -99; } - if (address_length_set == 0) + /* Construct the API message */ + M (VIRTIO_PCI_DELETE, mp); + + mp->sw_if_index = htonl (sw_if_index); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_bond_create (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bond_create_t *mp; + u8 mac_address[6]; + u8 custom_mac = 0; + int ret; + u8 mode; + u8 lb; + u8 mode_is_set = 0; + u32 id = ~0; + u8 numa_only = 0; + + clib_memset (mac_address, 0, sizeof (mac_address)); + lb = BOND_LB_L2; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("missing address length"); - return -99; + if (unformat (i, "mode %U", unformat_bond_mode, &mode)) + mode_is_set = 1; + else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR)) + && unformat (i, "lb %U", unformat_bond_load_balance, &lb)) + ; + else if (unformat (i, "hw-addr %U", unformat_ethernet_address, + mac_address)) + custom_mac = 1; + else if (unformat (i, "numa-only")) + numa_only = 1; + else if (unformat (i, "id %u", &id)) + ; + else + break; } - /* Generate a pile of unique, random routes */ - if (random_add_del) + if (mode_is_set == 0) { - u32 this_random_address; - random_hash = hash_create (count, sizeof (uword)); - - hash_set (random_hash, v4_next_hop_address.as_u32, 1); - for (j = 0; j <= count; j++) - { - do - { - this_random_address = random_u32 (&random_seed); - this_random_address = - clib_host_to_net_u32 (this_random_address); - } - while (hash_get (random_hash, this_random_address)); - vec_add1 (random_vector, this_random_address); - hash_set (random_hash, this_random_address, 1); - } - hash_free (random_hash); - v4_dst_address.as_u32 = random_vector[0]; - } - - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); + errmsg ("Missing bond mode. "); + return -99; } - for (j = 0; j < count; j++) - { - /* Construct the API message */ - M2 (IP_ADD_DEL_ROUTE, mp, - sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack)); + /* Construct the API message */ + M (BOND_CREATE, mp); - mp->next_hop_sw_if_index = ntohl (sw_if_index); - mp->table_id = ntohl (vrf_id); - mp->create_vrf_if_needed = create_vrf_if_needed; + mp->use_custom_mac = custom_mac; - mp->is_add = is_add; - mp->is_drop = is_drop; - mp->is_unreach = is_unreach; - mp->is_prohibit = is_prohibit; - mp->is_ipv6 = is_ipv6; - mp->is_local = is_local; - mp->is_classify = is_classify; - 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); - mp->classify_table_index = ntohl (classify_table_index); - mp->next_hop_via_label = ntohl (next_hop_via_label); - mp->next_hop_n_out_labels = vec_len (next_hop_out_label_stack); - if (0 != mp->next_hop_n_out_labels) - { - memcpy (mp->next_hop_out_label_stack, - next_hop_out_label_stack, - vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t)); - vec_free (next_hop_out_label_stack); - } - - if (is_ipv6) - { - clib_memcpy (mp->dst_address, &v6_dst_address, - sizeof (v6_dst_address)); - if (next_hop_set) - clib_memcpy (mp->next_hop_address, &v6_next_hop_address, - sizeof (v6_next_hop_address)); - increment_v6_address (&v6_dst_address); - } - else - { - clib_memcpy (mp->dst_address, &v4_dst_address, - sizeof (v4_dst_address)); - if (next_hop_set) - clib_memcpy (mp->next_hop_address, &v4_next_hop_address, - sizeof (v4_next_hop_address)); - if (random_add_del) - v4_dst_address.as_u32 = random_vector[j + 1]; - else - increment_v4_address (&v4_dst_address); - } - /* send it... */ - S (mp); - /* If we receive SIGTERM, stop now... */ - if (vam->do_exit) - break; - } + mp->mode = htonl (mode); + mp->lb = htonl (lb); + mp->id = htonl (id); + mp->numa_only = numa_only; - /* When testing multiple add/del ops, use a control-ping to sync */ - if (count > 1) - { - vl_api_control_ping_t *mp_ping; - f64 after; - f64 timeout; + if (custom_mac) + clib_memcpy (mp->mac_address, mac_address, 6); - /* Shut off async mode */ - vam->async_mode = 0; + /* send it... */ + S (mp); - M (CONTROL_PING, mp_ping); - S (mp_ping); + /* Wait for a reply... */ + W (ret); + return ret; +} - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; +static int +api_bond_delete (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bond_delete_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; - out: - if (vam->retval == -99) - errmsg ("timeout"); + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } - if (vam->async_errors > 0) - { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; - } - vam->async_errors = 0; - after = vat_time_now (vam); + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } - /* slim chance, but we might have eaten SIGTERM on the first iteration */ - if (j > 0) - count = j; + /* Construct the API message */ + M (BOND_DELETE, mp); - print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", - count, after - before, count / (after - before)); - } - else - { - int ret; + mp->sw_if_index = ntohl (sw_if_index); - /* Wait for a reply... */ - W (ret); - return ret; - } + /* send it... */ + S (mp); - /* Return the good/bad news */ - return (vam->retval); + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_ip_mroute_add_del (vat_main_t * vam) +api_bond_enslave (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ip_mroute_add_del_t *mp; - u32 sw_if_index = ~0, vrf_id = 0; - u8 is_ipv6 = 0; - u8 is_local = 0; - u8 create_vrf_if_needed = 0; - u8 is_add = 1; - u8 address_set = 0; - u32 grp_address_length = 0; - ip4_address_t v4_grp_address, v4_src_address; - ip6_address_t v6_grp_address, v6_src_address; - mfib_itf_flags_t iflags = 0; - mfib_entry_flags_t eflags = 0; + vl_api_bond_enslave_t *mp; + u32 bond_sw_if_index; int ret; + u8 is_passive; + u8 is_long_timeout; + u32 bond_sw_if_index_is_set = 0; + u32 sw_if_index; + u8 sw_if_index_is_set = 0; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_is_set = 1; + else if (unformat (i, "bond %u", &bond_sw_if_index)) + bond_sw_if_index_is_set = 1; + else if (unformat (i, "passive %d", &is_passive)) ; - else if (unformat (i, "%U %U", - unformat_ip4_address, &v4_src_address, - unformat_ip4_address, &v4_grp_address)) - { - grp_address_length = 64; - address_set = 1; - is_ipv6 = 0; - } - else if (unformat (i, "%U %U", - unformat_ip6_address, &v6_src_address, - unformat_ip6_address, &v6_grp_address)) - { - grp_address_length = 256; - address_set = 1; - is_ipv6 = 1; - } - else if (unformat (i, "%U", unformat_ip4_address, &v4_grp_address)) - { - memset (&v4_src_address, 0, sizeof (v4_src_address)); - grp_address_length = 32; - address_set = 1; - is_ipv6 = 0; - } - else if (unformat (i, "%U", unformat_ip6_address, &v6_grp_address)) - { - memset (&v6_src_address, 0, sizeof (v6_src_address)); - grp_address_length = 128; - address_set = 1; - is_ipv6 = 1; - } - else if (unformat (i, "/%d", &grp_address_length)) - ; - else if (unformat (i, "local")) - { - is_local = 1; - } - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "vrf %d", &vrf_id)) - ; - else if (unformat (i, "create-vrf")) - create_vrf_if_needed = 1; - else if (unformat (i, "%U", unformat_mfib_itf_flags, &iflags)) - ; - else if (unformat (i, "%U", unformat_mfib_entry_flags, &eflags)) + else if (unformat (i, "long-timeout %d", &is_long_timeout)) ; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (address_set == 0) + if (bond_sw_if_index_is_set == 0) { - errmsg ("missing addresses\n"); + errmsg ("Missing bond sw_if_index. "); + return -99; + } + if (sw_if_index_is_set == 0) + { + errmsg ("Missing slave sw_if_index. "); return -99; } /* Construct the API message */ - M (IP_MROUTE_ADD_DEL, mp); + M (BOND_ENSLAVE, mp); - mp->next_hop_sw_if_index = ntohl (sw_if_index); - mp->table_id = ntohl (vrf_id); - mp->create_vrf_if_needed = create_vrf_if_needed; + mp->bond_sw_if_index = ntohl (bond_sw_if_index); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_long_timeout = is_long_timeout; + mp->is_passive = is_passive; - mp->is_add = is_add; - mp->is_ipv6 = is_ipv6; - mp->is_local = is_local; - mp->itf_flags = ntohl (iflags); - mp->entry_flags = ntohl (eflags); - mp->grp_address_length = grp_address_length; - mp->grp_address_length = ntohs (mp->grp_address_length); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_bond_detach_slave (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bond_detach_slave_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; - if (is_ipv6) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - clib_memcpy (mp->grp_address, &v6_grp_address, sizeof (v6_grp_address)); - clib_memcpy (mp->src_address, &v6_src_address, sizeof (v6_src_address)); + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; } - else - { - clib_memcpy (mp->grp_address, &v4_grp_address, sizeof (v4_grp_address)); - clib_memcpy (mp->src_address, &v4_src_address, sizeof (v4_src_address)); + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; } + /* Construct the API message */ + M (BOND_DETACH_SLAVE, mp); + + mp->sw_if_index = ntohl (sw_if_index); + /* send it... */ S (mp); + /* Wait for a reply... */ W (ret); return ret; } static int -api_mpls_route_add_del (vat_main_t * vam) +api_ip_table_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_mpls_route_add_del_t *mp; - u32 sw_if_index = ~0, table_id = 0; - u8 create_table_if_needed = 0; + vl_api_ip_table_add_del_t *mp; + u32 table_id = ~0; + u8 is_ipv6 = 0; u8 is_add = 1; - u32 next_hop_weight = 1; - u8 is_multipath = 0; - u32 next_hop_table_id = 0; - u8 next_hop_set = 0; - ip4_address_t v4_next_hop_address = { - .as_u32 = 0, - }; - ip6_address_t v6_next_hop_address = { {0} }; - int count = 1; - int j; - f64 before = 0; - u32 classify_table_index = ~0; - u8 is_classify = 0; - u8 resolve_host = 0, resolve_attached = 0; - mpls_label_t next_hop_via_label = MPLS_LABEL_INVALID; - mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; - 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; + int ret = 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)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (i, "%d", &local_label)) - ; - else if (unformat (i, "eos")) - is_eos = 1; - else if (unformat (i, "non-eos")) - is_eos = 0; - else if (unformat (i, "via %U", unformat_ip4_address, - &v4_next_hop_address)) - { - next_hop_set = 1; - next_hop_proto_is_ip4 = 1; - } - else if (unformat (i, "via %U", unformat_ip6_address, - &v6_next_hop_address)) - { - next_hop_set = 1; - next_hop_proto_is_ip4 = 0; - } - else if (unformat (i, "weight %d", &next_hop_weight)) - ; - else if (unformat (i, "create-table")) - create_table_if_needed = 1; - else if (unformat (i, "classify %d", &classify_table_index)) - { - is_classify = 1; - } + 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, "resolve-via-host")) - resolve_host = 1; - else if (unformat (i, "resolve-via-attached")) - resolve_attached = 1; - else if (unformat (i, "multipath")) - is_multipath = 1; - else if (unformat (i, "count %d", &count)) - ; - else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id)) - { - next_hop_set = 1; - next_hop_proto_is_ip4 = 1; - } - else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id)) - { - next_hop_set = 1; - next_hop_proto_is_ip4 = 0; - } - else if (unformat (i, "next-hop-table %d", &next_hop_table_id)) - ; - else if (unformat (i, "via-label %d", &next_hop_via_label)) + else if (unformat (i, "table %d", &table_id)) ; - else if (unformat (i, "out-label %d", &next_hop_out_label)) - vec_add1 (next_hop_out_label_stack, ntohl (next_hop_out_label)); else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -7495,75 +7881,287 @@ api_mpls_route_add_del (vat_main_t * vam) } } - if (!next_hop_set && !is_classify) - { - errmsg ("next hop / classify not set"); - return -99; - } - - if (MPLS_LABEL_INVALID == local_label) + if (~0 == table_id) { - errmsg ("missing label"); + errmsg ("missing table-ID"); return -99; } - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } + /* Construct the API message */ + M (IP_TABLE_ADD_DEL, mp); - for (j = 0; j < count; j++) - { - /* Construct the API message */ - M2 (MPLS_ROUTE_ADD_DEL, mp, - sizeof (mpls_label_t) * vec_len (next_hop_out_label_stack)); + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; + mp->is_add = is_add; - mp->mr_next_hop_sw_if_index = ntohl (sw_if_index); - mp->mr_table_id = ntohl (table_id); - mp->mr_create_table_if_needed = create_table_if_needed; + /* send it... */ + S (mp); - mp->mr_is_add = is_add; - mp->mr_next_hop_proto_is_ip4 = next_hop_proto_is_ip4; - mp->mr_is_classify = is_classify; - mp->mr_is_multipath = is_multipath; - mp->mr_is_resolve_host = resolve_host; - mp->mr_is_resolve_attached = resolve_attached; - mp->mr_next_hop_weight = next_hop_weight; - mp->mr_next_hop_table_id = ntohl (next_hop_table_id); - mp->mr_classify_table_index = ntohl (classify_table_index); - mp->mr_next_hop_via_label = ntohl (next_hop_via_label); - mp->mr_label = ntohl (local_label); - mp->mr_eos = is_eos; + /* Wait for a reply... */ + W (ret); + + return ret; +} + +uword +unformat_fib_path (unformat_input_t * input, va_list * args) +{ + vat_main_t *vam = va_arg (*args, vat_main_t *); + vl_api_fib_path_t *path = va_arg (*args, vl_api_fib_path_t *); + u32 weight, preference; + mpls_label_t out_label; + + clib_memset (path, 0, sizeof (*path)); + path->weight = 1; + path->sw_if_index = ~0; + path->rpf_id = ~0; + path->n_labels = 0; - mp->mr_next_hop_n_out_labels = vec_len (next_hop_out_label_stack); - if (0 != mp->mr_next_hop_n_out_labels) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U %U", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, + api_unformat_sw_if_index, vam, &path->sw_if_index)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "%U %U", + unformat_vl_api_ip6_address, + &path->nh.address.ip6, + api_unformat_sw_if_index, vam, &path->sw_if_index)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "weight %u", &weight)) + { + path->weight = weight; + } + else if (unformat (input, "preference %u", &preference)) + { + path->preference = preference; + } + else if (unformat (input, "%U next-hop-table %d", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, &path->table_id)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "%U next-hop-table %d", + unformat_vl_api_ip6_address, + &path->nh.address.ip6, &path->table_id)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "%U", + unformat_vl_api_ip4_address, &path->nh.address.ip4)) + { + /* + * the recursive next-hops are by default in the default table + */ + path->table_id = 0; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "%U", + unformat_vl_api_ip6_address, &path->nh.address.ip6)) + { + /* + * the recursive next-hops are by default in the default table + */ + path->table_id = 0; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "resolve-via-host")) { - memcpy (mp->mr_next_hop_out_label_stack, - next_hop_out_label_stack, - vec_len (next_hop_out_label_stack) * sizeof (mpls_label_t)); - vec_free (next_hop_out_label_stack); + path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_HOST; } + else if (unformat (input, "resolve-via-attached")) + { + path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_ATTACHED; + } + else if (unformat (input, "ip4-lookup-in-table %d", &path->table_id)) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "ip6-lookup-in-table %d", &path->table_id)) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "sw_if_index %d", &path->sw_if_index)) + ; + else if (unformat (input, "via-label %d", &path->nh.via_label)) + { + path->proto = FIB_API_PATH_NH_PROTO_MPLS; + path->sw_if_index = ~0; + } + else if (unformat (input, "l2-input-on %d", &path->sw_if_index)) + { + path->proto = FIB_API_PATH_NH_PROTO_ETHERNET; + path->type = FIB_API_PATH_TYPE_INTERFACE_RX; + } + else if (unformat (input, "local")) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + } + else if (unformat (input, "out-labels")) + { + while (unformat (input, "%d", &out_label)) + { + path->label_stack[path->n_labels].label = out_label; + path->label_stack[path->n_labels].is_uniform = 0; + path->label_stack[path->n_labels].ttl = 64; + path->n_labels++; + } + } + else if (unformat (input, "via")) + { + /* new path, back up and return */ + unformat_put_input (input); + unformat_put_input (input); + unformat_put_input (input); + unformat_put_input (input); + break; + } + else + { + return (0); + } + } + + path->proto = ntohl (path->proto); + path->type = ntohl (path->type); + path->flags = ntohl (path->flags); + path->table_id = ntohl (path->table_id); + path->sw_if_index = ntohl (path->sw_if_index); + + return (1); +} + +static int +api_ip_route_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_ip_route_add_del_t *mp; + u32 vrf_id = 0; + u8 is_add = 1; + u8 is_multipath = 0; + u8 prefix_set = 0; + u8 path_count = 0; + vl_api_prefix_t pfx = { }; + vl_api_fib_path_t paths[8]; + int count = 1; + int j; + f64 before = 0; + u32 random_add_del = 0; + u32 *random_vector = 0; + u32 random_seed = 0xdeaddabe; - if (next_hop_set) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) + prefix_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "vrf %d", &vrf_id)) + ; + else if (unformat (i, "count %d", &count)) + ; + else if (unformat (i, "random")) + random_add_del = 1; + else if (unformat (i, "multipath")) + is_multipath = 1; + else if (unformat (i, "seed %d", &random_seed)) + ; + else + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) { - if (next_hop_proto_is_ip4) + path_count++; + if (8 == path_count) { - clib_memcpy (mp->mr_next_hop, - &v4_next_hop_address, - sizeof (v4_next_hop_address)); + errmsg ("max 8 paths"); + return -99; } - else + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!path_count) + { + errmsg ("specify a path; via ..."); + return -99; + } + if (prefix_set == 0) + { + errmsg ("missing prefix"); + return -99; + } + + /* Generate a pile of unique, random routes */ + if (random_add_del) + { + ip4_address_t *i = (ip4_address_t *) & paths[0].nh.address.ip4; + u32 this_random_address; + uword *random_hash; + + random_hash = hash_create (count, sizeof (uword)); + + hash_set (random_hash, i->as_u32, 1); + for (j = 0; j <= count; j++) + { + do { - clib_memcpy (mp->mr_next_hop, - &v6_next_hop_address, - sizeof (v6_next_hop_address)); + this_random_address = random_u32 (&random_seed); + this_random_address = + clib_host_to_net_u32 (this_random_address); } + while (hash_get (random_hash, this_random_address)); + vec_add1 (random_vector, this_random_address); + hash_set (random_hash, this_random_address, 1); } - local_label++; + hash_free (random_hash); + set_ip4_address (&pfx.address, random_vector[0]); + } + + if (count > 1) + { + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); + } + + for (j = 0; j < count; j++) + { + /* Construct the API message */ + M2 (IP_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); + + mp->is_add = is_add; + mp->is_multipath = is_multipath; + clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); + mp->route.table_id = ntohl (vrf_id); + mp->route.n_paths = path_count; + + clib_memcpy (&mp->route.paths, &paths, sizeof (paths[0]) * path_count); + + if (random_add_del) + set_ip4_address (&pfx.address, random_vector[j + 1]); + else + increment_address (&pfx.address); /* send it... */ S (mp); /* If we receive SIGTERM, stop now... */ @@ -7581,7 +8179,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; @@ -7623,46 +8221,37 @@ api_mpls_route_add_del (vat_main_t * vam) } static int -api_mpls_ip_bind_unbind (vat_main_t * vam) +api_ip_mroute_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_mpls_ip_bind_unbind_t *mp; - u32 ip_table_id = 0; - u8 create_table_if_needed = 0; - u8 is_bind = 1; - u8 is_ip4 = 1; - ip4_address_t v4_address; - ip6_address_t v6_address; - u32 address_length; - u8 address_set = 0; - mpls_label_t local_label = MPLS_LABEL_INVALID; + u8 path_set = 0, prefix_set = 0, is_add = 1; + vl_api_ip_mroute_add_del_t *mp; + mfib_entry_flags_t eflags = 0; + vl_api_mfib_path_t path; + vl_api_mprefix_t pfx = { }; + u32 vrf_id = 0; int ret; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U/%d", unformat_ip4_address, - &v4_address, &address_length)) - { - is_ip4 = 1; - address_set = 1; - } - else if (unformat (i, "%U/%d", unformat_ip6_address, - &v6_address, &address_length)) + if (unformat (i, "%U", unformat_vl_api_mprefix, &pfx)) { - is_ip4 = 0; - address_set = 1; + prefix_set = 1; + pfx.grp_address_length = htons (pfx.grp_address_length); } - else if (unformat (i, "%d", &local_label)) + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "vrf %d", &vrf_id)) ; - else if (unformat (i, "create-table")) - create_table_if_needed = 1; - else if (unformat (i, "table-id %d", &ip_table_id)) + else if (unformat (i, "%U", unformat_mfib_itf_flags, &path.itf_flags)) + path.itf_flags = htonl (path.itf_flags); + else if (unformat (i, "%U", unformat_mfib_entry_flags, &eflags)) ; - else if (unformat (i, "unbind")) - is_bind = 0; - else if (unformat (i, "bind")) - is_bind = 1; + else if (unformat (i, "via %U", unformat_fib_path, vam, &path.path)) + path_set = 1; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -7670,62 +8259,55 @@ api_mpls_ip_bind_unbind (vat_main_t * vam) } } - if (!address_set) + if (prefix_set == 0) { - errmsg ("IP addres not set"); + errmsg ("missing addresses\n"); return -99; } - - if (MPLS_LABEL_INVALID == local_label) + if (path_set == 0) { - errmsg ("missing label"); + errmsg ("missing path\n"); return -99; } /* Construct the API message */ - M (MPLS_IP_BIND_UNBIND, mp); + M (IP_MROUTE_ADD_DEL, mp); - mp->mb_create_table_if_needed = create_table_if_needed; - mp->mb_is_bind = is_bind; - mp->mb_is_ip4 = is_ip4; - mp->mb_ip_table_id = ntohl (ip_table_id); - mp->mb_mpls_table_id = 0; - mp->mb_label = ntohl (local_label); - mp->mb_address_length = address_length; + mp->is_add = is_add; + mp->is_multipath = 1; - if (is_ip4) - clib_memcpy (mp->mb_address, &v4_address, sizeof (v4_address)); - else - clib_memcpy (mp->mb_address, &v6_address, sizeof (v6_address)); + clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); + mp->route.table_id = htonl (vrf_id); + mp->route.n_paths = 1; + mp->route.entry_flags = htonl (eflags); + + clib_memcpy (&mp->route.paths, &path, sizeof (path)); /* send it... */ S (mp); - /* Wait for a reply... */ W (ret); return ret; } static int -api_proxy_arp_add_del (vat_main_t * vam) +api_mpls_table_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_proxy_arp_add_del_t *mp; - u32 vrf_id = 0; + vl_api_mpls_table_add_del_t *mp; + u32 table_id = ~0; u8 is_add = 1; - ip4_address_t lo, hi; - u8 range_set = 0; - int ret; + int ret = 0; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vrf %d", &vrf_id)) + if (unformat (i, "table %d", &table_id)) ; - else if (unformat (i, "%U - %U", unformat_ip4_address, &lo, - unformat_ip4_address, &hi)) - range_set = 1; else if (unformat (i, "del")) is_add = 0; + else if (unformat (i, "add")) + is_add = 1; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -7733,173 +8315,195 @@ api_proxy_arp_add_del (vat_main_t * vam) } } - if (range_set == 0) + if (~0 == table_id) { - errmsg ("address range not set"); + errmsg ("missing table-ID"); return -99; } - M (PROXY_ARP_ADD_DEL, mp); + /* Construct the API message */ + M (MPLS_TABLE_ADD_DEL, mp); - mp->vrf_id = ntohl (vrf_id); - mp->is_add = is_add; - clib_memcpy (mp->low_address, &lo, sizeof (mp->low_address)); - clib_memcpy (mp->hi_address, &hi, sizeof (mp->hi_address)); + mp->mt_table.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_proxy_arp_intfc_enable_disable (vat_main_t * vam) +api_mpls_route_add_del (vat_main_t * vam) { + u8 is_add = 1, path_count = 0, is_multipath = 0, is_eos = 0; + mpls_label_t local_label = MPLS_LABEL_INVALID; unformat_input_t *i = vam->input; - vl_api_proxy_arp_intfc_enable_disable_t *mp; - u32 sw_if_index; - u8 enable = 1; - u8 sw_if_index_set = 0; - int ret; + vl_api_mpls_route_add_del_t *mp; + vl_api_fib_path_t paths[8]; + int count = 1, j; + f64 before = 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)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; + if (unformat (i, "%d", &local_label)) + ; + else if (unformat (i, "eos")) + is_eos = 1; + else if (unformat (i, "non-eos")) + is_eos = 0; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "multipath")) + is_multipath = 1; + else if (unformat (i, "count %d", &count)) + ; else + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; } } - if (sw_if_index_set == 0) + if (!path_count) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("specify a path; via ..."); return -99; } - M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp); + if (MPLS_LABEL_INVALID == local_label) + { + errmsg ("missing label"); + return -99; + } - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable; + if (count > 1) + { + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); + } - S (mp); - W (ret); - return ret; -} + for (j = 0; j < count; j++) + { + /* Construct the API message */ + M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); -static int -api_mpls_tunnel_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_mpls_tunnel_add_del_t *mp; + mp->mr_is_add = is_add; + mp->mr_is_multipath = is_multipath; - u8 is_add = 1; - u8 l2_only = 0; - u32 sw_if_index = ~0; - u32 next_hop_sw_if_index = ~0; - u32 next_hop_proto_is_ip4 = 1; + mp->mr_route.mr_label = local_label; + mp->mr_route.mr_eos = is_eos; + mp->mr_route.mr_table_id = 0; + mp->mr_route.mr_n_paths = path_count; - u32 next_hop_table_id = 0; - ip4_address_t v4_next_hop_address = { - .as_u32 = 0, - }; - ip6_address_t v6_next_hop_address = { {0} }; - mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID, *labels = NULL; - int ret; + clib_memcpy (&mp->mr_route.mr_paths, paths, + sizeof (paths[0]) * path_count); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "del sw_if_index %d", &sw_if_index)) - is_add = 0; - else if (unformat (i, "sw_if_index %d", &next_hop_sw_if_index)) - ; - else if (unformat (i, "via %U", - unformat_ip4_address, &v4_next_hop_address)) - { - next_hop_proto_is_ip4 = 1; - } - else if (unformat (i, "via %U", - unformat_ip6_address, &v6_next_hop_address)) - { - next_hop_proto_is_ip4 = 0; - } - else if (unformat (i, "l2-only")) - l2_only = 1; - else if (unformat (i, "next-hop-table %d", &next_hop_table_id)) - ; - else if (unformat (i, "out-label %d", &next_hop_out_label)) - vec_add1 (labels, ntohl (next_hop_out_label)); - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + local_label++; + + /* send it... */ + S (mp); + /* If we receive SIGTERM, stop now... */ + if (vam->do_exit) + break; } - M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (mpls_label_t) * vec_len (labels)); + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) + { + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; + + /* Shut off async mode */ + vam->async_mode = 0; - mp->mt_next_hop_sw_if_index = ntohl (next_hop_sw_if_index); - mp->mt_sw_if_index = ntohl (sw_if_index); - mp->mt_is_add = is_add; - mp->mt_l2_only = l2_only; - mp->mt_next_hop_table_id = ntohl (next_hop_table_id); - mp->mt_next_hop_proto_is_ip4 = next_hop_proto_is_ip4; + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - mp->mt_next_hop_n_out_labels = vec_len (labels); + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; - if (0 != mp->mt_next_hop_n_out_labels) - { - clib_memcpy (mp->mt_next_hop_out_label_stack, labels, - sizeof (mpls_label_t) * mp->mt_next_hop_n_out_labels); - vec_free (labels); - } + out: + if (vam->retval == -99) + errmsg ("timeout"); - if (next_hop_proto_is_ip4) - { - clib_memcpy (mp->mt_next_hop, - &v4_next_hop_address, sizeof (v4_next_hop_address)); + if (vam->async_errors > 0) + { + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; + } + vam->async_errors = 0; + after = vat_time_now (vam); + + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (j > 0) + count = j; + + print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", + count, after - before, count / (after - before)); } else { - clib_memcpy (mp->mt_next_hop, - &v6_next_hop_address, sizeof (v6_next_hop_address)); + int ret; + + /* Wait for a reply... */ + W (ret); + return ret; } - S (mp); - W (ret); - return ret; + /* Return the good/bad news */ + return (vam->retval); + return (0); } static int -api_sw_interface_set_unnumbered (vat_main_t * vam) +api_mpls_ip_bind_unbind (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_set_unnumbered_t *mp; - u32 sw_if_index; - u32 unnum_sw_index = ~0; - u8 is_add = 1; - u8 sw_if_index_set = 0; + vl_api_mpls_ip_bind_unbind_t *mp; + u32 ip_table_id = 0; + u8 is_bind = 1; + vl_api_prefix_t pfx; + u8 prefix_set = 0; + mpls_label_t local_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%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, "unnum_if_index %d", &unnum_sw_index)) + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) + prefix_set = 1; + else if (unformat (i, "%d", &local_label)) ; - else if (unformat (i, "del")) - is_add = 0; + else if (unformat (i, "table-id %d", &ip_table_id)) + ; + else if (unformat (i, "unbind")) + is_bind = 0; + else if (unformat (i, "bind")) + is_bind = 1; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -7907,65 +8511,63 @@ api_sw_interface_set_unnumbered (vat_main_t * vam) } } - if (sw_if_index_set == 0) + if (!prefix_set) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("IP prefix not set"); return -99; } - M (SW_INTERFACE_SET_UNNUMBERED, mp); + if (MPLS_LABEL_INVALID == local_label) + { + errmsg ("missing label"); + return -99; + } - mp->sw_if_index = ntohl (sw_if_index); - mp->unnumbered_sw_if_index = ntohl (unnum_sw_index); - mp->is_add = is_add; + /* Construct the API message */ + M (MPLS_IP_BIND_UNBIND, mp); + + mp->mb_is_bind = is_bind; + mp->mb_ip_table_id = ntohl (ip_table_id); + mp->mb_mpls_table_id = 0; + mp->mb_label = ntohl (local_label); + clib_memcpy (&mp->mb_prefix, &pfx, sizeof (pfx)); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; + return (0); } static int -api_ip_neighbor_add_del (vat_main_t * vam) +api_sr_mpls_policy_add (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ip_neighbor_add_del_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 is_add = 1; - u8 is_static = 0; - u8 is_no_fib_entry = 0; - u8 mac_address[6]; - u8 mac_set = 0; - u8 v4_address_set = 0; - u8 v6_address_set = 0; - ip4_address_t v4address; - ip6_address_t v6address; + vl_api_sr_mpls_policy_add_t *mp; + u32 bsid = 0; + u32 weight = 1; + u8 type = 0; + u8 n_segments = 0; + u32 sid; + u32 *segments = NULL; int ret; - memset (mac_address, 0, sizeof (mac_address)); - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) + if (unformat (i, "bsid %d", &bsid)) + ; + else if (unformat (i, "weight %d", &weight)) + ; + else if (unformat (i, "spray")) + type = 1; + else if (unformat (i, "next %d", &sid)) { - mac_set = 1; + n_segments += 1; + vec_add1 (segments, htonl (sid)); } - else if (unformat (i, "del")) - is_add = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "is_static")) - is_static = 1; - else if (unformat (i, "no-fib-entry")) - is_no_fib_entry = 1; - else if (unformat (i, "dst %U", unformat_ip4_address, &v4address)) - v4_address_set = 1; - else if (unformat (i, "dst %U", unformat_ip6_address, &v6address)) - v6_address_set = 1; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -7973,66 +8575,49 @@ api_ip_neighbor_add_del (vat_main_t * vam) } } - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - if (v4_address_set && v6_address_set) + if (bsid == 0) { - errmsg ("both v4 and v6 addresses set"); + errmsg ("bsid not set"); return -99; } - if (!v4_address_set && !v6_address_set) + + if (n_segments == 0) { - errmsg ("no address set"); + errmsg ("no sid in segment stack"); return -99; } /* Construct the API message */ - M (IP_NEIGHBOR_ADD_DEL, mp); + M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = is_add; - mp->is_static = is_static; - mp->is_no_adj_fib = is_no_fib_entry; - if (mac_set) - clib_memcpy (mp->mac_address, mac_address, 6); - if (v6_address_set) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->dst_address, &v6address, sizeof (v6address)); - } - else - { - /* mp->is_ipv6 = 0; via memset in M macro above */ - clib_memcpy (mp->dst_address, &v4address, sizeof (v4address)); - } + mp->bsid = htonl (bsid); + mp->weight = htonl (weight); + mp->type = type; + mp->n_segments = n_segments; + memcpy (mp->segments, segments, sizeof (u32) * n_segments); + vec_free (segments); /* send it... */ S (mp); - /* Wait for a reply, return good/bad news */ + /* Wait for a reply... */ W (ret); return ret; } static int -api_reset_vrf (vat_main_t * vam) +api_sr_mpls_policy_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_reset_vrf_t *mp; - u32 vrf_id = 0; - u8 is_ipv6 = 0; - u8 vrf_id_set = 0; + vl_api_sr_mpls_policy_del_t *mp; + u32 bsid = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vrf %d", &vrf_id)) - vrf_id_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; + if (unformat (i, "bsid %d", &bsid)) + ; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -8040,42 +8625,50 @@ api_reset_vrf (vat_main_t * vam) } } - if (vrf_id_set == 0) + if (bsid == 0) { - errmsg ("missing vrf id"); + errmsg ("bsid not set"); return -99; } - M (RESET_VRF, mp); + /* Construct the API message */ + M (SR_MPLS_POLICY_DEL, mp); - mp->vrf_id = ntohl (vrf_id); - mp->is_ipv6 = is_ipv6; + mp->bsid = htonl (bsid); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_create_vlan_subif (vat_main_t * vam) +api_bier_table_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_create_vlan_subif_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u32 vlan_id; - u8 vlan_id_set = 0; + vl_api_bier_table_add_del_t *mp; + u8 is_add = 1; + u32 set = 0, sub_domain = 0, hdr_len = 3; + mpls_label_t local_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "vlan %d", &vlan_id)) - vlan_id_set = 1; + if (unformat (i, "sub-domain %d", &sub_domain)) + ; + else if (unformat (i, "set %d", &set)) + ; + else if (unformat (i, "label %d", &local_label)) + ; + else if (unformat (i, "hdr-len %d", &hdr_len)) + ; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -8083,131 +8676,142 @@ api_create_vlan_subif (vat_main_t * vam) } } - if (sw_if_index_set == 0) + if (MPLS_LABEL_INVALID == local_label) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing label\n"); return -99; } - if (vlan_id_set == 0) - { - errmsg ("missing vlan_id"); - return -99; - } - M (CREATE_VLAN_SUBIF, mp); + /* Construct the API message */ + M (BIER_TABLE_ADD_DEL, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->vlan_id = ntohl (vlan_id); + mp->bt_is_add = is_add; + mp->bt_label = ntohl (local_label); + mp->bt_tbl_id.bt_set = set; + mp->bt_tbl_id.bt_sub_domain = sub_domain; + mp->bt_tbl_id.bt_hdr_len_id = hdr_len; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); - return ret; -} -#define foreach_create_subif_bit \ -_(no_tags) \ -_(one_tag) \ -_(two_tags) \ -_(dot1ad) \ -_(exact_match) \ -_(default_sub) \ -_(outer_vlan_id_any) \ -_(inner_vlan_id_any) + return (ret); +} static int -api_create_subif (vat_main_t * vam) +api_bier_route_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_create_subif_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u32 sub_id; - u8 sub_id_set = 0; - u32 no_tags = 0; - u32 one_tag = 0; - u32 two_tags = 0; - u32 dot1ad = 0; - u32 exact_match = 0; - u32 default_sub = 0; - u32 outer_vlan_id_any = 0; - u32 inner_vlan_id_any = 0; - u32 tmp; - u16 outer_vlan_id = 0; - u16 inner_vlan_id = 0; + vl_api_bier_route_add_del_t *mp; + u8 is_add = 1; + u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0; + ip4_address_t v4_next_hop_address; + ip6_address_t v6_next_hop_address; + u8 next_hop_set = 0; + u8 next_hop_proto_is_ip4 = 1; + mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (i, "%U", unformat_ip4_address, &v4_next_hop_address)) + { + next_hop_proto_is_ip4 = 1; + next_hop_set = 1; + } + else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address)) + { + next_hop_proto_is_ip4 = 0; + next_hop_set = 1; + } + if (unformat (i, "sub-domain %d", &sub_domain)) + ; + else if (unformat (i, "set %d", &set)) + ; + else if (unformat (i, "hdr-len %d", &hdr_len)) + ; + else if (unformat (i, "bp %d", &bp)) + ; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "out-label %d", &next_hop_out_label)) + ; else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sub_id %d", &sub_id)) - sub_id_set = 1; - else if (unformat (i, "outer_vlan_id %d", &tmp)) - outer_vlan_id = tmp; - else if (unformat (i, "inner_vlan_id %d", &tmp)) - inner_vlan_id = tmp; - -#define _(a) else if (unformat (i, #a)) a = 1 ; - foreach_create_subif_bit -#undef _ - else { clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (sw_if_index_set == 0) + if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label)) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("next hop / label set\n"); return -99; } - - if (sub_id_set == 0) + if (0 == bp) { - errmsg ("missing sub_id"); + errmsg ("bit=position not set\n"); return -99; } - M (CREATE_SUBIF, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->sub_id = ntohl (sub_id); -#define _(a) mp->a = a; - foreach_create_subif_bit; -#undef _ + /* Construct the API message */ + M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t)); + + mp->br_is_add = is_add; + mp->br_route.br_tbl_id.bt_set = set; + mp->br_route.br_tbl_id.bt_sub_domain = sub_domain; + mp->br_route.br_tbl_id.bt_hdr_len_id = hdr_len; + mp->br_route.br_bp = ntohs (bp); + mp->br_route.br_n_paths = 1; + mp->br_route.br_paths[0].n_labels = 1; + mp->br_route.br_paths[0].label_stack[0].label = ntohl (next_hop_out_label); + mp->br_route.br_paths[0].proto = (next_hop_proto_is_ip4 ? + FIB_API_PATH_NH_PROTO_IP4 : + FIB_API_PATH_NH_PROTO_IP6); - mp->outer_vlan_id = ntohs (outer_vlan_id); - mp->inner_vlan_id = ntohs (inner_vlan_id); + if (next_hop_proto_is_ip4) + { + clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip4, + &v4_next_hop_address, sizeof (v4_next_hop_address)); + } + else + { + clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip6, + &v6_next_hop_address, sizeof (v6_next_hop_address)); + } + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); - return ret; + + return (ret); } static int -api_oam_add_del (vat_main_t * vam) +api_proxy_arp_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_oam_add_del_t *mp; + vl_api_proxy_arp_add_del_t *mp; u32 vrf_id = 0; u8 is_add = 1; - ip4_address_t src, dst; - u8 src_set = 0; - u8 dst_set = 0; + vl_api_ip4_address_t lo, hi; + u8 range_set = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "vrf %d", &vrf_id)) ; - else if (unformat (i, "src %U", unformat_ip4_address, &src)) - src_set = 1; - else if (unformat (i, "dst %U", unformat_ip4_address, &dst)) - dst_set = 1; + else if (unformat (i, "%U - %U", unformat_vl_api_ip4_address, &lo, + unformat_vl_api_ip4_address, &hi)) + range_set = 1; else if (unformat (i, "del")) is_add = 0; else @@ -8217,24 +8821,18 @@ api_oam_add_del (vat_main_t * vam) } } - if (src_set == 0) - { - errmsg ("missing src addr"); - return -99; - } - - if (dst_set == 0) + if (range_set == 0) { - errmsg ("missing dst addr"); + errmsg ("address range not set"); return -99; } - M (OAM_ADD_DEL, mp); + M (PROXY_ARP_ADD_DEL, mp); - mp->vrf_id = ntohl (vrf_id); + mp->proxy.table_id = ntohl (vrf_id); mp->is_add = is_add; - clib_memcpy (mp->src_address, &src, sizeof (mp->src_address)); - clib_memcpy (mp->dst_address, &dst, sizeof (mp->dst_address)); + clib_memcpy (mp->proxy.low, &lo, sizeof (lo)); + clib_memcpy (mp->proxy.hi, &hi, sizeof (hi)); S (mp); W (ret); @@ -8242,21 +8840,25 @@ api_oam_add_del (vat_main_t * vam) } static int -api_reset_fib (vat_main_t * vam) +api_proxy_arp_intfc_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_reset_fib_t *mp; - u32 vrf_id = 0; - u8 is_ipv6 = 0; - u8 vrf_id_set = 0; - + vl_api_proxy_arp_intfc_enable_disable_t *mp; + u32 sw_if_index; + u8 enable = 1; + u8 sw_if_index_set = 0; int ret; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vrf %d", &vrf_id)) - vrf_id_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 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, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -8264,16 +8866,16 @@ api_reset_fib (vat_main_t * vam) } } - if (vrf_id_set == 0) + if (sw_if_index_set == 0) { - errmsg ("missing vrf id"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (RESET_FIB, mp); + M (PROXY_ARP_INTFC_ENABLE_DISABLE, mp); - mp->vrf_id = ntohl (vrf_id); - mp->is_ipv6 = is_ipv6; + mp->sw_if_index = ntohl (sw_if_index); + mp->enable_disable = enable; S (mp); W (ret); @@ -8281,203 +8883,206 @@ api_reset_fib (vat_main_t * vam) } static int -api_dhcp_proxy_config (vat_main_t * vam) +api_mpls_tunnel_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_dhcp_proxy_config_t *mp; - u32 rx_vrf_id = 0; - u32 server_vrf_id = 0; + vl_api_mpls_tunnel_add_del_t *mp; + + vl_api_fib_path_t paths[8]; + u32 sw_if_index = ~0; + u8 path_count = 0; + u8 l2_only = 0; u8 is_add = 1; - u8 v4_address_set = 0; - u8 v6_address_set = 0; - ip4_address_t v4address; - ip6_address_t v6address; - u8 v4_src_address_set = 0; - u8 v6_src_address_set = 0; - ip4_address_t v4srcaddress; - ip6_address_t v6srcaddress; int ret; - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) + if (unformat (i, "add")) + is_add = 1; + else + if (unformat + (i, "del %U", api_unformat_sw_if_index, vam, &sw_if_index)) is_add = 0; - else if (unformat (i, "rx_vrf_id %d", &rx_vrf_id)) - ; - else if (unformat (i, "server_vrf_id %d", &server_vrf_id)) - ; - else if (unformat (i, "svr %U", unformat_ip4_address, &v4address)) - v4_address_set = 1; - else if (unformat (i, "svr %U", unformat_ip6_address, &v6address)) - v6_address_set = 1; - else if (unformat (i, "src %U", unformat_ip4_address, &v4srcaddress)) - v4_src_address_set = 1; - else if (unformat (i, "src %U", unformat_ip6_address, &v6srcaddress)) - v6_src_address_set = 1; + else if (unformat (i, "del sw_if_index %d", &sw_if_index)) + is_add = 0; + else if (unformat (i, "l2-only")) + l2_only = 1; else - break; + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) + { + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (v4_address_set && v6_address_set) - { - errmsg ("both v4 and v6 server addresses set"); - return -99; - } - if (!v4_address_set && !v6_address_set) - { - errmsg ("no server addresses set"); - return -99; - } + M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - if (v4_src_address_set && v6_src_address_set) - { - errmsg ("both v4 and v6 src addresses set"); - return -99; - } - if (!v4_src_address_set && !v6_src_address_set) + mp->mt_is_add = is_add; + mp->mt_tunnel.mt_sw_if_index = ntohl (sw_if_index); + mp->mt_tunnel.mt_l2_only = l2_only; + mp->mt_tunnel.mt_is_multicast = 0; + mp->mt_tunnel.mt_n_paths = path_count; + + clib_memcpy (&mp->mt_tunnel.mt_paths, &paths, + sizeof (paths[0]) * path_count); + + S (mp); + W (ret); + return ret; +} + +static int +api_sw_interface_set_unnumbered (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_unnumbered_t *mp; + u32 sw_if_index; + u32 unnum_sw_index = ~0; + u8 is_add = 1; + u8 sw_if_index_set = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("no src addresses set"); - return -99; + 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, "unnum_if_index %d", &unnum_sw_index)) + ; + else if (unformat (i, "del")) + is_add = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (!(v4_src_address_set && v4_address_set) && - !(v6_src_address_set && v6_address_set)) + if (sw_if_index_set == 0) { - errmsg ("no matching server and src addresses set"); + errmsg ("missing interface name or sw_if_index"); return -99; } - /* Construct the API message */ - M (DHCP_PROXY_CONFIG, mp); + M (SW_INTERFACE_SET_UNNUMBERED, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->unnumbered_sw_if_index = ntohl (unnum_sw_index); mp->is_add = is_add; - mp->rx_vrf_id = ntohl (rx_vrf_id); - mp->server_vrf_id = ntohl (server_vrf_id); - if (v6_address_set) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->dhcp_server, &v6address, sizeof (v6address)); - clib_memcpy (mp->dhcp_src_address, &v6srcaddress, sizeof (v6address)); - } - else - { - clib_memcpy (mp->dhcp_server, &v4address, sizeof (v4address)); - clib_memcpy (mp->dhcp_src_address, &v4srcaddress, sizeof (v4address)); - } - /* send it... */ S (mp); - - /* Wait for a reply, return good/bad news */ W (ret); return ret; } -#define vl_api_dhcp_proxy_details_t_endian vl_noop_handler -#define vl_api_dhcp_proxy_details_t_print vl_noop_handler - -static void -vl_api_dhcp_proxy_details_t_handler (vl_api_dhcp_proxy_details_t * mp) +static int +api_ip_neighbor_add_del (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - u32 i, count = mp->count; - vl_api_dhcp_server_t *s; - - if (mp->is_ipv6) - print (vam->ofp, - "RX Table-ID %d, Source Address %U, VSS FIB-ID %d, VSS OUI %d", - ntohl (mp->rx_vrf_id), - format_ip6_address, mp->dhcp_src_address, - ntohl (mp->vss_oui), ntohl (mp->vss_fib_id)); - else - print (vam->ofp, - "RX Table-ID %d, Source Address %U, VSS FIB-ID %d, VSS OUI %d", - ntohl (mp->rx_vrf_id), - format_ip4_address, mp->dhcp_src_address, - ntohl (mp->vss_oui), ntohl (mp->vss_fib_id)); - - for (i = 0; i < count; i++) - { - s = &mp->servers[i]; - - if (mp->is_ipv6) - print (vam->ofp, - " Server Table-ID %d, Server Address %U", - ntohl (s->server_vrf_id), format_ip6_address, s->dhcp_server); - else - print (vam->ofp, - " Server Table-ID %d, Server Address %U", - ntohl (s->server_vrf_id), format_ip4_address, s->dhcp_server); - } -} + vl_api_mac_address_t mac_address; + unformat_input_t *i = vam->input; + vl_api_ip_neighbor_add_del_t *mp; + vl_api_address_t ip_address; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 is_add = 1; + u8 mac_set = 0; + u8 address_set = 0; + int ret; + ip_neighbor_flags_t flags; -static void vl_api_dhcp_proxy_details_t_handler_json - (vl_api_dhcp_proxy_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - u32 i, count = mp->count; - struct in_addr ip4; - struct in6_addr ip6; - vl_api_dhcp_server_t *s; + flags = IP_NEIGHBOR_FLAG_NONE; + clib_memset (&ip_address, 0, sizeof (ip_address)); + clib_memset (&mac_address, 0, sizeof (mac_address)); - if (VAT_JSON_ARRAY != vam->json_tree.type) + /* Parse args required to build the message */ + 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, "mac %U", unformat_vl_api_mac_address, &mac_address)) + { + mac_set = 1; + } + else if (unformat (i, "del")) + is_add = 0; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "static")) + flags |= IP_NEIGHBOR_FLAG_STATIC; + else if (unformat (i, "no-fib-entry")) + flags |= IP_NEIGHBOR_FLAG_NO_FIB_ENTRY; + else if (unformat (i, "dst %U", unformat_vl_api_address, &ip_address)) + address_set = 1; + 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, "rx-table-id", ntohl (mp->rx_vrf_id)); - vat_json_object_add_uint (node, "vss-fib-id", ntohl (mp->vss_fib_id)); - vat_json_object_add_uint (node, "vss-oui", ntohl (mp->vss_oui)); - if (mp->is_ipv6) + if (sw_if_index_set == 0) { - clib_memcpy (&ip6, &mp->dhcp_src_address, sizeof (ip6)); - vat_json_object_add_ip6 (node, "src_address", ip6); + errmsg ("missing interface name or sw_if_index"); + return -99; } - else + if (!address_set) { - clib_memcpy (&ip4, &mp->dhcp_src_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "src_address", ip4); + errmsg ("no address set"); + return -99; } - for (i = 0; i < count; i++) - { - s = &mp->servers[i]; + /* Construct the API message */ + M (IP_NEIGHBOR_ADD_DEL, mp); - vat_json_object_add_uint (node, "server-table-id", - ntohl (s->server_vrf_id)); + mp->neighbor.sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; + mp->neighbor.flags = htonl (flags); + if (mac_set) + clib_memcpy (&mp->neighbor.mac_address, &mac_address, + sizeof (mac_address)); + if (address_set) + clib_memcpy (&mp->neighbor.ip_address, &ip_address, sizeof (ip_address)); - if (mp->is_ipv6) - { - clib_memcpy (&ip4, &s->dhcp_server, sizeof (ip4)); - vat_json_object_add_ip4 (node, "src_address", ip4); - } - else - { - clib_memcpy (&ip6, &s->dhcp_server, sizeof (ip6)); - vat_json_object_add_ip6 (node, "server_address", ip6); - } - } + /* send it... */ + S (mp); + + /* Wait for a reply, return good/bad news */ + W (ret); + return ret; } static int -api_dhcp_proxy_dump (vat_main_t * vam) +api_create_vlan_subif (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_control_ping_t *mp_ping; - vl_api_dhcp_proxy_dump_t *mp; - u8 is_ipv6 = 0; + vl_api_create_vlan_subif_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u32 vlan_id; + u8 vlan_id_set = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ipv6")) - is_ipv6 = 1; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "vlan %d", &vlan_id)) + vlan_id_set = 1; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -8485,76 +9090,115 @@ api_dhcp_proxy_dump (vat_main_t * vam) } } - M (DHCP_PROXY_DUMP, mp); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - mp->is_ip6 = is_ipv6; - S (mp); + if (vlan_id_set == 0) + { + errmsg ("missing vlan_id"); + return -99; + } + M (CREATE_VLAN_SUBIF, mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + mp->sw_if_index = ntohl (sw_if_index); + mp->vlan_id = ntohl (vlan_id); + S (mp); W (ret); return ret; } +#define foreach_create_subif_bit \ +_(no_tags) \ +_(one_tag) \ +_(two_tags) \ +_(dot1ad) \ +_(exact_match) \ +_(default_sub) \ +_(outer_vlan_id_any) \ +_(inner_vlan_id_any) + +#define foreach_create_subif_flag \ +_(0, "no_tags") \ +_(1, "one_tag") \ +_(2, "two_tags") \ +_(3, "dot1ad") \ +_(4, "exact_match") \ +_(5, "default_sub") \ +_(6, "outer_vlan_id_any") \ +_(7, "inner_vlan_id_any") + static int -api_dhcp_proxy_set_vss (vat_main_t * vam) +api_create_subif (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_dhcp_proxy_set_vss_t *mp; - u8 is_ipv6 = 0; - u8 is_add = 1; - u32 tbl_id; - u8 tbl_id_set = 0; - u32 oui; - u8 oui_set = 0; - u32 fib_id; - u8 fib_id_set = 0; + vl_api_create_subif_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u32 sub_id; + u8 sub_id_set = 0; + u32 __attribute__ ((unused)) no_tags = 0; + u32 __attribute__ ((unused)) one_tag = 0; + u32 __attribute__ ((unused)) two_tags = 0; + u32 __attribute__ ((unused)) dot1ad = 0; + u32 __attribute__ ((unused)) exact_match = 0; + u32 __attribute__ ((unused)) default_sub = 0; + u32 __attribute__ ((unused)) outer_vlan_id_any = 0; + u32 __attribute__ ((unused)) inner_vlan_id_any = 0; + u32 tmp; + u16 outer_vlan_id = 0; + u16 inner_vlan_id = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "tbl_id %d", &tbl_id)) - tbl_id_set = 1; - if (unformat (i, "fib_id %d", &fib_id)) - fib_id_set = 1; - if (unformat (i, "oui %d", &oui)) - oui_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else if (unformat (i, "del")) - is_add = 0; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sub_id %d", &sub_id)) + sub_id_set = 1; + else if (unformat (i, "outer_vlan_id %d", &tmp)) + outer_vlan_id = tmp; + else if (unformat (i, "inner_vlan_id %d", &tmp)) + inner_vlan_id = tmp; + +#define _(a) else if (unformat (i, #a)) a = 1 ; + foreach_create_subif_bit +#undef _ + else { clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (tbl_id_set == 0) + if (sw_if_index_set == 0) { - errmsg ("missing tbl id"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (fib_id_set == 0) - { - errmsg ("missing fib id"); - return -99; - } - if (oui_set == 0) + if (sub_id_set == 0) { - errmsg ("missing oui"); + errmsg ("missing sub_id"); return -99; } + M (CREATE_SUBIF, mp); - M (DHCP_PROXY_SET_VSS, mp); - mp->tbl_id = ntohl (tbl_id); - mp->fib_id = ntohl (fib_id); - mp->oui = ntohl (oui); - mp->is_ipv6 = is_ipv6; - mp->is_add = is_add; + mp->sw_if_index = ntohl (sw_if_index); + mp->sub_id = ntohl (sub_id); + +#define _(a,b) mp->sub_if_flags |= (1 << a); + foreach_create_subif_flag; +#undef _ + + mp->outer_vlan_id = ntohs (outer_vlan_id); + mp->inner_vlan_id = ntohs (inner_vlan_id); S (mp); W (ret); @@ -8562,61 +9206,40 @@ api_dhcp_proxy_set_vss (vat_main_t * vam) } static int -api_dhcp_client_config (vat_main_t * vam) +api_reset_fib (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_dhcp_client_config_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 is_add = 1; - u8 *hostname = 0; - u8 disable_event = 0; - int ret; + vl_api_reset_fib_t *mp; + u32 vrf_id = 0; + u8 is_ipv6 = 0; + u8 vrf_id_set = 0; - /* Parse args required to build the message */ + int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "hostname %s", &hostname)) - ; - else if (unformat (i, "disable_event")) - disable_event = 1; + if (unformat (i, "vrf %d", &vrf_id)) + vrf_id_set = 1; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index_set == 0) + if (vrf_id_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing vrf id"); return -99; } - if (vec_len (hostname) > 63) - { - errmsg ("hostname too long"); - } - vec_add1 (hostname, 0); - - /* Construct the API message */ - M (DHCP_CLIENT_CONFIG, mp); + M (RESET_FIB, mp); - mp->sw_if_index = htonl (sw_if_index); - clib_memcpy (mp->hostname, hostname, vec_len (hostname)); - vec_free (hostname); - mp->is_add = is_add; - mp->want_dhcp_event = disable_event ? 0 : 1; - mp->pid = htonl (getpid ()); + mp->vrf_id = ntohl (vrf_id); + mp->is_ipv6 = is_ipv6; - /* send it... */ S (mp); - - /* Wait for a reply, return good/bad news */ W (ret); return ret; } @@ -8728,30 +9351,35 @@ api_sw_interface_ip6_enable_disable (vat_main_t * vam) } static int -api_sw_interface_ip6_set_link_local_address (vat_main_t * vam) +api_ip6nd_proxy_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_ip6_set_link_local_address_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; + vl_api_ip6nd_proxy_add_del_t *mp; + u32 sw_if_index = ~0; u8 v6_address_set = 0; - ip6_address_t v6address; + vl_api_ip6_address_t v6address; + u8 is_del = 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, "%U", unformat_ip6_address, &v6address)) + ; + else if (unformat (i, "%U", unformat_vl_api_ip6_address, &v6address)) v6_address_set = 1; + if (unformat (i, "del")) + is_del = 1; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index_set == 0) + if (sw_if_index == ~0) { errmsg ("missing interface name or sw_if_index"); return -99; @@ -8763,10 +9391,11 @@ api_sw_interface_ip6_set_link_local_address (vat_main_t * vam) } /* Construct the API message */ - M (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, mp); + M (IP6ND_PROXY_ADD_DEL, mp); + mp->is_del = is_del; mp->sw_if_index = ntohl (sw_if_index); - clib_memcpy (mp->address, &v6address, sizeof (v6address)); + clib_memcpy (mp->ip, v6address, sizeof (v6address)); /* send it... */ S (mp); @@ -8777,65 +9406,10 @@ api_sw_interface_ip6_set_link_local_address (vat_main_t * vam) } static int -api_ip6nd_proxy_add_del (vat_main_t * vam) +api_ip6nd_proxy_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_ip6nd_proxy_add_del_t *mp; - u32 sw_if_index = ~0; - u8 v6_address_set = 0; - ip6_address_t v6address; - u8 is_del = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (i, "%U", unformat_ip6_address, &v6address)) - v6_address_set = 1; - if (unformat (i, "del")) - is_del = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - if (!v6_address_set) - { - errmsg ("no address set"); - return -99; - } - - /* Construct the API message */ - M (IP6ND_PROXY_ADD_DEL, mp); - - mp->is_del = is_del; - mp->sw_if_index = ntohl (sw_if_index); - clib_memcpy (mp->address, &v6address, sizeof (v6address)); - - /* send it... */ - S (mp); - - /* Wait for a reply, return good/bad news */ - W (ret); - return ret; -} - -static int -api_ip6nd_proxy_dump (vat_main_t * vam) -{ - vl_api_ip6nd_proxy_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_ip6nd_proxy_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; M (IP6ND_PROXY_DUMP, mp); @@ -8843,7 +9417,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); @@ -8856,7 +9430,7 @@ static void vl_api_ip6nd_proxy_details_t_handler vat_main_t *vam = &vat_main; print (vam->ofp, "host %U sw_if_index %d", - format_ip6_address, mp->address, ntohl (mp->sw_if_index)); + format_vl_api_ip6_address, mp->ip, ntohl (mp->sw_if_index)); } static void vl_api_ip6nd_proxy_details_t_handler_json @@ -8876,7 +9450,7 @@ static void vl_api_ip6nd_proxy_details_t_handler_json vat_json_init_object (node); vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - clib_memcpy (&ip6, mp->address, sizeof (ip6)); + clib_memcpy (&ip6, mp->ip, sizeof (ip6)); vat_json_object_add_ip6 (node, "host", ip6); } @@ -8887,9 +9461,8 @@ api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam) vl_api_sw_interface_ip6nd_ra_prefix_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; - u32 address_length = 0; u8 v6_address_set = 0; - ip6_address_t v6address; + vl_api_prefix_t pfx; u8 use_default = 0; u8 no_advertise = 0; u8 off_link = 0; @@ -8907,8 +9480,7 @@ api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam) 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, "%U/%d", - unformat_ip6_address, &v6address, &address_length)) + else if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) v6_address_set = 1; else if (unformat (i, "val_life %d", &val_lifetime)) ; @@ -8948,8 +9520,7 @@ api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam) M (SW_INTERFACE_IP6ND_RA_PREFIX, mp); mp->sw_if_index = ntohl (sw_if_index); - clib_memcpy (mp->address, &v6address, sizeof (v6address)); - mp->address_length = address_length; + clib_memcpy (&mp->prefix, &pfx, sizeof (pfx)); mp->use_default = use_default; mp->no_advertise = no_advertise; mp->off_link = off_link; @@ -9192,7 +9763,10 @@ api_sr_localsid_add_del (vat_main_t * vam) u8 behavior = ~0; u32 sw_if_index; u32 fib_table = ~(u32) 0; - ip6_address_t next_hop; + ip6_address_t nh_addr6; + ip4_address_t nh_addr4; + clib_memset (&nh_addr6, 0, sizeof (ip6_address_t)); + clib_memset (&nh_addr4, 0, sizeof (ip4_address_t)); bool nexthop_set = 0; @@ -9203,7 +9777,9 @@ api_sr_localsid_add_del (vat_main_t * vam) if (unformat (i, "del")) is_del = 1; else if (unformat (i, "address %U", unformat_ip6_address, &localsid)); - else if (unformat (i, "next-hop %U", unformat_ip6_address, &next_hop)) + else if (unformat (i, "next-hop %U", unformat_ip4_address, &nh_addr4)) + nexthop_set = 1; + else if (unformat (i, "next-hop %U", unformat_ip6_address, &nh_addr6)) nexthop_set = 1; else if (unformat (i, "behavior %u", &behavior)); else if (unformat (i, "sw_if_index %u", &sw_if_index)); @@ -9215,9 +9791,12 @@ api_sr_localsid_add_del (vat_main_t * vam) M (SR_LOCALSID_ADD_DEL, mp); - clib_memcpy (mp->localsid_addr, &localsid, sizeof (mp->localsid_addr)); + clib_memcpy (mp->localsid.addr, &localsid, sizeof (mp->localsid)); if (nexthop_set) - clib_memcpy (mp->nh_addr, &next_hop, sizeof (mp->nh_addr)); + { + clib_memcpy (mp->nh_addr6, &nh_addr6, sizeof (mp->nh_addr6)); + clib_memcpy (mp->nh_addr4, &nh_addr4, sizeof (mp->nh_addr4)); + } mp->behavior = behavior; mp->sw_if_index = ntohl (sw_if_index); mp->fib_table = ntohl (fib_table); @@ -9336,7 +9915,7 @@ unformat_tcp_mask (unformat_input_t * input, va_list * args) tcp = (tcp_header_t *) mask; -#define _(a) if (a) memset (&tcp->a, 0xff, sizeof (tcp->a)); +#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a)); foreach_tcp_proto_field; #undef _ @@ -9377,7 +9956,7 @@ unformat_udp_mask (unformat_input_t * input, va_list * args) udp = (udp_header_t *) mask; -#define _(a) if (a) memset (&udp->a, 0xff, sizeof (udp->a)); +#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a)); foreach_udp_proto_field; #undef _ @@ -9467,7 +10046,7 @@ unformat_ip4_mask (unformat_input_t * input, va_list * args) ip = (ip4_header_t *) mask; -#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a)); +#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); foreach_ip4_proto_field; #undef _ @@ -9539,7 +10118,7 @@ unformat_ip6_mask (unformat_input_t * input, va_list * args) ip = (ip6_header_t *) mask; -#define _(a) if (a) memset (&ip->a, 0xff, sizeof (ip->a)); +#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); foreach_ip6_proto_field; #undef _ @@ -9635,10 +10214,10 @@ unformat_l2_mask (unformat_input_t * input, va_list * args) vec_validate (mask, len - 1); if (dst) - memset (mask, 0xff, 6); + clib_memset (mask, 0xff, 6); if (src) - memset (mask + 6, 0xff, 6); + clib_memset (mask + 6, 0xff, 6); if (tag2 || dot1ad) { @@ -9987,6 +10566,7 @@ api_classify_add_del_table (vat_main_t * vam) mp->miss_next_index = ntohl (miss_next_index); mp->current_data_flag = ntohl (current_data_flag); mp->current_data_offset = ntohl (current_data_offset); + mp->mask_len = ntohl (vec_len (mask)); clib_memcpy (mp->mask, mask, vec_len (mask)); vec_free (mask); @@ -10361,6 +10941,25 @@ unformat_l2_match (unformat_input_t * input, va_list * args) *matchp = match; return 1; } + +uword +unformat_qos_source (unformat_input_t * input, va_list * args) +{ + int *qs = va_arg (*args, int *); + + if (unformat (input, "ip")) + *qs = QOS_SOURCE_IP; + else if (unformat (input, "mpls")) + *qs = QOS_SOURCE_MPLS; + else if (unformat (input, "ext")) + *qs = QOS_SOURCE_EXT; + else if (unformat (input, "vlan")) + *qs = QOS_SOURCE_VLAN; + else + return 0; + + return 1; +} #endif uword @@ -10519,6 +11118,7 @@ api_classify_add_del_session (vat_main_t * vam) mp->advance = ntohl (advance); mp->action = action; mp->metadata = ntohl (metadata); + mp->match_len = ntohl (vec_len (match)); clib_memcpy (mp->match, match, vec_len (match)); vec_free (match); @@ -11179,7 +11779,7 @@ api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -11187,17 +11787,29 @@ api_sw_if_l2tpv3_tunnel_dump (vat_main_t * vam) } -static void vl_api_sw_interface_tap_details_t_handler - (vl_api_sw_interface_tap_details_t * mp) +static void vl_api_sw_interface_tap_v2_details_t_handler + (vl_api_sw_interface_tap_v2_details_t * mp) { vat_main_t *vam = &vat_main; - print (vam->ofp, "%-16s %d", - mp->dev_name, clib_net_to_host_u32 (mp->sw_if_index)); + u8 *ip4 = format (0, "%U/%d", format_ip4_address, mp->host_ip4_addr, + mp->host_ip4_prefix_len); + u8 *ip6 = format (0, "%U/%d", format_ip6_address, mp->host_ip6_addr, + mp->host_ip6_prefix_len); + + print (vam->ofp, + "\n%-16s %-12d %-5d %-12d %-12d %-14U %-30s %-20s %-20s %-30s 0x%-08x", + mp->dev_name, ntohl (mp->sw_if_index), ntohl (mp->id), + ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), + format_ethernet_address, mp->host_mac_addr, mp->host_namespace, + mp->host_bridge, ip4, ip6, ntohl (mp->tap_flags)); + + vec_free (ip4); + vec_free (ip6); } -static void vl_api_sw_interface_tap_details_t_handler_json - (vl_api_sw_interface_tap_details_t * mp) +static void vl_api_sw_interface_tap_v2_details_t_handler_json + (vl_api_sw_interface_tap_v2_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; @@ -11210,30 +11822,186 @@ static void vl_api_sw_interface_tap_details_t_handler_json node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); + vat_json_object_add_uint (node, "id", ntohl (mp->id)); vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "tap_flags", ntohl (mp->tap_flags)); vat_json_object_add_string_copy (node, "dev_name", mp->dev_name); + vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); + vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); + vat_json_object_add_string_copy (node, "host_mac_addr", + format (0, "%U", format_ethernet_address, + &mp->host_mac_addr)); + vat_json_object_add_string_copy (node, "host_namespace", + mp->host_namespace); + vat_json_object_add_string_copy (node, "host_bridge", mp->host_bridge); + vat_json_object_add_string_copy (node, "host_ip4_addr", + format (0, "%U/%d", format_ip4_address, + mp->host_ip4_addr, + mp->host_ip4_prefix_len)); + vat_json_object_add_string_copy (node, "host_ip6_addr", + format (0, "%U/%d", format_ip6_address, + mp->host_ip6_addr, + mp->host_ip6_prefix_len)); + } static int -api_sw_interface_tap_dump (vat_main_t * vam) +api_sw_interface_tap_v2_dump (vat_main_t * vam) { - vl_api_sw_interface_tap_dump_t *mp; + vl_api_sw_interface_tap_v2_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; - print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index"); + print (vam->ofp, + "\n%-16s %-12s %-5s %-12s %-12s %-14s %-30s %-20s %-20s %-30s", + "dev_name", "sw_if_index", "id", "rx_ring_sz", "tx_ring_sz", + "host_mac_addr", "host_namespace", "host_bridge", "host_ip4_addr", + "host_ip6_addr"); + /* Get list of tap interfaces */ - M (SW_INTERFACE_TAP_DUMP, mp); + M (SW_INTERFACE_TAP_V2_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 void vl_api_sw_interface_virtio_pci_details_t_handler + (vl_api_sw_interface_virtio_pci_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + typedef union + { + struct + { + u16 domain; + u8 bus; + u8 slot:5; + u8 function:3; + }; + u32 as_u32; + } pci_addr_t; + pci_addr_t addr; + addr.as_u32 = ntohl (mp->pci_addr); + u8 *pci_addr = format (0, "%04x:%02x:%02x.%x", addr.domain, addr.bus, + addr.slot, addr.function); + + print (vam->ofp, + "\n%-12s %-12d %-12d %-12d %-17U 0x%-08llx", + pci_addr, ntohl (mp->sw_if_index), + ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), + format_ethernet_address, mp->mac_addr, + clib_net_to_host_u64 (mp->features)); + vec_free (pci_addr); +} + +static void vl_api_sw_interface_virtio_pci_details_t_handler_json + (vl_api_sw_interface_virtio_pci_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "pci-addr", ntohl (mp->pci_addr)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); + vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); + vat_json_object_add_uint (node, "features", + clib_net_to_host_u64 (mp->features)); + vat_json_object_add_string_copy (node, "mac_addr", + format (0, "%U", format_ethernet_address, + &mp->mac_addr)); +} + +static int +api_sw_interface_virtio_pci_dump (vat_main_t * vam) +{ + vl_api_sw_interface_virtio_pci_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + print (vam->ofp, + "\n%-12s %-12s %-12s %-12s %-17s %-08s", + "pci_addr", "sw_if_index", "rx_ring_sz", "tx_ring_sz", + "mac_addr", "features"); + + /* Get list of tap interfaces */ + M (SW_INTERFACE_VIRTIO_PCI_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_vxlan_offload_rx (vat_main_t * vam) +{ + unformat_input_t *line_input = vam->input; + vl_api_vxlan_offload_rx_t *mp; + u32 hw_if_index = ~0, rx_if_index = ~0; + u8 is_add = 1; + int ret; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "hw %U", api_unformat_hw_if_index, vam, + &hw_if_index)) + ; + else if (unformat (line_input, "hw hw_if_index %u", &hw_if_index)) + ; + else if (unformat (line_input, "rx %U", api_unformat_sw_if_index, vam, + &rx_if_index)) + ; + else if (unformat (line_input, "rx sw_if_index %u", &rx_if_index)) + ; + else + { + errmsg ("parse error '%U'", format_unformat_error, line_input); + return -99; + } + } + + if (hw_if_index == ~0) + { + errmsg ("no hw interface"); + return -99; + } + + if (rx_if_index == ~0) + { + errmsg ("no rx tunnel"); + return -99; + } + + M (VXLAN_OFFLOAD_RX, mp); + + mp->hw_if_index = ntohl (hw_if_index); + mp->sw_if_index = ntohl (rx_if_index); + mp->enable = is_add; + + S (mp); + W (ret); + return ret; +} + static uword unformat_vxlan_decap_next (unformat_input_t * input, va_list * args) { @@ -11260,6 +12028,7 @@ api_vxlan_add_del_tunnel (vat_main_t * vam) u8 src_set = 0; u8 dst_set = 0; u8 grp_set = 0; + u32 instance = ~0; u32 mcast_sw_if_index = ~0; u32 encap_vrf_id = 0; u32 decap_next_index = ~0; @@ -11267,13 +12036,15 @@ api_vxlan_add_del_tunnel (vat_main_t * vam) int ret; /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ - memset (&src, 0, sizeof src); - memset (&dst, 0, sizeof dst); + clib_memset (&src, 0, sizeof src); + clib_memset (&dst, 0, sizeof dst); while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { if (unformat (line_input, "del")) is_add = 0; + else if (unformat (line_input, "instance %d", &instance)) + ; else if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) { @@ -11393,6 +12164,8 @@ api_vxlan_add_del_tunnel (vat_main_t * vam) clib_memcpy (mp->src_address, &src.ip4, sizeof (src.ip4)); clib_memcpy (mp->dst_address, &dst.ip4, sizeof (dst.ip4)); } + + mp->instance = htonl (instance); 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); @@ -11412,8 +12185,9 @@ static void vl_api_vxlan_tunnel_details_t_handler ip46_address_t src = to_ip46 (mp->is_ipv6, mp->dst_address); ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->src_address); - print (vam->ofp, "%11d%24U%24U%14d%18d%13d%19d", + print (vam->ofp, "%11d%11d%24U%24U%14d%18d%13d%19d", ntohl (mp->sw_if_index), + ntohl (mp->instance), format_ip46_address, &src, IP46_TYPE_ANY, format_ip46_address, &dst, IP46_TYPE_ANY, ntohl (mp->encap_vrf_id), @@ -11436,6 +12210,9 @@ static void vl_api_vxlan_tunnel_details_t_handler_json 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, "instance", ntohl (mp->instance)); + if (mp->is_ipv6) { struct in6_addr ip6; @@ -11489,8 +12266,8 @@ 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", + print (vam->ofp, "%11s%11s%24s%24s%14s%18s%13s%19s", + "sw_if_index", "instance", "src_address", "dst_address", "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); } @@ -11502,62 +12279,113 @@ api_vxlan_tunnel_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); return ret; } +static uword unformat_geneve_decap_next + (unformat_input_t * input, va_list * args) +{ + u32 *result = va_arg (*args, u32 *); + u32 tmp; + + if (unformat (input, "l2")) + *result = GENEVE_INPUT_NEXT_L2_INPUT; + else if (unformat (input, "%d", &tmp)) + *result = tmp; + else + return 0; + return 1; +} + static int -api_gre_add_del_tunnel (vat_main_t * vam) +api_geneve_add_del_tunnel (vat_main_t * vam) { unformat_input_t *line_input = vam->input; - vl_api_gre_add_del_tunnel_t *mp; - ip4_address_t src4, dst4; - ip6_address_t src6, dst6; + vl_api_geneve_add_del_tunnel_t *mp; + ip46_address_t src, dst; u8 is_add = 1; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - u8 teb = 0; + u8 ipv4_set = 0, ipv6_set = 0; u8 src_set = 0; u8 dst_set = 0; - u32 outer_fib_id = 0; + u8 grp_set = 0; + u32 mcast_sw_if_index = ~0; + u32 encap_vrf_id = 0; + u32 decap_next_index = ~0; + u32 vni = 0; int ret; - memset (&src4, 0, sizeof src4); - memset (&dst4, 0, sizeof dst4); - memset (&src6, 0, sizeof src6); - memset (&dst6, 0, sizeof dst6); + /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ + clib_memset (&src, 0, sizeof src); + clib_memset (&dst, 0, sizeof dst); while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { if (unformat (line_input, "del")) is_add = 0; - else if (unformat (line_input, "src %U", unformat_ip4_address, &src4)) + else + if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) { + 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_ip4_address, &dst4)) + 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, "src %U", unformat_ip6_address, &src6)) + else if (unformat (line_input, "group %U", + unformat_ip4_address, &dst.ip4)) { - src_set = 1; + 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, "dst %U", unformat_ip6_address, &dst6)) + else if (unformat (line_input, "group %U", + unformat_ip6_address, &dst.ip6)) { - dst_set = 1; + grp_set = dst_set = 1; ipv6_set = 1; } - else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id)) + else + if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + ; + else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + ; + else if (unformat (line_input, "decap-next %U", + unformat_geneve_decap_next, &decap_next_index)) + ; + else if (unformat (line_input, "vni %d", &vni)) ; - else if (unformat (line_input, "teb")) - teb = 1; else { errmsg ("parse error '%U'", format_unformat_error, line_input); @@ -11575,28 +12403,53 @@ api_gre_add_del_tunnel (vat_main_t * vam) errmsg ("tunnel dst address not specified"); return -99; } + + if (grp_set && !ip46_address_is_multicast (&dst)) + { + errmsg ("tunnel group address not multicast"); + return -99; + } + if (grp_set && mcast_sw_if_index == ~0) + { + errmsg ("tunnel nonexistent multicast device"); + return -99; + } + if (grp_set == 0 && ip46_address_is_multicast (&dst)) + { + errmsg ("tunnel dst address must be unicast"); + return -99; + } + + if (ipv4_set && ipv6_set) { errmsg ("both IPv4 and IPv6 addresses specified"); return -99; } + if ((vni == 0) || (vni >> 24)) + { + errmsg ("vni not specified or out of range"); + return -99; + } - M (GRE_ADD_DEL_TUNNEL, mp); + M (GENEVE_ADD_DEL_TUNNEL, mp); - if (ipv4_set) + if (ipv6_set) { - clib_memcpy (&mp->src_address, &src4, 4); - clib_memcpy (&mp->dst_address, &dst4, 4); + 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, &src6, 16); - clib_memcpy (&mp->dst_address, &dst6, 16); + clib_memcpy (mp->local_address, &src.ip4, sizeof (src.ip4)); + clib_memcpy (mp->remote_address, &dst.ip4, sizeof (dst.ip4)); } - mp->outer_fib_id = ntohl (outer_fib_id); + 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->teb = teb; mp->is_ipv6 = ipv6_set; S (mp); @@ -11604,27 +12457,27 @@ api_gre_add_del_tunnel (vat_main_t * vam) return ret; } -static void vl_api_gre_tunnel_details_t_handler - (vl_api_gre_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->src_address); - ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->dst_address); + ip46_address_t src = to_ip46 (mp->is_ipv6, mp->dst_address); + ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->src_address); - print (vam->ofp, "%11d%24U%24U%6d%14d", + 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, - mp->teb, ntohl (mp->outer_fib_id)); + ntohl (mp->encap_vrf_id), + ntohl (mp->decap_next_index), ntohl (mp->vni), + ntohl (mp->mcast_sw_if_index)); } -static void vl_api_gre_tunnel_details_t_handler_json - (vl_api_gre_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; - struct in_addr ip4; - struct in6_addr ip6; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -11635,23 +12488,190 @@ static void vl_api_gre_tunnel_details_t_handler_json vat_json_init_object (node); vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - if (!mp->is_ipv6) + if (mp->is_ipv6) + { + struct in6_addr ip6; + + clib_memcpy (&ip6, mp->src_address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "src_address", ip6); + clib_memcpy (&ip6, mp->dst_address, sizeof (ip6)); + vat_json_object_add_ip6 (node, "dst_address", ip6); + } + else { - clib_memcpy (&ip4, &mp->src_address, sizeof (ip4)); + struct in_addr ip4; + + clib_memcpy (&ip4, mp->src_address, sizeof (ip4)); vat_json_object_add_ip4 (node, "src_address", ip4); - clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4)); + clib_memcpy (&ip4, mp->dst_address, sizeof (ip4)); vat_json_object_add_ip4 (node, "dst_address", ip4); } - else + vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); + vat_json_object_add_uint (node, "decap_next_index", + ntohl (mp->decap_next_index)); + vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); + vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); + vat_json_object_add_uint (node, "mcast_sw_if_index", + ntohl (mp->mcast_sw_if_index)); +} + +static int +api_geneve_tunnel_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_geneve_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index; + u8 sw_if_index_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - 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); + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + sw_if_index = ~0; + } + + if (!vam->json_output) + { + print (vam->ofp, "%11s%24s%24s%14s%18s%13s%19s", + "sw_if_index", "local_address", "remote_address", + "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); + } + + /* Get list of geneve-tunnel interfaces */ + M (GENEVE_TUNNEL_DUMP, mp); + + mp->sw_if_index = htonl (sw_if_index); + + S (mp); + + /* Use a control ping for synchronization */ + M (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static int +api_gre_tunnel_add_del (vat_main_t * vam) +{ + unformat_input_t *line_input = vam->input; + vl_api_address_t src = { }, dst = + { + }; + vl_api_gre_tunnel_add_del_t *mp; + vl_api_gre_tunnel_type_t t_type; + u8 is_add = 1; + u8 src_set = 0; + u8 dst_set = 0; + u32 outer_fib_id = 0; + u32 session_id = 0; + u32 instance = ~0; + int ret; + + t_type = GRE_API_TUNNEL_TYPE_L3; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "instance %d", &instance)) + ; + else if (unformat (line_input, "src %U", unformat_vl_api_address, &src)) + { + src_set = 1; + } + else if (unformat (line_input, "dst %U", unformat_vl_api_address, &dst)) + { + dst_set = 1; + } + else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id)) + ; + else if (unformat (line_input, "teb")) + t_type = GRE_API_TUNNEL_TYPE_TEB; + else if (unformat (line_input, "erspan %d", &session_id)) + t_type = GRE_API_TUNNEL_TYPE_ERSPAN; + else + { + errmsg ("parse error '%U'", format_unformat_error, line_input); + return -99; + } + } + + if (src_set == 0) + { + errmsg ("tunnel src address not specified"); + return -99; + } + if (dst_set == 0) + { + errmsg ("tunnel dst address not specified"); + return -99; + } + + M (GRE_TUNNEL_ADD_DEL, mp); + + clib_memcpy (&mp->tunnel.src, &src, sizeof (mp->tunnel.src)); + clib_memcpy (&mp->tunnel.dst, &dst, sizeof (mp->tunnel.dst)); + + mp->tunnel.instance = htonl (instance); + mp->tunnel.outer_fib_id = htonl (outer_fib_id); + mp->is_add = is_add; + mp->tunnel.session_id = htons ((u16) session_id); + mp->tunnel.type = htonl (t_type); + + S (mp); + W (ret); + return ret; +} + +static void vl_api_gre_tunnel_details_t_handler + (vl_api_gre_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%11d%11d%24U%24U%13d%14d%12d", + ntohl (mp->tunnel.sw_if_index), + ntohl (mp->tunnel.instance), + format_vl_api_address, &mp->tunnel.src, + format_vl_api_address, &mp->tunnel.dst, + mp->tunnel.type, ntohl (mp->tunnel.outer_fib_id), + ntohl (mp->tunnel.session_id)); +} + +static void vl_api_gre_tunnel_details_t_handler_json + (vl_api_gre_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } - vat_json_object_add_uint (node, "teb", mp->teb); - vat_json_object_add_uint (node, "outer_fib_id", ntohl (mp->outer_fib_id)); - vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6); + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", + ntohl (mp->tunnel.sw_if_index)); + vat_json_object_add_uint (node, "instance", ntohl (mp->tunnel.instance)); + + vat_json_object_add_address (node, "src", &mp->tunnel.src); + vat_json_object_add_address (node, "dst", &mp->tunnel.dst); + vat_json_object_add_uint (node, "tunnel_type", mp->tunnel.type); + vat_json_object_add_uint (node, "outer_fib_id", + ntohl (mp->tunnel.outer_fib_id)); + vat_json_object_add_uint (node, "session_id", mp->tunnel.session_id); } static int @@ -11680,9 +12700,9 @@ api_gre_tunnel_dump (vat_main_t * vam) if (!vam->json_output) { - print (vam->ofp, "%11s%24s%24s%6s%14s", - "sw_if_index", "src_address", "dst_address", "teb", - "outer_fib_id"); + print (vam->ofp, "%11s%11s%24s%24s%13s%14s%12s", + "sw_if_index", "instance", "src_address", "dst_address", + "tunnel_type", "outer_fib_id", "session_id"); } /* Get list of gre-tunnel interfaces */ @@ -11693,7 +12713,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); @@ -11835,11 +12855,14 @@ api_create_vhost_user_if (vat_main_t * vam) u32 custom_dev_instance = ~0; u8 hwaddr[6]; u8 use_custom_mac = 0; + u8 disable_mrg_rxbuf = 0; + u8 disable_indirect_desc = 0; u8 *tag = 0; + u8 enable_gso = 0; int ret; /* Shut up coverity */ - memset (hwaddr, 0, sizeof (hwaddr)); + clib_memset (hwaddr, 0, sizeof (hwaddr)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -11853,6 +12876,12 @@ api_create_vhost_user_if (vat_main_t * vam) use_custom_mac = 1; else if (unformat (i, "server")) is_server = 1; + else if (unformat (i, "disable_mrg_rxbuf")) + disable_mrg_rxbuf = 1; + else if (unformat (i, "disable_indirect_desc")) + disable_indirect_desc = 1; + else if (unformat (i, "gso")) + enable_gso = 1; else if (unformat (i, "tag %s", &tag)) ; else @@ -11875,6 +12904,9 @@ api_create_vhost_user_if (vat_main_t * vam) M (CREATE_VHOST_USER_IF, mp); mp->is_server = is_server; + mp->disable_mrg_rxbuf = disable_mrg_rxbuf; + mp->disable_indirect_desc = disable_indirect_desc; + mp->enable_gso = enable_gso; clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); vec_free (file_name); if (custom_dev_instance != ~0) @@ -11882,6 +12914,7 @@ api_create_vhost_user_if (vat_main_t * vam) mp->renumber = 1; mp->custom_dev_instance = ntohl (custom_dev_instance); } + mp->use_custom_mac = use_custom_mac; clib_memcpy (mp->mac_address, hwaddr, 6); if (tag) @@ -11904,6 +12937,7 @@ api_modify_vhost_user_if (vat_main_t * vam) u32 custom_dev_instance = ~0; u8 sw_if_index_set = 0; u32 sw_if_index = (u32) ~ 0; + u8 enable_gso = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) @@ -11920,6 +12954,8 @@ api_modify_vhost_user_if (vat_main_t * vam) ; else if (unformat (i, "server")) is_server = 1; + else if (unformat (i, "gso")) + enable_gso = 1; else break; } @@ -11947,6 +12983,7 @@ api_modify_vhost_user_if (vat_main_t * vam) mp->sw_if_index = ntohl (sw_if_index); mp->is_server = is_server; + mp->enable_gso = enable_gso; clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); vec_free (file_name); if (custom_dev_instance != ~0) @@ -12049,7 +13086,7 @@ api_sw_interface_vhost_user_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -12091,10 +13128,10 @@ api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) 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); + clib_memset (&local4, 0, sizeof local4); + clib_memset (&remote4, 0, sizeof remote4); + clib_memset (&local6, 0, sizeof local6); + clib_memset (&remote6, 0, sizeof remote6); while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { @@ -12309,947 +13346,143 @@ api_vxlan_gpe_tunnel_dump (vat_main_t * vam) sw_if_index = ~0; } - if (!vam->json_output) - { - print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s", - "sw_if_index", "local", "remote", "vni", - "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id"); - } - - /* Get list of vxlan-tunnel interfaces */ - M (VXLAN_GPE_TUNNEL_DUMP, mp); - - mp->sw_if_index = htonl (sw_if_index); - - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - - -u8 * -format_l2_fib_mac_address (u8 * s, va_list * args) -{ - u8 *a = va_arg (*args, u8 *); - - return format (s, "%02x:%02x:%02x:%02x:%02x:%02x", - a[2], a[3], a[4], a[5], a[6], a[7]); -} - -static void vl_api_l2_fib_table_details_t_handler - (vl_api_l2_fib_table_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32 - " %d %d %d", - ntohl (mp->bd_id), format_l2_fib_mac_address, &mp->mac, - ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac, - mp->bvi_mac); -} - -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; - - 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, "bd_id", ntohl (mp->bd_id)); - vat_json_object_add_uint (node, "mac", clib_net_to_host_u64 (mp->mac)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "static_mac", mp->static_mac); - vat_json_object_add_uint (node, "filter_mac", mp->filter_mac); - vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac); -} - -static int -api_l2_fib_table_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2_fib_table_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 bd_id; - u8 bd_id_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; - else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - - print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI"); - - /* Get list of l2 fib entries */ - M (L2_FIB_TABLE_DUMP, mp); - - mp->bd_id = ntohl (bd_id); - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - - -static int -api_interface_name_renumber (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_interface_name_renumber_t *mp; - u32 sw_if_index = ~0; - u32 new_show_dev_instance = ~0; - int ret; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "%U", api_unformat_sw_if_index, vam, - &sw_if_index)) - ; - else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (line_input, "new_show_dev_instance %d", - &new_show_dev_instance)) - ; - else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (new_show_dev_instance == ~0) - { - errmsg ("missing new_show_dev_instance"); - return -99; - } - - M (INTERFACE_NAME_RENUMBER, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->new_show_dev_instance = ntohl (new_show_dev_instance); - - S (mp); - W (ret); - return ret; -} - -static int -api_want_ip4_arp_events (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_want_ip4_arp_events_t *mp; - ip4_address_t address; - int address_set = 0; - u32 enable_disable = 1; - int ret; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "address %U", unformat_ip4_address, &address)) - address_set = 1; - else if (unformat (line_input, "del")) - enable_disable = 0; - else - break; - } - - if (address_set == 0) - { - errmsg ("missing addresses"); - return -99; - } - - M (WANT_IP4_ARP_EVENTS, mp); - mp->enable_disable = enable_disable; - mp->pid = htonl (getpid ()); - mp->address = address.as_u32; - - S (mp); - W (ret); - return ret; -} - -static int -api_want_ip6_nd_events (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_want_ip6_nd_events_t *mp; - ip6_address_t address; - int address_set = 0; - u32 enable_disable = 1; - int ret; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "address %U", unformat_ip6_address, &address)) - address_set = 1; - else if (unformat (line_input, "del")) - enable_disable = 0; - else - break; - } - - if (address_set == 0) - { - errmsg ("missing addresses"); - return -99; - } - - M (WANT_IP6_ND_EVENTS, mp); - mp->enable_disable = enable_disable; - mp->pid = htonl (getpid ()); - clib_memcpy (mp->address, &address, sizeof (ip6_address_t)); - - S (mp); - W (ret); - return ret; -} - -static int -api_input_acl_set_interface (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_input_acl_set_interface_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 l2_table_index = ~0; - u8 is_add = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "l2-table %d", &l2_table_index)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (INPUT_ACL_SET_INTERFACE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->l2_table_index = ntohl (l2_table_index); - mp->is_add = is_add; - - S (mp); - W (ret); - return ret; -} - -static int -api_ip_address_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_address_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - int ret; - - 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 - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "ipv4")) - ipv4_set = 1; - else if (unformat (i, "ipv6")) - ipv6_set = 1; - else - break; - } - - if (ipv4_set && ipv6_set) - { - errmsg ("ipv4 and ipv6 flags cannot be both set"); - return -99; - } - - if ((!ipv4_set) && (!ipv6_set)) - { - errmsg ("no ipv4 nor ipv6 flag set"); - return -99; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - vam->current_sw_if_index = sw_if_index; - vam->is_ipv6 = ipv6_set; - - M (IP_ADDRESS_DUMP, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_ipv6 = ipv6_set; - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_ip_dump (vat_main_t * vam) -{ - vl_api_ip_dump_t *mp; - vl_api_control_ping_t *mp_ping; - unformat_input_t *in = vam->input; - int ipv4_set = 0; - int ipv6_set = 0; - int is_ipv6; - int i; - int ret; - - while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) - { - if (unformat (in, "ipv4")) - ipv4_set = 1; - else if (unformat (in, "ipv6")) - ipv6_set = 1; - else - break; - } - - if (ipv4_set && ipv6_set) - { - errmsg ("ipv4 and ipv6 flags cannot be both set"); - return -99; - } - - if ((!ipv4_set) && (!ipv6_set)) - { - errmsg ("no ipv4 nor ipv6 flag set"); - return -99; - } - - is_ipv6 = ipv6_set; - vam->is_ipv6 = is_ipv6; - - /* free old data */ - for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++) - { - vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr); - } - vec_free (vam->ip_details_by_sw_if_index[is_ipv6]); - - M (IP_DUMP, mp); - mp->is_ipv6 = ipv6_set; - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_ipsec_spd_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_spd_add_del_t *mp; - u32 spd_id = ~0; - u8 is_add = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "spd_id %d", &spd_id)) - ; - else if (unformat (i, "del")) - is_add = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - if (spd_id == ~0) - { - errmsg ("spd_id must be set"); - return -99; - } - - M (IPSEC_SPD_ADD_DEL, mp); - - mp->spd_id = ntohl (spd_id); - mp->is_add = is_add; - - S (mp); - W (ret); - return ret; -} - -static int -api_ipsec_interface_add_del_spd (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_interface_add_del_spd_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u32 spd_id = (u32) ~ 0; - u8 is_add = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "spd_id %d", &spd_id)) - ; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - - } - - if (spd_id == (u32) ~ 0) - { - errmsg ("spd_id must be set"); - return -99; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (IPSEC_INTERFACE_ADD_DEL_SPD, mp); - - mp->spd_id = ntohl (spd_id); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = is_add; - - S (mp); - W (ret); - return ret; -} - -static int -api_ipsec_spd_add_del_entry (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_spd_add_del_entry_t *mp; - u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1; - u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0; - i32 priority = 0; - u32 rport_start = 0, rport_stop = (u32) ~ 0; - u32 lport_start = 0, lport_stop = (u32) ~ 0; - ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop; - ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop; - int ret; - - laddr4_start.as_u32 = raddr4_start.as_u32 = 0; - laddr4_stop.as_u32 = raddr4_stop.as_u32 = (u32) ~ 0; - laddr6_start.as_u64[0] = raddr6_start.as_u64[0] = 0; - laddr6_start.as_u64[1] = raddr6_start.as_u64[1] = 0; - laddr6_stop.as_u64[0] = raddr6_stop.as_u64[0] = (u64) ~ 0; - laddr6_stop.as_u64[1] = raddr6_stop.as_u64[1] = (u64) ~ 0; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del")) - is_add = 0; - if (unformat (i, "outbound")) - is_outbound = 1; - if (unformat (i, "inbound")) - is_outbound = 0; - else if (unformat (i, "spd_id %d", &spd_id)) - ; - else if (unformat (i, "sa_id %d", &sa_id)) - ; - else if (unformat (i, "priority %d", &priority)) - ; - else if (unformat (i, "protocol %d", &protocol)) - ; - else if (unformat (i, "lport_start %d", &lport_start)) - ; - else if (unformat (i, "lport_stop %d", &lport_stop)) - ; - else if (unformat (i, "rport_start %d", &rport_start)) - ; - else if (unformat (i, "rport_stop %d", &rport_stop)) - ; - else - if (unformat - (i, "laddr_start %U", unformat_ip4_address, &laddr4_start)) - { - is_ipv6 = 0; - is_ip_any = 0; - } - else - if (unformat (i, "laddr_stop %U", unformat_ip4_address, &laddr4_stop)) - { - is_ipv6 = 0; - is_ip_any = 0; - } - else - if (unformat - (i, "raddr_start %U", unformat_ip4_address, &raddr4_start)) - { - is_ipv6 = 0; - is_ip_any = 0; - } - else - if (unformat (i, "raddr_stop %U", unformat_ip4_address, &raddr4_stop)) - { - is_ipv6 = 0; - is_ip_any = 0; - } - else - if (unformat - (i, "laddr_start %U", unformat_ip6_address, &laddr6_start)) - { - is_ipv6 = 1; - is_ip_any = 0; - } - else - if (unformat (i, "laddr_stop %U", unformat_ip6_address, &laddr6_stop)) - { - is_ipv6 = 1; - is_ip_any = 0; - } - else - if (unformat - (i, "raddr_start %U", unformat_ip6_address, &raddr6_start)) - { - is_ipv6 = 1; - is_ip_any = 0; - } - else - if (unformat (i, "raddr_stop %U", unformat_ip6_address, &raddr6_stop)) - { - is_ipv6 = 1; - is_ip_any = 0; - } - else - if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy)) - { - if (policy == IPSEC_POLICY_ACTION_RESOLVE) - { - clib_warning ("unsupported action: 'resolve'"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - - } - - M (IPSEC_SPD_ADD_DEL_ENTRY, mp); - - mp->spd_id = ntohl (spd_id); - mp->priority = ntohl (priority); - mp->is_outbound = is_outbound; - - mp->is_ipv6 = is_ipv6; - if (is_ipv6 || is_ip_any) - { - clib_memcpy (mp->remote_address_start, &raddr6_start, - sizeof (ip6_address_t)); - clib_memcpy (mp->remote_address_stop, &raddr6_stop, - sizeof (ip6_address_t)); - clib_memcpy (mp->local_address_start, &laddr6_start, - sizeof (ip6_address_t)); - clib_memcpy (mp->local_address_stop, &laddr6_stop, - sizeof (ip6_address_t)); - } - else - { - clib_memcpy (mp->remote_address_start, &raddr4_start, - sizeof (ip4_address_t)); - clib_memcpy (mp->remote_address_stop, &raddr4_stop, - sizeof (ip4_address_t)); - clib_memcpy (mp->local_address_start, &laddr4_start, - sizeof (ip4_address_t)); - clib_memcpy (mp->local_address_stop, &laddr4_stop, - sizeof (ip4_address_t)); - } - mp->protocol = (u8) protocol; - mp->local_port_start = ntohs ((u16) lport_start); - mp->local_port_stop = ntohs ((u16) lport_stop); - mp->remote_port_start = ntohs ((u16) rport_start); - mp->remote_port_stop = ntohs ((u16) rport_stop); - mp->policy = (u8) policy; - mp->sa_id = ntohl (sa_id); - mp->is_add = is_add; - mp->is_ip_any = is_ip_any; - S (mp); - W (ret); - return ret; -} - -static int -api_ipsec_sad_add_del_entry (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_sad_add_del_entry_t *mp; - u32 sad_id = 0, spi = 0; - u8 *ck = 0, *ik = 0; - u8 is_add = 1; - - u8 protocol = IPSEC_PROTOCOL_AH; - u8 is_tunnel = 0, is_tunnel_ipv6 = 0; - u32 crypto_alg = 0, integ_alg = 0; - ip4_address_t tun_src4; - ip4_address_t tun_dst4; - ip6_address_t tun_src6; - ip6_address_t tun_dst6; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "sad_id %d", &sad_id)) - ; - else if (unformat (i, "spi %d", &spi)) - ; - else if (unformat (i, "esp")) - protocol = IPSEC_PROTOCOL_ESP; - else if (unformat (i, "tunnel_src %U", unformat_ip4_address, &tun_src4)) - { - is_tunnel = 1; - is_tunnel_ipv6 = 0; - } - else if (unformat (i, "tunnel_dst %U", unformat_ip4_address, &tun_dst4)) - { - is_tunnel = 1; - is_tunnel_ipv6 = 0; - } - else if (unformat (i, "tunnel_src %U", unformat_ip6_address, &tun_src6)) - { - is_tunnel = 1; - is_tunnel_ipv6 = 1; - } - else if (unformat (i, "tunnel_dst %U", unformat_ip6_address, &tun_dst6)) - { - is_tunnel = 1; - is_tunnel_ipv6 = 1; - } - else - if (unformat - (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg)) - { - if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 || - crypto_alg >= IPSEC_CRYPTO_N_ALG) - { - clib_warning ("unsupported crypto-alg: '%U'", - format_ipsec_crypto_alg, crypto_alg); - return -99; - } - } - else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck)) - ; - else - if (unformat - (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg)) - { - if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 || - integ_alg >= IPSEC_INTEG_N_ALG) - { - clib_warning ("unsupported integ-alg: '%U'", - format_ipsec_integ_alg, integ_alg); - return -99; - } - } - else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - + if (!vam->json_output) + { + print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s", + "sw_if_index", "local", "remote", "vni", + "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id"); } - M (IPSEC_SAD_ADD_DEL_ENTRY, mp); + /* Get list of vxlan-tunnel interfaces */ + M (VXLAN_GPE_TUNNEL_DUMP, mp); - mp->sad_id = ntohl (sad_id); - mp->is_add = is_add; - mp->protocol = protocol; - mp->spi = ntohl (spi); - mp->is_tunnel = is_tunnel; - mp->is_tunnel_ipv6 = is_tunnel_ipv6; - mp->crypto_algorithm = crypto_alg; - mp->integrity_algorithm = integ_alg; - mp->crypto_key_length = vec_len (ck); - mp->integrity_key_length = vec_len (ik); + mp->sw_if_index = htonl (sw_if_index); - if (mp->crypto_key_length > sizeof (mp->crypto_key)) - mp->crypto_key_length = sizeof (mp->crypto_key); + S (mp); - if (mp->integrity_key_length > sizeof (mp->integrity_key)) - mp->integrity_key_length = sizeof (mp->integrity_key); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - if (ck) - clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length); - if (ik) - clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length); + W (ret); + return ret; +} + +static void vl_api_l2_fib_table_details_t_handler + (vl_api_l2_fib_table_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32 + " %d %d %d", + ntohl (mp->bd_id), format_ethernet_address, mp->mac, + ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac, + mp->bvi_mac); +} + +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; - if (is_tunnel) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - if (is_tunnel_ipv6) - { - clib_memcpy (mp->tunnel_src_address, &tun_src6, - sizeof (ip6_address_t)); - clib_memcpy (mp->tunnel_dst_address, &tun_dst6, - sizeof (ip6_address_t)); - } - else - { - clib_memcpy (mp->tunnel_src_address, &tun_src4, - sizeof (ip4_address_t)); - clib_memcpy (mp->tunnel_dst_address, &tun_dst4, - sizeof (ip4_address_t)); - } + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - S (mp); - W (ret); - return ret; + vat_json_init_object (node); + vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id)); + vat_json_object_add_bytes (node, "mac", mp->mac, 6); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "static_mac", mp->static_mac); + vat_json_object_add_uint (node, "filter_mac", mp->filter_mac); + vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac); } static int -api_ipsec_sa_set_key (vat_main_t * vam) +api_l2_fib_table_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipsec_sa_set_key_t *mp; - u32 sa_id; - u8 *ck = 0, *ik = 0; + vl_api_l2_fib_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 bd_id; + u8 bd_id_set = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sa_id %d", &sa_id)) - ; - else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck)) - ; - else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) - ; + if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - M (IPSEC_SA_SET_KEY, mp); + if (bd_id_set == 0) + { + errmsg ("missing bridge domain"); + return -99; + } - mp->sa_id = ntohl (sa_id); - mp->crypto_key_length = vec_len (ck); - mp->integrity_key_length = vec_len (ik); + print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI"); - if (mp->crypto_key_length > sizeof (mp->crypto_key)) - mp->crypto_key_length = sizeof (mp->crypto_key); + /* Get list of l2 fib entries */ + M (L2_FIB_TABLE_DUMP, mp); - if (mp->integrity_key_length > sizeof (mp->integrity_key)) - mp->integrity_key_length = sizeof (mp->integrity_key); + mp->bd_id = ntohl (bd_id); + S (mp); - if (ck) - clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length); - if (ik) - clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); W (ret); return ret; } + static int -api_ipsec_tunnel_if_add_del (vat_main_t * vam) +api_interface_name_renumber (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_ipsec_tunnel_if_add_del_t *mp; - u32 local_spi = 0, remote_spi = 0; - u32 crypto_alg = 0, integ_alg = 0; - u8 *lck = NULL, *rck = NULL; - u8 *lik = NULL, *rik = NULL; - ip4_address_t local_ip = { {0} }; - ip4_address_t remote_ip = { {0} }; - u8 is_add = 1; - u8 esn = 0; - u8 anti_replay = 0; + unformat_input_t *line_input = vam->input; + vl_api_interface_name_renumber_t *mp; + u32 sw_if_index = ~0; + u32 new_show_dev_instance = ~0; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "esn")) - esn = 1; - else if (unformat (i, "anti_replay")) - anti_replay = 1; - else if (unformat (i, "local_spi %d", &local_spi)) - ; - else if (unformat (i, "remote_spi %d", &remote_spi)) - ; - else if (unformat (i, "local_ip %U", unformat_ip4_address, &local_ip)) - ; - else if (unformat (i, "remote_ip %U", unformat_ip4_address, &remote_ip)) - ; - else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck)) - ; - else - if (unformat (i, "remote_crypto_key %U", unformat_hex_string, &rck)) + if (unformat (line_input, "%U", api_unformat_sw_if_index, vam, + &sw_if_index)) ; - else if (unformat (i, "local_integ_key %U", unformat_hex_string, &lik)) + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) ; - else if (unformat (i, "remote_integ_key %U", unformat_hex_string, &rik)) + else if (unformat (line_input, "new_show_dev_instance %d", + &new_show_dev_instance)) ; else - if (unformat - (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg)) - { - if (crypto_alg < IPSEC_CRYPTO_ALG_AES_CBC_128 || - crypto_alg >= IPSEC_CRYPTO_N_ALG) - { - errmsg ("unsupported crypto-alg: '%U'\n", - format_ipsec_crypto_alg, crypto_alg); - return -99; - } - } - else - if (unformat - (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg)) - { - if (integ_alg < IPSEC_INTEG_ALG_SHA1_96 || - integ_alg >= IPSEC_INTEG_N_ALG) - { - errmsg ("unsupported integ-alg: '%U'\n", - format_ipsec_integ_alg, integ_alg); - return -99; - } - } - else - { - errmsg ("parse error '%U'\n", format_unformat_error, i); - return -99; - } + break; } - M (IPSEC_TUNNEL_IF_ADD_DEL, mp); - - mp->is_add = is_add; - mp->esn = esn; - mp->anti_replay = anti_replay; - - clib_memcpy (mp->local_ip, &local_ip, sizeof (ip4_address_t)); - clib_memcpy (mp->remote_ip, &remote_ip, sizeof (ip4_address_t)); - - mp->local_spi = htonl (local_spi); - mp->remote_spi = htonl (remote_spi); - mp->crypto_alg = (u8) crypto_alg; - - mp->local_crypto_key_len = 0; - if (lck) + if (sw_if_index == ~0) { - mp->local_crypto_key_len = vec_len (lck); - if (mp->local_crypto_key_len > sizeof (mp->local_crypto_key)) - mp->local_crypto_key_len = sizeof (mp->local_crypto_key); - clib_memcpy (mp->local_crypto_key, lck, mp->local_crypto_key_len); + errmsg ("missing interface name or sw_if_index"); + return -99; } - mp->remote_crypto_key_len = 0; - if (rck) + if (new_show_dev_instance == ~0) { - 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); + errmsg ("missing new_show_dev_instance"); + return -99; } - 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); - } + M (INTERFACE_NAME_RENUMBER, mp); - 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); - } + mp->sw_if_index = ntohl (sw_if_index); + mp->new_show_dev_instance = ntohl (new_show_dev_instance); S (mp); W (ret); @@ -13257,46 +13490,44 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) } static int -api_ikev2_profile_add_del (vat_main_t * vam) +api_ip_probe_neighbor (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_profile_add_del_t *mp; - u8 is_add = 1; - u8 *name = 0; + vl_api_ip_probe_neighbor_t *mp; + vl_api_address_t dst_adr = { }; + u8 int_set = 0; + u8 adr_set = 0; + u32 sw_if_index; int ret; - const char *valid_chars = "a-zA-Z0-9_"; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "name %U", unformat_token, valid_chars, &name)) - vec_add1 (name, 0); + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + int_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + int_set = 1; + else if (unformat (i, "address %U", unformat_vl_api_address, &dst_adr)) + adr_set = 1; else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (!vec_len (name)) + if (int_set == 0) { - errmsg ("profile name must be specified"); + errmsg ("missing interface"); return -99; } - if (vec_len (name) > 64) + if (adr_set == 0) { - errmsg ("profile name too long"); + errmsg ("missing addresses"); return -99; } - M (IKEV2_PROFILE_ADD_DEL, mp); + M (IP_PROBE_NEIGHBOR, mp); - clib_memcpy (mp->name, name, vec_len (name)); - mp->is_add = is_add; - vec_free (name); + mp->sw_if_index = ntohl (sw_if_index); + clib_memcpy (&mp->dst, &dst_adr, sizeof (dst_adr)); S (mp); W (ret); @@ -13304,69 +13535,71 @@ api_ikev2_profile_add_del (vat_main_t * vam) } static int -api_ikev2_profile_set_auth (vat_main_t * vam) +api_ip_scan_neighbor_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_profile_set_auth_t *mp; - u8 *name = 0; - u8 *data = 0; - u32 auth_method = 0; - u8 is_hex = 0; + vl_api_ip_scan_neighbor_enable_disable_t *mp; + u8 mode = IP_SCAN_V46_NEIGHBORS; + u32 interval = 0, time = 0, update = 0, delay = 0, stale = 0; int ret; - const char *valid_chars = "a-zA-Z0-9_"; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "name %U", unformat_token, valid_chars, &name)) - vec_add1 (name, 0); - else if (unformat (i, "auth_method %U", - unformat_ikev2_auth_method, &auth_method)) + if (unformat (i, "ip4")) + mode = IP_SCAN_V4_NEIGHBORS; + else if (unformat (i, "ip6")) + mode = IP_SCAN_V6_NEIGHBORS; + if (unformat (i, "both")) + mode = IP_SCAN_V46_NEIGHBORS; + else if (unformat (i, "disable")) + mode = IP_SCAN_DISABLED; + else if (unformat (i, "interval %d", &interval)) + ; + else if (unformat (i, "max-time %d", &time)) + ; + else if (unformat (i, "max-update %d", &update)) ; - else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data)) - is_hex = 1; - else if (unformat (i, "auth_data %v", &data)) + else if (unformat (i, "delay %d", &delay)) + ; + else if (unformat (i, "stale %d", &stale)) ; else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (!vec_len (name)) + if (interval > 255) { - errmsg ("profile name must be specified"); + errmsg ("interval cannot exceed 255 minutes."); return -99; } - - if (vec_len (name) > 64) + if (time > 255) { - errmsg ("profile name too long"); + errmsg ("max-time cannot exceed 255 usec."); return -99; } - - if (!vec_len (data)) + if (update > 255) { - errmsg ("auth_data must be specified"); + errmsg ("max-update cannot exceed 255."); return -99; } - - if (!auth_method) + if (delay > 255) { - errmsg ("auth_method must be specified"); + errmsg ("delay cannot exceed 255 msec."); + return -99; + } + if (stale > 255) + { + errmsg ("stale cannot exceed 255 minutes."); return -99; } - M (IKEV2_PROFILE_SET_AUTH, mp); - - mp->is_hex = is_hex; - mp->auth_method = (u8) auth_method; - mp->data_len = vec_len (data); - clib_memcpy (mp->name, name, vec_len (name)); - clib_memcpy (mp->data, data, vec_len (data)); - vec_free (name); - vec_free (data); + M (IP_SCAN_NEIGHBOR_ENABLE_DISABLE, mp); + mp->mode = mode; + mp->scan_interval = interval; + mp->max_proc_time = time; + mp->max_update = update; + mp->scan_int_delay = delay; + mp->stale_threshold = stale; S (mp); W (ret); @@ -13374,78 +13607,72 @@ api_ikev2_profile_set_auth (vat_main_t * vam) } static int -api_ikev2_profile_set_id (vat_main_t * vam) +api_want_ip4_arp_events (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_ikev2_profile_set_id_t *mp; - u8 *name = 0; - u8 *data = 0; - u8 is_local = 0; - u32 id_type = 0; - ip4_address_t ip4; + unformat_input_t *line_input = vam->input; + vl_api_want_ip4_arp_events_t *mp; + ip4_address_t address; + int address_set = 0; + u32 enable_disable = 1; int ret; - const char *valid_chars = "a-zA-Z0-9_"; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "name %U", unformat_token, valid_chars, &name)) - vec_add1 (name, 0); - else if (unformat (i, "id_type %U", unformat_ikev2_id_type, &id_type)) - ; - else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4)) - { - data = vec_new (u8, 4); - clib_memcpy (data, ip4.as_u8, 4); - } - else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data)) - ; - else if (unformat (i, "id_data %v", &data)) - ; - else if (unformat (i, "local")) - is_local = 1; - else if (unformat (i, "remote")) - is_local = 0; + if (unformat (line_input, "address %U", unformat_ip4_address, &address)) + address_set = 1; + else if (unformat (line_input, "del")) + enable_disable = 0; else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (!vec_len (name)) + if (address_set == 0) { - errmsg ("profile name must be specified"); + errmsg ("missing addresses"); return -99; } - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } + M (WANT_IP4_ARP_EVENTS, mp); + mp->enable_disable = enable_disable; + mp->pid = htonl (getpid ()); + clib_memcpy (mp->ip, &address, sizeof (address)); + + S (mp); + W (ret); + return ret; +} + +static int +api_want_ip6_nd_events (vat_main_t * vam) +{ + unformat_input_t *line_input = vam->input; + vl_api_want_ip6_nd_events_t *mp; + vl_api_ip6_address_t address; + int address_set = 0; + u32 enable_disable = 1; + int ret; - if (!vec_len (data)) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - errmsg ("id_data must be specified"); - return -99; + if (unformat + (line_input, "address %U", unformat_vl_api_ip6_address, &address)) + address_set = 1; + else if (unformat (line_input, "del")) + enable_disable = 0; + else + break; } - if (!id_type) + if (address_set == 0) { - errmsg ("id_type must be specified"); + errmsg ("missing addresses"); return -99; } - M (IKEV2_PROFILE_SET_ID, mp); - - mp->is_local = is_local; - mp->id_type = (u8) id_type; - mp->data_len = vec_len (data); - clib_memcpy (mp->name, name, vec_len (name)); - clib_memcpy (mp->data, data, vec_len (data)); - vec_free (name); - vec_free (data); + M (WANT_IP6_ND_EVENTS, mp); + mp->enable_disable = enable_disable; + mp->pid = htonl (getpid ()); + clib_memcpy (&mp->ip, &address, sizeof (address)); S (mp); W (ret); @@ -13453,110 +13680,88 @@ api_ikev2_profile_set_id (vat_main_t * vam) } static int -api_ikev2_profile_set_ts (vat_main_t * vam) +api_want_l2_macs_events (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_ikev2_profile_set_ts_t *mp; - u8 *name = 0; - u8 is_local = 0; - u32 proto = 0, start_port = 0, end_port = (u32) ~ 0; - ip4_address_t start_addr, end_addr; - - const char *valid_chars = "a-zA-Z0-9_"; + 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; - start_addr.as_u32 = 0; - end_addr.as_u32 = (u32) ~ 0; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "name %U", unformat_token, valid_chars, &name)) - vec_add1 (name, 0); - else if (unformat (i, "protocol %d", &proto)) - ; - else if (unformat (i, "start_port %d", &start_port)) + if (unformat (line_input, "learn-limit %d", &learn_limit)) ; - else if (unformat (i, "end_port %d", &end_port)) + else if (unformat (line_input, "scan-delay %d", &scan_delay)) ; - else - if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr)) - ; - else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr)) + else if (unformat (line_input, "max-entries %d", &max_macs_in_event)) ; - else if (unformat (i, "local")) - is_local = 1; - else if (unformat (i, "remote")) - is_local = 0; + else if (unformat (line_input, "disable")) + enable_disable = 0; else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; + break; } - M (IKEV2_PROFILE_SET_TS, mp); - - mp->is_local = is_local; - mp->proto = (u8) proto; - mp->start_port = (u16) start_port; - mp->end_port = (u16) end_port; - mp->start_addr = start_addr.as_u32; - mp->end_addr = end_addr.as_u32; - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); - + 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_ikev2_set_local_key (vat_main_t * vam) +api_input_acl_set_interface (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_set_local_key_t *mp; - u8 *file = 0; + vl_api_input_acl_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 l2_table_index = ~0; + u8 is_add = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "file %v", &file)) - vec_add1 (file, 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, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "l2-table %d", &l2_table_index)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (!vec_len (file)) - { - errmsg ("RSA key file must be specified"); - return -99; - } - - if (vec_len (file) > 256) + if (sw_if_index_set == 0) { - errmsg ("file name too long"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (IKEV2_SET_LOCAL_KEY, mp); + M (INPUT_ACL_SET_INTERFACE, mp); - clib_memcpy (mp->key_file, file, vec_len (file)); - vec_free (file); + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->l2_table_index = ntohl (l2_table_index); + mp->is_add = is_add; S (mp); W (ret); @@ -13564,49 +13769,52 @@ api_ikev2_set_local_key (vat_main_t * vam) } static int -api_ikev2_set_responder (vat_main_t * vam) +api_output_acl_set_interface (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_set_responder_t *mp; + vl_api_output_acl_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 l2_table_index = ~0; + u8 is_add = 1; int ret; - u8 *name = 0; - u32 sw_if_index = ~0; - ip4_address_t address; - - const char *valid_chars = "a-zA-Z0-9_"; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat - (i, "%U interface %d address %U", unformat_token, valid_chars, - &name, &sw_if_index, unformat_ip4_address, &address)) - vec_add1 (name, 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, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "l2-table %d", &l2_table_index)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) + if (sw_if_index_set == 0) { - errmsg ("profile name too long"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (IKEV2_SET_RESPONDER, mp); - - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); + M (OUTPUT_ACL_SET_INTERFACE, mp); - mp->sw_if_index = sw_if_index; - clib_memcpy (mp->address, &address, sizeof (address)); + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->l2_table_index = ntohl (l2_table_index); + mp->is_add = is_add; S (mp); W (ret); @@ -13614,149 +13822,153 @@ api_ikev2_set_responder (vat_main_t * vam) } static int -api_ikev2_set_ike_transforms (vat_main_t * vam) +api_ip_address_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_set_ike_transforms_t *mp; + vl_api_ip_address_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + u8 ipv4_set = 0; + u8 ipv6_set = 0; int ret; - u8 *name = 0; - u32 crypto_alg, crypto_key_size, integ_alg, dh_group; - - const char *valid_chars = "a-zA-Z0-9_"; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U %d %d %d %d", unformat_token, valid_chars, &name, - &crypto_alg, &crypto_key_size, &integ_alg, &dh_group)) - vec_add1 (name, 0); + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "ipv4")) + ipv4_set = 1; + else if (unformat (i, "ipv6")) + ipv6_set = 1; + else + break; } - if (!vec_len (name)) + if (ipv4_set && ipv6_set) { - errmsg ("profile name must be specified"); + errmsg ("ipv4 and ipv6 flags cannot be both set"); return -99; } - if (vec_len (name) > 64) + if ((!ipv4_set) && (!ipv6_set)) { - errmsg ("profile name too long"); + errmsg ("no ipv4 nor ipv6 flag set"); return -99; } - M (IKEV2_SET_IKE_TRANSFORMS, mp); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); - mp->crypto_alg = crypto_alg; - mp->crypto_key_size = crypto_key_size; - mp->integ_alg = integ_alg; - mp->dh_group = dh_group; + vam->current_sw_if_index = sw_if_index; + vam->is_ipv6 = ipv6_set; + M (IP_ADDRESS_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_ipv6 = ipv6_set; S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } - static int -api_ikev2_set_esp_transforms (vat_main_t * vam) +api_ip_dump (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_ikev2_set_esp_transforms_t *mp; + vl_api_ip_dump_t *mp; + vl_api_control_ping_t *mp_ping; + unformat_input_t *in = vam->input; + int ipv4_set = 0; + int ipv6_set = 0; + int is_ipv6; + int i; int ret; - u8 *name = 0; - u32 crypto_alg, crypto_key_size, integ_alg, dh_group; - const char *valid_chars = "a-zA-Z0-9_"; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U %d %d %d %d", unformat_token, valid_chars, &name, - &crypto_alg, &crypto_key_size, &integ_alg, &dh_group)) - vec_add1 (name, 0); + if (unformat (in, "ipv4")) + ipv4_set = 1; + else if (unformat (in, "ipv6")) + ipv6_set = 1; else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (!vec_len (name)) + if (ipv4_set && ipv6_set) { - errmsg ("profile name must be specified"); + errmsg ("ipv4 and ipv6 flags cannot be both set"); return -99; } - if (vec_len (name) > 64) + if ((!ipv4_set) && (!ipv6_set)) { - errmsg ("profile name too long"); + errmsg ("no ipv4 nor ipv6 flag set"); return -99; } - M (IKEV2_SET_ESP_TRANSFORMS, mp); + is_ipv6 = ipv6_set; + vam->is_ipv6 = is_ipv6; - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); - mp->crypto_alg = crypto_alg; - mp->crypto_key_size = crypto_key_size; - mp->integ_alg = integ_alg; - mp->dh_group = dh_group; + /* free old data */ + for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++) + { + vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr); + } + vec_free (vam->ip_details_by_sw_if_index[is_ipv6]); + M (IP_DUMP, mp); + mp->is_ipv6 = ipv6_set; S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_ikev2_set_sa_lifetime (vat_main_t * vam) +api_ipsec_spd_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_set_sa_lifetime_t *mp; + vl_api_ipsec_spd_add_del_t *mp; + u32 spd_id = ~0; + u8 is_add = 1; int ret; - u8 *name = 0; - u64 lifetime, lifetime_maxdata; - u32 lifetime_jitter, handover; - - const char *valid_chars = "a-zA-Z0-9_"; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U %lu %u %u %lu", unformat_token, valid_chars, &name, - &lifetime, &lifetime_jitter, &handover, - &lifetime_maxdata)) - vec_add1 (name, 0); + if (unformat (i, "spd_id %d", &spd_id)) + ; + else if (unformat (i, "del")) + is_add = 0; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) + } + if (spd_id == ~0) { - errmsg ("profile name too long"); + errmsg ("spd_id must be set"); return -99; } - M (IKEV2_SET_SA_LIFETIME, mp); + M (IPSEC_SPD_ADD_DEL, mp); - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); - mp->lifetime = lifetime; - mp->lifetime_jitter = lifetime_jitter; - mp->handover = handover; - mp->lifetime_maxdata = lifetime_maxdata; + mp->spd_id = ntohl (spd_id); + mp->is_add = is_add; S (mp); W (ret); @@ -13764,42 +13976,52 @@ api_ikev2_set_sa_lifetime (vat_main_t * vam) } static int -api_ikev2_initiate_sa_init (vat_main_t * vam) +api_ipsec_interface_add_del_spd (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_initiate_sa_init_t *mp; + vl_api_ipsec_interface_add_del_spd_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u32 spd_id = (u32) ~ 0; + u8 is_add = 1; int ret; - u8 *name = 0; - - const char *valid_chars = "a-zA-Z0-9_"; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", unformat_token, valid_chars, &name)) - vec_add1 (name, 0); + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "spd_id %d", &spd_id)) + ; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } + } - if (!vec_len (name)) + if (spd_id == (u32) ~ 0) { - errmsg ("profile name must be specified"); + errmsg ("spd_id must be set"); return -99; } - if (vec_len (name) > 64) + if (sw_if_index_set == 0) { - errmsg ("profile name too long"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (IKEV2_INITIATE_SA_INIT, mp); + M (IPSEC_INTERFACE_ADD_DEL_SPD, mp); - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); + mp->spd_id = ntohl (spd_id); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; S (mp); W (ret); @@ -13807,28 +14029,101 @@ api_ikev2_initiate_sa_init (vat_main_t * vam) } static int -api_ikev2_initiate_del_ike_sa (vat_main_t * vam) +api_ipsec_spd_entry_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_initiate_del_ike_sa_t *mp; + vl_api_ipsec_spd_entry_add_del_t *mp; + u8 is_add = 1, is_outbound = 0; + u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0; + i32 priority = 0; + u32 rport_start = 0, rport_stop = (u32) ~ 0; + u32 lport_start = 0, lport_stop = (u32) ~ 0; + vl_api_address_t laddr_start = { }, laddr_stop = + { + }, raddr_start = + { + }, raddr_stop = + { + }; int ret; - u64 ispi; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%lx", &ispi)) + if (unformat (i, "del")) + is_add = 0; + if (unformat (i, "outbound")) + is_outbound = 1; + if (unformat (i, "inbound")) + is_outbound = 0; + else if (unformat (i, "spd_id %d", &spd_id)) + ; + else if (unformat (i, "sa_id %d", &sa_id)) + ; + else if (unformat (i, "priority %d", &priority)) + ; + else if (unformat (i, "protocol %d", &protocol)) + ; + else if (unformat (i, "lport_start %d", &lport_start)) + ; + else if (unformat (i, "lport_stop %d", &lport_stop)) + ; + else if (unformat (i, "rport_start %d", &rport_start)) + ; + else if (unformat (i, "rport_stop %d", &rport_stop)) + ; + else if (unformat (i, "laddr_start %U", + unformat_vl_api_address, &laddr_start)) + ; + else if (unformat (i, "laddr_stop %U", unformat_vl_api_address, + &laddr_stop)) + ; + else if (unformat (i, "raddr_start %U", unformat_vl_api_address, + &raddr_start)) + ; + else if (unformat (i, "raddr_stop %U", unformat_vl_api_address, + &raddr_stop)) ; else + if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy)) { - errmsg ("parse error '%U'", format_unformat_error, i); + if (policy == IPSEC_POLICY_ACTION_RESOLVE) + { + clib_warning ("unsupported action: 'resolve'"); + return -99; + } + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } + } - M (IKEV2_INITIATE_DEL_IKE_SA, mp); + M (IPSEC_SPD_ENTRY_ADD_DEL, mp); + + mp->is_add = is_add; - mp->ispi = ispi; + mp->entry.spd_id = ntohl (spd_id); + mp->entry.priority = ntohl (priority); + mp->entry.is_outbound = is_outbound; + + clib_memcpy (&mp->entry.remote_address_start, &raddr_start, + sizeof (vl_api_address_t)); + clib_memcpy (&mp->entry.remote_address_stop, &raddr_stop, + sizeof (vl_api_address_t)); + clib_memcpy (&mp->entry.local_address_start, &laddr_start, + sizeof (vl_api_address_t)); + clib_memcpy (&mp->entry.local_address_stop, &laddr_stop, + sizeof (vl_api_address_t)); + + mp->entry.protocol = (u8) protocol; + mp->entry.local_port_start = ntohs ((u16) lport_start); + mp->entry.local_port_stop = ntohs ((u16) lport_stop); + mp->entry.remote_port_start = ntohs ((u16) rport_start); + mp->entry.remote_port_stop = ntohs ((u16) rport_stop); + mp->entry.policy = (u8) policy; + mp->entry.sa_id = ntohl (sa_id); S (mp); W (ret); @@ -13836,209 +14131,388 @@ api_ikev2_initiate_del_ike_sa (vat_main_t * vam) } static int -api_ikev2_initiate_del_child_sa (vat_main_t * vam) +api_ipsec_sad_entry_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ikev2_initiate_del_child_sa_t *mp; - int ret; - u32 ispi; + vl_api_ipsec_sad_entry_add_del_t *mp; + u32 sad_id = 0, spi = 0; + u8 *ck = 0, *ik = 0; + u8 is_add = 1; + vl_api_ipsec_crypto_alg_t crypto_alg = IPSEC_API_CRYPTO_ALG_NONE; + vl_api_ipsec_integ_alg_t integ_alg = IPSEC_API_INTEG_ALG_NONE; + vl_api_ipsec_sad_flags_t flags = IPSEC_API_SAD_FLAG_NONE; + vl_api_ipsec_proto_t protocol = IPSEC_API_PROTO_AH; + vl_api_address_t tun_src, tun_dst; + int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%x", &ispi)) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "sad_id %d", &sad_id)) + ; + else if (unformat (i, "spi %d", &spi)) ; + else if (unformat (i, "esp")) + protocol = IPSEC_API_PROTO_ESP; else + if (unformat (i, "tunnel_src %U", unformat_vl_api_address, &tun_src)) { - errmsg ("parse error '%U'", format_unformat_error, i); + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; + if (ADDRESS_IP6 == tun_src.af) + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; + } + else + if (unformat (i, "tunnel_dst %U", unformat_vl_api_address, &tun_dst)) + { + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; + if (ADDRESS_IP6 == tun_src.af) + flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; + } + else + if (unformat (i, "crypto_alg %U", + unformat_ipsec_api_crypto_alg, &crypto_alg)) + ; + else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck)) + ; + else if (unformat (i, "integ_alg %U", + unformat_ipsec_api_integ_alg, &integ_alg)) + ; + else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } + } - M (IKEV2_INITIATE_DEL_CHILD_SA, mp); + M (IPSEC_SAD_ENTRY_ADD_DEL, mp); - mp->ispi = ispi; + mp->is_add = is_add; + mp->entry.sad_id = ntohl (sad_id); + mp->entry.protocol = protocol; + mp->entry.spi = ntohl (spi); + mp->entry.flags = flags; - S (mp); - W (ret); - return ret; -} + mp->entry.crypto_algorithm = crypto_alg; + mp->entry.integrity_algorithm = integ_alg; + mp->entry.crypto_key.length = vec_len (ck); + mp->entry.integrity_key.length = vec_len (ik); -static int -api_ikev2_initiate_rekey_child_sa (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_initiate_rekey_child_sa_t *mp; - int ret; - u32 ispi; + if (mp->entry.crypto_key.length > sizeof (mp->entry.crypto_key.data)) + mp->entry.crypto_key.length = sizeof (mp->entry.crypto_key.data); + if (mp->entry.integrity_key.length > sizeof (mp->entry.integrity_key.data)) + mp->entry.integrity_key.length = sizeof (mp->entry.integrity_key.data); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (ck) + clib_memcpy (mp->entry.crypto_key.data, ck, mp->entry.crypto_key.length); + if (ik) + clib_memcpy (mp->entry.integrity_key.data, ik, + mp->entry.integrity_key.length); + + if (flags & IPSEC_API_SAD_FLAG_IS_TUNNEL) { - if (unformat (i, "%x", &ispi)) - ; - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } + clib_memcpy (&mp->entry.tunnel_src, &tun_src, + sizeof (mp->entry.tunnel_src)); + clib_memcpy (&mp->entry.tunnel_dst, &tun_dst, + sizeof (mp->entry.tunnel_dst)); } - M (IKEV2_INITIATE_REKEY_CHILD_SA, mp); - - mp->ispi = ispi; - S (mp); W (ret); return ret; } -/* - * MAP - */ static int -api_map_add_domain (vat_main_t * vam) +api_ipsec_tunnel_if_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_map_add_domain_t *mp; - - ip4_address_t ip4_prefix; - ip6_address_t ip6_prefix; - ip6_address_t ip6_src; - u32 num_m_args = 0; - u32 ip6_prefix_len = 0, ip4_prefix_len = 0, ea_bits_len = 0, psid_offset = - 0, psid_length = 0; - u8 is_translation = 0; - u32 mtu = 0; - u32 ip6_src_len = 128; - int ret; + vl_api_ipsec_tunnel_if_add_del_t *mp; + u32 local_spi = 0, remote_spi = 0; + u32 crypto_alg = 0, integ_alg = 0; + u8 *lck = NULL, *rck = NULL; + u8 *lik = NULL, *rik = NULL; + vl_api_address_t local_ip = { 0 }; + vl_api_address_t remote_ip = { 0 }; + f64 before = 0; + u8 is_add = 1; + u8 esn = 0; + u8 anti_replay = 0; + u8 renumber = 0; + u32 instance = ~0; + u32 count = 1, jj; + int ret = -1; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ip4-pfx %U/%d", unformat_ip4_address, - &ip4_prefix, &ip4_prefix_len)) - num_m_args++; - else if (unformat (i, "ip6-pfx %U/%d", unformat_ip6_address, - &ip6_prefix, &ip6_prefix_len)) - num_m_args++; + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "esn")) + esn = 1; + else if (unformat (i, "anti-replay")) + anti_replay = 1; + else if (unformat (i, "count %d", &count)) + ; + else if (unformat (i, "local_spi %d", &local_spi)) + ; + else if (unformat (i, "remote_spi %d", &remote_spi)) + ; + else + if (unformat (i, "local_ip %U", unformat_vl_api_address, &local_ip)) + ; + else + if (unformat (i, "remote_ip %U", unformat_vl_api_address, &remote_ip)) + ; + else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck)) + ; + else + if (unformat (i, "remote_crypto_key %U", unformat_hex_string, &rck)) + ; + else if (unformat (i, "local_integ_key %U", unformat_hex_string, &lik)) + ; + else if (unformat (i, "remote_integ_key %U", unformat_hex_string, &rik)) + ; + else + if (unformat + (i, "crypto_alg %U", unformat_ipsec_api_crypto_alg, &crypto_alg)) + { + if (crypto_alg >= IPSEC_CRYPTO_N_ALG) + { + errmsg ("unsupported crypto-alg: '%U'\n", + format_ipsec_crypto_alg, crypto_alg); + return -99; + } + } else if (unformat - (i, "ip6-src %U/%d", unformat_ip6_address, &ip6_src, - &ip6_src_len)) - num_m_args++; - else if (unformat (i, "ip6-src %U", unformat_ip6_address, &ip6_src)) - num_m_args++; - else if (unformat (i, "ea-bits-len %d", &ea_bits_len)) - num_m_args++; - else if (unformat (i, "psid-offset %d", &psid_offset)) - num_m_args++; - else if (unformat (i, "psid-len %d", &psid_length)) - num_m_args++; - else if (unformat (i, "mtu %d", &mtu)) - num_m_args++; - else if (unformat (i, "map-t")) - is_translation = 1; + (i, "integ_alg %U", unformat_ipsec_api_integ_alg, &integ_alg)) + { + if (integ_alg >= IPSEC_INTEG_N_ALG) + { + errmsg ("unsupported integ-alg: '%U'\n", + format_ipsec_integ_alg, integ_alg); + return -99; + } + } + else if (unformat (i, "instance %u", &instance)) + renumber = 1; else { - clib_warning ("parse error '%U'", format_unformat_error, i); + errmsg ("parse error '%U'\n", format_unformat_error, i); return -99; } } - if (num_m_args < 3) + if (count > 1) { - errmsg ("mandatory argument(s) missing"); - return -99; + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - /* Construct the API message */ - M (MAP_ADD_DOMAIN, mp); + for (jj = 0; jj < count; jj++) + { + M (IPSEC_TUNNEL_IF_ADD_DEL, mp); - clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix)); - mp->ip4_prefix_len = ip4_prefix_len; + mp->is_add = is_add; + mp->esn = esn; + mp->anti_replay = anti_replay; - clib_memcpy (mp->ip6_prefix, &ip6_prefix, sizeof (ip6_prefix)); - mp->ip6_prefix_len = ip6_prefix_len; + if (jj > 0) + increment_address (&remote_ip); - clib_memcpy (mp->ip6_src, &ip6_src, sizeof (ip6_src)); - mp->ip6_src_prefix_len = ip6_src_len; + clib_memcpy (&mp->local_ip, &local_ip, sizeof (local_ip)); + clib_memcpy (&mp->remote_ip, &remote_ip, sizeof (remote_ip)); - mp->ea_bits_len = ea_bits_len; - mp->psid_offset = psid_offset; - mp->psid_length = psid_length; - mp->is_translation = is_translation; - mp->mtu = htons (mtu); + mp->local_spi = htonl (local_spi + jj); + mp->remote_spi = htonl (remote_spi + jj); + mp->crypto_alg = (u8) crypto_alg; - /* send it... */ - S (mp); + mp->local_crypto_key_len = 0; + if (lck) + { + mp->local_crypto_key_len = vec_len (lck); + if (mp->local_crypto_key_len > sizeof (mp->local_crypto_key)) + mp->local_crypto_key_len = sizeof (mp->local_crypto_key); + 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 = 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); + } + + if (renumber) + { + mp->renumber = renumber; + mp->show_instance = ntohl (instance); + } + S (mp); + } + + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) + { + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; + + /* Shut off async mode */ + vam->async_mode = 0; + + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; + + out: + if (vam->retval == -99) + errmsg ("timeout"); + + if (vam->async_errors > 0) + { + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; + } + vam->async_errors = 0; + after = vat_time_now (vam); + + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (jj > 0) + count = jj; + + print (vam->ofp, "%d tunnels in %.6f secs, %.2f tunnels/sec", + count, after - before, count / (after - before)); + } + else + { + /* Wait for a reply... */ + W (ret); + return ret; + } - /* Wait for a reply, return good/bad news */ - W (ret); return ret; } -static int -api_map_del_domain (vat_main_t * vam) +static void +vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) { - unformat_input_t *i = vam->input; - vl_api_map_del_domain_t *mp; - - u32 num_m_args = 0; - u32 index; - int ret; + vat_main_t *vam = &vat_main; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "index %d", &index)) - num_m_args++; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } + 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 flags %x " + "tunnel_src_addr %U tunnel_dst_addr %U " + "salt %u seq_outbound %lu last_seq_inbound %lu " + "replay_window %lu\n", + ntohl (mp->entry.sad_id), + ntohl (mp->sw_if_index), + ntohl (mp->entry.spi), + ntohl (mp->entry.protocol), + ntohl (mp->entry.crypto_algorithm), + format_hex_bytes, mp->entry.crypto_key.data, + mp->entry.crypto_key.length, ntohl (mp->entry.integrity_algorithm), + format_hex_bytes, mp->entry.integrity_key.data, + mp->entry.integrity_key.length, ntohl (mp->entry.flags), + format_vl_api_address, &mp->entry.tunnel_src, format_vl_api_address, + &mp->entry.tunnel_dst, 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)); +} + +#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; + vl_api_ipsec_sad_flags_t flags; - if (num_m_args != 1) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - errmsg ("mandatory argument(s) missing"); - 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 (MAP_DEL_DOMAIN, mp); - - mp->index = ntohl (index); - - /* send it... */ - S (mp); - - /* Wait for a reply, return good/bad news */ - W (ret); - return ret; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sa_id", ntohl (mp->entry.sad_id)); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "spi", ntohl (mp->entry.spi)); + vat_json_object_add_uint (node, "proto", ntohl (mp->entry.protocol)); + vat_json_object_add_uint (node, "crypto_alg", + ntohl (mp->entry.crypto_algorithm)); + vat_json_object_add_uint (node, "integ_alg", + ntohl (mp->entry.integrity_algorithm)); + flags = ntohl (mp->entry.flags); + vat_json_object_add_uint (node, "use_esn", + ! !(flags & IPSEC_API_SAD_FLAG_USE_ESN)); + vat_json_object_add_uint (node, "use_anti_replay", + ! !(flags & IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY)); + vat_json_object_add_uint (node, "is_tunnel", + ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL)); + vat_json_object_add_uint (node, "is_tunnel_ip6", + ! !(flags & IPSEC_API_SAD_FLAG_IS_TUNNEL_V6)); + vat_json_object_add_uint (node, "udp_encap", + ! !(flags & IPSEC_API_SAD_FLAG_UDP_ENCAP)); + vat_json_object_add_bytes (node, "crypto_key", mp->entry.crypto_key.data, + mp->entry.crypto_key.length); + vat_json_object_add_bytes (node, "integ_key", mp->entry.integrity_key.data, + mp->entry.integrity_key.length); + vat_json_object_add_address (node, "src", &mp->entry.tunnel_src); + vat_json_object_add_address (node, "dst", &mp->entry.tunnel_dst); + vat_json_object_add_uint (node, "replay_window", + clib_net_to_host_u64 (mp->replay_window)); } static int -api_map_add_del_rule (vat_main_t * vam) +api_ipsec_sa_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_map_add_del_rule_t *mp; - u8 is_add = 1; - ip6_address_t ip6_dst; - u32 num_m_args = 0, index, psid = 0; + 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, "index %d", &index)) - num_m_args++; - else if (unformat (i, "psid %d", &psid)) - num_m_args++; - else if (unformat (i, "dst %U", unformat_ip6_address, &ip6_dst)) - num_m_args++; - else if (unformat (i, "del")) - { - is_add = 0; - } + if (unformat (i, "sa_id %d", &sa_id)) + ; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -14046,33 +14520,10 @@ api_map_add_del_rule (vat_main_t * vam) } } - /* Construct the API message */ - M (MAP_ADD_DEL_RULE, mp); - - mp->index = ntohl (index); - mp->is_add = is_add; - clib_memcpy (mp->ip6_dst, &ip6_dst, sizeof (ip6_dst)); - mp->psid = ntohs (psid); - - /* send it... */ - S (mp); - - /* Wait for a reply, return good/bad news */ - W (ret); - return ret; -} - -static int -api_map_domain_dump (vat_main_t * vam) -{ - vl_api_map_domain_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + M (IPSEC_SA_DUMP, mp); - /* Construct the API message */ - M (MAP_DOMAIN_DUMP, mp); + mp->sa_id = ntohl (sa_id); - /* send it... */ S (mp); /* Use a control ping for synchronization */ @@ -14084,76 +14535,54 @@ api_map_domain_dump (vat_main_t * vam) } static int -api_map_rule_dump (vat_main_t * vam) +api_ipsec_tunnel_if_set_sa (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_map_rule_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 domain_index = ~0; + vl_api_ipsec_tunnel_if_set_sa_t *mp; + u32 sw_if_index = ~0; + u32 sa_id = ~0; + u8 is_outbound = (u8) ~ 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "index %u", &domain_index)) + 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 - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (domain_index == ~0) + if (sw_if_index == ~0) { - clib_warning ("parse error: domain index expected"); + errmsg ("interface must be specified"); return -99; } - /* Construct the API message */ - M (MAP_RULE_DUMP, mp); - - mp->domain_index = htonl (domain_index); - - /* send it... */ - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static void vl_api_map_add_domain_reply_t_handler - (vl_api_map_add_domain_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else + if (sa_id == ~0) { - vam->retval = retval; - vam->result_ready = 1; + errmsg ("SA ID must be specified"); + return -99; } -} -static void vl_api_map_add_domain_reply_t_handler_json - (vl_api_map_add_domain_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; + M (IPSEC_TUNNEL_IF_SET_SA, mp); - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "index", ntohl (mp->index)); + mp->sw_if_index = htonl (sw_if_index); + mp->sa_id = htonl (sa_id); + mp->is_outbound = is_outbound; - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + S (mp); + W (ret); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; + return ret; } static int @@ -14314,7 +14743,7 @@ unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) { lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *); - memset (a, 0, sizeof (a[0])); + clib_memset (a, 0, sizeof (a[0])); if (unformat (input, "%U/%d", unformat_ip4_address, a->addr, &a->len)) { @@ -14715,7 +15144,7 @@ api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam) vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0; int ret; - memset (&rloc, 0, sizeof (rloc)); + clib_memset (&rloc, 0, sizeof (rloc)); /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -15023,7 +15452,141 @@ static int api_one_rloc_probe_enable_disable (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_one_rloc_probe_enable_disable_t *mp; + vl_api_one_rloc_probe_enable_disable_t *mp; + u8 is_set = 0; + u8 is_en = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_en = 1; + } + else if (unformat (input, "disable")) + is_set = 1; + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_RLOC_PROBE_ENABLE_DISABLE, mp); + + mp->is_enabled = is_en; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_rloc_probe_enable_disable api_one_rloc_probe_enable_disable + +static int +api_one_map_register_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_map_register_enable_disable_t *mp; + u8 is_set = 0; + u8 is_en = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_en = 1; + } + else if (unformat (input, "disable")) + is_set = 1; + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_MAP_REGISTER_ENABLE_DISABLE, mp); + + mp->is_enabled = is_en; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_map_register_enable_disable api_one_map_register_enable_disable + +static int +api_one_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_enable_disable_t *mp; + u8 is_set = 0; + u8 is_en = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_en = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ENABLE_DISABLE, mp); + + mp->is_en = is_en; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_enable_disable api_one_enable_disable + +static int +api_one_enable_disable_xtr_mode (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_enable_disable_xtr_mode_t *mp; u8 is_set = 0; u8 is_en = 0; int ret; @@ -15037,7 +15600,9 @@ api_one_rloc_probe_enable_disable (vat_main_t * vam) is_en = 1; } else if (unformat (input, "disable")) - is_set = 1; + { + is_set = 1; + } else break; } @@ -15049,9 +15614,9 @@ api_one_rloc_probe_enable_disable (vat_main_t * vam) } /* Construct the API message */ - M (ONE_RLOC_PROBE_ENABLE_DISABLE, mp); + M (ONE_ENABLE_DISABLE_XTR_MODE, mp); - mp->is_enabled = is_en; + mp->is_en = is_en; /* send it... */ S (mp); @@ -15061,13 +15626,28 @@ api_one_rloc_probe_enable_disable (vat_main_t * vam) return ret; } -#define api_lisp_rloc_probe_enable_disable api_one_rloc_probe_enable_disable +static int +api_one_show_xtr_mode (vat_main_t * vam) +{ + vl_api_one_show_xtr_mode_t *mp; + int ret; + + /* Construct the API message */ + M (ONE_SHOW_XTR_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} static int -api_one_map_register_enable_disable (vat_main_t * vam) +api_one_enable_disable_pitr_mode (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_one_map_register_enable_disable_t *mp; + vl_api_one_enable_disable_pitr_mode_t *mp; u8 is_set = 0; u8 is_en = 0; int ret; @@ -15081,7 +15661,9 @@ api_one_map_register_enable_disable (vat_main_t * vam) is_en = 1; } else if (unformat (input, "disable")) - is_set = 1; + { + is_set = 1; + } else break; } @@ -15093,9 +15675,9 @@ api_one_map_register_enable_disable (vat_main_t * vam) } /* Construct the API message */ - M (ONE_MAP_REGISTER_ENABLE_DISABLE, mp); + M (ONE_ENABLE_DISABLE_PITR_MODE, mp); - mp->is_enabled = is_en; + mp->is_en = is_en; /* send it... */ S (mp); @@ -15105,13 +15687,28 @@ api_one_map_register_enable_disable (vat_main_t * vam) return ret; } -#define api_lisp_map_register_enable_disable api_one_map_register_enable_disable +static int +api_one_show_pitr_mode (vat_main_t * vam) +{ + vl_api_one_show_pitr_mode_t *mp; + int ret; + + /* Construct the API message */ + M (ONE_SHOW_PITR_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} static int -api_one_enable_disable (vat_main_t * vam) +api_one_enable_disable_petr_mode (vat_main_t * vam) { unformat_input_t *input = vam->input; - vl_api_one_enable_disable_t *mp; + vl_api_one_enable_disable_petr_mode_t *mp; u8 is_set = 0; u8 is_en = 0; int ret; @@ -15139,7 +15736,7 @@ api_one_enable_disable (vat_main_t * vam) } /* Construct the API message */ - M (ONE_ENABLE_DISABLE, mp); + M (ONE_ENABLE_DISABLE_PETR_MODE, mp); mp->is_en = is_en; @@ -15151,7 +15748,22 @@ api_one_enable_disable (vat_main_t * vam) return ret; } -#define api_lisp_enable_disable api_one_enable_disable +static int +api_one_show_petr_mode (vat_main_t * vam) +{ + vl_api_one_show_petr_mode_t *mp; + int ret; + + /* Construct the API message */ + M (ONE_SHOW_PETR_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} static int api_show_one_map_register_state (vat_main_t * vam) @@ -15189,6 +15801,58 @@ 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) { @@ -15240,6 +15904,60 @@ api_one_add_del_l2_arp_entry (vat_main_t * vam) 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) { @@ -15533,7 +16251,7 @@ api_one_use_petr (vat_main_t * vam) ip_address_t ip; int ret; - memset (&ip, 0, sizeof (ip)); + clib_memset (&ip, 0, sizeof (ip)); /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -15729,7 +16447,7 @@ api_one_add_del_remote_mapping (vat_main_t * vam) vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0; int ret; - memset (&rloc, 0, sizeof (rloc)); + clib_memset (&rloc, 0, sizeof (rloc)); /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -16077,10 +16795,133 @@ api_lisp_gpe_add_del_iface (vat_main_t * vam) /* Construct the API message */ M (GPE_ADD_DEL_IFACE, mp); - mp->is_add = is_add; - mp->dp_table = clib_host_to_net_u32 (dp_table); - mp->is_l2 = is_l2; - mp->vni = clib_host_to_net_u32 (vni); + mp->is_add = is_add; + mp->dp_table = clib_host_to_net_u32 (dp_table); + mp->is_l2 = is_l2; + mp->vni = clib_host_to_net_u32 (vni); + + /* send it... */ + S (mp); + + /* 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); @@ -16200,7 +17041,7 @@ api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) } else { - memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); + clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); } vec_free (locator_set_name); @@ -16282,7 +17123,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... */ @@ -16332,7 +17173,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... */ @@ -16390,7 +17231,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... */ @@ -16418,7 +17259,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... */ @@ -16526,7 +17367,7 @@ api_one_eid_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); /* Wait for a reply... */ @@ -16712,8 +17553,8 @@ api_gpe_add_del_native_fwd_rpath (vat_main_t * vam) struct in6_addr ip6; u32 table_id = 0, nh_sw_if_index = ~0; - memset (&ip4, 0, sizeof (ip4)); - memset (&ip6, 0, sizeof (ip6)); + clib_memset (&ip4, 0, sizeof (ip4)); + clib_memset (&ip6, 0, sizeof (ip6)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -16793,7 +17634,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... */ @@ -16820,7 +17661,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... */ @@ -16854,7 +17695,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... */ @@ -16916,7 +17757,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... */ @@ -16955,7 +17796,7 @@ api_af_packet_create (vat_main_t * vam) u8 random_hw_addr = 1; int ret; - memset (hw_addr, 0, sizeof (hw_addr)); + clib_memset (hw_addr, 0, sizeof (hw_addr)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -17037,6 +17878,53 @@ api_af_packet_delete (vat_main_t * vam) return ret; } +static void vl_api_af_packet_details_t_handler + (vl_api_af_packet_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%-16s %d", + mp->host_if_name, clib_net_to_host_u32 (mp->sw_if_index)); +} + +static void vl_api_af_packet_details_t_handler_json + (vl_api_af_packet_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_string_copy (node, "dev_name", mp->host_if_name); +} + +static int +api_af_packet_dump (vat_main_t * vam) +{ + vl_api_af_packet_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index"); + /* Get list of tap interfaces */ + M (AF_PACKET_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_policer_add_del (vat_main_t * vam) { @@ -17116,10 +18004,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; @@ -17165,7 +18053,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... */ @@ -17254,7 +18142,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... */ @@ -17274,7 +18162,7 @@ api_netmap_create (vat_main_t * vam) u8 is_master = 0; int ret; - memset (hw_addr, 0, sizeof (hw_addr)); + clib_memset (hw_addr, 0, sizeof (hw_addr)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -17356,47 +18244,127 @@ api_netmap_delete (vat_main_t * vam) return ret; } +static u8 * +format_fib_api_path_nh_proto (u8 * s, va_list * args) +{ + vl_api_fib_path_nh_proto_t proto = + va_arg (*args, vl_api_fib_path_nh_proto_t); + + switch (proto) + { + case FIB_API_PATH_NH_PROTO_IP4: + s = format (s, "ip4"); + break; + case FIB_API_PATH_NH_PROTO_IP6: + s = format (s, "ip6"); + break; + case FIB_API_PATH_NH_PROTO_MPLS: + s = format (s, "mpls"); + break; + case FIB_API_PATH_NH_PROTO_BIER: + s = format (s, "bier"); + break; + case FIB_API_PATH_NH_PROTO_ETHERNET: + s = format (s, "ethernet"); + break; + } + + return (s); +} + +static u8 * +format_vl_api_ip_address_union (u8 * s, va_list * args) +{ + vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t); + const vl_api_address_union_t *u = va_arg (*args, vl_api_address_union_t *); + + switch (af) + { + case ADDRESS_IP4: + s = format (s, "%U", format_ip4_address, u->ip4); + break; + case ADDRESS_IP6: + s = format (s, "%U", format_ip6_address, u->ip6); + break; + } + return (s); +} + +static u8 * +format_vl_api_fib_path_type (u8 * s, va_list * args) +{ + vl_api_fib_path_type_t t = va_arg (*args, vl_api_fib_path_type_t); + + switch (t) + { + case FIB_API_PATH_TYPE_NORMAL: + s = format (s, "normal"); + break; + case FIB_API_PATH_TYPE_LOCAL: + s = format (s, "local"); + break; + case FIB_API_PATH_TYPE_DROP: + s = format (s, "drop"); + break; + case FIB_API_PATH_TYPE_UDP_ENCAP: + s = format (s, "udp-encap"); + break; + case FIB_API_PATH_TYPE_BIER_IMP: + s = format (s, "bier-imp"); + break; + case FIB_API_PATH_TYPE_ICMP_UNREACH: + s = format (s, "unreach"); + break; + case FIB_API_PATH_TYPE_ICMP_PROHIBIT: + s = format (s, "prohibit"); + break; + case FIB_API_PATH_TYPE_SOURCE_LOOKUP: + s = format (s, "src-lookup"); + break; + case FIB_API_PATH_TYPE_DVR: + s = format (s, "dvr"); + break; + case FIB_API_PATH_TYPE_INTERFACE_RX: + s = format (s, "interface-rx"); + break; + case FIB_API_PATH_TYPE_CLASSIFY: + s = format (s, "classify"); + break; + } + + return (s); +} + static void -vl_api_mpls_fib_path_print (vat_main_t * vam, vl_api_fib_path2_t * fp) +vl_api_fib_path_print (vat_main_t * vam, vl_api_fib_path_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); + print (vam->ofp, + " weight %d, sw_if_index %d, type %U, afi %U, next_hop %U", + ntohl (fp->weight), ntohl (fp->sw_if_index), + format_vl_api_fib_path_type, fp->type, + format_fib_api_path_nh_proto, fp->proto, + format_vl_api_ip_address_union, &fp->nh.address); } static void vl_api_mpls_fib_path_json_print (vat_json_node_t * node, - vl_api_fib_path2_t * fp) + vl_api_fib_path_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_uint (node, "type", fp->type); + vat_json_object_add_uint (node, "next_hop_proto", fp->proto); + if (fp->proto == FIB_API_PATH_NH_PROTO_IP4) + { + clib_memcpy (&ip4, &fp->nh.address.ip4, sizeof (ip4)); vat_json_object_add_ip4 (node, "next_hop", ip4); } - else if (fp->afi == IP46_TYPE_IP6) + else if (fp->proto == FIB_API_PATH_NH_PROTO_IP4) { - clib_memcpy (&ip6, &fp->next_hop, sizeof (ip6)); + clib_memcpy (&ip6, &fp->nh.address.ip6, sizeof (ip6)); vat_json_object_add_ip6 (node, "next_hop", ip6); } } @@ -17405,16 +18373,16 @@ 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; + int count = ntohl (mp->mt_tunnel.mt_n_paths); + vl_api_fib_path_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; + print (vam->ofp, "sw_if_index %d via:", + ntohl (mp->mt_tunnel.mt_sw_if_index)); + fp = mp->mt_tunnel.mt_paths; for (i = 0; i < count; i++) { - vl_api_mpls_fib_path_print (vam, fp); + vl_api_fib_path_print (vam, fp); fp++; } @@ -17429,8 +18397,8 @@ 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; + int count = ntohl (mp->mt_tunnel.mt_n_paths); + vl_api_fib_path_t *fp; i32 i; if (VAT_JSON_ARRAY != vam->json_tree.type) @@ -17441,13 +18409,12 @@ 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_uint (node, "sw_if_index", + ntohl (mp->mt_tunnel.mt_sw_if_index)); - vat_json_object_add_uint (node, "l2_only", mp->mt_l2_only); + vat_json_object_add_uint (node, "l2_only", mp->mt_tunnel.mt_l2_only); - fp = mp->mt_paths; + fp = mp->mt_tunnel.mt_paths; for (i = 0; i < count; i++) { vl_api_mpls_fib_path_json_print (node, fp); @@ -17460,63 +18427,97 @@ 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) + M (MPLS_TUNNEL_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_mpls_table_details_t_endian vl_noop_handler +#define vl_api_mpls_table_details_t_print vl_noop_handler + + +static void +vl_api_mpls_table_details_t_handler (vl_api_mpls_table_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "table-id %d,", ntohl (mp->mt_table.mt_table_id)); +} + +static void vl_api_mpls_table_details_t_handler_json + (vl_api_mpls_table_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + + if (VAT_JSON_ARRAY != vam->json_tree.type) { - if (!unformat (vam->input, "tunnel_index %d", &index)) - { - index = -1; - break; - } + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - print (vam->ofp, " tunnel_index %d", index); + vat_json_init_object (node); + vat_json_object_add_uint (node, "table", ntohl (mp->mt_table.mt_table_id)); +} - M (MPLS_TUNNEL_DUMP, mp); - mp->tunnel_index = htonl (index); +static int +api_mpls_table_dump (vat_main_t * vam) +{ + vl_api_mpls_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (MPLS_TABLE_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; } -#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_mpls_route_details_t_endian vl_noop_handler +#define vl_api_mpls_route_details_t_print vl_noop_handler static void -vl_api_mpls_fib_details_t_handler (vl_api_mpls_fib_details_t * mp) +vl_api_mpls_route_details_t_handler (vl_api_mpls_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); - vl_api_fib_path2_t *fp; + int count = (int) clib_net_to_host_u32 (mp->mr_route.mr_n_paths); + 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); - fp = mp->path; + ntohl (mp->mr_route.mr_table_id), + ntohl (mp->mr_route.mr_label), mp->mr_route.mr_eos); + fp = mp->mr_route.mr_paths; for (i = 0; i < count; i++) { - vl_api_mpls_fib_path_print (vam, fp); + vl_api_fib_path_print (vam, fp); fp++; } } -static void vl_api_mpls_fib_details_t_handler_json - (vl_api_mpls_fib_details_t * mp) +static void vl_api_mpls_route_details_t_handler_json + (vl_api_mpls_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); + int count = (int) clib_host_to_net_u32 (mp->mr_route.mr_n_paths); vat_json_node_t *node = NULL; - vl_api_fib_path2_t *fp; + vl_api_fib_path_t *fp; int i; if (VAT_JSON_ARRAY != vam->json_tree.type) @@ -17527,11 +18528,11 @@ static void vl_api_mpls_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)); - 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, "table", ntohl (mp->mr_route.mr_table_id)); + vat_json_object_add_uint (node, "s_bit", mp->mr_route.mr_eos); + vat_json_object_add_uint (node, "label", ntohl (mp->mr_route.mr_label)); vat_json_object_add_uint (node, "path_count", count); - fp = mp->path; + fp = mp->mr_route.mr_paths; for (i = 0; i < count; i++) { vl_api_mpls_fib_path_json_print (node, fp); @@ -17540,69 +18541,59 @@ static void vl_api_mpls_fib_details_t_handler_json } static int -api_mpls_fib_dump (vat_main_t * vam) +api_mpls_route_dump (vat_main_t * vam) { - vl_api_mpls_fib_dump_t *mp; + unformat_input_t *input = vam->input; + vl_api_mpls_route_dump_t *mp; vl_api_control_ping_t *mp_ping; + u32 table_id; int ret; - M (MPLS_FIB_DUMP, mp); + 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; + } + + M (MPLS_ROUTE_DUMP, mp); + + mp->table.mt_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 +#define vl_api_ip_table_details_t_endian vl_noop_handler +#define vl_api_ip_table_details_t_print vl_noop_handler static void -vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp) +vl_api_ip_table_details_t_handler (vl_api_ip_table_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++; - } + "%s; table-id %d, prefix %U/%d", + mp->table.name, ntohl (mp->table.table_id)); } -static void vl_api_ip_fib_details_t_handler_json - (vl_api_ip_fib_details_t * mp) + +static void vl_api_ip_table_details_t_handler_json + (vl_api_ip_table_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); vat_json_node_t *node = NULL; - struct in_addr ip4; - struct in6_addr ip6; - vl_api_fib_path_t *fp; - int i; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -17612,46 +18603,21 @@ static void vl_api_ip_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 (&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_object_add_uint (node, "table", ntohl (mp->table.table_id)); } static int -api_ip_fib_dump (vat_main_t * vam) +api_ip_table_dump (vat_main_t * vam) { - vl_api_ip_fib_dump_t *mp; + vl_api_ip_table_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; - M (IP_FIB_DUMP, mp); + M (IP_TABLE_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); @@ -17659,17 +18625,57 @@ api_ip_fib_dump (vat_main_t * vam) } static int -api_ip_mfib_dump (vat_main_t * vam) +api_ip_mtable_dump (vat_main_t * vam) { - vl_api_ip_mfib_dump_t *mp; + vl_api_ip_mtable_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; - M (IP_MFIB_DUMP, mp); + M (IP_MTABLE_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 int +api_ip_mroute_dump (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_control_ping_t *mp_ping; + vl_api_ip_mroute_dump_t *mp; + int ret, is_ip6; + u32 table_id; + + is_ip6 = 0; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "table_id %d", &table_id)) + ; + else if (unformat (input, "ip6")) + is_ip6 = 1; + else if (unformat (input, "ip4")) + is_ip6 = 0; + else + break; + } + if (table_id == ~0) + { + errmsg ("missing table id"); + return -99; + } + + M (IP_MROUTE_DUMP, mp); + mp->table.table_id = table_id; + mp->table.is_ip6 = is_ip6; + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -17682,10 +18688,9 @@ static void vl_api_ip_neighbor_details_t_handler 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); + (ntohl (mp->neighbor.flags) & IP_NEIGHBOR_FLAG_STATIC) ? 'S' : 'D', + format_vl_api_mac_address, &mp->neighbor.mac_address, + format_vl_api_address, &mp->neighbor.ip_address); } static void vl_api_ip_neighbor_details_t_handler_json @@ -17694,8 +18699,6 @@ static void vl_api_ip_neighbor_details_t_handler_json 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) { @@ -17705,24 +18708,15 @@ static void vl_api_ip_neighbor_details_t_handler_json 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, "flag", + ((ntohl (mp->neighbor.flags) & IP_NEIGHBOR_FLAG_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); - } + format (0, "%U", format_vl_api_mac_address, + &mp->neighbor.mac_address)); + vat_json_object_add_address (node, "ip", &mp->neighbor.ip_address); } static int @@ -17760,54 +18754,42 @@ api_ip_neighbor_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; } -#define vl_api_ip6_fib_details_t_endian vl_noop_handler -#define vl_api_ip6_fib_details_t_print vl_noop_handler +#define vl_api_ip_route_details_t_endian vl_noop_handler +#define vl_api_ip_route_details_t_print vl_noop_handler static void -vl_api_ip6_fib_details_t_handler (vl_api_ip6_fib_details_t * mp) +vl_api_ip_route_details_t_handler (vl_api_ip_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); + u8 count = mp->route.n_paths; vl_api_fib_path_t *fp; int i; print (vam->ofp, "table-id %d, prefix %U/%d", - ntohl (mp->table_id), format_ip6_address, mp->address, - mp->address_length); - fp = mp->path; + ntohl (mp->route.table_id), + format_ip46_address, mp->route.prefix.address, mp->route.prefix.len); 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 = &mp->route.paths[i]; + + vl_api_fib_path_print (vam, fp); fp++; } } -static void vl_api_ip6_fib_details_t_handler_json - (vl_api_ip6_fib_details_t * mp) +static void vl_api_ip_route_details_t_handler_json + (vl_api_ip_route_details_t * mp) { vat_main_t *vam = &vat_main; - int count = ntohl (mp->count); + u8 count = mp->route.n_paths; vat_json_node_t *node = NULL; struct in_addr ip4; struct in6_addr ip6; @@ -17822,64 +18804,63 @@ 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, "table", ntohl (mp->route.table_id)); + if (ADDRESS_IP6 == mp->route.prefix.address.af) + { + clib_memcpy (&ip6, &mp->route.prefix.address.un.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "prefix", ip6); + } + else + { + clib_memcpy (&ip4, &mp->route.prefix.address.un.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "prefix", ip4); + } + vat_json_object_add_uint (node, "mask_length", mp->route.prefix.len); 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); - } + fp = &mp->route.paths[i]; + vl_api_mpls_fib_path_json_print (node, fp); } } static int -api_ip6_fib_dump (vat_main_t * vam) +api_ip_route_dump (vat_main_t * vam) { - vl_api_ip6_fib_dump_t *mp; + unformat_input_t *input = vam->input; + vl_api_ip_route_dump_t *mp; vl_api_control_ping_t *mp_ping; + u32 table_id; + u8 is_ip6; int ret; - M (IP6_FIB_DUMP, mp); - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + is_ip6 = 0; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "table_id %d", &table_id)) + ; + else if (unformat (input, "ip6")) + is_ip6 = 1; + else if (unformat (input, "ip4")) + is_ip6 = 0; + else + break; + } + if (table_id == ~0) + { + errmsg ("missing table id"); + return -99; + } - W (ret); - return ret; -} + M (IP_ROUTE_DUMP, mp); -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; + mp->table.table_id = table_id; + mp->table.is_ip6 = is_ip6; - M (IP6_MFIB_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); @@ -17994,7 +18975,7 @@ api_classify_session_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); @@ -18128,7 +19109,7 @@ api_ipfix_classify_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); @@ -18245,8 +19226,9 @@ vl_api_sw_interface_span_details_t_handler (vl_api_sw_interface_span_details_t } })); /* *INDENT-ON* */ - print (vam->ofp, "%20s => %20s (%s)", - sw_if_from_name, sw_if_to_name, states[mp->state]); + print (vam->ofp, "%20s => %20s (%s) %s", + sw_if_from_name, sw_if_to_name, states[mp->state], + mp->is_l2 ? "l2" : "device"); } static void @@ -18295,6 +19277,7 @@ static void vat_json_object_add_string_copy (node, "dst-if-name", sw_if_to_name); } vat_json_object_add_uint (node, "state", mp->state); + vat_json_object_add_uint (node, "is-l2", mp->is_l2); } static int @@ -18319,7 +19302,7 @@ api_sw_interface_span_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); @@ -18332,12 +19315,24 @@ api_pg_create_interface (vat_main_t * vam) unformat_input_t *input = vam->input; vl_api_pg_create_interface_t *mp; - u32 if_id = ~0; + u32 if_id = ~0, gso_size = 0; + u8 gso_enabled = 0; int ret; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "if_id %d", &if_id)) ; + else if (unformat (input, "gso-enabled")) + { + gso_enabled = 1; + if (unformat (input, "gso-size %u", &gso_size)) + ; + else + { + errmsg ("missing gso-size"); + return -99; + } + } else break; } @@ -18351,6 +19346,7 @@ api_pg_create_interface (vat_main_t * vam) M (PG_CREATE_INTERFACE, mp); mp->context = 0; mp->interface_id = ntohl (if_id); + mp->gso_enabled = gso_enabled; S (mp); W (ret); @@ -18471,234 +19467,534 @@ api_ip_source_and_port_range_check_add_del (vat_main_t * vam) u16 *high_ports = 0; u16 this_low; u16 this_hi; - ip4_address_t ip4_addr; - ip6_address_t ip6_addr; - u32 length; + vl_api_prefix_t prefix; 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, "%U/%d", unformat_ip4_address, &ip4_addr, &length)) + if (unformat (input, "%U", unformat_vl_api_prefix, &prefix)) + prefix_set = 1; + else if (unformat (input, "vrf %d", &vrf_id)) + ; + else if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "port %d", &tmp)) { - prefix_set = 1; + 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 - if (unformat - (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length)) + break; + } + + if (prefix_set == 0) + { + errmsg ("
/ not specified"); + return -99; + } + + if (vrf_id == ~0) + { + errmsg ("VRF ID required, not specified"); + return -99; + } + + if (vrf_id == 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"); + return -99; + } + + M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, mp); + + mp->is_add = is_add; + + clib_memcpy (&mp->prefix, &prefix, sizeof (prefix)); + + 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); + + S (mp); + W (ret); + return ret; +} + +int +api_ip_source_and_port_range_check_interface_add_del (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; + u8 is_add = 1; + 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 if (unformat (input, "tcp-out-vrf %d", &tcp_out_vrf_id)) + vrf_set = 1; + else if (unformat (input, "udp-out-vrf %d", &udp_out_vrf_id)) + vrf_set = 1; + else if (unformat (input, "tcp-in-vrf %d", &tcp_in_vrf_id)) + vrf_set = 1; + else if (unformat (input, "udp-in-vrf %d", &udp_in_vrf_id)) + vrf_set = 1; + else if (unformat (input, "del")) + is_add = 0; + else + break; + } + + if (sw_if_index == ~0) + { + errmsg ("Interface required but not specified"); + return -99; + } + + if (vrf_set == 0) + { + errmsg ("VRF ID required but not specified"); + return -99; + } + + 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_set_punt (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_address_family_t af; + vl_api_set_punt_t *mp; + u32 protocol = ~0; + u32 port = ~0; + int is_add = 1; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", unformat_vl_api_address_family, &af)) + ; + else if (unformat (i, "protocol %d", &protocol)) + ; + else if (unformat (i, "port %d", &port)) + ; + else if (unformat (i, "del")) + is_add = 0; + else { - prefix_set = 1; - is_ipv6 = 1; + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; } - else if (unformat (input, "vrf %d", &vrf_id)) + } + + M (SET_PUNT, mp); + + mp->is_add = (u8) is_add; + mp->punt.type = PUNT_API_TYPE_L4; + mp->punt.punt.l4.af = af; + mp->punt.punt.l4.protocol = (u8) protocol; + mp->punt.punt.l4.port = htons ((u16) port); + + S (mp); + W (ret); + return ret; +} + +static int +api_delete_subif (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_delete_subif_t *mp; + u32 sw_if_index = ~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)) + ; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } + + if (sw_if_index == ~0) + { + errmsg ("missing sw_if_index"); + return -99; + } + + /* Construct the API message */ + M (DELETE_SUBIF, mp); + mp->sw_if_index = ntohl (sw_if_index); + + 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) +{ + 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; + + /* Shut up coverity */ + clib_memset (dmac, 0, sizeof (dmac)); + clib_memset (smac, 0, sizeof (smac)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) ; - else if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "port %d", &tmp)) + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (i, "vtr_op %d", &vtr_op)) + ; +#define _(n,v) else if (unformat(i, n)) {vtr_op = v;} + foreach_pbb_vtr_op +#undef _ + else if (unformat (i, "translate_pbb_stag")) { - if (tmp == 0 || tmp > 65535) + if (unformat (i, "%d", &tmp)) { - errmsg ("port %d out of range", tmp); - return -99; + vtr_op = L2_VTR_TRANSLATE_2_1; + outer_tag = tmp; } - this_low = tmp; - this_hi = this_low + 1; - vec_add1 (low_ports, this_low); - vec_add1 (high_ports, this_hi); - } - else if (unformat (input, "range %d - %d", &tmp, &tmp2)) - { - if ((tmp > tmp2) || (tmp == 0) || (tmp2 > 65535)) + else { - errmsg ("incorrect range parameters"); + errmsg + ("translate_pbb_stag operation requires outer tag definition"); return -99; } - this_low = tmp; - /* Note: in debug CLI +1 is added to high before - passing to real fn that does "the work" - (ip_source_and_port_range_check_add_del). - This fn is a wrapper around the binary API fn a - control plane will call, which expects this increment - to have occurred. Hence letting the binary API control - plane fn do the increment for consistency between VAT - and other control planes. - */ - this_hi = tmp2; - vec_add1 (low_ports, this_low); - vec_add1 (high_ports, this_hi); } + else if (unformat (i, "dmac %U", unformat_ethernet_address, dmac)) + dmac_set++; + else if (unformat (i, "smac %U", unformat_ethernet_address, smac)) + smac_set++; + else if (unformat (i, "sid %d", &sid)) + ; + else if (unformat (i, "vlanid %d", &tmp)) + vlanid = tmp; else - break; + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (prefix_set == 0) + if ((sw_if_index == ~0) || (vtr_op == ~0)) { - errmsg ("
/ 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 required, not specified"); + errmsg + ("push and translate_qinq operations require dmac, smac, sid and optionally vlanid"); return -99; } - if (vrf_id == 0) + 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; +} + +static int +api_flow_classify_set_interface (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; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg - ("VRF ID should not be default. Should be distinct VRF for this purpose."); - return -99; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (vec_len (low_ports) == 0) + if (sw_if_index_set == 0) { - errmsg ("At least one port or port range required"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, mp); + 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; - if (is_ipv6) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr)); - } + 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 { - mp->is_ipv6 = 0; - clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr)); + errmsg ("classify table type must be specified"); + return -99; } - 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); + if (!vam->json_output) + { + print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); + } - clib_memcpy (mp->high_ports, high_ports, vec_len (high_ports)); - vec_free (high_ports); + M (FLOW_CLASSIFY_DUMP, mp); + mp->type = type; + /* send it... */ + S (mp); - mp->vrf_id = ntohl (vrf_id); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); + /* Wait for a reply... */ W (ret); return ret; } -int -api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam) +static int +api_feature_enable_disable (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_ip_source_and_port_range_check_interface_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; - 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; + u8 enable = 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, "arc_name %s", &arc_name)) ; - else if (unformat (input, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "feature_name %s", &feature_name)) ; - 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 + 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, "disable")) + enable = 0; else break; } - if (sw_if_index == ~0) + if (arc_name == 0) { - errmsg ("Interface required but not specified"); + errmsg ("missing arc name"); return -99; } + if (vec_len (arc_name) > 63) + { + errmsg ("arc name too long"); + } - if (vrf_set == 0) + if (feature_name == 0) { - errmsg ("VRF ID required but not specified"); + errmsg ("missing feature name"); return -99; } + if (vec_len (feature_name) > 63) + { + errmsg ("feature name too long"); + } - if (tcp_out_vrf_id == 0 - || udp_out_vrf_id == 0 || tcp_in_vrf_id == 0 || udp_in_vrf_id == 0) + if (sw_if_index == ~0) { - errmsg - ("VRF ID should not be default. Should be distinct VRF for this purpose."); + errmsg ("missing interface name or sw_if_index"); return -99; } /* Construct the API message */ - M (IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, mp); - + M (FEATURE_ENABLE_DISABLE, 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); + 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); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } static int -api_ipsec_gre_add_del_tunnel (vat_main_t * vam) +api_sw_interface_tag_add_del (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_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, "local_sa %d", &local_sa_id)) - ; - else if (unformat (i, "remote_sa %d", &remote_sa_id)) + if (unformat (i, "tag %s", &tag)) ; - else if (unformat (i, "src %U", unformat_ip4_address, &src_address)) + 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; + enable = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - M (IPSEC_GRE_ADD_DEL_TUNNEL, mp); + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - 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 (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); @@ -18706,63 +20002,67 @@ api_ipsec_gre_add_del_tunnel (vat_main_t * vam) } static int -api_punt (vat_main_t * vam) +api_sw_interface_add_del_mac_address (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_mac_address_t mac = { 0 }; + vl_api_sw_interface_add_del_mac_address_t *mp; + u32 sw_if_index = ~0; + u8 is_add = 1; + u8 mac_set = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ip %d", &ipv)) - ; - 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, "%U", unformat_vl_api_mac_address, &mac)) + mac_set++; else if (unformat (i, "del")) is_add = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; + } + + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; } - M (PUNT, mp); + if (!mac_set) + { + errmsg ("missing MAC address"); + return -99; + } - mp->is_add = (u8) is_add; - mp->ipv = (u8) ipv; - mp->l4_protocol = (u8) protocol; - mp->l4_port = htons ((u16) port); + /* Construct the API message */ + M (SW_INTERFACE_ADD_DEL_MAC_ADDRESS, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; + clib_memcpy (&mp->addr, &mac, sizeof (mac)); 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) { @@ -18772,55 +20072,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); @@ -18828,18 +20103,21 @@ api_ipsec_gre_tunnel_dump (vat_main_t * vam) } static int -api_delete_subif (vat_main_t * vam) +api_hw_interface_set_mtu (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_delete_subif_t *mp; + vl_api_hw_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; @@ -18847,75 +20125,50 @@ 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 (HW_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)); - + clib_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)) - ; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index)) ; - else if (unformat (i, "vtr_op %d", &vtr_op)) + else if (unformat (i, "sw_if_index %d", &parent_if_index)) ; -#define _(n,v) else if (unformat(i, n)) {vtr_op = v;} - foreach_pbb_vtr_op -#undef _ - else if (unformat (i, "translate_pbb_stag")) - { - if (unformat (i, "%d", &tmp)) - { - vtr_op = L2_VTR_TRANSLATE_2_1; - outer_tag = tmp; - } - else - { - errmsg - ("translate_pbb_stag operation requires outer tag definition"); - return -99; - } - } - else if (unformat (i, "dmac %U", unformat_ethernet_address, dmac)) - dmac_set++; - else if (unformat (i, "smac %U", unformat_ethernet_address, smac)) - smac_set++; - else if (unformat (i, "sid %d", &sid)) + else + if (unformat + (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) + mac_set++; + else if (unformat (i, "sub_id %d", &sub_id)) ; - else if (unformat (i, "vlanid %d", &tmp)) - vlanid = tmp; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -18923,27 +20176,26 @@ 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; + } + if (sub_id == ~0) + { + errmsg ("missing sub-interface id"); 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_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); @@ -18951,29 +20203,26 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) } static int -api_flow_classify_set_interface (vat_main_t * vam) +api_p2p_ethernet_del (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_p2p_ethernet_del_t *mp; + u32 parent_if_index = ~0; + u8 remote_mac[6]; + u8 mac_set = 0; int ret; + clib_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)) - 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, "%U", api_unformat_sw_if_index, vam, &parent_if_index)) ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) + else if (unformat (i, "sw_if_index %d", &parent_if_index)) ; + else + if (unformat + (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) + mac_set++; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -18981,18 +20230,20 @@ api_flow_classify_set_interface (vat_main_t * vam) } } - if (sw_if_index_set == 0) + 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; + } - M (FLOW_CLASSIFY_SET_INTERFACE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->is_add = is_add; + M (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); @@ -19000,89 +20251,79 @@ api_flow_classify_set_interface (vat_main_t * vam) } static int -api_flow_classify_dump (vat_main_t * vam) +api_lldp_config (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 ("classify table type must be specified"); - return -99; - } + vl_api_lldp_config_t *mp; + int tx_hold = 0; + int tx_interval = 0; + u8 *sys_name = NULL; + int ret; - if (!vam->json_output) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%10s%20s", "Intfc idx", "Classify table"); + if (unformat (i, "system-name %s", &sys_name)) + ; + else if (unformat (i, "tx-hold %d", &tx_hold)) + ; + else if (unformat (i, "tx-interval %d", &tx_interval)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - M (FLOW_CLASSIFY_DUMP, mp); - mp->type = type; - /* send it... */ - S (mp); + vec_add1 (sys_name, 0); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + 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); - /* Wait for a reply... */ + S (mp); W (ret); return ret; } static int -api_feature_enable_disable (vat_main_t * vam) +api_sw_interface_set_lldp (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_feature_enable_disable_t *mp; - u8 *arc_name = 0; - u8 *feature_name = 0; + vl_api_sw_interface_set_lldp_t *mp; u32 sw_if_index = ~0; - u8 enable = 1; + u32 enable = 1; + u8 *port_desc = NULL, *mgmt_oid = NULL; + ip4_address_t ip4_addr; + ip6_address_t ip6_addr; int ret; + clib_memset (&ip4_addr, 0, sizeof (ip4_addr)); + clib_memset (&ip6_addr, 0, sizeof (ip6_addr)); + 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)) - ; + 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, "disable")) - enable = 0; + 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 (arc_name == 0) - { - errmsg ("missing arc name"); - return -99; - } - if (vec_len (arc_name) > 63) - { - errmsg ("arc name too long"); - } - - 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"); @@ -19090,13 +20331,17 @@ api_feature_enable_disable (vat_main_t * vam) } /* Construct the API message */ - M (FEATURE_ENABLE_DISABLE, mp); + 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->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->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); @@ -19104,201 +20349,380 @@ api_feature_enable_disable (vat_main_t * vam) } static int -api_sw_interface_tag_add_del (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_sw_interface_tag_add_del_t *mp; - u32 sw_if_index = ~0; - u8 *tag = 0; - u8 enable = 1; + ip4_address_t v4first, v4last; + ip6_address_t v6first, v6last; + u8 range_set = 0; + u32 vrf_id = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "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, "%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 if (unformat (i, "del")) - enable = 0; else break; } - if (sw_if_index == ~0) + if (range_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("address range not set"); return -99; } - if (enable && (tag == 0)) + M (TCP_CONFIGURE_SRC_ADDRESSES, mp); + mp->vrf_id = ntohl (vrf_id); + /* ipv6? */ + if (range_set == 2) { - errmsg ("no tag specified"); - return -99; + 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)); } - - /* 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_l2_xconnect_details_t_handler - (vl_api_l2_xconnect_details_t * mp) +static void vl_api_app_namespace_add_del_reply_t_handler + (vl_api_app_namespace_add_del_reply_t * mp) { vat_main_t *vam = &vat_main; - - print (vam->ofp, "%15d%15d", - ntohl (mp->rx_sw_if_index), ntohl (mp->tx_sw_if_index)); + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + if (retval == 0) + errmsg ("app ns index %d\n", ntohl (mp->appns_index)); + vam->result_ready = 1; + } } -static void vl_api_l2_xconnect_details_t_handler_json - (vl_api_l2_xconnect_details_t * mp) +static void vl_api_app_namespace_add_del_reply_t_handler_json + (vl_api_app_namespace_add_del_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + 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_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "appns_index", ntohl (mp->appns_index)); - 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)); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; } static int -api_l2_xconnect_dump (vat_main_t * vam) +api_app_namespace_add_del (vat_main_t * vam) { - vl_api_l2_xconnect_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_app_namespace_add_del_t *mp; + unformat_input_t *i = vam->input; + 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; - if (!vam->json_output) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%15s%15s", "rx_sw_if_index", "tx_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 + break; } + if (!ns_id || !secret_set || !sw_if_index_set) + { + errmsg ("namespace id, secret and sw_if_index must be set"); + return -99; + } + if (vec_len (ns_id) > 64) + { + errmsg ("namespace id too long"); + return -99; + } + M (APP_NAMESPACE_ADD_DEL, mp); - M (L2_XCONNECT_DUMP, mp); - + 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); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); return ret; } static int -api_sw_interface_set_mtu (vat_main_t * vam) +api_sock_init_shm (vat_main_t * vam) { +#if VPP_API_TEST_BUILTIN == 0 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_shm_elem_config_t *config = 0; + u64 size = 64 << 20; + int rv; 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, "size %U", unformat_memory_size, &size)) ; else break; } - if (sw_if_index == ~0) + /* + * Canned custom ring allocator config. + * Should probably parse all of this + */ + vec_validate (config, 6); + config[0].type = VL_API_VLIB_RING; + config[0].size = 256; + config[0].count = 32; + + config[1].type = VL_API_VLIB_RING; + config[1].size = 1024; + config[1].count = 16; + + config[2].type = VL_API_VLIB_RING; + config[2].size = 4096; + config[2].count = 2; + + config[3].type = VL_API_CLIENT_RING; + config[3].size = 256; + config[3].count = 32; + + config[4].type = VL_API_CLIENT_RING; + config[4].size = 1024; + config[4].count = 16; + + config[5].type = VL_API_CLIENT_RING; + config[5].size = 4096; + config[5].count = 2; + + config[6].type = VL_API_QUEUE; + config[6].count = 128; + config[6].size = sizeof (uword); + + rv = vl_socket_client_init_shm (config, 1 /* want_pthread */ ); + if (!rv) + vam->client_index_invalid = 1; + return rv; +#else + return -99; +#endif +} + +static void +vl_api_session_rules_details_t_handler (vl_api_session_rules_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + if (mp->is_ip4) { - errmsg ("missing interface name or sw_if_index"); - return -99; + print (vam->ofp, + "appns %u tp %u scope %d %U/%d %d %U/%d %d action: %d tag: %s", + clib_net_to_host_u32 (mp->appns_index), mp->transport_proto, + mp->scope, format_ip4_address, &mp->lcl_ip, mp->lcl_plen, + clib_net_to_host_u16 (mp->lcl_port), format_ip4_address, + &mp->rmt_ip, mp->rmt_plen, clib_net_to_host_u16 (mp->rmt_port), + clib_net_to_host_u32 (mp->action_index), mp->tag); } - - if (mtu == 0) + else { - errmsg ("no mtu specified"); - return -99; + print (vam->ofp, + "appns %u tp %u scope %d %U/%d %d %U/%d %d action: %d tag: %s", + clib_net_to_host_u32 (mp->appns_index), mp->transport_proto, + mp->scope, format_ip6_address, &mp->lcl_ip, mp->lcl_plen, + clib_net_to_host_u16 (mp->lcl_port), format_ip6_address, + &mp->rmt_ip, mp->rmt_plen, clib_net_to_host_u16 (mp->rmt_port), + clib_net_to_host_u32 (mp->action_index), mp->tag); } +} - /* Construct the API message */ - M (SW_INTERFACE_SET_MTU, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->mtu = ntohs ((u16) mtu); +static void +vl_api_session_rules_details_t_handler_json (vl_api_session_rules_details_t * + mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in6_addr ip6; + struct in_addr ip4; - S (mp); - W (ret); - return ret; + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + vat_json_init_object (node); + + vat_json_object_add_uint (node, "is_ip4", mp->is_ip4 ? 1 : 0); + vat_json_object_add_uint (node, "appns_index", + clib_net_to_host_u32 (mp->appns_index)); + vat_json_object_add_uint (node, "transport_proto", mp->transport_proto); + vat_json_object_add_uint (node, "scope", mp->scope); + vat_json_object_add_uint (node, "action_index", + clib_net_to_host_u32 (mp->action_index)); + vat_json_object_add_uint (node, "lcl_port", + clib_net_to_host_u16 (mp->lcl_port)); + vat_json_object_add_uint (node, "rmt_port", + clib_net_to_host_u16 (mp->rmt_port)); + vat_json_object_add_uint (node, "lcl_plen", mp->lcl_plen); + vat_json_object_add_uint (node, "rmt_plen", mp->rmt_plen); + vat_json_object_add_string_copy (node, "tag", mp->tag); + if (mp->is_ip4) + { + clib_memcpy (&ip4, mp->lcl_ip, sizeof (ip4)); + vat_json_object_add_ip4 (node, "lcl_ip", ip4); + clib_memcpy (&ip4, mp->rmt_ip, sizeof (ip4)); + vat_json_object_add_ip4 (node, "rmt_ip", ip4); + } + else + { + clib_memcpy (&ip6, mp->lcl_ip, sizeof (ip6)); + vat_json_object_add_ip6 (node, "lcl_ip", ip6); + clib_memcpy (&ip6, mp->rmt_ip, sizeof (ip6)); + vat_json_object_add_ip6 (node, "rmt_ip", ip6); + } } static int -api_p2p_ethernet_add (vat_main_t * vam) +api_session_rule_add_del (vat_main_t * vam) { + vl_api_session_rule_add_del_t *mp; unformat_input_t *i = vam->input; - vl_api_p2p_ethernet_add_t *mp; - u32 parent_if_index = ~0; - u32 sub_id = ~0; - u8 remote_mac[6]; - u8 mac_set = 0; + u32 proto = ~0, lcl_port, rmt_port, action = 0, lcl_plen, rmt_plen; + u32 appns_index = 0, scope = 0; + ip4_address_t lcl_ip4, rmt_ip4; + ip6_address_t lcl_ip6, rmt_ip6; + u8 is_ip4 = 1, conn_set = 0; + u8 is_add = 1, *tag = 0; int ret; - 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)) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) ; - else if (unformat (i, "sw_if_index %d", &parent_if_index)) + else if (unformat (i, "proto tcp")) + proto = 0; + else if (unformat (i, "proto udp")) + proto = 1; + else if (unformat (i, "appns %d", &appns_index)) + ; + else if (unformat (i, "scope %d", &scope)) + ; + else if (unformat (i, "tag %_%v%_", &tag)) ; else if (unformat - (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) - mac_set++; - else if (unformat (i, "sub_id %d", &sub_id)) - ; + (i, "%U/%d %d %U/%d %d", unformat_ip4_address, &lcl_ip4, + &lcl_plen, &lcl_port, unformat_ip4_address, &rmt_ip4, &rmt_plen, + &rmt_port)) + { + is_ip4 = 1; + conn_set = 1; + } else + if (unformat + (i, "%U/%d %d %U/%d %d", unformat_ip6_address, &lcl_ip6, + &lcl_plen, &lcl_port, unformat_ip6_address, &rmt_ip6, &rmt_plen, + &rmt_port)) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + is_ip4 = 0; + conn_set = 1; } + else if (unformat (i, "action %d", &action)) + ; + else + break; } - - if (parent_if_index == ~0) + if (proto == ~0 || !conn_set || action == ~0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("transport proto, connection and action must be set"); return -99; } - if (mac_set == 0) + + if (scope > 3) { - errmsg ("missing remote mac address"); + errmsg ("scope should be 0-3"); return -99; } - if (sub_id == ~0) + + M (SESSION_RULE_ADD_DEL, mp); + + mp->is_ip4 = is_ip4; + mp->transport_proto = proto; + mp->lcl_port = clib_host_to_net_u16 ((u16) lcl_port); + mp->rmt_port = clib_host_to_net_u16 ((u16) rmt_port); + mp->lcl_plen = lcl_plen; + mp->rmt_plen = rmt_plen; + mp->action_index = clib_host_to_net_u32 (action); + mp->appns_index = clib_host_to_net_u32 (appns_index); + mp->scope = scope; + mp->is_add = is_add; + if (is_ip4) { - errmsg ("missing sub-interface id"); - return -99; + clib_memcpy (mp->lcl_ip, &lcl_ip4, sizeof (lcl_ip4)); + clib_memcpy (mp->rmt_ip, &rmt_ip4, sizeof (rmt_ip4)); + } + else + { + clib_memcpy (mp->lcl_ip, &lcl_ip6, sizeof (lcl_ip6)); + clib_memcpy (mp->rmt_ip, &rmt_ip6, sizeof (rmt_ip6)); + } + if (tag) + { + clib_memcpy (mp->tag, tag, vec_len (tag)); + vec_free (tag); } - - 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); @@ -19306,85 +20730,64 @@ api_p2p_ethernet_add (vat_main_t * vam) } static int -api_p2p_ethernet_del (vat_main_t * vam) +api_session_rules_dump (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; + vl_api_session_rules_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - memset (remote_mac, 0, sizeof (remote_mac)); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (!vam->json_output) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &parent_if_index)) - ; - else if (unformat (i, "sw_if_index %d", &parent_if_index)) - ; - else - if (unformat - (i, "remote_mac %U", unformat_ethernet_address, remote_mac)) - mac_set++; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + print (vam->ofp, "%=20s", "Session Rules"); } - 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; - } + M (SESSION_RULES_DUMP, mp); + /* send it... */ + S (mp); - M (P2P_ETHERNET_DEL, mp); - mp->parent_if_index = ntohl (parent_if_index); - clib_memcpy (mp->remote_mac, remote_mac, sizeof (remote_mac)); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - S (mp); + /* Wait for a reply... */ W (ret); return ret; } static int -api_lldp_config (vat_main_t * vam) +api_ip_container_proxy_add_del (vat_main_t * vam) { + vl_api_ip_container_proxy_add_del_t *mp; unformat_input_t *i = vam->input; - vl_api_lldp_config_t *mp; - int tx_hold = 0; - int tx_interval = 0; - u8 *sys_name = NULL; + u32 sw_if_index = ~0; + vl_api_prefix_t pfx = { }; + u8 is_add = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "system-name %s", &sys_name)) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) ; - else if (unformat (i, "tx-hold %d", &tx_hold)) + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) ; - else if (unformat (i, "tx-interval %d", &tx_interval)) + else if (unformat (i, "sw_if_index %u", &sw_if_index)) ; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; + } + if (sw_if_index == ~0 || pfx.len == 0) + { + errmsg ("address and sw_if_index must be set"); + return -99; } - vec_add1 (sys_name, 0); + M (IP_CONTAINER_PROXY_ADD_DEL, mp); - 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); + mp->sw_if_index = clib_host_to_net_u32 (sw_if_index); + mp->is_add = is_add; + clib_memcpy (&mp->pfx, &pfx, sizeof (pfx)); S (mp); W (ret); @@ -19392,49 +20795,55 @@ api_lldp_config (vat_main_t * vam) } static int -api_sw_interface_set_lldp (vat_main_t * vam) +api_qos_record_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_set_lldp_t *mp; - u32 sw_if_index = ~0; - u32 enable = 1; - u8 *port_desc = NULL; + vl_api_qos_record_enable_disable_t *mp; + u32 sw_if_index, qs = 0xff; + u8 sw_if_index_set = 0; + u8 enable = 1; int ret; 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)) - ; + 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, "%U", unformat_qos_source, &qs)) ; - else if (unformat (i, "port-desc %s", &port_desc)) - ; + else if (unformat (i, "disable")) + enable = 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 ("missing interface name or sw_if_index"); return -99; } + if (qs == 0xff) + { + errmsg ("input location must be specified"); + return -99; + } - /* Construct the API message */ - vec_add1 (port_desc, 0); - M (SW_INTERFACE_SET_LLDP, mp); - mp->sw_if_index = ntohl (sw_if_index); + M (QOS_RECORD_ENABLE_DISABLE, mp); + + mp->record.sw_if_index = ntohl (sw_if_index); + mp->record.input_source = qs; mp->enable = enable; - clib_memcpy (mp->port_desc, port_desc, vec_len (port_desc)); - vec_free (port_desc); S (mp); W (ret); return ret; } + static int q_or_quit (vat_main_t * vam) { @@ -19462,6 +20871,172 @@ comment (vat_main_t * vam) return 0; } +static int +elog_save (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + unformat_input_t *i = vam->input; + char *file, *chroot_file; + clib_error_t *error; + + if (!unformat (i, "%s", &file)) + { + errmsg ("expected file name, got `%U'", format_unformat_error, i); + return 0; + } + + /* It's fairly hard to get "../oopsie" through unformat; just in case */ + if (strstr (file, "..") || index (file, '/')) + { + errmsg ("illegal characters in filename '%s'", file); + return 0; + } + + chroot_file = (char *) format (0, "/tmp/%s%c", file, 0); + + vec_free (file); + + errmsg ("Saving %wd of %wd events to %s", + elog_n_events_in_buffer (em), + elog_buffer_capacity (em), chroot_file); + + error = elog_write_file (em, chroot_file, 1 /* flush ring */ ); + vec_free (chroot_file); + + if (error) + clib_error_report (error); +#else + errmsg ("Use the vpp event loger..."); +#endif + + return 0; +} + +static int +elog_setup (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + unformat_input_t *i = vam->input; + u32 nevents = 128 << 10; + + (void) unformat (i, "nevents %d", &nevents); + + elog_init (em, nevents); + vl_api_set_elog_main (em); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger initialized with %u events", nevents); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + +static int +elog_enable (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + + elog_enable_disable (em, 1 /* enable */ ); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger enabled..."); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + +static int +elog_disable (vat_main_t * vam) +{ +#if VPP_API_TEST_BUILTIN == 0 + elog_main_t *em = &vam->elog_main; + + elog_enable_disable (em, 0 /* enable */ ); + vl_api_set_elog_trace_api_messages (1); + errmsg ("Event logger disabled..."); +#else + errmsg ("Use the vpp event loger..."); +#endif + return 0; +} + +static int +statseg (vat_main_t * vam) +{ + ssvm_private_t *ssvmp = &vam->stat_segment; + ssvm_shared_header_t *shared_header = ssvmp->sh; + vlib_counter_t **counters; + u64 thread0_index1_packets; + u64 thread0_index1_bytes; + f64 vector_rate, input_rate; + uword *p; + + uword *counter_vector_by_name; + if (vam->stat_segment_lockp == 0) + { + errmsg ("Stat segment not mapped..."); + return -99; + } + + /* look up "/if/rx for sw_if_index 1 as a test */ + + clib_spinlock_lock (vam->stat_segment_lockp); + + counter_vector_by_name = (uword *) shared_header->opaque[1]; + + p = hash_get_mem (counter_vector_by_name, "/if/rx"); + if (p == 0) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("/if/tx not found?"); + return -99; + } + + /* Fish per-thread vector of combined counters from shared memory */ + counters = (vlib_counter_t **) p[0]; + + if (vec_len (counters[0]) < 2) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("/if/tx vector length %d", vec_len (counters[0])); + return -99; + } + + /* Read thread 0 sw_if_index 1 counter */ + thread0_index1_packets = counters[0][1].packets; + thread0_index1_bytes = counters[0][1].bytes; + + p = hash_get_mem (counter_vector_by_name, "vector_rate"); + if (p == 0) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("vector_rate not found?"); + return -99; + } + + vector_rate = *(f64 *) (p[0]); + p = hash_get_mem (counter_vector_by_name, "input_rate"); + if (p == 0) + { + clib_spinlock_unlock (vam->stat_segment_lockp); + errmsg ("input_rate not found?"); + return -99; + } + input_rate = *(f64 *) (p[0]); + + clib_spinlock_unlock (vam->stat_segment_lockp); + + print (vam->ofp, "vector_rate %.2f input_rate %.2f", + vector_rate, input_rate); + print (vam->ofp, "thread 0 sw_if_index 1 rx pkts %lld, bytes %lld", + thread0_index1_packets, thread0_index1_bytes); + + return 0; +} + static int cmd_cmp (void *a1, void *a2) { @@ -19608,15 +21183,15 @@ dump_node_table (vat_main_t * vam) return 0; } - for (i = 0; i < vec_len (vam->graph_nodes); i++) + for (i = 0; i < vec_len (vam->graph_nodes[0]); i++) { - node = vam->graph_nodes[i]; + node = vam->graph_nodes[0][i]; print (vam->ofp, "[%d] %s", i, node->name); for (j = 0; j < vec_len (node->next_nodes); j++) { if (node->next_nodes[j] != ~0) { - next_node = vam->graph_nodes[node->next_nodes[j]]; + next_node = vam->graph_nodes[0][node->next_nodes[j]]; print (vam->ofp, " [%d] %s", j, next_node->name); } } @@ -19671,7 +21246,7 @@ get_msg_id (vat_main_t * vam) if (unformat (vam->input, "%s", &name_and_crc)) { - message_index = vl_api_get_msg_index (name_and_crc); + message_index = vl_msg_api_get_msg_index (name_and_crc); if (message_index == ~0) { print (vam->ofp, " '%s' not found", name_and_crc); @@ -19711,13 +21286,13 @@ search_node_table (vat_main_t * vam) print (vam->ofp, "%s not found...", node_to_find); goto out; } - node = vam->graph_nodes[p[0]]; + node = vam->graph_nodes[0][p[0]]; print (vam->ofp, "[%d] %s", p[0], node->name); for (j = 0; j < vec_len (node->next_nodes); j++) { if (node->next_nodes[j] != ~0) { - next_node = vam->graph_nodes[node->next_nodes[j]]; + next_node = vam->graph_nodes[0][node->next_nodes[j]]; print (vam->ofp, " [%d] %s", j, next_node->name); } } @@ -19778,7 +21353,7 @@ script (vat_main_t * vam) vam->current_file = s; do_one_file (vam); - clib_memcpy (&vam->input, &save_input, sizeof (vam->input)); + clib_memcpy (&vam->input, &save_input, sizeof (save_input)); clib_memcpy (&vam->jump_buf, &save_jump_buf, sizeof (save_jump_buf)); vam->ifp = save_ifp; vam->input_line_number = save_line_number; @@ -19807,6 +21382,12 @@ _(sw_interface_set_flags, \ " | sw_if_index admin-up | admin-down link-up | link down") \ _(sw_interface_add_del_address, \ " | sw_if_index | [del] [del-all] ") \ +_(sw_interface_set_rx_mode, \ + " | sw_if_index [queue ] ") \ +_(sw_interface_set_rx_placement, \ + " | sw_if_index [queue ] [worker | main]") \ +_(sw_interface_rx_placement_dump, \ + "[ | sw_if_index ]") \ _(sw_interface_set_table, \ " | sw_if_index vrf [ipv6]") \ _(sw_interface_set_mpls_enable, \ @@ -19815,6 +21396,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") \ @@ -19824,41 +21407,75 @@ _(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, \ - "tapname mac | random-mac [tag ]") \ -_(tap_modify, \ - " | sw_if_index tapname mac | random-mac") \ -_(tap_delete, \ +_(tap_create_v2, \ + "id [hw-addr ] [host-ns ] [rx-ring-size [tx-ring-size ] [host-mtu-size ] [gso | no-gso]") \ +_(tap_delete_v2, \ " | sw_if_index ") \ -_(sw_interface_tap_dump, "") \ -_(ip_add_del_route, \ - "/ via [table-id ]\n" \ - "[ | sw_if_index ] [resolve-attempts ]\n" \ - "[weight ] [drop] [local] [classify ] [del]\n" \ - "[multipath] [count ]") \ +_(sw_interface_tap_v2_dump, "") \ +_(virtio_pci_create, \ + "pci-addr [use_random_mac | hw-addr ] [features ] [gso-enabled]") \ +_(virtio_pci_delete, \ + " | sw_if_index ") \ +_(sw_interface_virtio_pci_dump, "") \ +_(bond_create, \ + "[hw-addr ] {round-robin | active-backup | " \ + "broadcast | {lacp | xor} [load-balance { l2 | l23 | l34 }]} " \ + "[id ]") \ +_(bond_delete, \ + " | sw_if_index ") \ +_(bond_enslave, \ + "sw_if_index bond [is_passive] [is_long_timeout]") \ +_(bond_detach_slave, \ + "sw_if_index ") \ + _(sw_interface_set_bond_weight, " | sw_if_index weight ") \ +_(sw_interface_bond_dump, "") \ +_(sw_interface_slave_dump, \ + " | sw_if_index ") \ +_(ip_table_add_del, \ + "table [ipv6] [add | del]\n") \ +_(ip_route_add_del, \ + "/ via <||sw_if_index |via-label >\n" \ + "[table-id ] [ | sw_if_index ] [resolve-attempts ]\n"\ + "[weight ] [drop] [local] [classify ] [out-label ]\n" \ + "[multipath] [count ] [del]") \ _(ip_mroute_add_del, \ " / [table-id ]\n" \ "[ | sw_if_index ] [local] [del]") \ +_(mpls_table_add_del, \ + "table [add | del]\n") \ _(mpls_route_add_del, \ - "