X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=d9a9d2238040e9b454dd668efdb7942b8eaa4b74;hb=bc764c8bc;hp=89843e41d08cc94224e747e50c63f06b2c6874cc;hpb=d723161e038d00e59766aa67a6a0dcc350227e4b;p=vpp.git diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 89843e41d08..d9a9d223804 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -18,11 +18,13 @@ */ #include +#include #include #include #include #include #include +#include #include #include #include @@ -39,9 +41,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -53,7 +53,12 @@ #include #include #include +#include +#include #include "vat/json_format.h" +#include +#include +#include #include #include @@ -69,7 +74,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 @@ -89,9 +98,15 @@ vl (void *p) int vat_socket_connect (vat_main_t * vam) { + int rv; vam->socket_client_main = &socket_client_main; - return vl_socket_client_connect ((char *) vam->socket_name, "vpp_api_test", - 0 /* default socket rx, tx buffer */ ); + 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 @@ -177,6 +192,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) @@ -344,20 +365,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) { @@ -375,20 +382,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) { @@ -406,14 +399,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; @@ -421,34 +437,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) @@ -567,12 +567,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) { @@ -709,8 +710,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; @@ -718,8 +720,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]); @@ -732,6 +735,25 @@ increment_v6_address (ip6_address_t * a) a->as_u64[1] = clib_net_to_host_u64 (v1); } +static void +increment_address (vl_api_address_t * a) +{ + if (a->af == ADDRESS_IP4) + increment_v4_address (&a->un.ip4); + else if (a->af == ADDRESS_IP6) + increment_v6_address (&a->un.ip6); +} + +static void +set_ip4_address (vl_api_address_t * a, u32 v) +{ + 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) { @@ -743,6 +765,34 @@ increment_mac_address (u8 * mac) 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, "address_length", prefix->address_length); + vat_json_object_add_address (node, "prefix", &prefix->address); +} + static void vl_api_create_loopback_reply_t_handler (vl_api_create_loopback_reply_t * mp) { @@ -1031,8 +1081,8 @@ static void vl_api_sw_interface_event_t_handler } #endif -static void vl_api_sw_interface_event_t_handler_json - (vl_api_sw_interface_event_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 */ } @@ -1083,7 +1133,7 @@ vl_api_cli_inband_reply_t_handler (vl_api_cli_inband_reply_t * mp) { vat_main_t *vam = &vat_main; i32 retval = ntohl (mp->retval); - u32 length = ntohl (mp->length); + u32 length = vl_api_string_len (&mp->reply); vec_reset_length (vam->cmd_reply); @@ -1091,7 +1141,8 @@ vl_api_cli_inband_reply_t_handler (vl_api_cli_inband_reply_t * mp) if (retval == 0) { vec_validate (vam->cmd_reply, length); - clib_memcpy ((char *) (vam->cmd_reply), mp->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; @@ -1107,7 +1158,8 @@ vl_api_cli_inband_reply_t_handler_json (vl_api_cli_inband_reply_t * mp) 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); @@ -1278,10 +1330,31 @@ static void vl_api_show_version_reply_t_handler if (retval >= 0) { - errmsg (" program: %s", mp->program); - errmsg (" version: %s", mp->version); - errmsg (" build date: %s", mp->build_date); - errmsg ("build directory: %s", mp->build_directory); + u8 *s = 0; + char *p = (char *) &mp->program; + + s = vl_api_from_api_to_vec ((vl_api_string_t *) p); + errmsg (" program: %v\n", s); + vec_free (s); + + p += + vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t); + s = vl_api_from_api_to_vec ((vl_api_string_t *) p); + errmsg (" version: %v\n", s); + vec_free (s); + + p += + vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t); + s = vl_api_from_api_to_vec ((vl_api_string_t *) p); + errmsg (" build date: %v\n", s); + vec_free (s); + + p += + vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t); + s = vl_api_from_api_to_vec ((vl_api_string_t *) p); + vec_free (s); + + errmsg ("build directory: %v\n", s); } vam->retval = retval; vam->result_ready = 1; @@ -1295,11 +1368,22 @@ static void vl_api_show_version_reply_t_handler_json vat_json_init_object (&node); vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_string_copy (&node, "program", mp->program); - vat_json_object_add_string_copy (&node, "version", mp->version); - vat_json_object_add_string_copy (&node, "build_date", mp->build_date); + char *p = (char *) &mp->program; + vat_json_object_add_string_copy (&node, "program", + vl_api_from_api_string ((vl_api_string_t *) + p)); + p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32); + vat_json_object_add_string_copy (&node, "version", + vl_api_from_api_string ((vl_api_string_t *) + p)); + p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32); + vat_json_object_add_string_copy (&node, "build_date", + vl_api_from_api_string ((vl_api_string_t *) + p)); + p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32); vat_json_object_add_string_copy (&node, "build_directory", - mp->build_directory); + vl_api_from_api_string ((vl_api_string_t *) + p)); vat_json_print (vam->ofp, &node); vat_json_free (&node); @@ -1308,14 +1392,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 @@ -1330,8 +1488,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 @@ -1344,7 +1502,7 @@ static void vl_api_l2_macs_event_t_handler (vl_api_l2_macs_event_t * mp) { u32 n_macs = ntohl (mp->n_macs); - errmsg ("L2MAC event recived with pid %d cl-idx %d for %d macs: \n", + 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++) @@ -1378,12 +1536,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) { @@ -1607,8 +1766,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); @@ -1625,8 +1784,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; @@ -1644,41 +1803,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) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->sw_if_index = ntohl (mp->sw_if_index); - vam->result_ready = 1; - } -} - -static void vl_api_tap_modify_reply_t_handler_json - (vl_api_tap_modify_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void -vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_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); @@ -1693,8 +1818,8 @@ vl_api_tap_delete_reply_t_handler (vl_api_tap_delete_reply_t * mp) } } -static void vl_api_tap_delete_reply_t_handler_json - (vl_api_tap_delete_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; @@ -1710,7 +1835,8 @@ static void vl_api_tap_delete_reply_t_handler_json } static void -vl_api_tap_create_v2_reply_t_handler (vl_api_tap_create_v2_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); @@ -1724,11 +1850,10 @@ vl_api_tap_create_v2_reply_t_handler (vl_api_tap_create_v2_reply_t * mp) vam->sw_if_index = ntohl (mp->sw_if_index); vam->result_ready = 1; } - } -static void vl_api_tap_create_v2_reply_t_handler_json - (vl_api_tap_create_v2_reply_t * mp) +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; @@ -1746,7 +1871,8 @@ static void vl_api_tap_create_v2_reply_t_handler_json } static void -vl_api_tap_delete_v2_reply_t_handler (vl_api_tap_delete_v2_reply_t * mp) +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); @@ -1761,8 +1887,8 @@ vl_api_tap_delete_v2_reply_t_handler (vl_api_tap_delete_v2_reply_t * mp) } } -static void vl_api_tap_delete_v2_reply_t_handler_json - (vl_api_tap_delete_v2_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; @@ -2058,8 +2184,10 @@ static void vl_api_mpls_tunnel_add_del_reply_t_handler 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_mpls_tunnel_add_del_reply_t_handler_json @@ -2274,6 +2402,38 @@ static void vl_api_vxlan_add_del_tunnel_reply_t_handler_json vam->result_ready = 1; } +static void vl_api_vxlan_offload_rx_reply_t_handler + (vl_api_vxlan_offload_rx_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->result_ready = 1; + } +} + +static void vl_api_vxlan_offload_rx_reply_t_handler_json + (vl_api_vxlan_offload_rx_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t node; + + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + static void vl_api_geneve_add_del_tunnel_reply_t_handler (vl_api_geneve_add_del_tunnel_reply_t * mp) { @@ -2343,8 +2503,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_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); @@ -2360,8 +2520,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_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; @@ -2504,8 +2664,8 @@ static void vl_api_ip_address_details_t_handler 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; + clib_memcpy (&address->ip, &mp->prefix.address.un, sizeof (address->ip)); + address->prefix_length = mp->prefix.address_length; #undef addresses } @@ -2514,8 +2674,6 @@ static void vl_api_ip_address_details_t_handler_json { 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) { @@ -2525,17 +2683,7 @@ static void vl_api_ip_address_details_t_handler_json node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - if (vam->is_ipv6) - { - clib_memcpy (&ip6, mp->ip, sizeof (ip6)); - vat_json_object_add_ip6 (node, "ip", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip, sizeof (ip4)); - vat_json_object_add_ip4 (node, "ip", ip4); - } - vat_json_object_add_uint (node, "prefix_length", mp->prefix_length); + vat_json_object_add_prefix (node, &mp->prefix); } static void @@ -2571,110 +2719,27 @@ vl_api_ip_details_t_handler_json (vl_api_ip_details_t * mp) 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) +static void +vl_api_dhcp_compl_event_t_handler (vl_api_dhcp_compl_event_t * mp) { - vat_json_node_t *node = NULL; - vat_main_t *vam = &vat_main; - struct in6_addr ip6; - struct in_addr ip4; + u8 *s, i; - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } + s = format (0, "DHCP compl event: pid %d %s hostname %s host_addr %U " + "host_mac %U router_addr %U", + ntohl (mp->pid), mp->lease.is_ipv6 ? "ipv6" : "ipv4", + mp->lease.hostname, + format_ip4_address, mp->lease.host_address, + format_ethernet_address, mp->lease.host_mac, + format_ip4_address, mp->lease.router_address); - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); + for (i = 0; i < mp->lease.count; i++) + s = + format (s, " domain_server_addr %U", format_ip4_address, + mp->lease.domain_server[i].address); - 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) -{ - vat_main_t *vam = &vat_main; - - 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" : ""); -} - -static void vl_api_map_rule_details_t_handler_json - (vl_api_map_rule_details_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) - { - 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, "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); -} - -static void -vl_api_map_rule_details_t_handler (vl_api_map_rule_details_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->lease.is_ipv6 ? "ipv6" : "ipv4", - mp->lease.hostname, - format_ip4_address, &mp->lease.host_address, - format_ip4_address, &mp->lease.router_address, - format_ethernet_address, mp->lease.host_mac); -} + errmsg ((char *) s); + vec_free (s); +} static void vl_api_dhcp_compl_event_t_handler_json (vl_api_dhcp_compl_event_t * mp) @@ -2682,288 +2747,6 @@ static void vl_api_dhcp_compl_event_t_handler_json /* JSON output not supported */ } -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; - - 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; -} - -static void -set_combined_interface_counter (u8 vnet_counter_type, u32 sw_if_index, - interface_counter_t counter) -{ - 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++) - { - 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++; - } -} - -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++) - { - 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++; - } -} - -static u32 -ip4_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id) -{ - 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; -} - -static u32 -ip6_fib_counters_get_vrf_index_by_vrf_id (u32 vrf_id) -{ - vat_main_t *vam = &vat_main; - u32 i; - - 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; -} - -static void vl_api_vnet_ip4_fib_counters_t_handler - (vl_api_vnet_ip4_fib_counters_t * mp) -{ - /* not supported */ -} - -static void vl_api_vnet_ip4_fib_counters_t_handler_json - (vl_api_vnet_ip4_fib_counters_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) - { - 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; - } - - 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++) - { - 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++; - } -} - -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) -{ - 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); - - if (mp->begin) - vec_free (vam->ip4_nbr_counters[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++; - } -} - -static void vl_api_vnet_ip6_fib_counters_t_handler - (vl_api_vnet_ip6_fib_counters_t * mp) -{ - /* not supported */ -} - -static void vl_api_vnet_ip6_fib_counters_t_handler_json - (vl_api_vnet_ip6_fib_counters_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) - { - 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; - } - - 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++) - { - 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++; - } -} - -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) -{ - 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; - - sw_if_index = ntohl (mp->sw_if_index); - count = ntohl (mp->count); - vec_validate (vam->ip6_nbr_counters, sw_if_index); - - if (mp->begin) - vec_free (vam->ip6_nbr_counters[sw_if_index]); - - 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++; - } -} - static void vl_api_get_first_msg_id_reply_t_handler (vl_api_get_first_msg_id_reply_t * mp) { @@ -3044,13 +2827,14 @@ static void vl_api_get_node_graph_reply_t_handler { hash_free (vam->graph_node_index_by_name); - 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]; vec_free (node->name); vec_free (node->next_nodes); vec_free (node); } + vec_free (vam->graph_nodes[0]); vec_free (vam->graph_nodes); } @@ -3058,9 +2842,9 @@ static void vl_api_get_node_graph_reply_t_handler vam->graph_nodes = vlib_node_unserialize (pvt_copy); vec_free (pvt_copy); - 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]; hash_set_mem (vam->graph_node_index_by_name, node->name, i); } } @@ -5300,41 +5084,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; - } - vam->regenerate_interface_table = 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) { @@ -5362,18 +5111,6 @@ 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 @@ -5398,6 +5135,7 @@ static void vl_api_flow_classify_details_t_handler_json _(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) \ @@ -5410,7 +5148,7 @@ _(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) \ @@ -5422,19 +5160,20 @@ _(proxy_arp_add_del_reply) \ _(proxy_arp_intfc_enable_disable_reply) \ _(sw_interface_set_unnumbered_reply) \ _(ip_neighbor_add_del_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) \ @@ -5459,31 +5198,14 @@ _(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) \ -_(ipsec_tunnel_if_set_key_reply) \ _(ipsec_tunnel_if_set_sa_reply) \ -_(ikev2_profile_add_del_reply) \ -_(ikev2_profile_set_auth_reply) \ -_(ikev2_profile_set_id_reply) \ -_(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) \ _(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) \ @@ -5532,7 +5254,7 @@ _(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) \ _(hw_interface_set_mtu_reply) \ @@ -5595,6 +5317,8 @@ _(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) \ @@ -5613,20 +5337,19 @@ _(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) \ _(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_BOND_DETAILS, sw_interface_bond_details) \ _(SW_INTERFACE_SLAVE_DETAILS, sw_interface_slave_details) \ -_(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply) \ +_(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) \ @@ -5643,7 +5366,6 @@ _(SW_INTERFACE_SET_UNNUMBERED_REPLY, \ _(IP_NEIGHBOR_ADD_DEL_REPLY, ip_neighbor_add_del_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) \ @@ -5652,8 +5374,6 @@ _(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, \ @@ -5662,6 +5382,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) \ @@ -5682,10 +5405,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) \ _(GENEVE_TUNNEL_DETAILS, geneve_tunnel_details) \ -_(GRE_ADD_DEL_TUNNEL_REPLY, gre_add_del_tunnel_reply) \ +_(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) \ @@ -5695,6 +5419,7 @@ _(CREATE_VHOST_USER_IF_REPLY, create_vhost_user_if_reply) \ _(MODIFY_VHOST_USER_IF_REPLY, modify_vhost_user_if_reply) \ _(DELETE_VHOST_USER_IF_REPLY, delete_vhost_user_if_reply) \ _(SHOW_VERSION_REPLY, show_version_reply) \ +_(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_TUNNEL_DETAILS, vxlan_gpe_tunnel_details) \ @@ -5712,36 +5437,17 @@ _(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_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_SA_SET_KEY_REPLY, ipsec_sa_set_key_reply) \ _(IPSEC_TUNNEL_IF_ADD_DEL_REPLY, ipsec_tunnel_if_add_del_reply) \ -_(IPSEC_TUNNEL_IF_SET_KEY_REPLY, ipsec_tunnel_if_set_key_reply) \ _(IPSEC_TUNNEL_IF_SET_SA_REPLY, ipsec_tunnel_if_set_sa_reply) \ -_(IKEV2_PROFILE_ADD_DEL_REPLY, ikev2_profile_add_del_reply) \ -_(IKEV2_PROFILE_SET_AUTH_REPLY, ikev2_profile_set_auth_reply) \ -_(IKEV2_PROFILE_SET_ID_REPLY, ikev2_profile_set_id_reply) \ -_(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) \ _(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \ _(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \ +_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \ +_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \ _(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) \ _(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) \ @@ -5834,7 +5540,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) \ @@ -5857,13 +5564,11 @@ _(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) \ _(L2_XCONNECT_DETAILS, l2_xconnect_details) \ @@ -5884,17 +5589,10 @@ _(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) \ -_(MAP_STATS_SEGMENT_REPLY, map_stats_segment_reply) +_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) #define foreach_standalone_reply_msg \ -_(SW_INTERFACE_EVENT, sw_interface_event) \ -_(VNET_INTERFACE_SIMPLE_COUNTERS, vnet_interface_simple_counters) \ -_(VNET_INTERFACE_COMBINED_COUNTERS, vnet_interface_combined_counters) \ -_(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters) \ -_(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters) \ -_(VNET_IP4_NBR_COUNTERS, vnet_ip4_nbr_counters) \ -_(VNET_IP6_NBR_COUNTERS, vnet_ip6_nbr_counters) +_(SW_INTERFACE_EVENT, sw_interface_event) typedef struct { @@ -6068,205 +5766,6 @@ 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; -} - /* * Pass CLI buffers directly in the CLI_INBAND API message, * instead of an additional shared memory area. @@ -6299,8 +5798,7 @@ 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); W (ret); @@ -6328,7 +5826,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) { @@ -6394,38 +5892,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) { @@ -6617,18 +6083,27 @@ api_sw_interface_set_rx_mode (vat_main_t * vam) } static int -api_sw_interface_clear_stats (vat_main_t * vam) +api_sw_interface_set_rx_placement (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_clear_stats_t *mp; + vl_api_sw_interface_set_rx_placement_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; 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, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + 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; @@ -6636,9 +6111,127 @@ 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 (is_main) + thread_index = 0; + /* Construct the API message */ + M (SW_INTERFACE_SET_RX_PLACEMENT, mp); + mp->sw_if_index = ntohl (sw_if_index); + 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 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_rx_placement_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + 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; + + 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++; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set++; + else + break; + } + + print (vam->ofp, + "\n%-11s %-11s %-6s %-5s %-4s", + "sw_if_index", "main/worker", "thread", "queue", "mode"); + + /* Dump Interface rx placement */ + M (SW_INTERFACE_RX_PLACEMENT_DUMP, mp); + + if (sw_if_index_set) + mp->sw_if_index = htonl (sw_if_index); + else + mp->sw_if_index = ~0; + + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; +} + +static int +api_sw_interface_clear_stats (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + 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 @@ -7111,15 +6704,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) { @@ -7134,7 +6729,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")) @@ -7160,7 +6757,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); @@ -7606,7 +7203,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 */ @@ -7615,15 +7212,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")) @@ -7641,7 +7238,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); @@ -7652,17 +7249,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; @@ -7673,16 +7268,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++; } @@ -7710,215 +7300,126 @@ 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) - { - errmsg ("tap name too long"); - return -99; - } - vec_add1 (tap_name, 0); - - if (vec_len (tag) > 63) + if (bd_id_set == 0) { - errmsg ("tag too long"); + errmsg ("missing bridge domain"); return -99; } - /* Construct the API message */ - M (TAP_CONNECT, mp); - - mp->use_random_mac = random_mac; - clib_memcpy (mp->mac_address, mac_address, 6); - clib_memcpy (mp->tap_name, tap_name, vec_len (tap_name)); - if (tag) - clib_memcpy (mp->tag, tag, vec_len (tag)); - - if (ip4_address_set) - { - mp->ip4_address_set = 1; - clib_memcpy (mp->ip4_address, &ip4_address, sizeof (mp->ip4_address)); - mp->ip4_mask_width = ip4_mask_width; - } - if (ip6_address_set) - { - mp->ip6_address_set = 1; - clib_memcpy (mp->ip6_address, &ip6_address, sizeof (mp->ip6_address)); - mp->ip6_mask_width = ip6_mask_width; - } + M (BD_IP_MAC_FLUSH, mp); - vec_free (tap_name); - vec_free (tag); + mp->bd_id = ntohl (bd_id); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -static int -api_tap_modify (vat_main_t * vam) +static void vl_api_bd_ip_mac_details_t_handler + (vl_api_bd_ip_mac_details_t * mp) { - unformat_input_t *i = vam->input; - vl_api_tap_modify_t *mp; - 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; - int ret; + vat_main_t *vam = &vat_main; - memset (mac_address, 0, sizeof (mac_address)); + 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); +} - /* 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)) - { - random_mac = 0; - } - else if (unformat (i, "random-mac")) - random_mac = 1; - else if (unformat (i, "tapname %s", &tap_name)) - name_set = 1; - else - break; - } +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 (sw_if_index_set == 0) - { - errmsg ("missing vpp interface name"); - return -99; - } - if (name_set == 0) - { - errmsg ("missing tap name"); - return -99; - } - if (vec_len (tap_name) > 63) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - errmsg ("tap name too long"); + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } - vec_add1 (tap_name, 0); - - /* Construct the API message */ - M (TAP_MODIFY, 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); + node = vat_json_array_add (&vam->json_tree); - /* send it... */ - S (mp); + 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; - /* Wait for a reply... */ - W (ret); - return ret; + 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_tap_delete (vat_main_t * vam) +api_bd_ip_mac_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_tap_delete_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; + 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; - /* 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; + if (unformat (i, "bd_id %d", &bd_id)) + { + bd_id_set++; + } else break; } - if (sw_if_index_set == 0) - { - errmsg ("missing vpp interface name"); - return -99; - } + print (vam->ofp, + "\n%-5s %-7s %-20s %-30s", + "bd_id", "is_ipv6", "mac_address", "ip_address"); - /* Construct the API message */ - M (TAP_DELETE, mp); + /* Dump Bridge Domain Ip to Mac entries */ + M (BD_IP_MAC_DUMP, mp); - mp->sw_if_index = ntohl (sw_if_index); + 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; } @@ -7947,7 +7448,7 @@ api_tap_create_v2 (vat_main_t * vam) 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) @@ -8058,7 +7559,7 @@ api_tap_create_v2 (vat_main_t * vam) 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_ip4_prefix_len) + 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); @@ -8116,32 +7617,155 @@ api_tap_delete_v2 (vat_main_t * vam) return ret; } +uword +unformat_pci_addr (unformat_input_t * input, va_list * args) +{ + struct pci_addr_t + { + u16 domain; + u8 bus; + u8 slot:5; + u8 function:3; + } *addr; + addr = va_arg (*args, struct 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_bond_create (vat_main_t * vam) +api_virtio_pci_create (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_bond_create_t *mp; + vl_api_virtio_pci_create_t *mp; u8 mac_address[6]; - u8 custom_mac = 0; + u8 random_mac = 1; + u8 gso_enabled = 0; + u32 pci_addr = 0; + u64 features = (u64) ~ (0ULL); int ret; - u8 mode; - u8 lb; - u8 mode_is_set = 0; - memset (mac_address, 0, sizeof (mac_address)); - lb = BOND_LB_L2; + 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, "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)) + if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) + { + random_mac = 0; + } + else if (unformat (i, "pci-addr %U", unformat_pci_addr, &pci_addr)) ; - else if (unformat (i, "hw-addr %U", unformat_ethernet_address, - mac_address)) + else if (unformat (i, "features 0x%llx", &features)) + ; + else if (unformat (i, "gso-enabled")) + gso_enabled = 1; + else + break; + } + + if (pci_addr == 0) + { + errmsg ("pci address must be non zero. "); + return -99; + } + + /* 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) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; + } + + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } + + /* Construct the API message */ + M (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; + + 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) + { + 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, "id %u", &id)) + ; else break; } @@ -8159,6 +7783,7 @@ api_bond_create (vat_main_t * vam) mp->mode = mode; mp->lb = lb; + mp->id = htonl (id); if (custom_mac) clib_memcpy (mp->mac_address, mac_address, 6); @@ -8341,8 +7966,8 @@ api_ip_table_add_del (vat_main_t * vam) /* Construct the API message */ M (IP_TABLE_ADD_DEL, mp); - mp->table_id = ntohl (table_id); - mp->is_ipv6 = is_ipv6; + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; mp->is_add = is_add; /* send it... */ @@ -8354,122 +7979,195 @@ api_ip_table_add_del (vat_main_t * vam) return ret; } -static int -api_ip_add_del_route (vat_main_t * vam) +uword +unformat_fib_path (unformat_input_t * input, va_list * args) { - 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 is_add = 1; - u32 next_hop_weight = 1; - 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; + 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; - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + clib_memset (path, 0, sizeof (*path)); + path->weight = 1; + path->sw_if_index = ~0; + path->rpf_id = ~0; + path->n_labels = 0; + + while (unformat_check_input (input) != 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)) + if (unformat (input, "%U %U", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, + api_unformat_sw_if_index, vam, &path->sw_if_index)) { - address_set = 1; - is_ipv6 = 0; + path->proto = FIB_API_PATH_NH_PROTO_IP4; } - else if (unformat (i, "%U", unformat_ip6_address, &v6_dst_address)) + 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)) { - address_set = 1; - is_ipv6 = 1; + path->proto = FIB_API_PATH_NH_PROTO_IP6; } - else if (unformat (i, "/%d", &dst_address_length)) + else if (unformat (input, "weight %u", &weight)) { - address_length_set = 1; + path->weight = weight; } - - else if (is_ipv6 == 0 && unformat (i, "via %U", unformat_ip4_address, - &v4_next_hop_address)) + else if (unformat (input, "preference %u", &preference)) { - next_hop_set = 1; + path->preference = preference; } - else if (is_ipv6 == 1 && unformat (i, "via %U", unformat_ip6_address, - &v6_next_hop_address)) + else if (unformat (input, "%U next-hop-table %d", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, &path->table_id)) { - next_hop_set = 1; + path->proto = FIB_API_PATH_NH_PROTO_IP4; } - else if (unformat (i, "resolve-attempts %d", &resolve_attempts)) - ; - else if (unformat (i, "weight %d", &next_hop_weight)) + 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")) + { + 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 (i, "drop")) + else if (unformat (input, "via-label %d", &path->nh.via_label)) { - is_drop = 1; + path->proto = FIB_API_PATH_NH_PROTO_MPLS; + path->sw_if_index = ~0; } - else if (unformat (i, "null-send-unreach")) + else if (unformat (input, "l2-input-on %d", &path->sw_if_index)) { - is_unreach = 1; + path->proto = FIB_API_PATH_NH_PROTO_ETHERNET; + path->type = FIB_API_PATH_TYPE_INTERFACE_RX; } - else if (unformat (i, "null-send-prohibit")) + else if (unformat (input, "local")) { - is_prohibit = 1; + path->type = FIB_API_PATH_TYPE_LOCAL; } - else if (unformat (i, "local")) + else if (unformat (input, "out-labels")) { - is_local = 1; + 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 if (unformat (i, "classify %d", &classify_table_index)) + else { - is_classify = 1; + 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; + + /* 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, "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, "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, "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])) + { + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } + } else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -8477,39 +8175,27 @@ api_ip_add_del_route (vat_main_t * vam) } } - if (!next_hop_set && !is_drop && !is_local && - !is_classify && !is_unreach && !is_prohibit && - MPLS_LABEL_INVALID == next_hop_via_label) - { - errmsg - ("next hop / local / drop / unreach / prohibit / classify not set"); - return -99; - } - - if (next_hop_set && MPLS_LABEL_INVALID != next_hop_via_label) - { - errmsg ("next hop and next-hop via label set"); - return -99; - } - if (address_set == 0) + if (!path_count) { - errmsg ("missing addresses"); + errmsg ("specify a path; via ..."); return -99; } - - if (address_length_set == 0) + if (prefix_set == 0) { - errmsg ("missing address length"); + 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, v4_next_hop_address.as_u32, 1); + hash_set (random_hash, i->as_u32, 1); for (j = 0; j <= count; j++) { do @@ -8523,7 +8209,7 @@ api_ip_add_del_route (vat_main_t * vam) hash_set (random_hash, this_random_address, 1); } hash_free (random_hash); - v4_dst_address.as_u32 = random_vector[0]; + set_ip4_address (&pfx.address, random_vector[0]); } if (count > 1) @@ -8537,57 +8223,21 @@ api_ip_add_del_route (vat_main_t * vam) 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)); - - mp->next_hop_sw_if_index = ntohl (sw_if_index); - mp->table_id = ntohl (vrf_id); + M2 (IP_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); 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->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); - } + + 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... */ @@ -8650,59 +8300,21 @@ static int api_ip_mroute_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; + u8 path_set = 0, prefix_set = 0, is_add = 1; 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 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_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, "sw_if_index %d", &sw_if_index)) - ; - 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")) + if (unformat (i, "%U", unformat_vl_api_mprefix, &pfx)) { - is_local = 1; + prefix_set = 1; + pfx.grp_address_length = htons (pfx.grp_address_length); } else if (unformat (i, "del")) is_add = 0; @@ -8710,10 +8322,12 @@ api_ip_mroute_add_del (vat_main_t * vam) is_add = 1; else if (unformat (i, "vrf %d", &vrf_id)) ; - else if (unformat (i, "%U", unformat_mfib_itf_flags, &iflags)) - ; + 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, "via %U", unformat_fib_path, vam, &path.path)) + path_set = 1; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -8721,37 +8335,29 @@ api_ip_mroute_add_del (vat_main_t * vam) } } - if (address_set == 0) + if (prefix_set == 0) { errmsg ("missing addresses\n"); return -99; } + if (path_set == 0) + { + errmsg ("missing path\n"); + return -99; + } /* Construct the API message */ M (IP_MROUTE_ADD_DEL, mp); - mp->next_hop_sw_if_index = ntohl (sw_if_index); - mp->table_id = ntohl (vrf_id); - 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); + mp->is_multipath = 1; - if (is_ipv6) - { - clib_memcpy (mp->grp_address, &v6_grp_address, sizeof (v6_grp_address)); - clib_memcpy (mp->src_address, &v6_src_address, sizeof (v6_src_address)); - } - 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)); + 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); @@ -8794,7 +8400,7 @@ api_mpls_table_add_del (vat_main_t * vam) /* Construct the API message */ M (MPLS_TABLE_ADD_DEL, mp); - mp->mt_table_id = ntohl (table_id); + mp->mt_table.mt_table_id = ntohl (table_id); mp->mt_is_add = is_add; /* send it... */ @@ -8809,90 +8415,42 @@ api_mpls_table_add_del (vat_main_t * vam) static int 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_mpls_route_add_del_t *mp; - u32 sw_if_index = ~0, table_id = 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; + vl_api_fib_path_t paths[8]; + int count = 1, 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; - dpo_proto_t next_hop_proto = DPO_PROTO_IP4; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - 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)) + 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 = DPO_PROTO_IP4; - } - else if (unformat (i, "via %U", unformat_ip6_address, - &v6_next_hop_address)) - { - next_hop_set = 1; - next_hop_proto = DPO_PROTO_IP6; - } - else if (unformat (i, "weight %d", &next_hop_weight)) - ; - else if (unformat (i, "classify %d", &classify_table_index)) - { - is_classify = 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 = DPO_PROTO_IP4; - } - else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id)) + else + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) { - next_hop_set = 1; - next_hop_proto = DPO_PROTO_IP6; + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } } - 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, "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); @@ -8900,9 +8458,9 @@ api_mpls_route_add_del (vat_main_t * vam) } } - if (!next_hop_set && !is_classify) + if (!path_count) { - errmsg ("next hop / classify not set"); + errmsg ("specify a path; via ..."); return -99; } @@ -8923,50 +8481,19 @@ api_mpls_route_add_del (vat_main_t * vam) 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->mr_next_hop_sw_if_index = ntohl (sw_if_index); - mp->mr_table_id = ntohl (table_id); + M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); mp->mr_is_add = is_add; - mp->mr_next_hop_proto = next_hop_proto; - mp->mr_is_classify = is_classify; mp->mr_is_multipath = is_multipath; - mp->mr_is_resolve_host = resolve_host; - 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; - mp->mr_next_hop_n_out_labels = vec_len (next_hop_out_label_stack); - if (0 != mp->mr_next_hop_n_out_labels) - { - 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); - } + 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; - if (next_hop_set) - { - if (DPO_PROTO_IP4 == next_hop_proto) - { - clib_memcpy (mp->mr_next_hop, - &v4_next_hop_address, - sizeof (v4_next_hop_address)); - } - else if (DPO_PROTO_IP6 == next_hop_proto) + clib_memcpy (&mp->mr_route.mr_paths, paths, + sizeof (paths[0]) * path_count); - { - clib_memcpy (mp->mr_next_hop, - &v6_next_hop_address, - sizeof (v6_next_hop_address)); - } - } local_label++; /* send it... */ @@ -9025,6 +8552,7 @@ api_mpls_route_add_del (vat_main_t * vam) /* Return the good/bad news */ return (vam->retval); + return (0); } static int @@ -9034,29 +8562,16 @@ api_mpls_ip_bind_unbind (vat_main_t * vam) vl_api_mpls_ip_bind_unbind_t *mp; u32 ip_table_id = 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; + 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/%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)) - { - is_ip4 = 0; - address_set = 1; - } + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) + prefix_set = 1; else if (unformat (i, "%d", &local_label)) ; else if (unformat (i, "table-id %d", &ip_table_id)) @@ -9072,9 +8587,9 @@ api_mpls_ip_bind_unbind (vat_main_t * vam) } } - if (!address_set) + if (!prefix_set) { - errmsg ("IP addres not set"); + errmsg ("IP prefix not set"); return -99; } @@ -9088,16 +8603,114 @@ api_mpls_ip_bind_unbind (vat_main_t * vam) M (MPLS_IP_BIND_UNBIND, mp); 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; + clib_memcpy (&mp->mb_prefix, &pfx, sizeof (pfx)); - if (is_ip4) - clib_memcpy (mp->mb_address, &v4_address, sizeof (v4_address)); - else - clib_memcpy (mp->mb_address, &v6_address, sizeof (v6_address)); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; + return (0); +} + +static int +api_sr_mpls_policy_add (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + 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; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + 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)) + { + n_segments += 1; + vec_add1 (segments, htonl (sid)); + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (bsid == 0) + { + errmsg ("bsid not set"); + return -99; + } + + if (n_segments == 0) + { + errmsg ("no sid in segment stack"); + return -99; + } + + /* Construct the API message */ + M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments); + + 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... */ + W (ret); + return ret; +} + +static int +api_sr_mpls_policy_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + 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, "bsid %d", &bsid)) + ; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (bsid == 0) + { + errmsg ("bsid not set"); + return -99; + } + + /* Construct the API message */ + M (SR_MPLS_POLICY_DEL, mp); + + mp->bsid = htonl (bsid); /* send it... */ S (mp); @@ -9226,23 +8839,25 @@ api_bier_route_add_del (vat_main_t * vam) M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t)); mp->br_is_add = is_add; - mp->br_tbl_id.bt_set = set; - mp->br_tbl_id.bt_sub_domain = sub_domain; - mp->br_tbl_id.bt_hdr_len_id = hdr_len; - mp->br_bp = ntohs (bp); - mp->br_n_paths = 1; - mp->br_paths[0].n_labels = 1; - mp->br_paths[0].label_stack[0].label = ntohl (next_hop_out_label); - mp->br_paths[0].afi = (next_hop_proto_is_ip4 ? 0 : 1); + 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); if (next_hop_proto_is_ip4) { - clib_memcpy (mp->br_paths[0].next_hop, + 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_paths[0].next_hop, + clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip6, &v6_next_hop_address, sizeof (v6_next_hop_address)); } @@ -9262,7 +8877,7 @@ api_proxy_arp_add_del (vat_main_t * vam) vl_api_proxy_arp_add_del_t *mp; u32 vrf_id = 0; u8 is_add = 1; - ip4_address_t lo, hi; + vl_api_ip4_address_t lo, hi; u8 range_set = 0; int ret; @@ -9270,8 +8885,8 @@ api_proxy_arp_add_del (vat_main_t * vam) { if (unformat (i, "vrf %d", &vrf_id)) ; - else if (unformat (i, "%U - %U", unformat_ip4_address, &lo, - unformat_ip4_address, &hi)) + 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; @@ -9290,10 +8905,10 @@ api_proxy_arp_add_del (vat_main_t * vam) M (PROXY_ARP_ADD_DEL, mp); - mp->proxy.vrf_id = ntohl (vrf_id); + mp->proxy.table_id = ntohl (vrf_id); mp->is_add = is_add; - clib_memcpy (mp->proxy.low_address, &lo, sizeof (mp->proxy.low_address)); - clib_memcpy (mp->proxy.hi_address, &hi, sizeof (mp->proxy.hi_address)); + clib_memcpy (mp->proxy.low, &lo, sizeof (lo)); + clib_memcpy (mp->proxy.hi, &hi, sizeof (hi)); S (mp); W (ret); @@ -9349,44 +8964,36 @@ api_mpls_tunnel_add_del (vat_main_t * vam) unformat_input_t *i = vam->input; vl_api_mpls_tunnel_add_del_t *mp; - u8 is_add = 1; - u8 l2_only = 0; + vl_api_fib_path_t paths[8]; u32 sw_if_index = ~0; - u32 next_hop_sw_if_index = ~0; - u32 next_hop_proto_is_ip4 = 1; - - 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; + u8 path_count = 0; + u8 l2_only = 0; + u8 is_add = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { 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, "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 + 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); @@ -9394,34 +9001,16 @@ api_mpls_tunnel_add_del (vat_main_t * vam) } } - M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (mpls_label_t) * vec_len (labels)); + M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - 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; + 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; - mp->mt_next_hop_n_out_labels = vec_len (labels); - - 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); - } - - if (next_hop_proto_is_ip4) - { - clib_memcpy (mp->mt_next_hop, - &v4_next_hop_address, sizeof (v4_next_hop_address)); - } - else - { - clib_memcpy (mp->mt_next_hop, - &v6_next_hop_address, sizeof (v6_next_hop_address)); - } + clib_memcpy (&mp->mt_tunnel.mt_paths, &paths, + sizeof (paths[0]) * path_count); S (mp); W (ret); @@ -9476,27 +9065,26 @@ api_sw_interface_set_unnumbered (vat_main_t * vam) static int api_ip_neighbor_add_del (vat_main_t * vam) { + 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 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; + u8 address_set = 0; int ret; + ip_neighbor_flags_t flags; - memset (mac_address, 0, sizeof (mac_address)); + flags = IP_NEIGHBOR_FLAG_NONE; + clib_memset (&ip_address, 0, sizeof (ip_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, "mac %U", unformat_ethernet_address, mac_address)) + if (unformat (i, "mac %U", unformat_vl_api_mac_address, &mac_address)) { mac_set = 1; } @@ -9507,14 +9095,12 @@ api_ip_neighbor_add_del (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, "is_static")) - is_static = 1; + else if (unformat (i, "static")) + flags |= IP_NEIGHBOR_FLAG_STATIC; 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; + 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); @@ -9527,12 +9113,7 @@ api_ip_neighbor_add_del (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) + if (!address_set) { errmsg ("no address set"); return -99; @@ -9541,22 +9122,14 @@ api_ip_neighbor_add_del (vat_main_t * vam) /* Construct the API message */ M (IP_NEIGHBOR_ADD_DEL, mp); - mp->sw_if_index = ntohl (sw_if_index); + mp->neighbor.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; + mp->neighbor.flags = htonl (flags); 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)); - } + 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)); /* send it... */ S (mp); @@ -9698,59 +9271,6 @@ api_create_subif (vat_main_t * vam) return ret; } -static int -api_oam_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_oam_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; - 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, "del")) - is_add = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (src_set == 0) - { - errmsg ("missing src addr"); - return -99; - } - - if (dst_set == 0) - { - errmsg ("missing dst addr"); - return -99; - } - - M (OAM_ADD_DEL, mp); - - mp->vrf_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)); - - S (mp); - W (ret); - return ret; -} - static int api_reset_fib (vat_main_t * vam) { @@ -10248,55 +9768,6 @@ api_sw_interface_ip6_enable_disable (vat_main_t * vam) return ret; } -static int -api_sw_interface_ip6_set_link_local_address (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; - u8 v6_address_set = 0; - 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, "%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)) - v6_address_set = 1; - else - break; - } - - if (sw_if_index_set == 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 (SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS, mp); - - 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_add_del (vat_main_t * vam) { @@ -10304,7 +9775,7 @@ api_ip6nd_proxy_add_del (vat_main_t * vam) 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; @@ -10315,7 +9786,7 @@ api_ip6nd_proxy_add_del (vat_main_t * vam) ; else if (unformat (i, "sw_if_index %d", &sw_if_index)) ; - 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; @@ -10342,7 +9813,7 @@ api_ip6nd_proxy_add_del (vat_main_t * vam) 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); @@ -10377,7 +9848,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 @@ -10397,7 +9868,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); } @@ -10408,9 +9879,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; @@ -10428,8 +9898,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)) ; @@ -10469,8 +9938,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; @@ -10713,7 +10181,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; @@ -10724,7 +10195,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)); @@ -10736,9 +10209,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); @@ -10857,7 +10333,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 _ @@ -10898,7 +10374,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 _ @@ -10988,7 +10464,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 _ @@ -11060,7 +10536,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 _ @@ -11156,10 +10632,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) { @@ -11508,6 +10984,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); @@ -12059,6 +11536,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); @@ -12727,17 +12205,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; @@ -12750,20 +12240,44 @@ 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 */ @@ -12774,29 +12288,38 @@ api_sw_interface_tap_dump (vat_main_t * vam) return ret; } -static void vl_api_sw_interface_tap_v2_details_t_handler - (vl_api_sw_interface_tap_v2_details_t * mp) +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; - 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); + 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%-16s %-12d %-5d %-12d %-12d %-14U %-30s %-20s %-20s %-30s", - mp->dev_name, ntohl (mp->sw_if_index), ntohl (mp->id), + "\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->host_mac_addr, mp->host_namespace, - mp->host_bridge, ip4, ip6); - - vec_free (ip4); - vec_free (ip6); + format_ethernet_address, mp->mac_addr, + clib_net_to_host_u64 (mp->features)); + vec_free (pci_addr); } -static void vl_api_sw_interface_tap_v2_details_t_handler_json - (vl_api_sw_interface_tap_v2_details_t * mp) +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; @@ -12809,43 +12332,31 @@ static void vl_api_sw_interface_tap_v2_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, "pci-addr", ntohl (mp->pci_addr)); vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_string_copy (node, "dev_name", mp->dev_name); 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", + 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->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)); - + &mp->mac_addr)); } static int -api_sw_interface_tap_v2_dump (vat_main_t * vam) +api_sw_interface_virtio_pci_dump (vat_main_t * vam) { - vl_api_sw_interface_tap_v2_dump_t *mp; + vl_api_sw_interface_virtio_pci_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; 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"); + "\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_TAP_V2_DUMP, mp); + M (SW_INTERFACE_VIRTIO_PCI_DUMP, mp); S (mp); /* Use a control ping for synchronization */ @@ -12856,6 +12367,59 @@ api_sw_interface_tap_v2_dump (vat_main_t * vam) 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) { @@ -12890,8 +12454,8 @@ 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) { @@ -13173,8 +12737,8 @@ api_geneve_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) { @@ -13416,16 +12980,15 @@ api_geneve_tunnel_dump (vat_main_t * vam) } static int -api_gre_add_del_tunnel (vat_main_t * vam) +api_gre_tunnel_add_del (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_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 ipv4_set = 0; - u8 ipv6_set = 0; - u8 t_type = GRE_TUNNEL_TYPE_L3; u8 src_set = 0; u8 dst_set = 0; u32 outer_fib_id = 0; @@ -13433,10 +12996,7 @@ api_gre_add_del_tunnel (vat_main_t * vam) u32 instance = ~0; int ret; - memset (&src4, 0, sizeof src4); - memset (&dst4, 0, sizeof dst4); - memset (&src6, 0, sizeof src6); - memset (&dst6, 0, sizeof dst6); + t_type = GRE_API_TUNNEL_TYPE_L3; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { @@ -13444,32 +13004,20 @@ api_gre_add_del_tunnel (vat_main_t * vam) is_add = 0; else if (unformat (line_input, "instance %d", &instance)) ; - else if (unformat (line_input, "src %U", unformat_ip4_address, &src4)) - { - src_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "dst %U", unformat_ip4_address, &dst4)) - { - dst_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "src %U", unformat_ip6_address, &src6)) + else if (unformat (line_input, "src %U", unformat_vl_api_address, &src)) { src_set = 1; - ipv6_set = 1; } - else if (unformat (line_input, "dst %U", unformat_ip6_address, &dst6)) + else if (unformat (line_input, "dst %U", unformat_vl_api_address, &dst)) { dst_set = 1; - ipv6_set = 1; } else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id)) ; else if (unformat (line_input, "teb")) - t_type = GRE_TUNNEL_TYPE_TEB; + t_type = GRE_API_TUNNEL_TYPE_TEB; else if (unformat (line_input, "erspan %d", &session_id)) - t_type = GRE_TUNNEL_TYPE_ERSPAN; + t_type = GRE_API_TUNNEL_TYPE_ERSPAN; else { errmsg ("parse error '%U'", format_unformat_error, line_input); @@ -13487,31 +13035,17 @@ api_gre_add_del_tunnel (vat_main_t * vam) errmsg ("tunnel dst address not specified"); return -99; } - if (ipv4_set && ipv6_set) - { - errmsg ("both IPv4 and IPv6 addresses specified"); - return -99; - } + M (GRE_TUNNEL_ADD_DEL, mp); - M (GRE_ADD_DEL_TUNNEL, mp); + clib_memcpy (&mp->tunnel.src, &src, sizeof (mp->tunnel.src)); + clib_memcpy (&mp->tunnel.dst, &dst, sizeof (mp->tunnel.dst)); - if (ipv4_set) - { - clib_memcpy (&mp->src_address, &src4, 4); - clib_memcpy (&mp->dst_address, &dst4, 4); - } - else - { - clib_memcpy (&mp->src_address, &src6, 16); - clib_memcpy (&mp->dst_address, &dst6, 16); - } - mp->instance = htonl (instance); - mp->outer_fib_id = htonl (outer_fib_id); + mp->tunnel.instance = htonl (instance); + mp->tunnel.outer_fib_id = htonl (outer_fib_id); mp->is_add = is_add; - mp->session_id = htons ((u16) session_id); - mp->tunnel_type = t_type; - mp->is_ipv6 = ipv6_set; + mp->tunnel.session_id = htons ((u16) session_id); + mp->tunnel.type = htonl (t_type); S (mp); W (ret); @@ -13522,15 +13056,14 @@ static void vl_api_gre_tunnel_details_t_handler (vl_api_gre_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); print (vam->ofp, "%11d%11d%24U%24U%13d%14d%12d", - ntohl (mp->sw_if_index), - ntohl (mp->instance), - format_ip46_address, &src, IP46_TYPE_ANY, - format_ip46_address, &dst, IP46_TYPE_ANY, - mp->tunnel_type, ntohl (mp->outer_fib_id), ntohl (mp->session_id)); + 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 @@ -13538,8 +13071,6 @@ static void vl_api_gre_tunnel_details_t_handler_json { 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) { @@ -13549,26 +13080,16 @@ static void vl_api_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)); - vat_json_object_add_uint (node, "instance", ntohl (mp->instance)); - if (!mp->is_ipv6) - { - 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); - } - else - { - 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); - } - vat_json_object_add_uint (node, "tunnel_type", mp->tunnel_type); - 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); - vat_json_object_add_uint (node, "session_id", mp->session_id); + 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 @@ -13752,11 +13273,13 @@ 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; 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) { @@ -13770,6 +13293,10 @@ 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, "tag %s", &tag)) ; else @@ -13792,6 +13319,8 @@ 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; clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); vec_free (file_name); if (custom_dev_instance != ~0) @@ -13799,6 +13328,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) @@ -14008,10 +13538,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) { @@ -14374,10 +13904,9 @@ api_ip_probe_neighbor (vat_main_t * vam) { unformat_input_t *i = vam->input; vl_api_ip_probe_neighbor_t *mp; + vl_api_address_t dst_adr = { }; u8 int_set = 0; u8 adr_set = 0; - u8 is_ipv6 = 0; - u8 dst_adr[16]; u32 sw_if_index; int ret; @@ -14387,13 +13916,8 @@ api_ip_probe_neighbor (vat_main_t * vam) int_set = 1; else if (unformat (i, "sw_if_index %d", &sw_if_index)) int_set = 1; - else if (unformat (i, "address %U", unformat_ip4_address, dst_adr)) + else if (unformat (i, "address %U", unformat_vl_api_address, &dst_adr)) adr_set = 1; - else if (unformat (i, "address %U", unformat_ip6_address, dst_adr)) - { - adr_set = 1; - is_ipv6 = 1; - } else break; } @@ -14413,8 +13937,7 @@ api_ip_probe_neighbor (vat_main_t * vam) M (IP_PROBE_NEIGHBOR, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->is_ipv6 = is_ipv6; - clib_memcpy (mp->dst_address, dst_adr, sizeof (dst_adr)); + clib_memcpy (&mp->dst, &dst_adr, sizeof (dst_adr)); S (mp); W (ret); @@ -14522,7 +14045,7 @@ api_want_ip4_arp_events (vat_main_t * vam) M (WANT_IP4_ARP_EVENTS, mp); mp->enable_disable = enable_disable; mp->pid = htonl (getpid ()); - mp->address = address.as_u32; + clib_memcpy (mp->ip, &address, sizeof (address)); S (mp); W (ret); @@ -14534,14 +14057,15 @@ 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; + vl_api_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)) + if (unformat + (line_input, "address %U", unformat_vl_api_ip6_address, &address)) address_set = 1; else if (unformat (line_input, "del")) enable_disable = 0; @@ -14558,7 +14082,7 @@ api_want_ip6_nd_events (vat_main_t * vam) M (WANT_IP6_ND_EVENTS, mp); mp->enable_disable = enable_disable; mp->pid = htonl (getpid ()); - clib_memcpy (mp->address, &address, sizeof (ip6_address_t)); + clib_memcpy (&mp->ip, &address, sizeof (address)); S (mp); W (ret); @@ -14915,26 +14439,24 @@ api_ipsec_interface_add_del_spd (vat_main_t * vam) } static int -api_ipsec_spd_add_del_entry (vat_main_t * vam) +api_ipsec_spd_entry_add_del (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; + 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; - ip4_address_t laddr4_start, laddr4_stop, raddr4_start, raddr4_stop; - ip6_address_t laddr6_start, laddr6_stop, raddr6_start, raddr6_stop; + vl_api_address_t laddr_start = { }, laddr_stop = + { + }, raddr_start = + { + }, raddr_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")) @@ -14959,58 +14481,18 @@ api_ipsec_spd_add_del_entry (vat_main_t * vam) ; 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, "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)) { @@ -15028,65 +14510,50 @@ api_ipsec_spd_add_del_entry (vat_main_t * vam) } - M (IPSEC_SPD_ADD_DEL_ENTRY, mp); + M (IPSEC_SPD_ENTRY_ADD_DEL, 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; + + 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); return ret; } static int -api_ipsec_sad_add_del_entry (vat_main_t * vam) +api_ipsec_sad_entry_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipsec_sad_add_del_entry_t *mp; + vl_api_ipsec_sad_entry_add_del_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; + 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) @@ -15098,53 +14565,30 @@ api_ipsec_sad_add_del_entry (vat_main_t * vam) 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)) + protocol = IPSEC_API_PROTO_ESP; + else + if (unformat (i, "tunnel_src %U", unformat_vl_api_address, &tun_src)) { - is_tunnel = 1; - is_tunnel_ipv6 = 1; + 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_crypto_alg, &crypto_alg)) + if (unformat (i, "tunnel_dst %U", unformat_vl_api_address, &tun_dst)) { - if (crypto_alg < IPSEC_CRYPTO_ALG_NONE || - crypto_alg >= IPSEC_CRYPTO_N_ALG) - { - clib_warning ("unsupported crypto-alg: '%U'", - format_ipsec_crypto_alg, crypto_alg); - return -99; - } + 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_integ_alg, &integ_alg)) - { - if (integ_alg < IPSEC_INTEG_ALG_NONE || - 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_alg %U", + unformat_ipsec_api_integ_alg, &integ_alg)) + ; else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) ; else @@ -15155,46 +14599,37 @@ api_ipsec_sad_add_del_entry (vat_main_t * vam) } - M (IPSEC_SAD_ADD_DEL_ENTRY, mp); + M (IPSEC_SAD_ENTRY_ADD_DEL, 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->entry.sad_id = ntohl (sad_id); + mp->entry.protocol = protocol; + mp->entry.spi = ntohl (spi); + mp->entry.flags = flags; - if (mp->crypto_key_length > sizeof (mp->crypto_key)) - mp->crypto_key_length = sizeof (mp->crypto_key); + 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); - if (mp->integrity_key_length > sizeof (mp->integrity_key)) - mp->integrity_key_length = sizeof (mp->integrity_key); + 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); if (ck) - clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length); + clib_memcpy (mp->entry.crypto_key.data, ck, mp->entry.crypto_key.length); if (ik) - clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length); + clib_memcpy (mp->entry.integrity_key.data, ik, + mp->entry.integrity_key.length); - if (is_tunnel) + if (flags & IPSEC_API_SAD_FLAG_IS_TUNNEL) { - 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)); - } + 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)); } S (mp); @@ -15202,52 +14637,6 @@ api_ipsec_sad_add_del_entry (vat_main_t * vam) return ret; } -static int -api_ipsec_sa_set_key (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; - int ret; - - 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)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M (IPSEC_SA_SET_KEY, mp); - - mp->sa_id = ntohl (sa_id); - mp->crypto_key_length = vec_len (ck); - mp->integrity_key_length = vec_len (ik); - - if (mp->crypto_key_length > sizeof (mp->crypto_key)) - mp->crypto_key_length = sizeof (mp->crypto_key); - - if (mp->integrity_key_length > sizeof (mp->integrity_key)) - mp->integrity_key_length = sizeof (mp->integrity_key); - - if (ck) - clib_memcpy (mp->crypto_key, ck, mp->crypto_key_length); - if (ik) - clib_memcpy (mp->integrity_key, ik, mp->integrity_key_length); - - S (mp); - W (ret); - return ret; -} - static int api_ipsec_tunnel_if_add_del (vat_main_t * vam) { @@ -15257,14 +14646,16 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) 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} }; + 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; - int ret; + u32 count = 1, jj; + int ret = -1; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -15272,15 +14663,19 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) is_add = 0; else if (unformat (i, "esn")) esn = 1; - else if (unformat (i, "anti_replay")) + 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_ip4_address, &local_ip)) + else + if (unformat (i, "local_ip %U", unformat_vl_api_address, &local_ip)) ; - else if (unformat (i, "remote_ip %U", unformat_ip4_address, &remote_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)) ; @@ -15293,10 +14688,9 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) ; else if (unformat - (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg)) + (i, "crypto_alg %U", unformat_ipsec_api_crypto_alg, &crypto_alg)) { - if (crypto_alg < IPSEC_CRYPTO_ALG_NONE || - crypto_alg >= IPSEC_CRYPTO_N_ALG) + if (crypto_alg >= IPSEC_CRYPTO_N_ALG) { errmsg ("unsupported crypto-alg: '%U'\n", format_ipsec_crypto_alg, crypto_alg); @@ -15305,10 +14699,9 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) } else if (unformat - (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg)) + (i, "integ_alg %U", unformat_ipsec_api_integ_alg, &integ_alg)) { - if (integ_alg < IPSEC_INTEG_ALG_NONE || - integ_alg >= IPSEC_INTEG_N_ALG) + if (integ_alg >= IPSEC_INTEG_N_ALG) { errmsg ("unsupported integ-alg: '%U'\n", format_ipsec_integ_alg, integ_alg); @@ -15324,1090 +14717,212 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) } } - 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) - { - 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) + if (count > 1) { - 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); + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - if (renumber) + for (jj = 0; jj < count; jj++) { - mp->renumber = renumber; - mp->show_instance = ntohl (instance); - } - - S (mp); - W (ret); - return ret; -} - -static void -vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "sa_id %u sw_if_index %u spi %u proto %u crypto_alg %u " - "crypto_key %U integ_alg %u integ_key %U use_esn %u " - "use_anti_replay %u is_tunnel %u is_tunnel_ip6 %u " - "tunnel_src_addr %U tunnel_dst_addr %U " - "salt %u seq_outbound %lu last_seq_inbound %lu " - "replay_window %lu total_data_size %lu\n", - ntohl (mp->sa_id), ntohl (mp->sw_if_index), ntohl (mp->spi), - mp->protocol, - mp->crypto_alg, format_hex_bytes, mp->crypto_key, mp->crypto_key_len, - mp->integ_alg, format_hex_bytes, mp->integ_key, mp->integ_key_len, - mp->use_esn, mp->use_anti_replay, mp->is_tunnel, mp->is_tunnel_ip6, - (mp->is_tunnel_ip6) ? format_ip6_address : format_ip4_address, - mp->tunnel_src_addr, - (mp->is_tunnel_ip6) ? format_ip6_address : format_ip4_address, - mp->tunnel_dst_addr, - ntohl (mp->salt), - clib_net_to_host_u64 (mp->seq_outbound), - clib_net_to_host_u64 (mp->last_seq_inbound), - clib_net_to_host_u64 (mp->replay_window), - clib_net_to_host_u64 (mp->total_data_size)); -} - -#define vl_api_ipsec_sa_details_t_endian vl_noop_handler -#define vl_api_ipsec_sa_details_t_print vl_noop_handler - -static void vl_api_ipsec_sa_details_t_handler_json - (vl_api_ipsec_sa_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in_addr src_ip4, dst_ip4; - struct in6_addr src_ip6, dst_ip6; + M (IPSEC_TUNNEL_IF_ADD_DEL, mp); - 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); + mp->is_add = is_add; + mp->esn = esn; + mp->anti_replay = anti_replay; - vat_json_init_object (node); - vat_json_object_add_uint (node, "sa_id", ntohl (mp->sa_id)); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "spi", ntohl (mp->spi)); - vat_json_object_add_uint (node, "proto", mp->protocol); - vat_json_object_add_uint (node, "crypto_alg", mp->crypto_alg); - vat_json_object_add_uint (node, "integ_alg", mp->integ_alg); - vat_json_object_add_uint (node, "use_esn", mp->use_esn); - vat_json_object_add_uint (node, "use_anti_replay", mp->use_anti_replay); - vat_json_object_add_uint (node, "is_tunnel", mp->is_tunnel); - vat_json_object_add_uint (node, "is_tunnel_ip6", mp->is_tunnel_ip6); - vat_json_object_add_bytes (node, "crypto_key", mp->crypto_key, - mp->crypto_key_len); - vat_json_object_add_bytes (node, "integ_key", mp->integ_key, - mp->integ_key_len); - if (mp->is_tunnel_ip6) - { - clib_memcpy (&src_ip6, mp->tunnel_src_addr, sizeof (src_ip6)); - vat_json_object_add_ip6 (node, "tunnel_src_addr", src_ip6); - clib_memcpy (&dst_ip6, mp->tunnel_dst_addr, sizeof (dst_ip6)); - vat_json_object_add_ip6 (node, "tunnel_dst_addr", dst_ip6); - } - else - { - clib_memcpy (&src_ip4, mp->tunnel_src_addr, sizeof (src_ip4)); - vat_json_object_add_ip4 (node, "tunnel_src_addr", src_ip4); - clib_memcpy (&dst_ip4, mp->tunnel_dst_addr, sizeof (dst_ip4)); - vat_json_object_add_ip4 (node, "tunnel_dst_addr", dst_ip4); - } - vat_json_object_add_uint (node, "replay_window", - clib_net_to_host_u64 (mp->replay_window)); - vat_json_object_add_uint (node, "total_data_size", - clib_net_to_host_u64 (mp->total_data_size)); + if (jj > 0) + increment_address (&remote_ip); -} + clib_memcpy (&mp->local_ip, &local_ip, sizeof (local_ip)); + clib_memcpy (&mp->remote_ip, &remote_ip, sizeof (remote_ip)); -static int -api_ipsec_sa_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_sa_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sa_id = ~0; - int ret; + mp->local_spi = htonl (local_spi + jj); + mp->remote_spi = htonl (remote_spi + jj); + mp->crypto_alg = (u8) crypto_alg; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sa_id %d", &sa_id)) - ; - else + mp->local_crypto_key_len = 0; + if (lck) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + 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); } - } - - M (IPSEC_SA_DUMP, mp); - - mp->sa_id = ntohl (sa_id); - - S (mp); - - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); - return ret; -} + 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); + } -static int -api_ipsec_tunnel_if_set_key (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_tunnel_if_set_key_t *mp; - u32 sw_if_index = ~0; - u8 key_type = IPSEC_IF_SET_KEY_TYPE_NONE; - u8 *key = 0; - u32 alg = ~0; - int ret; + mp->integ_alg = (u8) integ_alg; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else - if (unformat (i, "local crypto %U", unformat_ipsec_crypto_alg, &alg)) - key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO; - else - if (unformat (i, "remote crypto %U", unformat_ipsec_crypto_alg, &alg)) - key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO; - else if (unformat (i, "local integ %U", unformat_ipsec_integ_alg, &alg)) - key_type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG; - else - if (unformat (i, "remote integ %U", unformat_ipsec_integ_alg, &alg)) - key_type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG; - else if (unformat (i, "%U", unformat_hex_string, &key)) - ; - else + mp->local_integ_key_len = 0; + if (lik) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + 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); } - } - if (sw_if_index == ~0) - { - errmsg ("interface must be specified"); - return -99; - } - - if (key_type == IPSEC_IF_SET_KEY_TYPE_NONE) - { - errmsg ("key type must be specified"); - return -99; - } + 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 (alg == ~0) - { - errmsg ("algorithm must be specified"); - return -99; + if (renumber) + { + mp->renumber = renumber; + mp->show_instance = ntohl (instance); + } + S (mp); } - if (vec_len (key) == 0) + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) { - errmsg ("key must be specified"); - return -99; - } - - M (IPSEC_TUNNEL_IF_SET_KEY, mp); + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; - mp->sw_if_index = htonl (sw_if_index); - mp->alg = alg; - mp->key_type = key_type; - mp->key_len = vec_len (key); - clib_memcpy (mp->key, key, vec_len (key)); + /* Shut off async mode */ + vam->async_mode = 0; - S (mp); - W (ret); + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - 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_ipsec_tunnel_if_set_sa (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_tunnel_if_set_sa_t *mp; - u32 sw_if_index = ~0; - u32 sa_id = ~0; - u8 is_outbound = (u8) ~ 0; - int ret; + out: + if (vam->retval == -99) + errmsg ("timeout"); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - ; - else if (unformat (i, "sa_id %d", &sa_id)) - ; - else if (unformat (i, "outbound")) - is_outbound = 1; - else if (unformat (i, "inbound")) - is_outbound = 0; - else + if (vam->async_errors > 0) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; } - } + vam->async_errors = 0; + after = vat_time_now (vam); - if (sw_if_index == ~0) - { - errmsg ("interface must be specified"); - return -99; - } + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (jj > 0) + count = jj; - if (sa_id == ~0) + print (vam->ofp, "%d tunnels in %.6f secs, %.2f tunnels/sec", + count, after - before, count / (after - before)); + } + else { - errmsg ("SA ID must be specified"); - return -99; + /* Wait for a reply... */ + W (ret); + return ret; } - M (IPSEC_TUNNEL_IF_SET_SA, mp); - - mp->sw_if_index = htonl (sw_if_index); - mp->sa_id = htonl (sa_id); - mp->is_outbound = is_outbound; - - S (mp); - W (ret); - return ret; } -static int -api_ikev2_profile_add_del (vat_main_t * vam) +static void +vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) { - unformat_input_t *i = vam->input; - vl_api_ikev2_profile_add_del_t *mp; - u8 is_add = 1; - u8 *name = 0; - int ret; - - const char *valid_chars = "a-zA-Z0-9_"; + vat_main_t *vam = &vat_main; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "name %U", unformat_token, valid_chars, &name)) - vec_add1 (name, 0); - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - M (IKEV2_PROFILE_ADD_DEL, mp); - - clib_memcpy (mp->name, name, vec_len (name)); - mp->is_add = is_add; - vec_free (name); - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_profile_set_auth (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; - 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)) - ; - else if (unformat (i, "auth_data 0x%U", unformat_hex_string, &data)) - is_hex = 1; - else if (unformat (i, "auth_data %v", &data)) - ; - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - if (!vec_len (data)) - { - errmsg ("auth_data must be specified"); - return -99; - } - - if (!auth_method) - { - errmsg ("auth_method must be specified"); - return -99; - } - - M (IKEV2_PROFILE_SET_AUTH, 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); - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_profile_set_id (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; - 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, "id_type %U", unformat_ikev2_id_type, &id_type)) - ; - else if (unformat (i, "id_data %U", unformat_ip4_address, &ip4)) - { - data = vec_new (u8, 4); - clib_memcpy (data, ip4.as_u8, 4); - } - else if (unformat (i, "id_data 0x%U", unformat_hex_string, &data)) - ; - else if (unformat (i, "id_data %v", &data)) - ; - else if (unformat (i, "local")) - is_local = 1; - else if (unformat (i, "remote")) - is_local = 0; - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - if (!vec_len (data)) - { - errmsg ("id_data must be specified"); - return -99; - } - - if (!id_type) - { - errmsg ("id_type must be specified"); - return -99; - } - - M (IKEV2_PROFILE_SET_ID, 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); - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_profile_set_ts (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_"; - int ret; - - start_addr.as_u32 = 0; - end_addr.as_u32 = (u32) ~ 0; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "name %U", unformat_token, valid_chars, &name)) - vec_add1 (name, 0); - else if (unformat (i, "protocol %d", &proto)) - ; - else if (unformat (i, "start_port %d", &start_port)) - ; - else if (unformat (i, "end_port %d", &end_port)) - ; - else - if (unformat (i, "start_addr %U", unformat_ip4_address, &start_addr)) - ; - else if (unformat (i, "end_addr %U", unformat_ip4_address, &end_addr)) - ; - else if (unformat (i, "local")) - is_local = 1; - else if (unformat (i, "remote")) - is_local = 0; - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - M (IKEV2_PROFILE_SET_TS, 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); - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_set_local_key (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_set_local_key_t *mp; - u8 *file = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "file %v", &file)) - vec_add1 (file, 0); - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (file)) - { - errmsg ("RSA key file must be specified"); - return -99; - } - - if (vec_len (file) > 256) - { - errmsg ("file name too long"); - return -99; - } - - M (IKEV2_SET_LOCAL_KEY, mp); - - clib_memcpy (mp->key_file, file, vec_len (file)); - vec_free (file); - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_set_responder (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_set_responder_t *mp; - 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); - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - M (IKEV2_SET_RESPONDER, mp); - - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); - - mp->sw_if_index = sw_if_index; - clib_memcpy (mp->address, &address, sizeof (address)); - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_set_ike_transforms (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_set_ike_transforms_t *mp; - 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); - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - M (IKEV2_SET_IKE_TRANSFORMS, mp); - - 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; - - S (mp); - W (ret); - return ret; -} - - -static int -api_ikev2_set_esp_transforms (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_set_esp_transforms_t *mp; - 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); - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - M (IKEV2_SET_ESP_TRANSFORMS, mp); - - 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; - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_set_sa_lifetime (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_set_sa_lifetime_t *mp; - 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); - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - M (IKEV2_SET_SA_LIFETIME, 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; - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_initiate_sa_init (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_initiate_sa_init_t *mp; - 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); - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!vec_len (name)) - { - errmsg ("profile name must be specified"); - return -99; - } - - if (vec_len (name) > 64) - { - errmsg ("profile name too long"); - return -99; - } - - M (IKEV2_INITIATE_SA_INIT, mp); - - clib_memcpy (mp->name, name, vec_len (name)); - vec_free (name); - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_initiate_del_ike_sa (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_initiate_del_ike_sa_t *mp; - int ret; - u64 ispi; - - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%lx", &ispi)) - ; - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M (IKEV2_INITIATE_DEL_IKE_SA, mp); - - mp->ispi = ispi; - - S (mp); - W (ret); - return ret; -} - -static int -api_ikev2_initiate_del_child_sa (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ikev2_initiate_del_child_sa_t *mp; - int ret; - u32 ispi; - - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%x", &ispi)) - ; - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M (IKEV2_INITIATE_DEL_CHILD_SA, mp); - - mp->ispi = ispi; - - S (mp); - W (ret); - return ret; -} - -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; - - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%x", &ispi)) - ; - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - 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) -{ - 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; - - 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++; - 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; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (num_m_args < 3) - { - errmsg ("mandatory argument(s) missing"); - return -99; - } - - /* Construct the API message */ - M (MAP_ADD_DOMAIN, mp); - - clib_memcpy (mp->ip4_prefix, &ip4_prefix, sizeof (ip4_prefix)); - mp->ip4_prefix_len = ip4_prefix_len; - - clib_memcpy (mp->ip6_prefix, &ip6_prefix, sizeof (ip6_prefix)); - mp->ip6_prefix_len = ip6_prefix_len; - - clib_memcpy (mp->ip6_src, &ip6_src, sizeof (ip6_src)); - mp->ip6_src_prefix_len = ip6_src_len; - - mp->ea_bits_len = ea_bits_len; - mp->psid_offset = psid_offset; - mp->psid_length = psid_length; - mp->is_translation = is_translation; - mp->mtu = htons (mtu); - - /* send it... */ - S (mp); - - /* Wait for a reply, return good/bad news */ - W (ret); - return ret; -} - -static int -api_map_del_domain (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_map_del_domain_t *mp; - - u32 num_m_args = 0; - u32 index; - int ret; - - 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; - } - } - - if (num_m_args != 1) - { - errmsg ("mandatory argument(s) missing"); - 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)); +} - /* Construct the API message */ - M (MAP_DEL_DOMAIN, mp); +#define vl_api_ipsec_sa_details_t_endian vl_noop_handler +#define vl_api_ipsec_sa_details_t_print vl_noop_handler - mp->index = ntohl (index); +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; - /* send it... */ - S (mp); + 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); - /* 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); @@ -16415,37 +14930,14 @@ 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 */ - MPING (CONTROL_PING, mp_ping); + M (CONTROL_PING, mp_ping); S (mp_ping); W (ret); @@ -16453,76 +14945,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 */ - MPING (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 @@ -16683,7 +15153,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)) { @@ -17084,7 +15554,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) @@ -18191,7 +16661,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) @@ -18387,7 +16857,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) @@ -18981,7 +17451,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); @@ -19493,8 +17963,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) { @@ -19736,7 +18206,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) { @@ -20102,7 +18572,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) { @@ -20184,23 +18654,106 @@ 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_path_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 @@ -20212,19 +18765,16 @@ vl_api_mpls_fib_path_json_print (vat_json_node_t * node, 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); } } @@ -20233,16 +18783,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); + 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++; } @@ -20257,7 +18807,7 @@ 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); + int count = ntohl (mp->mt_tunnel.mt_n_paths); vl_api_fib_path_t *fp; i32 i; @@ -20269,13 +18819,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); @@ -20288,23 +18837,57 @@ 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 */ @@ -20315,34 +18898,34 @@ api_mpls_tunnel_dump (vat_main_t * vam) 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); + int count = ntohl (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 = ntohl (mp->mr_route.mr_n_paths); vat_json_node_t *node = NULL; vl_api_fib_path_t *fp; int i; @@ -20355,11 +18938,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); @@ -20368,13 +18951,30 @@ 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 */ @@ -20385,52 +18985,25 @@ api_mpls_fib_dump (vat_main_t * vam) 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) { @@ -20440,42 +19013,35 @@ 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_table_dump (vat_main_t * vam) +{ + vl_api_ip_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (IP_TABLE_DUMP, mp); + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; } static int -api_ip_fib_dump (vat_main_t * vam) +api_ip_mtable_dump (vat_main_t * vam) { - vl_api_ip_fib_dump_t *mp; + vl_api_ip_mtable_dump_t *mp; vl_api_control_ping_t *mp_ping; int ret; - M (IP_FIB_DUMP, mp); + M (IP_MTABLE_DUMP, mp); S (mp); /* Use a control ping for synchronization */ @@ -20487,13 +19053,35 @@ api_ip_fib_dump (vat_main_t * vam) } static int -api_ip_mfib_dump (vat_main_t * vam) +api_ip_mroute_dump (vat_main_t * vam) { - vl_api_ip_mfib_dump_t *mp; + unformat_input_t *input = vam->input; vl_api_control_ping_t *mp_ping; - int ret; + 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_MFIB_DUMP, mp); + 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 */ @@ -20510,10 +19098,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 @@ -20522,8 +19109,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) { @@ -20533,24 +19118,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 @@ -20595,47 +19171,36 @@ api_ip_neighbor_dump (vat_main_t * vam) 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.address_length); 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; @@ -20650,60 +19215,60 @@ 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.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); - } + 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 */ - MPING (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 */ @@ -21301,29 +19866,17 @@ 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)) - { - prefix_set = 1; - } - else - if (unformat - (input, "%U/%d", unformat_ip6_address, &ip6_addr, &length)) - { - prefix_set = 1; - is_ipv6 = 1; - } + 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")) @@ -21394,18 +19947,8 @@ api_ip_source_and_port_range_check_add_del (vat_main_t * vam) mp->is_add = is_add; - if (is_ipv6) - { - mp->is_ipv6 = 1; - clib_memcpy (mp->address, &ip6_addr, sizeof (ip6_addr)); - } - else - { - mp->is_ipv6 = 0; - clib_memcpy (mp->address, &ip4_addr, sizeof (ip4_addr)); - } + clib_memcpy (&mp->prefix, &prefix, sizeof (prefix)); - mp->mask_length = length; mp->number_of_ranges = vec_len (low_ports); clib_memcpy (mp->low_ports, low_ports, vec_len (low_ports)); @@ -21492,55 +20035,11 @@ api_ip_source_and_port_range_check_interface_add_del (vat_main_t * vam) } static int -api_ipsec_gre_add_del_tunnel (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; - 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)) - ; - else if (unformat (i, "src %U", unformat_ip4_address, &src_address)) - ; - else if (unformat (i, "dst %U", unformat_ip4_address, &dst_address)) - ; - else if (unformat (i, "del")) - is_add = 0; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - M (IPSEC_GRE_ADD_DEL_TUNNEL, mp); - - mp->local_sa_id = ntohl (local_sa_id); - mp->remote_sa_id = ntohl (remote_sa_id); - clib_memcpy (mp->src_address, &src_address, sizeof (src_address)); - clib_memcpy (mp->dst_address, &dst_address, sizeof (dst_address)); - mp->is_add = is_add; - - S (mp); - W (ret); - return ret; -} - -static int -api_punt (vat_main_t * vam) +api_set_punt (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_punt_t *mp; - u32 ipv = ~0; + vl_api_address_family_t af; + vl_api_set_punt_t *mp; u32 protocol = ~0; u32 port = ~0; int is_add = 1; @@ -21548,7 +20047,7 @@ api_punt (vat_main_t * vam) while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ip %d", &ipv)) + if (unformat (i, "%U", unformat_vl_api_address_family, &af)) ; else if (unformat (i, "protocol %d", &protocol)) ; @@ -21563,96 +20062,15 @@ api_punt (vat_main_t * vam) } } - M (PUNT, mp); + M (SET_PUNT, mp); mp->is_add = (u8) is_add; - mp->ipv = (u8) ipv; - mp->l4_protocol = (u8) protocol; - mp->l4_port = htons ((u16) port); - - S (mp); - W (ret); - return ret; -} - -static void vl_api_ipsec_gre_tunnel_details_t_handler - (vl_api_ipsec_gre_tunnel_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)); -} - -static void vl_api_ipsec_gre_tunnel_details_t_handler_json - (vl_api_ipsec_gre_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in_addr ip4; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - clib_memcpy (&ip4, &mp->src_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "src_address", ip4); - clib_memcpy (&ip4, &mp->dst_address, sizeof (ip4)); - vat_json_object_add_ip4 (node, "dst_address", ip4); - vat_json_object_add_uint (node, "local_sa_id", ntohl (mp->local_sa_id)); - vat_json_object_add_uint (node, "remote_sa_id", ntohl (mp->remote_sa_id)); -} - -static int -api_ipsec_gre_tunnel_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_gre_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index; - u8 sw_if_index_set = 0; - 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"); - } - - /* Get list of gre-tunnel interfaces */ - M (IPSEC_GRE_TUNNEL_DUMP, mp); - - mp->sw_if_index = htonl (sw_if_index); + 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); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); return ret; } @@ -21710,8 +20128,8 @@ api_l2_interface_pbb_tag_rewrite (vat_main_t * vam) int ret; /* Shut up coverity */ - memset (dmac, 0, sizeof (dmac)); - memset (smac, 0, sizeof (smac)); + clib_memset (dmac, 0, sizeof (dmac)); + clib_memset (smac, 0, sizeof (smac)); while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -22089,7 +20507,7 @@ api_p2p_ethernet_add (vat_main_t * vam) u8 mac_set = 0; int ret; - memset (remote_mac, 0, sizeof (remote_mac)); + 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, &parent_if_index)) @@ -22145,7 +20563,7 @@ api_p2p_ethernet_del (vat_main_t * vam) u8 mac_set = 0; int ret; - memset (remote_mac, 0, sizeof (remote_mac)); + 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, &parent_if_index)) @@ -22233,8 +20651,8 @@ api_sw_interface_set_lldp (vat_main_t * vam) ip6_address_t ip6_addr; int ret; - memset (&ip4_addr, 0, sizeof (ip4_addr)); - memset (&ip6_addr, 0, sizeof (ip6_addr)); + 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) { @@ -22432,92 +20850,6 @@ api_app_namespace_add_del (vat_main_t * vam) return ret; } -static void vl_api_map_stats_segment_reply_t_handler - (vl_api_map_stats_segment_reply_t * mp) -{ -#if VPP_API_TEST_BUILTIN == 0 - vat_main_t *vam = &vat_main; - ssvm_private_t *ssvmp = &vam->stat_segment; - ssvm_shared_header_t *shared_header; - socket_client_main_t *scm = vam->socket_client_main; - int rv = ntohl (mp->retval); - int my_fd, retval; - clib_error_t *error; - - vam->retval = rv; - - if (rv != 0) - { - vam->result_ready = 1; - return; - } - - /* - * Check the socket for the magic fd - */ - error = vl_sock_api_recv_fd_msg (scm->socket_fd, &my_fd, 5); - if (error) - { - clib_error_report (error); - vam->retval = -99; - vam->result_ready = 1; - return; - } - - memset (ssvmp, 0, sizeof (*ssvmp)); - ssvmp->fd = my_fd; - - /* Note: this closes memfd.fd */ - retval = ssvm_slave_init_memfd (ssvmp); - if (retval) - { - clib_warning ("WARNING: segment map returned %d", retval); - vam->retval = -99; - vam->result_ready = 1; - return; - } - else - errmsg ("stat segment mapped OK..."); - - ASSERT (ssvmp && ssvmp->sh); - - /* Pick up the segment lock from the shared memory header */ - shared_header = ssvmp->sh; - vam->stat_segment_lockp = (clib_spinlock_t *) (shared_header->opaque[0]); - vam->retval = 0; - vam->result_ready = 1; -#endif -} - -static void vl_api_map_stats_segment_reply_t_handler_json - (vl_api_map_stats_segment_reply_t * mp) -{ -#if VPP_API_TEST_BUILTIN == 0 - vat_main_t *vam = &vat_main; - clib_warning ("not implemented"); - vam->retval = -99; - vam->result_ready = 1; -#endif -} - -static int -api_map_stats_segment (vat_main_t * vam) -{ -#if VPP_API_TEST_BUILTIN == 0 - vl_api_map_stats_segment_t *mp; - int ret; - - M (MAP_STATS_SEGMENT, mp); - S (mp); - W (ret); - - return ret; -#else - errmsg ("api unavailable"); - return -99; -#endif -} - static int api_sock_init_shm (vat_main_t * vam) { @@ -22568,7 +20900,7 @@ api_sock_init_shm (vat_main_t * vam) config[6].count = 128; config[6].size = sizeof (uword); - rv = vl_socket_client_init_shm (config); + rv = vl_socket_client_init_shm (config, 1 /* want_pthread */ ); if (!rv) vam->client_index_invalid = 1; return rv; @@ -22944,10 +21276,8 @@ 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; - u32 plen = ~0, sw_if_index = ~0; - ip4_address_t ip4; - ip6_address_t ip6; - u8 is_ip4 = 1; + u32 sw_if_index = ~0; + vl_api_prefix_t pfx = { }; u8 is_add = 1; int ret; @@ -22957,22 +21287,14 @@ api_ip_container_proxy_add_del (vat_main_t * vam) is_add = 0; else if (unformat (i, "add")) ; - if (unformat (i, "%U", unformat_ip4_address, &ip4)) - { - is_ip4 = 1; - plen = 32; - } - else if (unformat (i, "%U", unformat_ip6_address, &ip6)) - { - is_ip4 = 0; - plen = 128; - } + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) + ; else if (unformat (i, "sw_if_index %u", &sw_if_index)) ; else break; } - if (sw_if_index == ~0 || plen == ~0) + if (sw_if_index == ~0 || pfx.address_length == 0) { errmsg ("address and sw_if_index must be set"); return -99; @@ -22980,14 +21302,9 @@ api_ip_container_proxy_add_del (vat_main_t * vam) M (IP_CONTAINER_PROXY_ADD_DEL, mp); - mp->is_ip4 = is_ip4; mp->sw_if_index = clib_host_to_net_u32 (sw_if_index); - mp->plen = plen; mp->is_add = is_add; - if (is_ip4) - clib_memcpy (mp->ip, &ip4, sizeof (ip4)); - else - clib_memcpy (mp->ip, &ip6, sizeof (ip6)); + clib_memcpy (&mp->pfx, &pfx, sizeof (pfx)); S (mp); W (ret); @@ -23291,15 +21608,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); } } @@ -23394,13 +21711,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); } } @@ -23492,6 +21809,10 @@ _(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, \ @@ -23521,21 +21842,20 @@ _(l2_flags, \ "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, \ - " | sw_if_index ") \ -_(sw_interface_tap_dump, "") \ _(tap_create_v2, \ "id [hw-addr ] [host-ns ] [rx-ring-size [tx-ring-size ]") \ _(tap_delete_v2, \ " | sw_if_index ") \ _(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 }]}") \ + "broadcast | {lacp | xor} [load-balance { l2 | l23 | l34 }]} " \ + "[id ]") \ _(bond_delete, \ " | sw_if_index ") \ _(bond_enslave, \ @@ -23546,27 +21866,34 @@ _(sw_interface_bond_dump, "") \ _(sw_interface_slave_dump, \ " | sw_if_index ") \ _(ip_table_add_del, \ - "table-id [ipv6]\n") \ -_(ip_add_del_route, \ - "/ via [table-id ]\n" \ - "[ | sw_if_index ] [resolve-attempts ]\n" \ - "[weight ] [drop] [local] [classify ] [del]\n" \ - "[multipath] [count ]") \ + "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-id \n") \ + "table [add | del]\n") \ _(mpls_route_add_del, \ - "