From 2b202bc4b2d870d76bfe6fb1906ae62e253cec72 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 21 Sep 2020 08:17:51 +0000 Subject: [PATCH] lisp: Move to plugin Type: refactor Change-Id: I54df533a8f863c4e49742903cf2457f18b4fc506 Signed-off-by: Neale Ranns --- src/plugins/lisp/CMakeLists.txt | 79 + src/{vnet => plugins/lisp}/lisp-cp/FEATURE.yaml | 0 src/{vnet => plugins/lisp}/lisp-cp/control.c | 14 +- src/{vnet => plugins/lisp}/lisp-cp/control.h | 4 +- .../lisp}/lisp-cp/gid_dictionary.c | 2 +- .../lisp}/lisp-cp/gid_dictionary.h | 2 +- src/{vnet => plugins/lisp}/lisp-cp/lisp.api | 8 +- src/{vnet => plugins/lisp}/lisp-cp/lisp_api.c | 120 +- src/{vnet => plugins/lisp}/lisp-cp/lisp_cli.c | 4 +- src/{vnet => plugins/lisp}/lisp-cp/lisp_cp_dpo.c | 4 +- src/{vnet => plugins/lisp}/lisp-cp/lisp_cp_dpo.h | 0 .../lisp}/lisp-cp/lisp_cp_messages.h | 0 src/plugins/lisp/lisp-cp/lisp_cp_test.c | 2052 +++ .../lisp}/lisp-cp/lisp_msg_serdes.c | 4 +- .../lisp}/lisp-cp/lisp_msg_serdes.h | 4 +- src/plugins/lisp/lisp-cp/lisp_test.c | 45 + src/{vnet => plugins/lisp}/lisp-cp/lisp_types.api | 0 src/{vnet => plugins/lisp}/lisp-cp/lisp_types.c | 2 +- src/{vnet => plugins/lisp}/lisp-cp/lisp_types.h | 2 +- .../lisp}/lisp-cp/lisp_types_api.c | 2 +- .../lisp}/lisp-cp/lisp_types_api.h | 4 +- src/{vnet => plugins/lisp}/lisp-cp/one.api | 16 +- src/{vnet => plugins/lisp}/lisp-cp/one_api.c | 82 +- src/{vnet => plugins/lisp}/lisp-cp/one_cli.c | 4 +- src/plugins/lisp/lisp-cp/one_test.c | 3101 ++++ src/{vnet => plugins/lisp}/lisp-cp/packets.c | 4 +- src/{vnet => plugins/lisp}/lisp-cp/packets.h | 2 +- src/{vnet => plugins/lisp}/lisp-gpe/FEATURE.yaml | 0 src/{vnet => plugins/lisp}/lisp-gpe/decap.c | 4 +- src/{vnet => plugins/lisp}/lisp-gpe/dir.dox | 0 src/{vnet => plugins/lisp}/lisp-gpe/interface.c | 10 +- src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe.api | 12 +- src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe.c | 8 +- src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe.h | 6 +- .../lisp}/lisp-gpe/lisp_gpe_adjacency.c | 10 +- .../lisp}/lisp-gpe/lisp_gpe_adjacency.h | 2 +- src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_api.c | 81 +- .../lisp}/lisp-gpe/lisp_gpe_error.def | 0 .../lisp}/lisp-gpe/lisp_gpe_fwd_entry.c | 8 +- .../lisp}/lisp-gpe/lisp_gpe_fwd_entry.h | 2 +- .../lisp}/lisp-gpe/lisp_gpe_packet.h | 0 .../lisp}/lisp-gpe/lisp_gpe_sub_interface.c | 4 +- .../lisp}/lisp-gpe/lisp_gpe_sub_interface.h | 2 +- .../lisp}/lisp-gpe/lisp_gpe_tenant.c | 2 +- .../lisp}/lisp-gpe/lisp_gpe_tenant.h | 2 +- src/plugins/lisp/lisp-gpe/lisp_gpe_test.c | 888 + .../lisp}/lisp-gpe/lisp_gpe_tunnel.c | 6 +- .../lisp}/lisp-gpe/lisp_gpe_tunnel.h | 4 +- .../lisp}/lisp-gpe/lisp_types_api.c | 0 .../lisp}/lisp-gpe/lisp_types_api.h | 0 src/{vnet => plugins/lisp}/lisp-gpe/rfc.txt | 0 src/plugins/{unittest => lisp/test}/lisp_cp_test.c | 18 +- {test => src/plugins/lisp/test}/test_lisp.py | 0 src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c | 3 +- src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_util.h | 3 +- src/plugins/unittest/CMakeLists.txt | 1 - src/vat/api_format.c | 17714 +++++++------------ src/vnet/CMakeLists.txt | 58 - src/vnet/session/session_api.c | 2 +- src/vnet/vnet_all_api_h.h | 3 - src/vpp/api/custom_dump.c | 412 +- test/framework.py | 2 + 62 files changed, 12684 insertions(+), 12144 deletions(-) create mode 100644 src/plugins/lisp/CMakeLists.txt rename src/{vnet => plugins/lisp}/lisp-cp/FEATURE.yaml (100%) rename src/{vnet => plugins/lisp}/lisp-cp/control.c (99%) rename src/{vnet => plugins/lisp}/lisp-cp/control.h (99%) rename src/{vnet => plugins/lisp}/lisp-cp/gid_dictionary.c (99%) rename src/{vnet => plugins/lisp}/lisp-cp/gid_dictionary.h (99%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp.api (98%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_api.c (84%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_cli.c (99%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_cp_dpo.c (97%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_cp_dpo.h (100%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_cp_messages.h (100%) create mode 100644 src/plugins/lisp/lisp-cp/lisp_cp_test.c rename src/{vnet => plugins/lisp}/lisp-cp/lisp_msg_serdes.c (99%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_msg_serdes.h (95%) create mode 100644 src/plugins/lisp/lisp-cp/lisp_test.c rename src/{vnet => plugins/lisp}/lisp-cp/lisp_types.api (100%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_types.c (99%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_types.h (99%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_types_api.c (98%) rename src/{vnet => plugins/lisp}/lisp-cp/lisp_types_api.h (92%) rename src/{vnet => plugins/lisp}/lisp-cp/one.api (98%) rename src/{vnet => plugins/lisp}/lisp-cp/one_api.c (95%) rename src/{vnet => plugins/lisp}/lisp-cp/one_cli.c (99%) create mode 100644 src/plugins/lisp/lisp-cp/one_test.c rename src/{vnet => plugins/lisp}/lisp-cp/packets.c (98%) rename src/{vnet => plugins/lisp}/lisp-cp/packets.h (96%) rename src/{vnet => plugins/lisp}/lisp-gpe/FEATURE.yaml (100%) rename src/{vnet => plugins/lisp}/lisp-gpe/decap.c (99%) rename src/{vnet => plugins/lisp}/lisp-gpe/dir.dox (100%) rename src/{vnet => plugins/lisp}/lisp-gpe/interface.c (99%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe.api (94%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe.c (99%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe.h (98%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_adjacency.c (98%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_adjacency.h (98%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_api.c (83%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_error.def (100%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_fwd_entry.c (99%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_fwd_entry.h (99%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_packet.h (100%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_sub_interface.c (98%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_sub_interface.h (99%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_tenant.c (99%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_tenant.h (98%) create mode 100644 src/plugins/lisp/lisp-gpe/lisp_gpe_test.c rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_tunnel.c (98%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_gpe_tunnel.h (96%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_types_api.c (100%) rename src/{vnet => plugins/lisp}/lisp-gpe/lisp_types_api.h (100%) rename src/{vnet => plugins/lisp}/lisp-gpe/rfc.txt (100%) rename src/plugins/{unittest => lisp/test}/lisp_cp_test.c (98%) rename {test => src/plugins/lisp/test}/test_lisp.py (100%) diff --git a/src/plugins/lisp/CMakeLists.txt b/src/plugins/lisp/CMakeLists.txt new file mode 100644 index 00000000000..bf0d60aab0f --- /dev/null +++ b/src/plugins/lisp/CMakeLists.txt @@ -0,0 +1,79 @@ +# Copyright (c) 2020 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +############################################################################## +# LISP control plane: lisp-cp +############################################################################## + +############################################################################## +# Tunnel protocol: lisp-gpe +############################################################################## + +add_vpp_plugin(lisp + SOURCES + lisp-cp/lisp_types.c + lisp-cp/lisp_cp_dpo.c + lisp-cp/control.c + lisp-cp/control_main.c + lisp-cp/gid_dictionary.c + lisp-cp/lisp_msg_serdes.c + lisp-cp/packets.c + lisp-cp/one_cli.c + lisp-cp/lisp_cli.c + lisp-cp/one_api.c + lisp-cp/lisp_api.c + lisp-cp/lisp_types_api.c + lisp-gpe/lisp_gpe.c + lisp-gpe/lisp_gpe_sub_interface.c + lisp-gpe/lisp_gpe_adjacency.c + lisp-gpe/lisp_gpe_tunnel.c + lisp-gpe/lisp_gpe_fwd_entry.c + lisp-gpe/lisp_gpe_tenant.c + lisp-gpe/interface.c + lisp-gpe/decap.c + lisp-gpe/lisp_gpe_api.c + + API_FILES + lisp-cp/lisp_types.api + lisp-cp/lisp.api + lisp-cp/one.api + lisp-gpe/lisp_gpe.api + + INSTALL_HEADERS + lisp-cp/lisp_types.h + lisp-cp/packets.h + lisp-cp/gid_dictionary.h + lisp-cp/lisp_cp_messages.h + lisp-cp/lisp_msg_serdes.h + lisp-cp/control.h + lisp-cp/lisp_types_api.h + lisp-gpe/lisp_gpe.h + lisp-gpe/lisp_gpe_fwd_entry.h + lisp-gpe/lisp_gpe_tenant.h + lisp-gpe/lisp_gpe_packet.h + lisp-gpe/lisp_gpe_error.def + + API_TEST_SOURCES + lisp-cp/lisp_test.c + lisp-cp/lisp_cp_test.c + lisp-cp/one_test.c + lisp-gpe/lisp_gpe_test.c +) + +add_vpp_plugin(lisp_unittest + SOURCES + lisp-cp/lisp_msg_serdes.c + lisp-cp/control_main.c + lisp-cp/lisp_types.c + test/lisp_cp_test.c +) diff --git a/src/vnet/lisp-cp/FEATURE.yaml b/src/plugins/lisp/lisp-cp/FEATURE.yaml similarity index 100% rename from src/vnet/lisp-cp/FEATURE.yaml rename to src/plugins/lisp/lisp-cp/FEATURE.yaml diff --git a/src/vnet/lisp-cp/control.c b/src/plugins/lisp/lisp-cp/control.c similarity index 99% rename from src/vnet/lisp-cp/control.c rename to src/plugins/lisp/lisp-cp/control.c index 60d85619dc5..6eee74ac7d0 100644 --- a/src/vnet/lisp-cp/control.c +++ b/src/plugins/lisp/lisp-cp/control.c @@ -14,12 +14,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -34,8 +34,6 @@ #define TIME_UNTIL_REFETCH_OR_DELETE 20 #define MAPPING_TIMEOUT (((m->ttl) * 60) - TIME_UNTIL_REFETCH_OR_DELETE) -lisp_cp_main_t lisp_control_main; - u8 *format_lisp_cp_input_trace (u8 * s, va_list * args); static void *send_map_request_thread_fn (void *arg); diff --git a/src/vnet/lisp-cp/control.h b/src/plugins/lisp/lisp-cp/control.h similarity index 99% rename from src/vnet/lisp-cp/control.h rename to src/plugins/lisp/lisp-cp/control.h index 78d1ffe5e70..524f5028465 100644 --- a/src/vnet/lisp-cp/control.h +++ b/src/plugins/lisp/lisp-cp/control.h @@ -17,8 +17,8 @@ #define VNET_CONTROL_H_ #include -#include -#include +#include +#include #include #include diff --git a/src/vnet/lisp-cp/gid_dictionary.c b/src/plugins/lisp/lisp-cp/gid_dictionary.c similarity index 99% rename from src/vnet/lisp-cp/gid_dictionary.c rename to src/plugins/lisp/lisp-cp/gid_dictionary.c index 564ee8ea84d..9b0af3f5c6d 100644 --- a/src/vnet/lisp-cp/gid_dictionary.c +++ b/src/plugins/lisp/lisp-cp/gid_dictionary.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include typedef struct { diff --git a/src/vnet/lisp-cp/gid_dictionary.h b/src/plugins/lisp/lisp-cp/gid_dictionary.h similarity index 99% rename from src/vnet/lisp-cp/gid_dictionary.h rename to src/plugins/lisp/lisp-cp/gid_dictionary.h index 5154b3a5874..9a8e213c231 100644 --- a/src/vnet/lisp-cp/gid_dictionary.h +++ b/src/plugins/lisp/lisp-cp/gid_dictionary.h @@ -17,7 +17,7 @@ #define VNET_LISP_GPE_GID_DICTIONARY_H_ #include -#include +#include #include #include diff --git a/src/vnet/lisp-cp/lisp.api b/src/plugins/lisp/lisp-cp/lisp.api similarity index 98% rename from src/vnet/lisp-cp/lisp.api rename to src/plugins/lisp/lisp-cp/lisp.api index 50d72527193..ebd0a31c66e 100644 --- a/src/vnet/lisp-cp/lisp.api +++ b/src/plugins/lisp/lisp-cp/lisp.api @@ -16,7 +16,7 @@ option version = "2.0.0"; import "vnet/interface_types.api"; -import "vnet/lisp-cp/lisp_types.api"; +import "plugins/lisp/lisp-cp/lisp_types.api"; /** \brief add or delete locator_set @param client_index - opaque cookie to identify the sender @@ -26,7 +26,7 @@ import "vnet/lisp-cp/lisp_types.api"; @param locator_num - number of locators @param locators - LISP locator records */ -manual_endian manual_print define lisp_add_del_locator_set +define lisp_add_del_locator_set { u32 client_index; u32 context; @@ -294,7 +294,7 @@ define show_lisp_map_request_mode_reply @param rloc_num - number of remote locators @param rlocs - remote locator records */ -autoreply manual_print manual_endian define lisp_add_del_remote_mapping +autoreply define lisp_add_del_remote_mapping { u32 client_index; u32 context; @@ -501,7 +501,7 @@ typedef lisp_adjacency @param count - number of adjacencies @param adjacencies - array of adjacencies */ -manual_endian manual_print define lisp_adjacencies_get_reply +define lisp_adjacencies_get_reply { u32 context; i32 retval; diff --git a/src/vnet/lisp-cp/lisp_api.c b/src/plugins/lisp/lisp-cp/lisp_api.c similarity index 84% rename from src/vnet/lisp-cp/lisp_api.c rename to src/plugins/lisp/lisp-cp/lisp_api.c index 3cb892f035c..041069d5613 100644 --- a/src/vnet/lisp-cp/lisp_api.c +++ b/src/plugins/lisp/lisp-cp/lisp_api.c @@ -22,74 +22,25 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include -#include +/* define message IDs */ +#include +#include +#include - -#define vl_api_lisp_add_del_locator_set_t_endian vl_noop_handler -#define vl_api_lisp_add_del_locator_set_t_print vl_noop_handler -#define vl_api_lisp_add_del_remote_mapping_t_endian vl_noop_handler -#define vl_api_lisp_add_del_remote_mapping_t_print vl_noop_handler - -#define vl_api_one_add_del_locator_set_t_endian vl_noop_handler -#define vl_api_one_add_del_locator_set_t_print vl_noop_handler -#define vl_api_one_add_del_remote_mapping_t_endian vl_noop_handler -#define vl_api_one_add_del_remote_mapping_t_print vl_noop_handler - -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +/** + * Base message ID fot the plugin + */ +static u32 lisp_base_msg_id; +#define REPLY_MSG_ID_BASE lisp_base_msg_id #include -#define foreach_vpe_api_msg \ -_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set) \ -_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator) \ -_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid) \ -_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver) \ -_(LISP_ADD_DEL_MAP_SERVER, lisp_add_del_map_server) \ -_(LISP_ENABLE_DISABLE, lisp_enable_disable) \ -_(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable) \ -_(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable) \ -_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping) \ -_(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency) \ -_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set) \ -_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode) \ -_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map) \ -_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \ -_(LISP_LOCATOR_DUMP, lisp_locator_dump) \ -_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump) \ -_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump) \ -_(LISP_MAP_SERVER_DUMP, lisp_map_server_dump) \ -_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump) \ -_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump) \ -_(LISP_ADJACENCIES_GET, lisp_adjacencies_get) \ -_(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state) \ -_(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state) \ -_(SHOW_LISP_STATUS, show_lisp_status) \ -_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, \ - lisp_add_del_map_request_itr_rlocs) \ -_(LISP_GET_MAP_REQUEST_ITR_RLOCS, lisp_get_map_request_itr_rlocs) \ -_(SHOW_LISP_PITR, show_lisp_pitr) \ -_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode) \ -_(LISP_USE_PETR, lisp_use_petr) \ -_(SHOW_LISP_USE_PETR, show_lisp_use_petr) \ - static locator_t * unformat_lisp_locs (vl_api_remote_locator_t * rmt_locs, u32 rloc_num) { @@ -532,7 +483,7 @@ send_lisp_locator_details (lisp_cp_main_t * lcm, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_DETAILS); + rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_DETAILS + REPLY_MSG_ID_BASE); rmp->context = context; rmp->local = loc->local; @@ -604,7 +555,8 @@ send_lisp_locator_set_details (lisp_cp_main_t * lcm, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_LISP_LOCATOR_SET_DETAILS); + rmp->_vl_msg_id = + ntohs (VL_API_LISP_LOCATOR_SET_DETAILS + REPLY_MSG_ID_BASE); rmp->context = context; rmp->ls_index = htonl (ls_index); @@ -687,7 +639,7 @@ send_lisp_eid_table_details (mapping_t * mapit, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_DETAILS); + rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_DETAILS + REPLY_MSG_ID_BASE); ls = pool_elt_at_index (lcm->locator_set_pool, mapit->locator_set_index); if (vec_len (ls->locator_indices) == 0) @@ -769,7 +721,8 @@ send_lisp_map_server_details (ip_address_t * ip, vl_api_registration_t * reg, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_SERVER_DETAILS); + rmp->_vl_msg_id = + ntohs (VL_API_LISP_MAP_SERVER_DETAILS + REPLY_MSG_ID_BASE); ip_address_encode2 (ip, &rmp->ip_address); rmp->context = context; @@ -802,7 +755,8 @@ send_lisp_map_resolver_details (ip_address_t * ip, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_LISP_MAP_RESOLVER_DETAILS); + rmp->_vl_msg_id = + ntohs (VL_API_LISP_MAP_RESOLVER_DETAILS + REPLY_MSG_ID_BASE); ip_address_encode2 (ip, &rmp->ip_address); rmp->context = context; @@ -835,7 +789,8 @@ send_eid_table_map_pair (hash_pair_t * p, vl_api_registration_t * reg, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_MAP_DETAILS); + rmp->_vl_msg_id = + ntohs (VL_API_LISP_EID_TABLE_MAP_DETAILS + REPLY_MSG_ID_BASE); rmp->vni = clib_host_to_net_u32 (p->key); rmp->dp_table = clib_host_to_net_u32 (p->value[0]); @@ -880,7 +835,8 @@ send_eid_table_vni (u32 vni, vl_api_registration_t * reg, u32 context) rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_LISP_EID_TABLE_VNI_DETAILS); + rmp->_vl_msg_id = + ntohs (VL_API_LISP_EID_TABLE_VNI_DETAILS + REPLY_MSG_ID_BASE); rmp->context = context; rmp->vni = clib_host_to_net_u32 (vni); vl_api_send_msg (reg, (u8 *) rmp); @@ -1088,39 +1044,17 @@ vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp) * added the client registration handlers. * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() */ -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_lisp; -#undef _ -} +#include static clib_error_t * lisp_api_hookup (vlib_main_t * vm) { - api_main_t *am = vlibapi_get_main (); - -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N, #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vpe_api_msg; -#undef _ - /* * Set up the (msg_name, crc, message-id) table */ - setup_message_id_table (am); + lisp_base_msg_id = setup_message_id_table (); - return 0; + return NULL; } VLIB_API_INIT_FUNCTION (lisp_api_hookup); diff --git a/src/vnet/lisp-cp/lisp_cli.c b/src/plugins/lisp/lisp-cp/lisp_cli.c similarity index 99% rename from src/vnet/lisp-cp/lisp_cli.c rename to src/plugins/lisp/lisp-cp/lisp_cli.c index 93422fe2de7..8685c1cc04a 100644 --- a/src/vnet/lisp-cp/lisp_cli.c +++ b/src/plugins/lisp/lisp-cp/lisp_cli.c @@ -13,8 +13,8 @@ * limitations under the License. */ -#include -#include +#include +#include static clib_error_t * lisp_show_adjacencies_command_fn (vlib_main_t * vm, diff --git a/src/vnet/lisp-cp/lisp_cp_dpo.c b/src/plugins/lisp/lisp-cp/lisp_cp_dpo.c similarity index 97% rename from src/vnet/lisp-cp/lisp_cp_dpo.c rename to src/plugins/lisp/lisp-cp/lisp_cp_dpo.c index 848f621e35f..bbb0ee3b6dc 100644 --- a/src/vnet/lisp-cp/lisp_cp_dpo.c +++ b/src/plugins/lisp/lisp-cp/lisp_cp_dpo.c @@ -14,8 +14,8 @@ */ #include -#include -#include +#include +#include /** * The static array of LISP punt DPOs diff --git a/src/vnet/lisp-cp/lisp_cp_dpo.h b/src/plugins/lisp/lisp-cp/lisp_cp_dpo.h similarity index 100% rename from src/vnet/lisp-cp/lisp_cp_dpo.h rename to src/plugins/lisp/lisp-cp/lisp_cp_dpo.h diff --git a/src/vnet/lisp-cp/lisp_cp_messages.h b/src/plugins/lisp/lisp-cp/lisp_cp_messages.h similarity index 100% rename from src/vnet/lisp-cp/lisp_cp_messages.h rename to src/plugins/lisp/lisp-cp/lisp_cp_messages.h diff --git a/src/plugins/lisp/lisp-cp/lisp_cp_test.c b/src/plugins/lisp/lisp-cp/lisp_cp_test.c new file mode 100644 index 00000000000..faffb738c04 --- /dev/null +++ b/src/plugins/lisp/lisp-cp/lisp_cp_test.c @@ -0,0 +1,2052 @@ +/* + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include +#include +#include + +/* define message IDs */ +#include +#include +#include + +typedef struct +{ + /* API message ID base */ + u16 msg_id_base; + vat_main_t *vat_main; + u32 ping_id; +} lisp_test_main_t; + +lisp_test_main_t lisp_test_main; + +#define __plugin_msg_base lisp_test_main.msg_id_base +#include + +/* Macro to finish up custom dump fns */ +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) +#define FINISH \ + vec_add1 (s, 0); \ + vl_print (handle, (char *)s); \ + vec_free (s); \ + return handle; + +typedef struct +{ + u32 spi; + u8 si; +} __attribute__ ((__packed__)) lisp_nsh_api_t; + +#define LISP_PING(_lm, mp_ping) \ + if (!(_lm)->ping_id) \ + (_lm)->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); \ + mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); \ + mp_ping->_vl_msg_id = htons ((_lm)->ping_id); \ + mp_ping->client_index = vam->my_client_index; \ + fformat (vam->ofp, "Sending ping id=%d\n", (_lm)->ping_id); \ + vam->result_ready = 0; \ + +uword +unformat_nsh_address (unformat_input_t * input, va_list * args) +{ + lisp_nsh_api_t *nsh = va_arg (*args, lisp_nsh_api_t *); + return unformat (input, "SPI:%d SI:%d", &nsh->spi, &nsh->si); +} + +static u8 * +format_nsh_address_vat (u8 * s, va_list * args) +{ + nsh_t *a = va_arg (*args, nsh_t *); + return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); +} + +static u8 * +format_lisp_flat_eid (u8 * s, va_list * args) +{ + vl_api_eid_t *eid = va_arg (*args, vl_api_eid_t *); + + switch (eid->type) + { + case EID_TYPE_API_PREFIX: + if (eid->address.prefix.address.af) + return format (s, "%U/%d", format_ip6_address, + eid->address.prefix.address.un.ip6, + eid->address.prefix.len); + return format (s, "%U/%d", format_ip4_address, + eid->address.prefix.address.un.ip4, + eid->address.prefix.len); + case EID_TYPE_API_MAC: + return format (s, "%U", format_ethernet_address, eid->address.mac); + case EID_TYPE_API_NSH: + return format (s, "%U", format_nsh_address_vat, eid->address.nsh); + } + return 0; +} + +static u8 * +format_lisp_eid_vat (u8 * s, va_list * args) +{ + vl_api_eid_t *deid = va_arg (*args, vl_api_eid_t *); + vl_api_eid_t *seid = va_arg (*args, vl_api_eid_t *); + u8 is_src_dst = (u8) va_arg (*args, int); + + if (is_src_dst) + s = format (s, "%U|", format_lisp_flat_eid, seid); + + s = format (s, "%U", format_lisp_flat_eid, deid); + + return s; +} + + + +/* *INDENT-OFF* */ +/** Used for parsing LISP eids */ +typedef struct lisp_eid_vat_t_ +{ + union { + ip46_address_t ip; + mac_address_t mac; + lisp_nsh_api_t nsh; + } addr; + /**< prefix length if IP */ + u32 len; + /**< type of eid */ + u8 type; +} __clib_packed lisp_eid_vat_t; +/* *INDENT-ON* */ + +static uword +unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) +{ + lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *); + + clib_memset (a, 0, sizeof (a[0])); + + if (unformat (input, "%U/%d", unformat_ip46_address, a->addr.ip, &a->len)) + { + a->type = 0; /* ip prefix type */ + } + else if (unformat (input, "%U", unformat_ethernet_address, &a->addr.mac)) + { + a->type = 1; /* mac type */ + } + else if (unformat (input, "%U", unformat_nsh_address, a->addr.nsh)) + { + a->type = 2; /* NSH type */ + a->addr.nsh.spi = clib_host_to_net_u32 (a->addr.nsh.spi); + } + else + { + return 0; + } + + if (a->type == 0) + { + if (ip46_address_is_ip4 (&a->addr.ip)) + return a->len > 32 ? 1 : 0; + else + return a->len > 128 ? 1 : 0; + } + + return 1; +} + +static void +lisp_eid_put_vat (vl_api_eid_t * eid, const lisp_eid_vat_t * vat_eid) +{ + eid->type = vat_eid->type; + switch (eid->type) + { + case EID_TYPE_API_PREFIX: + if (ip46_address_is_ip4 (&vat_eid->addr.ip)) + { + clib_memcpy (&eid->address.prefix.address.un.ip4, + &vat_eid->addr.ip.ip4, 4); + eid->address.prefix.address.af = ADDRESS_IP4; + eid->address.prefix.len = vat_eid->len; + } + else + { + clib_memcpy (&eid->address.prefix.address.un.ip6, + &vat_eid->addr.ip.ip6, 16); + eid->address.prefix.address.af = ADDRESS_IP6; + eid->address.prefix.len = vat_eid->len; + } + return; + case EID_TYPE_API_MAC: + clib_memcpy (&eid->address.mac, &vat_eid->addr.mac, + sizeof (eid->address.mac)); + return; + case EID_TYPE_API_NSH: + clib_memcpy (&eid->address.nsh, &vat_eid->addr.nsh, + sizeof (eid->address.nsh)); + return; + default: + ASSERT (0); + return; + } +} + +static int +api_lisp_add_del_locator_set (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_locator_set_t *mp; + u8 is_add = 1; + u8 *locator_set_name = NULL; + u8 locator_set_name_set = 0; + vl_api_local_locator_t locator, *locators = 0; + u32 sw_if_index, priority, weight; + u32 data_len = 0; + + int ret; + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "locator-set %s", &locator_set_name)) + { + locator_set_name_set = 1; + } + else if (unformat (input, "sw_if_index %u p %u w %u", + &sw_if_index, &priority, &weight)) + { + locator.sw_if_index = htonl (sw_if_index); + locator.priority = priority; + locator.weight = weight; + vec_add1 (locators, locator); + } + else + if (unformat + (input, "iface %U p %u w %u", unformat_sw_if_index, vam, + &sw_if_index, &priority, &weight)) + { + locator.sw_if_index = htonl (sw_if_index); + locator.priority = priority; + locator.weight = weight; + vec_add1 (locators, locator); + } + else + break; + } + + if (locator_set_name_set == 0) + { + errmsg ("missing locator-set name"); + vec_free (locators); + return -99; + } + + if (vec_len (locator_set_name) > 64) + { + errmsg ("locator-set name too long"); + vec_free (locator_set_name); + vec_free (locators); + return -99; + } + vec_add1 (locator_set_name, 0); + + data_len = sizeof (vl_api_local_locator_t) * vec_len (locators); + + /* Construct the API message */ + M2 (LISP_ADD_DEL_LOCATOR_SET, mp, data_len); + + mp->is_add = is_add; + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + vec_free (locator_set_name); + + mp->locator_num = clib_host_to_net_u32 (vec_len (locators)); + if (locators) + clib_memcpy (mp->locators, locators, data_len); + vec_free (locators); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_add_del_locator (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_locator_t *mp; + u32 tmp_if_index = ~0; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + u8 sw_if_index_if_name_set = 0; + u32 priority = ~0; + u8 priority_set = 0; + u32 weight = ~0; + u8 weight_set = 0; + u8 is_add = 1; + u8 *locator_set_name = NULL; + u8 locator_set_name_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "locator-set %s", &locator_set_name)) + { + locator_set_name_set = 1; + } + else if (unformat (input, "iface %U", unformat_sw_if_index, vam, + &tmp_if_index)) + { + sw_if_index_if_name_set = 1; + sw_if_index = tmp_if_index; + } + else if (unformat (input, "sw_if_index %d", &tmp_if_index)) + { + sw_if_index_set = 1; + sw_if_index = tmp_if_index; + } + else if (unformat (input, "p %d", &priority)) + { + priority_set = 1; + } + else if (unformat (input, "w %d", &weight)) + { + weight_set = 1; + } + else + break; + } + + if (locator_set_name_set == 0) + { + errmsg ("missing locator-set name"); + return -99; + } + + if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) + { + errmsg ("missing sw_if_index"); + vec_free (locator_set_name); + return -99; + } + + if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) + { + errmsg ("cannot use both params interface name and sw_if_index"); + vec_free (locator_set_name); + return -99; + } + + if (priority_set == 0) + { + errmsg ("missing locator-set priority"); + vec_free (locator_set_name); + return -99; + } + + if (weight_set == 0) + { + errmsg ("missing locator-set weight"); + vec_free (locator_set_name); + return -99; + } + + if (vec_len (locator_set_name) > 64) + { + errmsg ("locator-set name too long"); + vec_free (locator_set_name); + return -99; + } + vec_add1 (locator_set_name, 0); + + /* Construct the API message */ + M (LISP_ADD_DEL_LOCATOR, mp); + + mp->is_add = is_add; + mp->sw_if_index = ntohl (sw_if_index); + mp->priority = priority; + mp->weight = weight; + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + vec_free (locator_set_name); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_add_del_local_eid (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_local_eid_t *mp; + u8 is_add = 1; + u8 eid_set = 0; + lisp_eid_vat_t _eid, *eid = &_eid; + u8 *locator_set_name = 0; + u8 locator_set_name_set = 0; + u32 vni = 0; + u16 key_id = 0; + u8 *key = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) + { + eid_set = 1; + } + else if (unformat (input, "locator-set %s", &locator_set_name)) + { + locator_set_name_set = 1; + } + else if (unformat (input, "key-id %U", unformat_hmac_key_id, &key_id)) + ; + else if (unformat (input, "secret-key %_%v%_", &key)) + ; + else + break; + } + + if (locator_set_name_set == 0) + { + errmsg ("missing locator-set name"); + return -99; + } + + if (0 == eid_set) + { + errmsg ("EID address not set!"); + vec_free (locator_set_name); + return -99; + } + + if (key && (0 == key_id)) + { + errmsg ("invalid key_id!"); + return -99; + } + + if (vec_len (key) > 64) + { + errmsg ("key too long"); + vec_free (key); + return -99; + } + + if (vec_len (locator_set_name) > 64) + { + errmsg ("locator-set name too long"); + vec_free (locator_set_name); + return -99; + } + vec_add1 (locator_set_name, 0); + + /* Construct the API message */ + M (LISP_ADD_DEL_LOCAL_EID, mp); + + mp->is_add = is_add; + lisp_eid_put_vat (&mp->eid, eid); + mp->vni = clib_host_to_net_u32 (vni); + mp->key.id = key_id; + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + clib_memcpy (mp->key.key, key, vec_len (key)); + + vec_free (locator_set_name); + vec_free (key); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_add_del_map_server (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_map_server_t *mp; + u8 is_add = 1; + u8 ipv4_set = 0; + u8 ipv6_set = 0; + ip4_address_t ipv4; + ip6_address_t ipv6; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) + { + ipv4_set = 1; + } + else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) + { + ipv6_set = 1; + } + else + break; + } + + if (ipv4_set && ipv6_set) + { + errmsg ("both eid v4 and v6 addresses set"); + return -99; + } + + if (!ipv4_set && !ipv6_set) + { + errmsg ("eid addresses not set"); + return -99; + } + + /* Construct the API message */ + M (LISP_ADD_DEL_MAP_SERVER, mp); + + mp->is_add = is_add; + if (ipv6_set) + { + mp->ip_address.af = 1; + clib_memcpy (mp->ip_address.un.ip6, &ipv6, sizeof (ipv6)); + } + else + { + mp->ip_address.af = 0; + clib_memcpy (mp->ip_address.un.ip4, &ipv4, sizeof (ipv4)); + } + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_add_del_map_resolver (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_map_resolver_t *mp; + u8 is_add = 1; + u8 ipv4_set = 0; + u8 ipv6_set = 0; + ip4_address_t ipv4; + ip6_address_t ipv6; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) + { + ipv4_set = 1; + } + else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) + { + ipv6_set = 1; + } + else + break; + } + + if (ipv4_set && ipv6_set) + { + errmsg ("both eid v4 and v6 addresses set"); + return -99; + } + + if (!ipv4_set && !ipv6_set) + { + errmsg ("eid addresses not set"); + return -99; + } + + /* Construct the API message */ + M (LISP_ADD_DEL_MAP_RESOLVER, mp); + + mp->is_add = is_add; + if (ipv6_set) + { + mp->ip_address.af = 1; + clib_memcpy (mp->ip_address.un.ip6, &ipv6, sizeof (ipv6)); + } + else + { + mp->ip_address.af = 0; + clib_memcpy (mp->ip_address.un.ip6, &ipv4, sizeof (ipv4)); + } + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_enable_disable_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (LISP_ENABLE_DISABLE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +/** + * Enable/disable LISP proxy ITR. + * + * @param vam vpp API test context + * @return return code + */ +static int +api_lisp_pitr_set_locator_set (vat_main_t * vam) +{ + u8 ls_name_set = 0; + unformat_input_t *input = vam->input; + vl_api_lisp_pitr_set_locator_set_t *mp; + u8 is_add = 1; + u8 *ls_name = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "locator-set %s", &ls_name)) + ls_name_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!ls_name_set) + { + errmsg ("locator-set name not set!"); + return -99; + } + + M (LISP_PITR_SET_LOCATOR_SET, mp); + + mp->is_add = is_add; + clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); + vec_free (ls_name); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_lisp_use_petr (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_use_petr_t *mp; + u8 is_add = 0; + ip_address_t ip; + int ret; + + clib_memset (&ip, 0, sizeof (ip)); + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "disable")) + is_add = 0; + else + if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (&ip))) + { + is_add = 1; + ip_addr_version (&ip) = AF_IP4; + } + else + if (unformat (input, "%U", unformat_ip6_address, &ip_addr_v6 (&ip))) + { + is_add = 1; + ip_addr_version (&ip) = AF_IP6; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + M (LISP_USE_PETR, mp); + + mp->is_add = is_add; + if (is_add) + { + mp->ip_address.af = ip_addr_version (&ip) == AF_IP4 ? 0 : 1; + if (mp->ip_address.af) + clib_memcpy (mp->ip_address.un.ip6, &ip, 16); + else + clib_memcpy (mp->ip_address.un.ip4, &ip, 4); + } + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static void + vl_api_show_lisp_use_petr_reply_t_handler + (vl_api_show_lisp_use_petr_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_petr_enable ? "enabled" : "disabled"); + if (mp->is_petr_enable) + { + print (vam->ofp, "Proxy-ETR address; %U", + mp->ip_address.af ? format_ip6_address : format_ip4_address, + mp->ip_address.un); + } + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static int +api_show_lisp_use_petr (vat_main_t * vam) +{ + vl_api_show_lisp_use_petr_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "Proxy-ETR status:"); + } + + M (SHOW_LISP_USE_PETR, mp); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static void + vl_api_show_lisp_rloc_probe_state_reply_t_handler + (vl_api_show_lisp_rloc_probe_state_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled"); +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static int +api_show_lisp_map_register_state (vat_main_t * vam) +{ + vl_api_show_lisp_map_register_state_t *mp; + int ret; + + M (SHOW_LISP_MAP_REGISTER_STATE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_show_lisp_rloc_probe_state (vat_main_t * vam) +{ + vl_api_show_lisp_rloc_probe_state_t *mp; + int ret; + + M (SHOW_LISP_RLOC_PROBE_STATE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_lisp_rloc_probe_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_rloc_probe_enable_disable_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + is_set = 1; + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (LISP_RLOC_PROBE_ENABLE_DISABLE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_map_register_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_map_register_enable_disable_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + is_set = 1; + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (LISP_MAP_REGISTER_ENABLE_DISABLE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static void + vl_api_show_lisp_map_request_mode_reply_t_handler + (vl_api_show_lisp_map_request_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "map_request_mode: %s", + mp->is_src_dst ? "src-dst" : "dst-only"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_lisp_map_register_state_reply_t_handler + (vl_api_show_lisp_map_register_state_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + int retval = clib_net_to_host_u32 (mp->retval); + + print (vam->ofp, "%s", mp->is_enabled ? "enabled" : "disabled"); + + vam->retval = retval; + vam->result_ready = 1; +} + +static void +vl_api_lisp_locator_details_t_handler (vl_api_lisp_locator_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u8 *s = 0; + + if (mp->local) + { + s = format (s, "%=16d%=16d%=16d", + ntohl (mp->sw_if_index), mp->priority, mp->weight); + } + else + { + s = format (s, "%=16U%=16d%=16d", + format_ip46_address, + mp->ip_address, mp->priority, mp->weight); + } + + print (vam->ofp, "%v", s); + vec_free (s); +} + +static void +vl_api_lisp_locator_set_details_t_handler (vl_api_lisp_locator_set_details_t * + mp) +{ + vat_main_t *vam = &vat_main; + u8 *ls_name = 0; + + ls_name = format (0, "%s", mp->ls_name); + + print (vam->ofp, "%=10d%=15v", clib_net_to_host_u32 (mp->ls_index), + ls_name); + vec_free (ls_name); +} + +static void vl_api_lisp_add_del_locator_set_reply_t_handler + (vl_api_lisp_add_del_locator_set_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_lisp_eid_table_details_t_handler (vl_api_lisp_eid_table_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u8 *s = 0, *eid = 0; + + if (~0 == mp->locator_set_index) + s = format (0, "action: %d", mp->action); + else + s = format (0, "%d", clib_net_to_host_u32 (mp->locator_set_index)); + + eid = format (0, "%U", format_lisp_eid_vat, + &mp->deid, &mp->seid, mp->is_src_dst); + vec_add1 (eid, 0); + + print (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-20d%-10d%-20s", + clib_net_to_host_u32 (mp->vni), + eid, + mp->is_local ? "local" : "remote", + s, clib_net_to_host_u32 (mp->ttl), mp->authoritative, + clib_net_to_host_u16 (mp->key.id), mp->key.key); + + vec_free (s); + vec_free (eid); +} + +static void + vl_api_lisp_eid_table_map_details_t_handler + (vl_api_lisp_eid_table_map_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + u8 *line = format (0, "%=10d%=10d", + clib_net_to_host_u32 (mp->vni), + clib_net_to_host_u32 (mp->dp_table)); + print (vam->ofp, "%v", line); + vec_free (line); +} + +static void + vl_api_lisp_eid_table_vni_details_t_handler + (vl_api_lisp_eid_table_vni_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + u8 *line = format (0, "%d", clib_net_to_host_u32 (mp->vni)); + print (vam->ofp, "%v", line); + vec_free (line); +} + +static void + vl_api_lisp_adjacencies_get_reply_t_handler + (vl_api_lisp_adjacencies_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_lisp_adjacency_t *a; + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + a = &mp->adjacencies[i]; + print (vam->ofp, "%U %40U", + format_lisp_flat_eid, a->leid, format_lisp_flat_eid, a->reid); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void +vl_api_lisp_map_server_details_t_handler (vl_api_lisp_map_server_details_t * + mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%=20U", + mp->ip_address.af ? format_ip6_address : format_ip4_address, + mp->ip_address.un); +} + +static void +vl_api_lisp_map_resolver_details_t_handler (vl_api_lisp_map_resolver_details_t + * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%=20U", + mp->ip_address.af ? format_ip6_address : format_ip4_address, + mp->ip_address.un); +} + +static void +vl_api_show_lisp_status_reply_t_handler (vl_api_show_lisp_status_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "feature: %s\ngpe: %s", + mp->is_lisp_enabled ? "enabled" : "disabled", + mp->is_gpe_enabled ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_lisp_get_map_request_itr_rlocs_reply_t_handler + (vl_api_lisp_get_map_request_itr_rlocs_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (retval >= 0) + { + print (vam->ofp, "%=20s", mp->locator_set_name); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void +vl_api_show_lisp_pitr_reply_t_handler (vl_api_show_lisp_pitr_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%-20s%-16s", + mp->is_enabled ? "enabled" : "disabled", + mp->is_enabled ? (char *) mp->locator_set_name : ""); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +uword +unformat_hmac_key_id (unformat_input_t * input, va_list * args) +{ + u32 *key_id = va_arg (*args, u32 *); + u8 *s = 0; + + if (unformat (input, "%s", &s)) + { + if (!strcmp ((char *) s, "sha1")) + key_id[0] = HMAC_SHA_1_96; + else if (!strcmp ((char *) s, "sha256")) + key_id[0] = HMAC_SHA_256_128; + else + { + clib_warning ("invalid key_id: '%s'", s); + key_id[0] = HMAC_NO_KEY; + } + } + else + return 0; + + vec_free (s); + return 1; +} + + + +static int +api_show_lisp_map_request_mode (vat_main_t * vam) +{ + vl_api_show_lisp_map_request_mode_t *mp; + int ret; + + M (SHOW_LISP_MAP_REQUEST_MODE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_lisp_map_request_mode (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_map_request_mode_t *mp; + u8 mode = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "dst-only")) + mode = 0; + else if (unformat (input, "src-dst")) + mode = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + M (LISP_MAP_REQUEST_MODE, mp); + + mp->is_src_dst = mode == 1; + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_show_lisp_pitr (vat_main_t * vam) +{ + vl_api_show_lisp_pitr_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "lisp status:"); + } + + M (SHOW_LISP_PITR, mp); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +/** + * Add/delete mapping between vni and vrf + */ +static int +api_lisp_eid_table_add_del_map (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_eid_table_add_del_map_t *mp; + u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0; + u32 vni, vrf, bd_index; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "vrf %d", &vrf)) + vrf_set = 1; + else if (unformat (input, "bd_index %d", &bd_index)) + bd_index_set = 1; + else if (unformat (input, "vni %d", &vni)) + vni_set = 1; + else + break; + } + + if (!vni_set || (!vrf_set && !bd_index_set)) + { + errmsg ("missing arguments!"); + return -99; + } + + if (vrf_set && bd_index_set) + { + errmsg ("error: both vrf and bd entered!"); + return -99; + } + + M (LISP_EID_TABLE_ADD_DEL_MAP, mp); + + mp->is_add = is_add; + mp->vni = htonl (vni); + mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index); + mp->is_l2 = bd_index_set; + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +/** + * Add/del remote mapping to/from LISP control plane + * + * @param vam vpp API test context + * @return return code + */ +static int +api_lisp_add_del_remote_mapping (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_remote_mapping_t *mp; + u32 vni = 0; + lisp_eid_vat_t _eid, *eid = &_eid; + lisp_eid_vat_t _seid, *seid = &_seid; + u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0; + u32 action = ~0, p, w, data_len; + ip4_address_t rloc4; + ip6_address_t rloc6; + vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0; + int ret; + + clib_memset (&rloc, 0, sizeof (rloc)); + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del-all")) + { + del_all = 1; + } + else if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "add")) + { + is_add = 1; + } + else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) + { + eid_set = 1; + } + else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid)) + { + seid_set = 1; + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else if (unformat (input, "p %d w %d", &p, &w)) + { + if (!curr_rloc) + { + errmsg ("No RLOC configured for setting priority/weight!"); + return -99; + } + curr_rloc->priority = p; + curr_rloc->weight = w; + } + else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4)) + { + rloc.ip_address.af = 0; + clib_memcpy (&rloc.ip_address.un.ip6, &rloc6, sizeof (rloc6)); + vec_add1 (rlocs, rloc); + curr_rloc = &rlocs[vec_len (rlocs) - 1]; + } + else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6)) + { + rloc.ip_address.af = 1; + clib_memcpy (&rloc.ip_address.un.ip4, &rloc4, sizeof (rloc4)); + vec_add1 (rlocs, rloc); + curr_rloc = &rlocs[vec_len (rlocs) - 1]; + } + else if (unformat (input, "action %U", + unformat_negative_mapping_action, &action)) + { + ; + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (0 == eid_set) + { + errmsg ("missing params!"); + return -99; + } + + if (is_add && (~0 == action) && 0 == vec_len (rlocs)) + { + errmsg ("no action set for negative map-reply!"); + return -99; + } + + data_len = vec_len (rlocs) * sizeof (vl_api_remote_locator_t); + + M2 (LISP_ADD_DEL_REMOTE_MAPPING, mp, data_len); + mp->is_add = is_add; + mp->vni = htonl (vni); + mp->action = (u8) action; + mp->is_src_dst = seid_set; + mp->del_all = del_all; + lisp_eid_put_vat (&mp->deid, eid); + lisp_eid_put_vat (&mp->seid, seid); + + mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs)); + clib_memcpy (mp->rlocs, rlocs, data_len); + vec_free (rlocs); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +/** + * Add/del LISP adjacency. Saves mapping in LISP control plane and updates + * forwarding entries in data-plane accordingly. + * + * @param vam vpp API test context + * @return return code + */ +static int +api_lisp_add_del_adjacency (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_adjacency_t *mp; + u32 vni = 0; + u8 is_add = 1; + int ret; + lisp_eid_vat_t leid, reid; + + leid.type = reid.type = (u8) ~ 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "add")) + { + is_add = 1; + } + else if (unformat (input, "reid %U/%d", unformat_ip46_address, + &reid.addr.ip, &reid.len)) + { + reid.type = 0; /* ipv4 */ + } + else if (unformat (input, "reid %U", unformat_ethernet_address, + &reid.addr.mac)) + { + reid.type = 1; /* mac */ + } + else if (unformat (input, "leid %U/%d", unformat_ip46_address, + &leid.addr.ip, &leid.len)) + { + leid.type = 0; /* ipv4 */ + } + else if (unformat (input, "leid %U", unformat_ethernet_address, + &leid.addr.mac)) + { + leid.type = 1; /* mac */ + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if ((u8) ~ 0 == reid.type) + { + errmsg ("missing params!"); + return -99; + } + + if (leid.type != reid.type) + { + errmsg ("remote and local EIDs are of different types!"); + return -99; + } + + M (LISP_ADD_DEL_ADJACENCY, mp); + mp->is_add = is_add; + mp->vni = htonl (vni); + lisp_eid_put_vat (&mp->leid, &leid); + lisp_eid_put_vat (&mp->reid, &reid); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +/** + * Add/del map request itr rlocs from LISP control plane and updates + * + * @param vam vpp API test context + * @return return code + */ +static int +api_lisp_add_del_map_request_itr_rlocs (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_add_del_map_request_itr_rlocs_t *mp; + u8 *locator_set_name = 0; + u8 locator_set_name_set = 0; + u8 is_add = 1; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "%_%v%_", &locator_set_name)) + { + locator_set_name_set = 1; + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (is_add && !locator_set_name_set) + { + errmsg ("itr-rloc is not set!"); + return -99; + } + + if (is_add && vec_len (locator_set_name) > 64) + { + errmsg ("itr-rloc locator-set name too long"); + vec_free (locator_set_name); + return -99; + } + + M (LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, mp); + mp->is_add = is_add; + if (is_add) + { + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + } + else + { + clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); + } + vec_free (locator_set_name); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_locator_dump (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_lisp_locator_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 is_index_set = 0, is_name_set = 0; + u8 *ls_name = 0; + u32 ls_index = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "ls_name %_%v%_", &ls_name)) + { + is_name_set = 1; + } + else if (unformat (input, "ls_index %d", &ls_index)) + { + is_index_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!is_index_set && !is_name_set) + { + errmsg ("error: expected lisp of index or name!"); + return -99; + } + + if (is_index_set && is_name_set) + { + errmsg ("error: only lisp param expected!"); + return -99; + } + + if (vec_len (ls_name) > 62) + { + errmsg ("error: locator set name too long!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight"); + } + + M (LISP_LOCATOR_DUMP, mp); + mp->is_index_set = is_index_set; + + if (is_index_set) + mp->ls_index = clib_host_to_net_u32 (ls_index); + else + { + vec_add1 (ls_name, 0); + strncpy ((char *) mp->ls_name, (char *) ls_name, + sizeof (mp->ls_name) - 1); + } + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + if (!lisp_test_main.ping_id) + lisp_test_main.ping_id = + vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); + mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); + mp_ping->_vl_msg_id = htons (lisp_test_main.ping_id); + mp_ping->client_index = vam->my_client_index; + + fformat (vam->ofp, "Sending ping id=%d\n", lisp_test_main.ping_id); + + vam->result_ready = 0; + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_locator_set_dump (vat_main_t * vam) +{ + vl_api_lisp_locator_set_dump_t *mp; + vl_api_control_ping_t *mp_ping; + unformat_input_t *input = vam->input; + u8 filter = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "local")) + { + filter = 1; + } + else if (unformat (input, "remote")) + { + filter = 2; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!vam->json_output) + { + print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name"); + } + + M (LISP_LOCATOR_SET_DUMP, mp); + + mp->filter = filter; + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&lisp_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_eid_table_map_dump (vat_main_t * vam) +{ + u8 is_l2 = 0; + u8 mode_set = 0; + unformat_input_t *input = vam->input; + vl_api_lisp_eid_table_map_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "l2")) + { + is_l2 = 1; + mode_set = 1; + } + else if (unformat (input, "l3")) + { + is_l2 = 0; + mode_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!mode_set) + { + errmsg ("expected lisp of 'l2' or 'l3' parameter!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); + } + + M (LISP_EID_TABLE_MAP_DUMP, mp); + mp->is_l2 = is_l2; + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&lisp_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_eid_table_vni_dump (vat_main_t * vam) +{ + vl_api_lisp_eid_table_vni_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "VNI"); + } + + M (LISP_EID_TABLE_VNI_DUMP, mp); + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&lisp_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_eid_table_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_lisp_eid_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 filter = 0; + int ret; + u32 vni, t = 0; + lisp_eid_vat_t eid; + u8 eid_set = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (i, "eid %U/%d", unformat_ip46_address, &eid.addr.ip, &eid.len)) + { + eid_set = 1; + eid.type = 0; + } + else + if (unformat (i, "eid %U", unformat_ethernet_address, &eid.addr.mac)) + { + eid_set = 1; + eid.type = 1; + } + else if (unformat (i, "eid %U", unformat_nsh_address, &eid.addr.nsh)) + { + eid_set = 1; + eid.type = 2; + } + else if (unformat (i, "vni %d", &t)) + { + vni = t; + } + else if (unformat (i, "local")) + { + filter = 1; + } + else if (unformat (i, "remote")) + { + filter = 2; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vam->json_output) + { + print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID", + "type", "ls_index", "ttl", "authoritative", "key_id", "key"); + } + + M (LISP_EID_TABLE_DUMP, mp); + + mp->filter = filter; + if (eid_set) + { + mp->eid_set = 1; + mp->vni = htonl (vni); + lisp_eid_put_vat (&mp->eid, &eid); + } + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&lisp_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + + +static int +api_lisp_adjacencies_get (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_lisp_adjacencies_get_t *mp; + u8 vni_set = 0; + u32 vni = ~0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "vni %d", &vni)) + { + vni_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vni_set) + { + errmsg ("vni not set!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%s %40s", "leid", "reid"); + } + + M (LISP_ADJACENCIES_GET, mp); + mp->vni = clib_host_to_net_u32 (vni); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_map_server_dump (vat_main_t * vam) +{ + vl_api_lisp_map_server_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "Map server"); + } + + M (LISP_MAP_SERVER_DUMP, mp); + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&lisp_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_map_resolver_dump (vat_main_t * vam) +{ + vl_api_lisp_map_resolver_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "Map resolver"); + } + + M (LISP_MAP_RESOLVER_DUMP, mp); + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&lisp_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_show_lisp_status (vat_main_t * vam) +{ + vl_api_show_lisp_status_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%-20s%-16s", "LISP status", "locator-set"); + } + + M (SHOW_LISP_STATUS, mp); + /* send it... */ + S (mp); + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_lisp_get_map_request_itr_rlocs (vat_main_t * vam) +{ + vl_api_lisp_get_map_request_itr_rlocs_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "itr-rlocs:"); + } + + M (LISP_GET_MAP_REQUEST_ITR_RLOCS, mp); + /* send it... */ + S (mp); + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define vat_plugin_register vat_plugin_register_cp +#include + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/lisp-cp/lisp_msg_serdes.c b/src/plugins/lisp/lisp-cp/lisp_msg_serdes.c similarity index 99% rename from src/vnet/lisp-cp/lisp_msg_serdes.c rename to src/plugins/lisp/lisp-cp/lisp_msg_serdes.c index 90afb10b68b..14d90982d4f 100644 --- a/src/vnet/lisp-cp/lisp_msg_serdes.c +++ b/src/plugins/lisp/lisp-cp/lisp_msg_serdes.c @@ -13,8 +13,8 @@ * limitations under the License. */ -#include -#include +#include +#include #include void *lisp_msg_put_gid (vlib_buffer_t * b, gid_address_t * gid); diff --git a/src/vnet/lisp-cp/lisp_msg_serdes.h b/src/plugins/lisp/lisp-cp/lisp_msg_serdes.h similarity index 95% rename from src/vnet/lisp-cp/lisp_msg_serdes.h rename to src/plugins/lisp/lisp-cp/lisp_msg_serdes.h index d794eff6340..a6222a0263a 100644 --- a/src/vnet/lisp-cp/lisp_msg_serdes.h +++ b/src/plugins/lisp/lisp-cp/lisp_msg_serdes.h @@ -17,8 +17,8 @@ #define VNET_LISP_GPE_LISP_MSG_BUILDER_H_ #include -#include -#include +#include +#include void *lisp_msg_put_mreq (lisp_cp_main_t * lcm, vlib_buffer_t * b, gid_address_t * seid, gid_address_t * deid, diff --git a/src/plugins/lisp/lisp-cp/lisp_test.c b/src/plugins/lisp/lisp-cp/lisp_test.c new file mode 100644 index 00000000000..17bfcf74ebd --- /dev/null +++ b/src/plugins/lisp/lisp-cp/lisp_test.c @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2020 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include + +clib_error_t *vat_plugin_register_one (vat_main_t * vam); +clib_error_t *vat_plugin_register_cp (vat_main_t * vam); +clib_error_t *vat_plugin_register_gpe (vat_main_t * vam); + +clib_error_t * +vat_plugin_register (vat_main_t * vam) +{ + clib_error_t *err; + + if ((err = vat_plugin_register_gpe (vam))) + return err; + if ((err = vat_plugin_register_cp (vam))) + return err; + if ((err = vat_plugin_register_one (vam))) + return err; + + return NULL; +} + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/lisp-cp/lisp_types.api b/src/plugins/lisp/lisp-cp/lisp_types.api similarity index 100% rename from src/vnet/lisp-cp/lisp_types.api rename to src/plugins/lisp/lisp-cp/lisp_types.api diff --git a/src/vnet/lisp-cp/lisp_types.c b/src/plugins/lisp/lisp-cp/lisp_types.c similarity index 99% rename from src/vnet/lisp-cp/lisp_types.c rename to src/plugins/lisp/lisp-cp/lisp_types.c index 6ff3b4ebf4b..0356949b757 100644 --- a/src/vnet/lisp-cp/lisp_types.c +++ b/src/plugins/lisp/lisp-cp/lisp_types.c @@ -14,7 +14,7 @@ */ #include -#include +#include static u16 gid_address_put_no_vni (u8 * b, gid_address_t * gid); static u16 gid_address_size_to_put_no_vni (gid_address_t * gid); diff --git a/src/vnet/lisp-cp/lisp_types.h b/src/plugins/lisp/lisp-cp/lisp_types.h similarity index 99% rename from src/vnet/lisp-cp/lisp_types.h rename to src/plugins/lisp/lisp-cp/lisp_types.h index e08ba15dfd3..3f7d0302640 100644 --- a/src/vnet/lisp-cp/lisp_types.h +++ b/src/plugins/lisp/lisp-cp/lisp_types.h @@ -17,7 +17,7 @@ #define VNET_LISP_GPE_LISP_TYPES_H_ #include -#include +#include #define SHA1_AUTH_DATA_LEN 20 #define SHA256_AUTH_DATA_LEN 32 diff --git a/src/vnet/lisp-cp/lisp_types_api.c b/src/plugins/lisp/lisp-cp/lisp_types_api.c similarity index 98% rename from src/vnet/lisp-cp/lisp_types_api.c rename to src/plugins/lisp/lisp-cp/lisp_types_api.c index e966f625677..795bd15f3e2 100644 --- a/src/vnet/lisp-cp/lisp_types_api.c +++ b/src/plugins/lisp/lisp-cp/lisp_types_api.c @@ -16,7 +16,7 @@ *------------------------------------------------------------------ */ -#include +#include #include #include diff --git a/src/vnet/lisp-cp/lisp_types_api.h b/src/plugins/lisp/lisp-cp/lisp_types_api.h similarity index 92% rename from src/vnet/lisp-cp/lisp_types_api.h rename to src/plugins/lisp/lisp-cp/lisp_types_api.h index c1aa9dc81ff..6f48281d81f 100644 --- a/src/vnet/lisp-cp/lisp_types_api.h +++ b/src/plugins/lisp/lisp-cp/lisp_types_api.h @@ -16,8 +16,8 @@ *------------------------------------------------------------------ */ -#include -#include +#include +#include int unformat_lisp_eid_api (gid_address_t * dst, u32 vni, const vl_api_eid_t * eid); diff --git a/src/vnet/lisp-cp/one.api b/src/plugins/lisp/lisp-cp/one.api similarity index 98% rename from src/vnet/lisp-cp/one.api rename to src/plugins/lisp/lisp-cp/one.api index be3a444e263..4df5faf5a5f 100644 --- a/src/vnet/lisp-cp/one.api +++ b/src/plugins/lisp/lisp-cp/one.api @@ -16,7 +16,7 @@ option version = "2.0.0"; import "vnet/interface_types.api"; -import "vnet/lisp-cp/lisp_types.api"; +import "plugins/lisp/lisp-cp/lisp_types.api"; /** \brief add or delete locator_set @param client_index - opaque cookie to identify the sender @@ -26,7 +26,7 @@ import "vnet/lisp-cp/lisp_types.api"; @param locator_num - number of locators @param locators - locator records */ -manual_endian manual_print define one_add_del_locator_set +define one_add_del_locator_set { u32 client_index; u32 context; @@ -355,7 +355,7 @@ define show_one_map_request_mode_reply @param rloc_num - number of remote locators @param rlocs - remote locator records */ -autoreply manual_print manual_endian define one_add_del_remote_mapping +autoreply define one_add_del_remote_mapping { u32 client_index; u32 context; @@ -410,7 +410,7 @@ define one_l2_arp_entries_get @param count - number of elements in the list @param vl_api_one_arp_entry_t - list of entries */ -manual_print manual_endian define one_l2_arp_entries_get_reply +define one_l2_arp_entries_get_reply { u32 context; i32 retval; @@ -441,7 +441,7 @@ define one_ndp_entries_get u32 bd; }; -manual_print manual_endian define one_ndp_entries_get_reply +define one_ndp_entries_get_reply { u32 context; i32 retval; @@ -491,7 +491,7 @@ define one_ndp_bd_get @param count - number of elements in the list @param bridge_domains - list of BDs */ -manual_print manual_endian define one_ndp_bd_get_reply +define one_ndp_bd_get_reply { u32 context; i32 retval; @@ -514,7 +514,7 @@ define one_l2_arp_bd_get @param count - number of elements in the list @param bridge_domains - list of BDs */ -manual_print manual_endian define one_l2_arp_bd_get_reply +define one_l2_arp_bd_get_reply { u32 context; i32 retval; @@ -708,7 +708,7 @@ typedef one_adjacency @param count - number of adjacencies @param adjacencies - array of adjacencies */ -manual_endian manual_print define one_adjacencies_get_reply +define one_adjacencies_get_reply { u32 context; i32 retval; diff --git a/src/vnet/lisp-cp/one_api.c b/src/plugins/lisp/lisp-cp/one_api.c similarity index 95% rename from src/vnet/lisp-cp/one_api.c rename to src/plugins/lisp/lisp-cp/one_api.c index 452a756ee80..eb0b4c691b7 100644 --- a/src/vnet/lisp-cp/one_api.c +++ b/src/plugins/lisp/lisp-cp/one_api.c @@ -22,43 +22,22 @@ #include #include -#include -#include +#include +#include #include #include -#include +/* define message IDs */ +#include +#include +#include -#define vl_api_one_add_del_locator_set_t_endian vl_noop_handler -#define vl_api_one_add_del_locator_set_t_print vl_noop_handler -#define vl_api_one_add_del_remote_mapping_t_endian vl_noop_handler -#define vl_api_one_add_del_remote_mapping_t_print vl_noop_handler - -#define vl_api_one_add_del_locator_set_t_endian vl_noop_handler -#define vl_api_one_add_del_locator_set_t_print vl_noop_handler -#define vl_api_one_add_del_remote_mapping_t_endian vl_noop_handler -#define vl_api_one_add_del_remote_mapping_t_print vl_noop_handler - -#define vl_api_one_add_del_l2_arp_entry vl_noop_handler -#define vl_api_one_l2_arp_bd_get vl_noop_handler - -#define vl_api_one_ndp_entries_get_reply_t_endian vl_noop_handler -#define vl_api_one_ndp_entries_get_reply_t_print vl_noop_handler - -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +/** + * Base message ID fot the plugin + */ +static u32 one_base_msg_id; +#define REPLY_MSG_ID_BASE one_base_msg_id #include @@ -1695,43 +1674,28 @@ vl_api_one_show_petr_mode_t_handler (vl_api_one_show_petr_mode_t * mp) * added the client registration handlers. * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() */ -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_one; -#undef _ -} +#include static clib_error_t * one_api_hookup (vlib_main_t * vm) { - api_main_t *am = vlibapi_get_main (); - -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N, #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vpe_api_msg; -#undef _ - - /* - * Set up the (msg_name, crc, message-id) table - */ - setup_message_id_table (am); + one_base_msg_id = setup_message_id_table (); return 0; } VLIB_API_INIT_FUNCTION (one_api_hookup); +#include +#include + +/* *INDENT-OFF* */ +VLIB_PLUGIN_REGISTER () = { + .version = VPP_BUILD_VER, + .description = "Locator ID Separation Protocol (LISP)", +}; +/* *INDENT-ON* */ + /* * fd.io coding-style-patch-verification: ON * diff --git a/src/vnet/lisp-cp/one_cli.c b/src/plugins/lisp/lisp-cp/one_cli.c similarity index 99% rename from src/vnet/lisp-cp/one_cli.c rename to src/plugins/lisp/lisp-cp/one_cli.c index 70de0c1a554..b43532684ef 100644 --- a/src/vnet/lisp-cp/one_cli.c +++ b/src/plugins/lisp/lisp-cp/one_cli.c @@ -13,8 +13,8 @@ * limitations under the License. */ -#include -#include +#include +#include static clib_error_t * lisp_show_adjacencies_command_fn (vlib_main_t * vm, diff --git a/src/plugins/lisp/lisp-cp/one_test.c b/src/plugins/lisp/lisp-cp/one_test.c new file mode 100644 index 00000000000..42554576fa0 --- /dev/null +++ b/src/plugins/lisp/lisp-cp/one_test.c @@ -0,0 +1,3101 @@ +/* + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include +#include +#include + +/* define message IDs */ +#include +#include +#include + +typedef struct +{ + /* API message ID base */ + u16 msg_id_base; + u32 ping_id; + vat_main_t *vat_main; +} one_test_main_t; + +one_test_main_t one_test_main; + +#define __plugin_msg_base one_test_main.msg_id_base +#include + +/* Macro to finish up custom dump fns */ +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) +#define FINISH \ + vec_add1 (s, 0); \ + vl_print (handle, (char *)s); \ + vec_free (s); \ + return handle; + +#define LISP_PING(_lm, mp_ping) \ + if (!(_lm)->ping_id) \ + (_lm)->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); \ + mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); \ + mp_ping->_vl_msg_id = htons ((_lm)->ping_id); \ + mp_ping->client_index = vam->my_client_index; \ + fformat (vam->ofp, "Sending ping id=%d\n", (_lm)->ping_id); \ + vam->result_ready = 0; \ + +typedef struct +{ + u32 spi; + u8 si; +} __attribute__ ((__packed__)) lisp_nsh_api_t; + +static uword +unformat_nsh_address (unformat_input_t * input, va_list * args) +{ + lisp_nsh_api_t *nsh = va_arg (*args, lisp_nsh_api_t *); + return unformat (input, "SPI:%d SI:%d", &nsh->spi, &nsh->si); +} + +static u8 * +format_nsh_address_vat (u8 * s, va_list * args) +{ + nsh_t *a = va_arg (*args, nsh_t *); + return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); +} + +static u8 * +format_lisp_transport_protocol (u8 * s, va_list * args) +{ + u32 proto = va_arg (*args, u32); + + switch (proto) + { + case 1: + return format (s, "udp"); + case 2: + return format (s, "api"); + default: + return 0; + } + return 0; +} + +static void +vl_api_one_locator_details_t_handler (vl_api_one_locator_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u8 *s = 0; + + if (mp->local) + { + s = format (s, "%=16d%=16d%=16d", + ntohl (mp->sw_if_index), mp->priority, mp->weight); + } + else + { + s = format (s, "%=16U%=16d%=16d", + format_ip46_address, + mp->ip_address, mp->priority, mp->weight); + } + + print (vam->ofp, "%v", s); + vec_free (s); +} + +static void +vl_api_one_locator_set_details_t_handler (vl_api_one_locator_set_details_t * + mp) +{ + vat_main_t *vam = &vat_main; + u8 *ls_name = 0; + + ls_name = format (0, "%s", mp->ls_name); + + print (vam->ofp, "%=10d%=15v", clib_net_to_host_u32 (mp->ls_index), + ls_name); + vec_free (ls_name); +} + +static void vl_api_one_get_transport_protocol_reply_t_handler + (vl_api_one_get_transport_protocol_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + u32 proto = mp->protocol; + print (vam->ofp, "Transport protocol: %U", + format_lisp_transport_protocol, proto); + vam->retval = retval; + vam->result_ready = 1; + } +} + +static void vl_api_one_add_del_locator_set_reply_t_handler + (vl_api_one_add_del_locator_set_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 u8 * +format_lisp_flat_eid (u8 * s, va_list * args) +{ + vl_api_eid_t *eid = va_arg (*args, vl_api_eid_t *); + + switch (eid->type) + { + case EID_TYPE_API_PREFIX: + if (eid->address.prefix.address.af) + return format (s, "%U/%d", format_ip6_address, + eid->address.prefix.address.un.ip6, + eid->address.prefix.len); + return format (s, "%U/%d", format_ip4_address, + eid->address.prefix.address.un.ip4, + eid->address.prefix.len); + case EID_TYPE_API_MAC: + return format (s, "%U", format_ethernet_address, eid->address.mac); + case EID_TYPE_API_NSH: + return format (s, "%U", format_nsh_address_vat, eid->address.nsh); + } + return 0; +} + +static u8 * +format_lisp_eid_vat (u8 * s, va_list * args) +{ + vl_api_eid_t *deid = va_arg (*args, vl_api_eid_t *); + vl_api_eid_t *seid = va_arg (*args, vl_api_eid_t *); + u8 is_src_dst = (u8) va_arg (*args, int); + + if (is_src_dst) + s = format (s, "%U|", format_lisp_flat_eid, seid); + + s = format (s, "%U", format_lisp_flat_eid, deid); + + return s; +} + +static void +vl_api_one_eid_table_details_t_handler (vl_api_one_eid_table_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u8 *s = 0, *eid = 0; + + if (~0 == mp->locator_set_index) + s = format (0, "action: %d", mp->action); + else + s = format (0, "%d", clib_net_to_host_u32 (mp->locator_set_index)); + + eid = format (0, "%U", format_lisp_eid_vat, + &mp->deid, &mp->seid, mp->is_src_dst); + vec_add1 (eid, 0); + + print (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-20d%-10d%-20s", + clib_net_to_host_u32 (mp->vni), + eid, + mp->is_local ? "local" : "remote", + s, clib_net_to_host_u32 (mp->ttl), mp->authoritative, + clib_net_to_host_u16 (mp->key.id), mp->key.key); + + vec_free (s); + vec_free (eid); +} + +static void +vl_api_one_stats_details_t_handler (vl_api_one_stats_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u8 *seid = 0, *deid = 0; + ip46_address_t lloc, rloc; + + deid = format (0, "%U", format_lisp_eid_vat, &mp->deid, 0, 0); + + seid = format (0, "%U", format_lisp_eid_vat, &mp->seid, 0, 0); + + vec_add1 (deid, 0); + vec_add1 (seid, 0); + + if (mp->lloc.af) + { + clib_memcpy (&lloc.ip6, mp->lloc.un.ip6, 16); + clib_memcpy (&rloc.ip6, mp->rloc.un.ip6, 16); + } + else + { + clib_memcpy (&lloc.ip4, mp->lloc.un.ip4, 4); + clib_memcpy (&rloc.ip4, mp->rloc.un.ip4, 4); + } + + + print (vam->ofp, "([%d] %s %s) (%U %U) %u %u", + clib_net_to_host_u32 (mp->vni), + seid, deid, + format_ip46_address, lloc, + format_ip46_address, rloc, + clib_net_to_host_u32 (mp->pkt_count), + clib_net_to_host_u32 (mp->bytes)); + + vec_free (deid); + vec_free (seid); +} + +static void + vl_api_one_eid_table_map_details_t_handler + (vl_api_one_eid_table_map_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + u8 *line = format (0, "%=10d%=10d", + clib_net_to_host_u32 (mp->vni), + clib_net_to_host_u32 (mp->dp_table)); + print (vam->ofp, "%v", line); + vec_free (line); +} + +static void + vl_api_one_eid_table_vni_details_t_handler + (vl_api_one_eid_table_vni_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + u8 *line = format (0, "%d", clib_net_to_host_u32 (mp->vni)); + print (vam->ofp, "%v", line); + vec_free (line); +} + +static void + vl_api_show_one_map_register_fallback_threshold_reply_t_handler + (vl_api_show_one_map_register_fallback_threshold_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + int retval = clib_net_to_host_u32 (mp->retval); + + print (vam->ofp, "fallback threshold value: %d", mp->value); + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_map_register_state_reply_t_handler + (vl_api_show_one_map_register_state_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + int retval = clib_net_to_host_u32 (mp->retval); + + print (vam->ofp, "%s", mp->is_enable ? "enabled" : "disabled"); + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_rloc_probe_state_reply_t_handler + (vl_api_show_one_rloc_probe_state_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + print (vam->ofp, "%s", mp->is_enable ? "enabled" : "disabled"); +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_stats_enable_disable_reply_t_handler + (vl_api_show_one_stats_enable_disable_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + print (vam->ofp, "%s", mp->is_enable ? "enabled" : "disabled"); +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_ndp_entries_get_reply_t_handler + (vl_api_one_ndp_entries_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + print (vam->ofp, "%U -> %U", format_ip6_address, &mp->entries[i].ip6, + format_ethernet_address, mp->entries[i].mac); + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_l2_arp_entries_get_reply_t_handler + (vl_api_one_l2_arp_entries_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + print (vam->ofp, "%U -> %U", format_ip4_address, &mp->entries[i].ip4, + format_ethernet_address, mp->entries[i].mac); + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void +vl_api_one_ndp_bd_get_reply_t_handler (vl_api_one_ndp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_l2_arp_bd_get_reply_t_handler + (vl_api_one_l2_arp_bd_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_adjacencies_get_reply_t_handler + (vl_api_one_adjacencies_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_one_adjacency_t *a; + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + a = &mp->adjacencies[i]; + print (vam->ofp, "%U %40U", + format_lisp_flat_eid, a->leid, format_lisp_flat_eid, a->reid); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void +vl_api_one_map_server_details_t_handler (vl_api_one_map_server_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%=20U", + mp->ip_address.af ? format_ip6_address : format_ip4_address, + mp->ip_address.un); +} + +static void +vl_api_one_map_resolver_details_t_handler (vl_api_one_map_resolver_details_t + * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%=20U", + mp->ip_address.af ? format_ip6_address : format_ip4_address, + mp->ip_address.un); +} + +static void +vl_api_show_one_status_reply_t_handler (vl_api_show_one_status_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "feature: %s\ngpe: %s", + mp->feature_status ? "enabled" : "disabled", + mp->gpe_status ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_get_map_request_itr_rlocs_reply_t_handler + (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (retval >= 0) + { + print (vam->ofp, "%=20s", mp->locator_set_name); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static u8 * +format_lisp_map_request_mode (u8 * s, va_list * args) +{ + u32 mode = va_arg (*args, u32); + + switch (mode) + { + case 0: + return format (0, "dst-only"); + case 1: + return format (0, "src-dst"); + } + return 0; +} + +static void + vl_api_show_one_map_request_mode_reply_t_handler + (vl_api_show_one_map_request_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + u32 mode = mp->mode; + print (vam->ofp, "map_request_mode: %U", + format_lisp_map_request_mode, mode); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_xtr_mode_reply_t_handler + (vl_api_one_show_xtr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_enable ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_pitr_mode_reply_t_handler + (vl_api_one_show_pitr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_enable ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_one_show_petr_mode_reply_t_handler + (vl_api_one_show_petr_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->is_enable ? "enabled" : "disabled"); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_use_petr_reply_t_handler + (vl_api_show_one_use_petr_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%s\n", mp->status ? "enabled" : "disabled"); + if (mp->status) + { + print (vam->ofp, "Proxy-ETR address; %U", + mp->ip_address.af ? format_ip6_address : format_ip4_address, + mp->ip_address.un); + } + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_nsh_mapping_reply_t_handler + (vl_api_show_one_nsh_mapping_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%-20s%-16s", + mp->is_set ? "set" : "not-set", + mp->is_set ? (char *) mp->locator_set_name : ""); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_show_one_map_register_ttl_reply_t_handler + (vl_api_show_one_map_register_ttl_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "ttl: %u", mp->ttl); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +static void +vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + + if (0 <= retval) + { + print (vam->ofp, "%-20s%-16s", + mp->status ? "enabled" : "disabled", + mp->status ? (char *) mp->locator_set_name : ""); + } + + vam->retval = retval; + vam->result_ready = 1; +} + +/* *INDENT-OFF* */ +/** Used for parsing LISP eids */ +typedef CLIB_PACKED(struct{ + union { + ip46_address_t ip; + mac_address_t mac; + lisp_nsh_api_t nsh; + } addr; + u32 len; /**< prefix length if IP */ + u8 type; /**< type of eid */ +}) lisp_eid_vat_t; +/* *INDENT-ON* */ + +static uword +unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) +{ + lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *); + + clib_memset (a, 0, sizeof (a[0])); + + if (unformat (input, "%U/%d", unformat_ip46_address, a->addr.ip, &a->len)) + { + a->type = 0; /* ip prefix type */ + } + else if (unformat (input, "%U", unformat_ethernet_address, &a->addr.mac)) + { + a->type = 1; /* mac type */ + } + else if (unformat (input, "%U", unformat_nsh_address, a->addr.nsh)) + { + a->type = 2; /* NSH type */ + a->addr.nsh.spi = clib_host_to_net_u32 (a->addr.nsh.spi); + } + else + { + return 0; + } + + if (a->type == 0) + { + if (ip46_address_is_ip4 (&a->addr.ip)) + return a->len > 32 ? 1 : 0; + else + return a->len > 128 ? 1 : 0; + } + + return 1; +} + +static void +lisp_eid_put_vat (vl_api_eid_t * eid, const lisp_eid_vat_t * vat_eid) +{ + eid->type = vat_eid->type; + switch (eid->type) + { + case EID_TYPE_API_PREFIX: + if (ip46_address_is_ip4 (&vat_eid->addr.ip)) + { + clib_memcpy (&eid->address.prefix.address.un.ip4, + &vat_eid->addr.ip.ip4, 4); + eid->address.prefix.address.af = ADDRESS_IP4; + eid->address.prefix.len = vat_eid->len; + } + else + { + clib_memcpy (&eid->address.prefix.address.un.ip6, + &vat_eid->addr.ip.ip6, 16); + eid->address.prefix.address.af = ADDRESS_IP6; + eid->address.prefix.len = vat_eid->len; + } + return; + case EID_TYPE_API_MAC: + clib_memcpy (&eid->address.mac, &vat_eid->addr.mac, + sizeof (eid->address.mac)); + return; + case EID_TYPE_API_NSH: + clib_memcpy (&eid->address.nsh, &vat_eid->addr.nsh, + sizeof (eid->address.nsh)); + return; + default: + ASSERT (0); + return; + } +} + +static int +api_one_add_del_locator_set (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_locator_set_t *mp; + u8 is_add = 1; + u8 *locator_set_name = NULL; + u8 locator_set_name_set = 0; + vl_api_local_locator_t locator, *locators = 0; + u32 sw_if_index, priority, weight; + u32 data_len = 0; + + int ret; + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "locator-set %s", &locator_set_name)) + { + locator_set_name_set = 1; + } + else if (unformat (input, "sw_if_index %u p %u w %u", + &sw_if_index, &priority, &weight)) + { + locator.sw_if_index = htonl (sw_if_index); + locator.priority = priority; + locator.weight = weight; + vec_add1 (locators, locator); + } + else + if (unformat + (input, "iface %U p %u w %u", unformat_sw_if_index, vam, + &sw_if_index, &priority, &weight)) + { + locator.sw_if_index = htonl (sw_if_index); + locator.priority = priority; + locator.weight = weight; + vec_add1 (locators, locator); + } + else + break; + } + + if (locator_set_name_set == 0) + { + errmsg ("missing locator-set name"); + vec_free (locators); + return -99; + } + + if (vec_len (locator_set_name) > 64) + { + errmsg ("locator-set name too long"); + vec_free (locator_set_name); + vec_free (locators); + return -99; + } + vec_add1 (locator_set_name, 0); + + data_len = sizeof (vl_api_local_locator_t) * vec_len (locators); + + /* Construct the API message */ + M2 (ONE_ADD_DEL_LOCATOR_SET, mp, data_len); + + mp->is_add = is_add; + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + vec_free (locator_set_name); + + mp->locator_num = clib_host_to_net_u32 (vec_len (locators)); + if (locators) + clib_memcpy (mp->locators, locators, data_len); + vec_free (locators); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_add_del_locator_set api_one_add_del_locator_set + +static int +api_one_add_del_locator (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_locator_t *mp; + u32 tmp_if_index = ~0; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + u8 sw_if_index_if_name_set = 0; + u32 priority = ~0; + u8 priority_set = 0; + u32 weight = ~0; + u8 weight_set = 0; + u8 is_add = 1; + u8 *locator_set_name = NULL; + u8 locator_set_name_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "locator-set %s", &locator_set_name)) + { + locator_set_name_set = 1; + } + else if (unformat (input, "iface %U", unformat_sw_if_index, vam, + &tmp_if_index)) + { + sw_if_index_if_name_set = 1; + sw_if_index = tmp_if_index; + } + else if (unformat (input, "sw_if_index %d", &tmp_if_index)) + { + sw_if_index_set = 1; + sw_if_index = tmp_if_index; + } + else if (unformat (input, "p %d", &priority)) + { + priority_set = 1; + } + else if (unformat (input, "w %d", &weight)) + { + weight_set = 1; + } + else + break; + } + + if (locator_set_name_set == 0) + { + errmsg ("missing locator-set name"); + return -99; + } + + if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) + { + errmsg ("missing sw_if_index"); + vec_free (locator_set_name); + return -99; + } + + if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) + { + errmsg ("cannot use both params interface name and sw_if_index"); + vec_free (locator_set_name); + return -99; + } + + if (priority_set == 0) + { + errmsg ("missing locator-set priority"); + vec_free (locator_set_name); + return -99; + } + + if (weight_set == 0) + { + errmsg ("missing locator-set weight"); + vec_free (locator_set_name); + return -99; + } + + if (vec_len (locator_set_name) > 64) + { + errmsg ("locator-set name too long"); + vec_free (locator_set_name); + return -99; + } + vec_add1 (locator_set_name, 0); + + /* Construct the API message */ + M (ONE_ADD_DEL_LOCATOR, mp); + + mp->is_add = is_add; + mp->sw_if_index = ntohl (sw_if_index); + mp->priority = priority; + mp->weight = weight; + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + vec_free (locator_set_name); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_add_del_locator api_one_add_del_locator + +static int +api_one_add_del_local_eid (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_local_eid_t *mp; + u8 is_add = 1; + u8 eid_set = 0; + lisp_eid_vat_t _eid, *eid = &_eid; + u8 *locator_set_name = 0; + u8 locator_set_name_set = 0; + u32 vni = 0; + u16 key_id = 0; + u8 *key = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) + { + eid_set = 1; + } + else if (unformat (input, "locator-set %s", &locator_set_name)) + { + locator_set_name_set = 1; + } + else if (unformat (input, "key-id %U", unformat_hmac_key_id, &key_id)) + ; + else if (unformat (input, "secret-key %_%v%_", &key)) + ; + else + break; + } + + if (locator_set_name_set == 0) + { + errmsg ("missing locator-set name"); + return -99; + } + + if (0 == eid_set) + { + errmsg ("EID address not set!"); + vec_free (locator_set_name); + return -99; + } + + if (key && (0 == key_id)) + { + errmsg ("invalid key_id!"); + return -99; + } + + if (vec_len (key) > 64) + { + errmsg ("key too long"); + vec_free (key); + return -99; + } + + if (vec_len (locator_set_name) > 64) + { + errmsg ("locator-set name too long"); + vec_free (locator_set_name); + return -99; + } + vec_add1 (locator_set_name, 0); + + /* Construct the API message */ + M (ONE_ADD_DEL_LOCAL_EID, mp); + + mp->is_add = is_add; + lisp_eid_put_vat (&mp->eid, eid); + mp->vni = clib_host_to_net_u32 (vni); + mp->key.id = key_id; + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + clib_memcpy (mp->key.key, key, vec_len (key)); + + vec_free (locator_set_name); + vec_free (key); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_add_del_map_server (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_map_server_t *mp; + u8 is_add = 1; + u8 ipv4_set = 0; + u8 ipv6_set = 0; + ip4_address_t ipv4; + ip6_address_t ipv6; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) + { + ipv4_set = 1; + } + else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) + { + ipv6_set = 1; + } + else + break; + } + + if (ipv4_set && ipv6_set) + { + errmsg ("both eid v4 and v6 addresses set"); + return -99; + } + + if (!ipv4_set && !ipv6_set) + { + errmsg ("eid addresses not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ADD_DEL_MAP_SERVER, mp); + + mp->is_add = is_add; + if (ipv6_set) + { + mp->ip_address.af = 1; + clib_memcpy (mp->ip_address.un.ip6, &ipv6, sizeof (ipv6)); + } + else + { + mp->ip_address.af = 0; + clib_memcpy (mp->ip_address.un.ip4, &ipv4, sizeof (ipv4)); + } + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_add_del_map_server api_one_add_del_map_server + +static int +api_one_add_del_map_resolver (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_map_resolver_t *mp; + u8 is_add = 1; + u8 ipv4_set = 0; + u8 ipv6_set = 0; + ip4_address_t ipv4; + ip6_address_t ipv6; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) + { + ipv4_set = 1; + } + else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) + { + ipv6_set = 1; + } + else + break; + } + + if (ipv4_set && ipv6_set) + { + errmsg ("both eid v4 and v6 addresses set"); + return -99; + } + + if (!ipv4_set && !ipv6_set) + { + errmsg ("eid addresses not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ADD_DEL_MAP_RESOLVER, mp); + + mp->is_add = is_add; + if (ipv6_set) + { + mp->ip_address.af = 1; + clib_memcpy (mp->ip_address.un.ip6, &ipv6, sizeof (ipv6)); + } + else + { + mp->ip_address.af = 0; + clib_memcpy (mp->ip_address.un.ip6, &ipv4, sizeof (ipv4)); + } + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_rloc_probe_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_rloc_probe_enable_disable_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + is_set = 1; + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_RLOC_PROBE_ENABLE_DISABLE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_rloc_probe_enable_disable api_one_rloc_probe_enable_disable + +static int +api_one_map_register_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_map_register_enable_disable_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + is_set = 1; + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_MAP_REGISTER_ENABLE_DISABLE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_map_register_enable_disable api_one_map_register_enable_disable + +static int +api_one_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_enable_disable_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ENABLE_DISABLE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_enable_disable api_one_enable_disable + +static int +api_one_enable_disable_xtr_mode (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_enable_disable_xtr_mode_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ENABLE_DISABLE_XTR_MODE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_show_xtr_mode (vat_main_t * vam) +{ + vl_api_one_show_xtr_mode_t *mp; + int ret; + + /* Construct the API message */ + M (ONE_SHOW_XTR_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_enable_disable_pitr_mode (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_enable_disable_pitr_mode_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ENABLE_DISABLE_PITR_MODE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_show_pitr_mode (vat_main_t * vam) +{ + vl_api_one_show_pitr_mode_t *mp; + int ret; + + /* Construct the API message */ + M (ONE_SHOW_PITR_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_enable_disable_petr_mode (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_enable_disable_petr_mode_t *mp; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (ONE_ENABLE_DISABLE_PETR_MODE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_show_petr_mode (vat_main_t * vam) +{ + vl_api_one_show_petr_mode_t *mp; + int ret; + + /* Construct the API message */ + M (ONE_SHOW_PETR_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_show_one_map_register_state (vat_main_t * vam) +{ + vl_api_show_one_map_register_state_t *mp; + int ret; + + M (SHOW_ONE_MAP_REGISTER_STATE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_show_lisp_map_register_state api_show_one_map_register_state + +static int +api_show_one_rloc_probe_state (vat_main_t * vam) +{ + vl_api_show_one_rloc_probe_state_t *mp; + int ret; + + M (SHOW_ONE_RLOC_PROBE_STATE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_show_lisp_rloc_probe_state api_show_one_rloc_probe_state + +static int +api_one_add_del_ndp_entry (vat_main_t * vam) +{ + vl_api_one_add_del_ndp_entry_t *mp; + unformat_input_t *input = vam->input; + u8 is_add = 1; + u8 mac_set = 0; + u8 bd_set = 0; + u8 ip_set = 0; + u8 mac[6] = { 0, }; + u8 ip6[16] = { 0, }; + u32 bd = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) + mac_set = 1; + else if (unformat (input, "ip %U", unformat_ip6_address, ip6)) + ip_set = 1; + else if (unformat (input, "bd %d", &bd)) + bd_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!bd_set || !ip_set || (!mac_set && is_add)) + { + errmsg ("Missing BD, IP or MAC!"); + return -99; + } + + M (ONE_ADD_DEL_NDP_ENTRY, mp); + mp->is_add = is_add; + clib_memcpy (&mp->entry.mac, mac, 6); + mp->bd = clib_host_to_net_u32 (bd); + clib_memcpy (&mp->entry.ip6, ip6, sizeof (mp->entry.ip6)); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_add_del_l2_arp_entry (vat_main_t * vam) +{ + vl_api_one_add_del_l2_arp_entry_t *mp; + unformat_input_t *input = vam->input; + u8 is_add = 1; + u8 mac_set = 0; + u8 bd_set = 0; + u8 ip_set = 0; + u8 mac[6] = { 0, }; + u32 ip4 = 0, bd = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) + mac_set = 1; + else if (unformat (input, "ip %U", unformat_ip4_address, &ip4)) + ip_set = 1; + else if (unformat (input, "bd %d", &bd)) + bd_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!bd_set || !ip_set || (!mac_set && is_add)) + { + errmsg ("Missing BD, IP or MAC!"); + return -99; + } + + M (ONE_ADD_DEL_L2_ARP_ENTRY, mp); + mp->is_add = is_add; + clib_memcpy (&mp->entry.mac, mac, 6); + mp->bd = clib_host_to_net_u32 (bd); + clib_memcpy (mp->entry.ip4, &ip4, sizeof (mp->entry.ip4)); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_ndp_bd_get (vat_main_t * vam) +{ + vl_api_one_ndp_bd_get_t *mp; + int ret; + + M (ONE_NDP_BD_GET, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_ndp_entries_get (vat_main_t * vam) +{ + vl_api_one_ndp_entries_get_t *mp; + unformat_input_t *input = vam->input; + u8 bd_set = 0; + u32 bd = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "bd %d", &bd)) + bd_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!bd_set) + { + errmsg ("Expected bridge domain!"); + return -99; + } + + M (ONE_NDP_ENTRIES_GET, mp); + mp->bd = clib_host_to_net_u32 (bd); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_l2_arp_bd_get (vat_main_t * vam) +{ + vl_api_one_l2_arp_bd_get_t *mp; + int ret; + + M (ONE_L2_ARP_BD_GET, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_l2_arp_entries_get (vat_main_t * vam) +{ + vl_api_one_l2_arp_entries_get_t *mp; + unformat_input_t *input = vam->input; + u8 bd_set = 0; + u32 bd = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "bd %d", &bd)) + bd_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!bd_set) + { + errmsg ("Expected bridge domain!"); + return -99; + } + + M (ONE_L2_ARP_ENTRIES_GET, mp); + mp->bd = clib_host_to_net_u32 (bd); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_one_stats_enable_disable (vat_main_t * vam) +{ + vl_api_one_stats_enable_disable_t *mp; + unformat_input_t *input = vam->input; + u8 is_set = 0; + u8 is_enable = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + } + else + break; + } + + if (!is_set) + { + errmsg ("Value not set"); + return -99; + } + + M (ONE_STATS_ENABLE_DISABLE, mp); + mp->is_enable = is_enable; + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_show_one_stats_enable_disable (vat_main_t * vam) +{ + vl_api_show_one_stats_enable_disable_t *mp; + int ret; + + M (SHOW_ONE_STATS_ENABLE_DISABLE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_show_one_map_request_mode (vat_main_t * vam) +{ + vl_api_show_one_map_request_mode_t *mp; + int ret; + + M (SHOW_ONE_MAP_REQUEST_MODE, mp); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_show_lisp_map_request_mode api_show_one_map_request_mode + +static int +api_one_map_request_mode (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_map_request_mode_t *mp; + u8 mode = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "dst-only")) + mode = 0; + else if (unformat (input, "src-dst")) + mode = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + M (ONE_MAP_REQUEST_MODE, mp); + + mp->mode = mode; + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_lisp_map_request_mode api_one_map_request_mode + +/** + * Enable/disable ONE proxy ITR. + * + * @param vam vpp API test context + * @return return code + */ +static int +api_one_pitr_set_locator_set (vat_main_t * vam) +{ + u8 ls_name_set = 0; + unformat_input_t *input = vam->input; + vl_api_one_pitr_set_locator_set_t *mp; + u8 is_add = 1; + u8 *ls_name = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "locator-set %s", &ls_name)) + ls_name_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!ls_name_set) + { + errmsg ("locator-set name not set!"); + return -99; + } + + M (ONE_PITR_SET_LOCATOR_SET, mp); + + mp->is_add = is_add; + clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); + vec_free (ls_name); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_lisp_pitr_set_locator_set api_one_pitr_set_locator_set + +static int +api_one_nsh_set_locator_set (vat_main_t * vam) +{ + u8 ls_name_set = 0; + unformat_input_t *input = vam->input; + vl_api_one_nsh_set_locator_set_t *mp; + u8 is_add = 1; + u8 *ls_name = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "ls %s", &ls_name)) + ls_name_set = 1; + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!ls_name_set && is_add) + { + errmsg ("locator-set name not set!"); + return -99; + } + + M (ONE_NSH_SET_LOCATOR_SET, mp); + + mp->is_add = is_add; + clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); + vec_free (ls_name); + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +static int +api_show_one_pitr (vat_main_t * vam) +{ + vl_api_show_one_pitr_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "lisp status:"); + } + + M (SHOW_ONE_PITR, mp); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_show_lisp_pitr api_show_one_pitr + +static int +api_one_use_petr (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_use_petr_t *mp; + u8 is_add = 0; + ip_address_t ip; + int ret; + + clib_memset (&ip, 0, sizeof (ip)); + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "disable")) + is_add = 0; + else + if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (&ip))) + { + is_add = 1; + ip_addr_version (&ip) = AF_IP4; + } + else + if (unformat (input, "%U", unformat_ip6_address, &ip_addr_v6 (&ip))) + { + is_add = 1; + ip_addr_version (&ip) = AF_IP6; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + M (ONE_USE_PETR, mp); + + mp->is_add = is_add; + if (is_add) + { + mp->ip_address.af = ip_addr_version (&ip) == AF_IP4 ? 0 : 1; + if (mp->ip_address.af) + clib_memcpy (mp->ip_address.un.ip6, &ip, 16); + else + clib_memcpy (mp->ip_address.un.ip4, &ip, 4); + } + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_lisp_use_petr api_one_use_petr + +static int +api_show_one_nsh_mapping (vat_main_t * vam) +{ + vl_api_show_one_use_petr_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "local ONE NSH mapping:"); + } + + M (SHOW_ONE_NSH_MAPPING, mp); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_show_one_use_petr (vat_main_t * vam) +{ + vl_api_show_one_use_petr_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "Proxy-ETR status:"); + } + + M (SHOW_ONE_USE_PETR, mp); + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_show_lisp_use_petr api_show_one_use_petr + +/** + * Add/delete mapping between vni and vrf + */ +static int +api_one_eid_table_add_del_map (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_eid_table_add_del_map_t *mp; + u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0; + u32 vni, vrf, bd_index; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "vrf %d", &vrf)) + vrf_set = 1; + else if (unformat (input, "bd_index %d", &bd_index)) + bd_index_set = 1; + else if (unformat (input, "vni %d", &vni)) + vni_set = 1; + else + break; + } + + if (!vni_set || (!vrf_set && !bd_index_set)) + { + errmsg ("missing arguments!"); + return -99; + } + + if (vrf_set && bd_index_set) + { + errmsg ("error: both vrf and bd entered!"); + return -99; + } + + M (ONE_EID_TABLE_ADD_DEL_MAP, mp); + + mp->is_add = is_add; + mp->vni = htonl (vni); + mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index); + mp->is_l2 = bd_index_set; + + /* send */ + S (mp); + + /* wait for reply */ + W (ret); + return ret; +} + +#define api_lisp_eid_table_add_del_map api_one_eid_table_add_del_map + +uword +unformat_negative_mapping_action (unformat_input_t * input, va_list * args) +{ + u32 *action = va_arg (*args, u32 *); + u8 *s = 0; + + if (unformat (input, "%s", &s)) + { + if (!strcmp ((char *) s, "no-action")) + action[0] = 0; + else if (!strcmp ((char *) s, "natively-forward")) + action[0] = 1; + else if (!strcmp ((char *) s, "send-map-request")) + action[0] = 2; + else if (!strcmp ((char *) s, "drop")) + action[0] = 3; + else + { + clib_warning ("invalid action: '%s'", s); + action[0] = 3; + } + } + else + return 0; + + vec_free (s); + return 1; +} + +/** + * Add/del remote mapping to/from ONE control plane + * + * @param vam vpp API test context + * @return return code + */ +static int +api_one_add_del_remote_mapping (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_remote_mapping_t *mp; + u32 vni = 0; + lisp_eid_vat_t _eid, *eid = &_eid; + lisp_eid_vat_t _seid, *seid = &_seid; + u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0; + u32 action = ~0, p, w, data_len; + ip4_address_t rloc4; + ip6_address_t rloc6; + vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0; + int ret; + + clib_memset (&rloc, 0, sizeof (rloc)); + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del-all")) + { + del_all = 1; + } + else if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "add")) + { + is_add = 1; + } + else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) + { + eid_set = 1; + } + else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid)) + { + seid_set = 1; + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else if (unformat (input, "p %d w %d", &p, &w)) + { + if (!curr_rloc) + { + errmsg ("No RLOC configured for setting priority/weight!"); + return -99; + } + curr_rloc->priority = p; + curr_rloc->weight = w; + } + else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4)) + { + rloc.ip_address.af = 0; + clib_memcpy (&rloc.ip_address.un.ip6, &rloc6, sizeof (rloc6)); + vec_add1 (rlocs, rloc); + curr_rloc = &rlocs[vec_len (rlocs) - 1]; + } + else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6)) + { + rloc.ip_address.af = 1; + clib_memcpy (&rloc.ip_address.un.ip4, &rloc4, sizeof (rloc4)); + vec_add1 (rlocs, rloc); + curr_rloc = &rlocs[vec_len (rlocs) - 1]; + } + else if (unformat (input, "action %U", + unformat_negative_mapping_action, &action)) + { + ; + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (0 == eid_set) + { + errmsg ("missing params!"); + return -99; + } + + if (is_add && (~0 == action) && 0 == vec_len (rlocs)) + { + errmsg ("no action set for negative map-reply!"); + return -99; + } + + data_len = vec_len (rlocs) * sizeof (vl_api_remote_locator_t); + + M2 (ONE_ADD_DEL_REMOTE_MAPPING, mp, data_len); + mp->is_add = is_add; + mp->vni = htonl (vni); + mp->action = (u8) action; + mp->is_src_dst = seid_set; + mp->del_all = del_all; + lisp_eid_put_vat (&mp->deid, eid); + lisp_eid_put_vat (&mp->seid, seid); + + mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs)); + clib_memcpy (mp->rlocs, rlocs, data_len); + vec_free (rlocs); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_add_del_remote_mapping api_one_add_del_remote_mapping + +/** + * Add/del ONE adjacency. Saves mapping in ONE control plane and updates + * forwarding entries in data-plane accordingly. + * + * @param vam vpp API test context + * @return return code + */ +static int +api_one_add_del_adjacency (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_adjacency_t *mp; + u32 vni = 0; + u8 is_add = 1; + int ret; + lisp_eid_vat_t leid, reid; + + leid.type = reid.type = (u8) ~ 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "add")) + { + is_add = 1; + } + else if (unformat (input, "reid %U/%d", unformat_ip46_address, + &reid.addr.ip, &reid.len)) + { + reid.type = 0; /* ipv4 */ + } + else if (unformat (input, "reid %U", unformat_ethernet_address, + &reid.addr.mac)) + { + reid.type = 1; /* mac */ + } + else if (unformat (input, "leid %U/%d", unformat_ip46_address, + &leid.addr.ip, &leid.len)) + { + leid.type = 0; /* ipv4 */ + } + else if (unformat (input, "leid %U", unformat_ethernet_address, + &leid.addr.mac)) + { + leid.type = 1; /* mac */ + } + else if (unformat (input, "vni %d", &vni)) + { + ; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if ((u8) ~ 0 == reid.type) + { + errmsg ("missing params!"); + return -99; + } + + if (leid.type != reid.type) + { + errmsg ("remote and local EIDs are of different types!"); + return -99; + } + + M (ONE_ADD_DEL_ADJACENCY, mp); + mp->is_add = is_add; + mp->vni = htonl (vni); + lisp_eid_put_vat (&mp->leid, &leid); + lisp_eid_put_vat (&mp->reid, &reid); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_add_del_adjacency api_one_add_del_adjacency + + +static int +api_one_map_register_fallback_threshold (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_map_register_fallback_threshold_t *mp; + u32 value = 0; + u8 is_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%u", &value)) + is_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!is_set) + { + errmsg ("fallback threshold value is missing!"); + return -99; + } + + M (ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); + mp->value = clib_host_to_net_u32 (value); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_show_one_map_register_fallback_threshold (vat_main_t * vam) +{ + vl_api_show_one_map_register_fallback_threshold_t *mp; + int ret; + + M (SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +uword +unformat_lisp_transport_protocol (unformat_input_t * input, va_list * args) +{ + u32 *proto = va_arg (*args, u32 *); + + if (unformat (input, "udp")) + *proto = 1; + else if (unformat (input, "api")) + *proto = 2; + else + return 0; + + return 1; +} + +static int +api_one_set_transport_protocol (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_set_transport_protocol_t *mp; + u8 is_set = 0; + u32 protocol = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U", unformat_lisp_transport_protocol, &protocol)) + is_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!is_set) + { + errmsg ("Transport protocol missing!"); + return -99; + } + + M (ONE_SET_TRANSPORT_PROTOCOL, mp); + mp->protocol = (u8) protocol; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_get_transport_protocol (vat_main_t * vam) +{ + vl_api_one_get_transport_protocol_t *mp; + int ret; + + M (ONE_GET_TRANSPORT_PROTOCOL, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_map_register_set_ttl (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_map_register_set_ttl_t *mp; + u32 ttl = 0; + u8 is_set = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%u", &ttl)) + is_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!is_set) + { + errmsg ("TTL value missing!"); + return -99; + } + + M (ONE_MAP_REGISTER_SET_TTL, mp); + mp->ttl = clib_host_to_net_u32 (ttl); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_show_one_map_register_ttl (vat_main_t * vam) +{ + vl_api_show_one_map_register_ttl_t *mp; + int ret; + + M (SHOW_ONE_MAP_REGISTER_TTL, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +/** + * Add/del map request itr rlocs from ONE control plane and updates + * + * @param vam vpp API test context + * @return return code + */ +static int +api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_add_del_map_request_itr_rlocs_t *mp; + u8 *locator_set_name = 0; + u8 locator_set_name_set = 0; + u8 is_add = 1; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + { + is_add = 0; + } + else if (unformat (input, "%_%v%_", &locator_set_name)) + { + locator_set_name_set = 1; + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (is_add && !locator_set_name_set) + { + errmsg ("itr-rloc is not set!"); + return -99; + } + + if (is_add && vec_len (locator_set_name) > 64) + { + errmsg ("itr-rloc locator-set name too long"); + vec_free (locator_set_name); + return -99; + } + + M (ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS, mp); + mp->is_add = is_add; + if (is_add) + { + clib_memcpy (mp->locator_set_name, locator_set_name, + vec_len (locator_set_name)); + } + else + { + clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); + } + vec_free (locator_set_name); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_add_del_map_request_itr_rlocs api_one_add_del_map_request_itr_rlocs + +static int +api_one_locator_dump (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_one_locator_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 is_index_set = 0, is_name_set = 0; + u8 *ls_name = 0; + u32 ls_index = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "ls_name %_%v%_", &ls_name)) + { + is_name_set = 1; + } + else if (unformat (input, "ls_index %d", &ls_index)) + { + is_index_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!is_index_set && !is_name_set) + { + errmsg ("error: expected one of index or name!"); + return -99; + } + + if (is_index_set && is_name_set) + { + errmsg ("error: only one param expected!"); + return -99; + } + + if (vec_len (ls_name) > 62) + { + errmsg ("error: locator set name too long!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight"); + } + + M (ONE_LOCATOR_DUMP, mp); + mp->is_index_set = is_index_set; + + if (is_index_set) + mp->ls_index = clib_host_to_net_u32 (ls_index); + else + { + vec_add1 (ls_name, 0); + strncpy ((char *) mp->ls_name, (char *) ls_name, + sizeof (mp->ls_name) - 1); + } + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_locator_dump api_one_locator_dump + +static int +api_one_locator_set_dump (vat_main_t * vam) +{ + vl_api_one_locator_set_dump_t *mp; + vl_api_control_ping_t *mp_ping; + unformat_input_t *input = vam->input; + u8 filter = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "local")) + { + filter = 1; + } + else if (unformat (input, "remote")) + { + filter = 2; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!vam->json_output) + { + print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name"); + } + + M (ONE_LOCATOR_SET_DUMP, mp); + + mp->filter = filter; + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_locator_set_dump api_one_locator_set_dump + +static int +api_one_eid_table_map_dump (vat_main_t * vam) +{ + u8 is_l2 = 0; + u8 mode_set = 0; + unformat_input_t *input = vam->input; + vl_api_one_eid_table_map_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "l2")) + { + is_l2 = 1; + mode_set = 1; + } + else if (unformat (input, "l3")) + { + is_l2 = 0; + mode_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!mode_set) + { + errmsg ("expected one of 'l2' or 'l3' parameter!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); + } + + M (ONE_EID_TABLE_MAP_DUMP, mp); + mp->is_l2 = is_l2; + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_eid_table_map_dump api_one_eid_table_map_dump + +static int +api_one_eid_table_vni_dump (vat_main_t * vam) +{ + vl_api_one_eid_table_vni_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "VNI"); + } + + M (ONE_EID_TABLE_VNI_DUMP, mp); + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_eid_table_vni_dump api_one_eid_table_vni_dump + +static int +api_one_eid_table_dump (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_one_eid_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u8 filter = 0; + int ret; + u32 vni, t = 0; + lisp_eid_vat_t eid; + u8 eid_set = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (i, "eid %U/%d", unformat_ip46_address, &eid.addr.ip, &eid.len)) + { + eid_set = 1; + eid.type = 0; + } + else + if (unformat (i, "eid %U", unformat_ethernet_address, &eid.addr.mac)) + { + eid_set = 1; + eid.type = 1; + } + else if (unformat (i, "eid %U", unformat_nsh_address, &eid.addr.nsh)) + { + eid_set = 1; + eid.type = 2; + } + else if (unformat (i, "vni %d", &t)) + { + vni = t; + } + else if (unformat (i, "local")) + { + filter = 1; + } + else if (unformat (i, "remote")) + { + filter = 2; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vam->json_output) + { + print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID", + "type", "ls_index", "ttl", "authoritative", "key_id", "key"); + } + + M (ONE_EID_TABLE_DUMP, mp); + + mp->filter = filter; + if (eid_set) + { + mp->eid_set = 1; + mp->vni = htonl (vni); + lisp_eid_put_vat (&mp->eid, &eid); + } + + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_adjacencies_get (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_one_adjacencies_get_t *mp; + u8 vni_set = 0; + u32 vni = ~0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "vni %d", &vni)) + { + vni_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vni_set) + { + errmsg ("vni not set!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%s %40s", "leid", "reid"); + } + + M (ONE_ADJACENCIES_GET, mp); + mp->vni = clib_host_to_net_u32 (vni); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_map_server_dump (vat_main_t * vam) +{ + vl_api_one_map_server_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "Map server"); + } + + M (ONE_MAP_SERVER_DUMP, mp); + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_map_server_dump api_one_map_server_dump + +static int +api_one_map_resolver_dump (vat_main_t * vam) +{ + vl_api_one_map_resolver_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "Map resolver"); + } + + M (ONE_MAP_RESOLVER_DUMP, mp); + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define api_lisp_map_resolver_dump api_one_map_resolver_dump + +static int +api_one_stats_flush (vat_main_t * vam) +{ + vl_api_one_stats_flush_t *mp; + int ret = 0; + + M (ONE_STATS_FLUSH, mp); + S (mp); + W (ret); + return ret; +} + +static int +api_one_stats_dump (vat_main_t * vam) +{ + vl_api_one_stats_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + + M (ONE_STATS_DUMP, mp); + /* send it... */ + S (mp); + + /* Use a control ping for synchronization */ + LISP_PING (&one_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_show_one_status (vat_main_t * vam) +{ + vl_api_show_one_status_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%-20s%-16s", "ONE status", "locator-set"); + } + + M (SHOW_ONE_STATUS, mp); + /* send it... */ + S (mp); + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_one_get_map_request_itr_rlocs (vat_main_t * vam) +{ + vl_api_one_get_map_request_itr_rlocs_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "%=20s", "itr-rlocs:"); + } + + M (ONE_GET_MAP_REQUEST_ITR_RLOCS, mp); + /* send it... */ + S (mp); + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define vat_plugin_register vat_plugin_register_one +#include + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/lisp-cp/packets.c b/src/plugins/lisp/lisp-cp/packets.c similarity index 98% rename from src/vnet/lisp-cp/packets.c rename to src/plugins/lisp/lisp-cp/packets.c index bbc3ad64572..95f95cdb68a 100644 --- a/src/vnet/lisp-cp/packets.c +++ b/src/plugins/lisp/lisp-cp/packets.c @@ -13,8 +13,8 @@ * limitations under the License. */ -#include -#include +#include +#include #include /* Returns IP ID for the packet */ diff --git a/src/vnet/lisp-cp/packets.h b/src/plugins/lisp/lisp-cp/packets.h similarity index 96% rename from src/vnet/lisp-cp/packets.h rename to src/plugins/lisp/lisp-cp/packets.h index eb9871bf9c0..68cd949e75d 100644 --- a/src/vnet/lisp-cp/packets.h +++ b/src/plugins/lisp/lisp-cp/packets.h @@ -14,7 +14,7 @@ */ #include -#include +#include #define IP_DF 0x4000 /* don't fragment */ diff --git a/src/vnet/lisp-gpe/FEATURE.yaml b/src/plugins/lisp/lisp-gpe/FEATURE.yaml similarity index 100% rename from src/vnet/lisp-gpe/FEATURE.yaml rename to src/plugins/lisp/lisp-gpe/FEATURE.yaml diff --git a/src/vnet/lisp-gpe/decap.c b/src/plugins/lisp/lisp-gpe/decap.c similarity index 99% rename from src/vnet/lisp-gpe/decap.c rename to src/plugins/lisp/lisp-gpe/decap.c index ab35c7ea73d..03e265ab739 100644 --- a/src/vnet/lisp-gpe/decap.c +++ b/src/plugins/lisp/lisp-gpe/decap.c @@ -19,7 +19,7 @@ */ #include #include -#include +#include typedef struct { @@ -453,7 +453,7 @@ lisp_gpe_ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, static char *lisp_gpe_ip4_input_error_strings[] = { #define lisp_gpe_error(n,s) s, -#include +#include #undef lisp_gpe_error }; diff --git a/src/vnet/lisp-gpe/dir.dox b/src/plugins/lisp/lisp-gpe/dir.dox similarity index 100% rename from src/vnet/lisp-gpe/dir.dox rename to src/plugins/lisp/lisp-gpe/dir.dox diff --git a/src/vnet/lisp-gpe/interface.c b/src/plugins/lisp/lisp-gpe/interface.c similarity index 99% rename from src/vnet/lisp-gpe/interface.c rename to src/plugins/lisp/lisp-gpe/interface.c index 1ccb53dda72..0d5f689fe7b 100644 --- a/src/vnet/lisp-gpe/interface.c +++ b/src/plugins/lisp/lisp-gpe/interface.c @@ -25,15 +25,15 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -#include +#include /** * @brief The VLIB node arc/edge from the interface's TX node, to the L2 diff --git a/src/vnet/lisp-gpe/lisp_gpe.api b/src/plugins/lisp/lisp-gpe/lisp_gpe.api similarity index 94% rename from src/vnet/lisp-gpe/lisp_gpe.api rename to src/plugins/lisp/lisp-gpe/lisp_gpe.api index 6c751eabffb..2e1846261ab 100644 --- a/src/vnet/lisp-gpe/lisp_gpe.api +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.api @@ -16,7 +16,7 @@ option version = "2.0.0"; import "vnet/interface_types.api"; -import "vnet/lisp-cp/lisp_types.api"; +import "plugins/lisp/lisp-cp/lisp_types.api"; /** \brief GPE locator structure @param is_ip4 - whether addr is IPv4 or v6 @@ -41,7 +41,7 @@ typedef gpe_locator @param loc_num - number of locators @param locs - array of remote locators */ -manual_print manual_endian define gpe_add_del_fwd_entry +define gpe_add_del_fwd_entry { u32 client_index; u32 context; @@ -95,7 +95,7 @@ define gpe_fwd_entry_vnis_get u32 context; }; -manual_print manual_endian define gpe_fwd_entry_vnis_get_reply +define gpe_fwd_entry_vnis_get_reply { u32 context; i32 retval; @@ -120,7 +120,7 @@ typedef gpe_fwd_entry u8 action; }; -manual_print manual_endian define gpe_fwd_entries_get_reply +define gpe_fwd_entries_get_reply { u32 context; i32 retval; @@ -135,7 +135,7 @@ define gpe_fwd_entry_path_dump u32 fwd_entry_index; }; -manual_endian manual_print define gpe_fwd_entry_path_details +define gpe_fwd_entry_path_details { u32 context; vl_api_gpe_locator_t lcl_loc; @@ -222,7 +222,7 @@ typedef gpe_native_fwd_rpath vl_api_address_t nh_addr; }; -manual_print manual_endian define gpe_native_fwd_rpaths_get_reply +define gpe_native_fwd_rpaths_get_reply { u32 context; i32 retval; diff --git a/src/vnet/lisp-gpe/lisp_gpe.c b/src/plugins/lisp/lisp-gpe/lisp_gpe.c similarity index 99% rename from src/vnet/lisp-gpe/lisp_gpe.c rename to src/plugins/lisp/lisp-gpe/lisp_gpe.c index c75ad6b87cd..1f087fd0625 100644 --- a/src/vnet/lisp-gpe/lisp_gpe.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.c @@ -18,10 +18,10 @@ * */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/vnet/lisp-gpe/lisp_gpe.h b/src/plugins/lisp/lisp-gpe/lisp_gpe.h similarity index 98% rename from src/vnet/lisp-gpe/lisp_gpe.h rename to src/plugins/lisp/lisp-gpe/lisp_gpe.h index 3a3d0e9f4da..aa2e7d1bfbf 100644 --- a/src/vnet/lisp-gpe/lisp_gpe.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.h @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -73,7 +73,7 @@ typedef enum typedef enum { #define lisp_gpe_error(n,s) LISP_GPE_ERROR_##n, -#include +#include #undef lisp_gpe_error LISP_GPE_N_ERROR, } lisp_gpe_error_t; diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c similarity index 98% rename from src/vnet/lisp-gpe/lisp_gpe_adjacency.c rename to src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c index cd0b33857f5..eab10f4d2d5 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.c @@ -19,11 +19,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.h b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.h similarity index 98% rename from src/vnet/lisp-gpe/lisp_gpe_adjacency.h rename to src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.h index adc3acaee3c..060c5d13ebc 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_adjacency.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_adjacency.h @@ -22,7 +22,7 @@ #define LISP_GPE_ADJACENCY_H__ #include -#include +#include /** * @brief A LISP GPE Adjacency. diff --git a/src/vnet/lisp-gpe/lisp_gpe_api.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c similarity index 83% rename from src/vnet/lisp-gpe/lisp_gpe_api.c rename to src/plugins/lisp/lisp-gpe/lisp_gpe_api.c index e20347a46f6..df90ef54403 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_api.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_api.c @@ -22,50 +22,29 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include #include #include -#include +#include -#define vl_api_gpe_locator_pair_t_endian vl_noop_handler -#define vl_api_gpe_locator_pair_t_print vl_noop_handler -#define vl_api_gpe_add_del_fwd_entry_t_endian vl_noop_handler -#define vl_api_gpe_add_del_fwd_entry_t_print vl_noop_handler +/* define message IDs */ +#include +#include +#include -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +/** + * Base message ID fot the plugin + */ +static u32 gpe_base_msg_id; +#define REPLY_MSG_ID_BASE gpe_base_msg_id #include -#define foreach_vpe_api_msg \ -_(GPE_ADD_DEL_FWD_ENTRY, gpe_add_del_fwd_entry) \ -_(GPE_FWD_ENTRIES_GET, gpe_fwd_entries_get) \ -_(GPE_FWD_ENTRY_PATH_DUMP, gpe_fwd_entry_path_dump) \ -_(GPE_ENABLE_DISABLE, gpe_enable_disable) \ -_(GPE_ADD_DEL_IFACE, gpe_add_del_iface) \ -_(GPE_FWD_ENTRY_VNIS_GET, gpe_fwd_entry_vnis_get) \ -_(GPE_SET_ENCAP_MODE, gpe_set_encap_mode) \ -_(GPE_GET_ENCAP_MODE, gpe_get_encap_mode) \ -_(GPE_ADD_DEL_NATIVE_FWD_RPATH, gpe_add_del_native_fwd_rpath) \ -_(GPE_NATIVE_FWD_RPATHS_GET, gpe_native_fwd_rpaths_get) - static locator_pair_t * unformat_gpe_loc_pairs (void *locs, u32 rloc_num) { @@ -497,45 +476,23 @@ vl_api_gpe_native_fwd_rpaths_get_t_handler (vl_api_gpe_native_fwd_rpaths_get_t } /* - * gpe_api_hookup + * lisp_api_hookup * Add vpe's API message handlers to the table. * vlib has already mapped shared memory and * added the client registration handlers. * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() */ -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_lisp_gpe; -#undef _ -} +#include static clib_error_t * gpe_api_hookup (vlib_main_t * vm) { - api_main_t *am = vlibapi_get_main (); - -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N, #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vpe_api_msg; -#undef _ - /* * Set up the (msg_name, crc, message-id) table */ - setup_message_id_table (am); + gpe_base_msg_id = setup_message_id_table (); - return 0; + return NULL; } VLIB_API_INIT_FUNCTION (gpe_api_hookup); diff --git a/src/vnet/lisp-gpe/lisp_gpe_error.def b/src/plugins/lisp/lisp-gpe/lisp_gpe_error.def similarity index 100% rename from src/vnet/lisp-gpe/lisp_gpe_error.def rename to src/plugins/lisp/lisp-gpe/lisp_gpe_error.def diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c similarity index 99% rename from src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c rename to src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c index 487ba246b4d..334164c2583 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.c @@ -13,10 +13,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.h similarity index 99% rename from src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h rename to src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.h index dfdb8b911ae..a170787f5b2 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_fwd_entry.h @@ -20,7 +20,7 @@ #ifndef __LISP_GPE_FWD_ENTRY_H__ #define __LISP_GPE_FWD_ENTRY_H__ -#include +#include /** * @brief A path on which to forward lisp traffic diff --git a/src/vnet/lisp-gpe/lisp_gpe_packet.h b/src/plugins/lisp/lisp-gpe/lisp_gpe_packet.h similarity index 100% rename from src/vnet/lisp-gpe/lisp_gpe_packet.h rename to src/plugins/lisp/lisp-gpe/lisp_gpe_packet.h diff --git a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c similarity index 98% rename from src/vnet/lisp-gpe/lisp_gpe_sub_interface.c rename to src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c index 1ccd5817d7f..b84c76f0103 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.c @@ -17,8 +17,8 @@ * @brief LISP sub-interfaces. * */ -#include -#include +#include +#include #include #include diff --git a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.h similarity index 99% rename from src/vnet/lisp-gpe/lisp_gpe_sub_interface.h rename to src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.h index 7375bf00ccc..c8b447a65dc 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_sub_interface.h @@ -21,7 +21,7 @@ #ifndef __LISP_GPE_SUB_INTERFACE_H__ #define __LISP_GPE_SUB_INTERFACE_H__ -#include +#include /** * A Key for lookup in the L£ sub-interface DB diff --git a/src/vnet/lisp-gpe/lisp_gpe_tenant.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c similarity index 99% rename from src/vnet/lisp-gpe/lisp_gpe_tenant.c rename to src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c index e2a310c043c..fb6aa1ac1d5 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_tenant.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include /** * The pool of all tenants diff --git a/src/vnet/lisp-gpe/lisp_gpe_tenant.h b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.h similarity index 98% rename from src/vnet/lisp-gpe/lisp_gpe_tenant.h rename to src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.h index a9271da91f5..35b6569d0ed 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_tenant.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tenant.h @@ -16,7 +16,7 @@ #ifndef __LISP_GPE_TENANT_H__ #define __LISP_GPE_TENANT_H__ -#include +#include /** * Refernece counting lock types on the tenant. diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c new file mode 100644 index 00000000000..39f99492268 --- /dev/null +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c @@ -0,0 +1,888 @@ +/* + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include +#include +#include + +/* define message IDs */ +#include +#include +#include + +typedef struct +{ + /* API message ID base */ + u16 msg_id_base; + vat_main_t *vat_main; + u32 ping_id; +} lisp_gpe_test_main_t; + +lisp_gpe_test_main_t lisp_gpe_test_main; + +#define __plugin_msg_base lisp_gpe_test_main.msg_id_base +#include + +/* Macro to finish up custom dump fns */ +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) +#define FINISH \ + vec_add1 (s, 0); \ + vl_print (handle, (char *)s); \ + vec_free (s); \ + return handle; + +#define LISP_PING(_lm, mp_ping) \ + if (!(_lm)->ping_id) \ + (_lm)->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); \ + mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); \ + mp_ping->_vl_msg_id = htons ((_lm)->ping_id); \ + mp_ping->client_index = vam->my_client_index; \ + fformat (vam->ofp, "Sending ping id=%d\n", (_lm)->ping_id); \ + vam->result_ready = 0; \ + +typedef struct +{ + u32 spi; + u8 si; +} __attribute__ ((__packed__)) lisp_nsh_api_t; + +static uword +unformat_nsh_address (unformat_input_t * input, va_list * args) +{ + lisp_nsh_api_t *nsh = va_arg (*args, lisp_nsh_api_t *); + return unformat (input, "SPI:%d SI:%d", &nsh->spi, &nsh->si); +} + +static u8 * +format_nsh_address_vat (u8 * s, va_list * args) +{ + nsh_t *a = va_arg (*args, nsh_t *); + return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); +} + +static u8 * +format_lisp_flat_eid (u8 * s, va_list * args) +{ + vl_api_eid_t *eid = va_arg (*args, vl_api_eid_t *); + + switch (eid->type) + { + case EID_TYPE_API_PREFIX: + if (eid->address.prefix.address.af) + return format (s, "%U/%d", format_ip6_address, + eid->address.prefix.address.un.ip6, + eid->address.prefix.len); + return format (s, "%U/%d", format_ip4_address, + eid->address.prefix.address.un.ip4, + eid->address.prefix.len); + case EID_TYPE_API_MAC: + return format (s, "%U", format_ethernet_address, eid->address.mac); + case EID_TYPE_API_NSH: + return format (s, "%U", format_nsh_address_vat, eid->address.nsh); + } + return 0; +} + +static void vl_api_gpe_add_del_fwd_entry_reply_t_handler + (vl_api_gpe_add_del_fwd_entry_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->result_ready = 1; + } +} + +static void +api_gpe_fwd_entry_net_to_host (vl_api_gpe_fwd_entry_t * e) +{ + e->dp_table = clib_net_to_host_u32 (e->dp_table); + e->fwd_entry_index = clib_net_to_host_u32 (e->fwd_entry_index); + e->vni = clib_net_to_host_u32 (e->vni); +} + +static void + gpe_fwd_entries_get_reply_t_net_to_host + (vl_api_gpe_fwd_entries_get_reply_t * mp) +{ + u32 i; + + mp->count = clib_net_to_host_u32 (mp->count); + for (i = 0; i < mp->count; i++) + { + api_gpe_fwd_entry_net_to_host (&mp->entries[i]); + } +} + +static u8 * +format_gpe_encap_mode (u8 * s, va_list * args) +{ + u32 mode = va_arg (*args, u32); + + switch (mode) + { + case 0: + return format (s, "lisp"); + case 1: + return format (s, "vxlan"); + } + return 0; +} + +static void + vl_api_gpe_get_encap_mode_reply_t_handler + (vl_api_gpe_get_encap_mode_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "gpe mode: %U", format_gpe_encap_mode, mp->encap_mode); + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + +static void + vl_api_gpe_fwd_entry_path_details_t_handler + (vl_api_gpe_fwd_entry_path_details_t * mp) +{ + vat_main_t *vam = &vat_main; + u8 *(*format_ip_address_fcn) (u8 *, va_list *) = 0; + + if (mp->lcl_loc.addr.af) + format_ip_address_fcn = format_ip6_address; + else + format_ip_address_fcn = format_ip4_address; + + print (vam->ofp, "w:%d %30U %30U", mp->rmt_loc.weight, + format_ip_address_fcn, &mp->lcl_loc.addr.un, + format_ip_address_fcn, &mp->rmt_loc.addr.un); +} + +static void + vl_api_gpe_fwd_entries_get_reply_t_handler + (vl_api_gpe_fwd_entries_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_gpe_fwd_entry_t *e; + + if (retval) + goto end; + + gpe_fwd_entries_get_reply_t_net_to_host (mp); + + for (i = 0; i < mp->count; i++) + { + e = &mp->entries[i]; + print (vam->ofp, "%10d %10d %U %40U", e->fwd_entry_index, e->dp_table, + format_lisp_flat_eid, e->leid, format_lisp_flat_eid, e->reid); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_gpe_native_fwd_rpaths_get_reply_t_handler + (vl_api_gpe_native_fwd_rpaths_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + vl_api_gpe_native_fwd_rpath_t *r; + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + { + r = &mp->entries[i]; + print (vam->ofp, "fib_index: %d sw_if_index %d nh %U", + clib_net_to_host_u32 (r->fib_index), + clib_net_to_host_u32 (r->nh_sw_if_index), + r->nh_addr.af ? format_ip6_address : format_ip4_address, + r->nh_addr.un); + } + +end: + vam->retval = retval; + vam->result_ready = 1; +} + +static void + vl_api_gpe_fwd_entry_vnis_get_reply_t_handler + (vl_api_gpe_fwd_entry_vnis_get_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + u32 i, n; + int retval = clib_net_to_host_u32 (mp->retval); + + if (retval) + goto end; + + n = clib_net_to_host_u32 (mp->count); + + for (i = 0; i < n; i++) + print (vam->ofp, "%d", clib_net_to_host_u32 (mp->vnis[i])); + +end: + vam->retval = retval; + vam->result_ready = 1; +} + + +/* *INDENT-OFF* */ +/** Used for parsing LISP eids */ +typedef CLIB_PACKED(struct{ + union { + ip46_address_t ip; + mac_address_t mac; + lisp_nsh_api_t nsh; + } addr; + u32 len; /**< prefix length if IP */ + u8 type; /**< type of eid */ +}) lisp_eid_vat_t; +/* *INDENT-ON* */ + +static uword +unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) +{ + lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *); + + clib_memset (a, 0, sizeof (a[0])); + + if (unformat (input, "%U/%d", unformat_ip46_address, a->addr.ip, &a->len)) + { + a->type = 0; /* ip prefix type */ + } + else if (unformat (input, "%U", unformat_ethernet_address, &a->addr.mac)) + { + a->type = 1; /* mac type */ + } + else if (unformat (input, "%U", unformat_nsh_address, a->addr.nsh)) + { + a->type = 2; /* NSH type */ + a->addr.nsh.spi = clib_host_to_net_u32 (a->addr.nsh.spi); + } + else + { + return 0; + } + + if (a->type == 0) + { + if (ip46_address_is_ip4 (&a->addr.ip)) + return a->len > 32 ? 1 : 0; + else + return a->len > 128 ? 1 : 0; + } + + return 1; +} + +static void +lisp_eid_put_vat (vl_api_eid_t * eid, const lisp_eid_vat_t * vat_eid) +{ + eid->type = vat_eid->type; + switch (eid->type) + { + case EID_TYPE_API_PREFIX: + if (ip46_address_is_ip4 (&vat_eid->addr.ip)) + { + clib_memcpy (&eid->address.prefix.address.un.ip4, + &vat_eid->addr.ip.ip4, 4); + eid->address.prefix.address.af = ADDRESS_IP4; + eid->address.prefix.len = vat_eid->len; + } + else + { + clib_memcpy (&eid->address.prefix.address.un.ip6, + &vat_eid->addr.ip.ip6, 16); + eid->address.prefix.address.af = ADDRESS_IP6; + eid->address.prefix.len = vat_eid->len; + } + return; + case EID_TYPE_API_MAC: + clib_memcpy (&eid->address.mac, &vat_eid->addr.mac, + sizeof (eid->address.mac)); + return; + case EID_TYPE_API_NSH: + clib_memcpy (&eid->address.nsh, &vat_eid->addr.nsh, + sizeof (eid->address.nsh)); + return; + default: + ASSERT (0); + return; + } +} + +static int +api_gpe_add_del_fwd_entry (vat_main_t * vam) +{ + u32 dp_table = 0, vni = 0;; + unformat_input_t *input = vam->input; + vl_api_gpe_add_del_fwd_entry_t *mp; + u8 is_add = 1; + lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid; + lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid; + u8 rmt_eid_set = 0, lcl_eid_set = 0; + u32 action = ~0, w; + ip4_address_t rmt_rloc4, lcl_rloc4; + ip6_address_t rmt_rloc6, lcl_rloc6; + vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0; + int ret; + + clib_memset (&rloc, 0, sizeof (rloc)); + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "del")) + is_add = 0; + else if (unformat (input, "add")) + is_add = 1; + else if (unformat (input, "reid %U", unformat_lisp_eid_vat, rmt_eid)) + { + rmt_eid_set = 1; + } + else if (unformat (input, "leid %U", unformat_lisp_eid_vat, lcl_eid)) + { + lcl_eid_set = 1; + } + else if (unformat (input, "vrf %d", &dp_table)) + ; + else if (unformat (input, "bd %d", &dp_table)) + ; + else if (unformat (input, "vni %d", &vni)) + ; + else if (unformat (input, "w %d", &w)) + { + if (!curr_rloc) + { + errmsg ("No RLOC configured for setting priority/weight!"); + return -99; + } + curr_rloc->weight = w; + } + else if (unformat (input, "loc-pair %U %U", unformat_ip4_address, + &lcl_rloc4, unformat_ip4_address, &rmt_rloc4)) + { + rloc.addr.af = 0; + clib_memcpy (&rloc.addr.un.ip4, &lcl_rloc4, sizeof (lcl_rloc4)); + rloc.weight = 0; + vec_add1 (lcl_locs, rloc); + + clib_memcpy (&rloc.addr.un.ip4, &rmt_rloc4, sizeof (rmt_rloc4)); + vec_add1 (rmt_locs, rloc); + /* weight saved in rmt loc */ + curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1]; + } + else if (unformat (input, "loc-pair %U %U", unformat_ip6_address, + &lcl_rloc6, unformat_ip6_address, &rmt_rloc6)) + { + rloc.addr.af = 1; + clib_memcpy (&rloc.addr.un.ip6, &lcl_rloc6, sizeof (lcl_rloc6)); + rloc.weight = 0; + vec_add1 (lcl_locs, rloc); + + clib_memcpy (&rloc.addr.un.ip6, &rmt_rloc6, sizeof (rmt_rloc6)); + vec_add1 (rmt_locs, rloc); + /* weight saved in rmt loc */ + curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1]; + } + else if (unformat (input, "action %d", &action)) + { + ; + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, input); + return -99; + } + } + + if (!rmt_eid_set) + { + errmsg ("remote eid addresses not set"); + return -99; + } + + if (lcl_eid_set && rmt_eid->type != lcl_eid->type) + { + errmsg ("eid types don't match"); + return -99; + } + + if (0 == rmt_locs && (u32) ~ 0 == action) + { + errmsg ("action not set for negative mapping"); + return -99; + } + + /* Construct the API message */ + M2 (GPE_ADD_DEL_FWD_ENTRY, mp, + sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs) * 2); + + mp->is_add = is_add; + lisp_eid_put_vat (&mp->rmt_eid, rmt_eid); + lisp_eid_put_vat (&mp->lcl_eid, lcl_eid); + mp->dp_table = clib_host_to_net_u32 (dp_table); + mp->vni = clib_host_to_net_u32 (vni); + mp->action = action; + + if (0 != rmt_locs && 0 != lcl_locs) + { + mp->loc_num = clib_host_to_net_u32 (vec_len (rmt_locs) * 2); + clib_memcpy (mp->locs, lcl_locs, + (sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs))); + + u32 offset = sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs); + clib_memcpy (((u8 *) mp->locs) + offset, rmt_locs, + (sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs))); + } + vec_free (lcl_locs); + vec_free (rmt_locs); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_enable_disable (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_gpe_enable_disable_t *mp; + u8 is_set = 0; + u8 is_enable = 1; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "enable")) + { + is_set = 1; + is_enable = 1; + } + else if (unformat (input, "disable")) + { + is_set = 1; + is_enable = 0; + } + else + break; + } + + if (is_set == 0) + { + errmsg ("Value not set"); + return -99; + } + + /* Construct the API message */ + M (GPE_ENABLE_DISABLE, mp); + + mp->is_enable = is_enable; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +uword +unformat_gpe_encap_mode (unformat_input_t * input, va_list * args) +{ + u32 *mode = va_arg (*args, u32 *); + + if (unformat (input, "lisp")) + *mode = 0; + else if (unformat (input, "vxlan")) + *mode = 1; + else + return 0; + + return 1; +} + +static int +api_gpe_get_encap_mode (vat_main_t * vam) +{ + vl_api_gpe_get_encap_mode_t *mp; + int ret; + + /* Construct the API message */ + M (GPE_GET_ENCAP_MODE, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_set_encap_mode (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_gpe_set_encap_mode_t *mp; + int ret; + u32 mode = 0; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U", unformat_gpe_encap_mode, &mode)) + ; + else + break; + } + + /* Construct the API message */ + M (GPE_SET_ENCAP_MODE, mp); + + mp->is_vxlan = mode; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_add_del_iface (vat_main_t * vam) +{ + unformat_input_t *input = vam->input; + vl_api_gpe_add_del_iface_t *mp; + u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0; + u32 dp_table = 0, vni = 0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "up")) + { + action_set = 1; + is_add = 1; + } + else if (unformat (input, "down")) + { + action_set = 1; + is_add = 0; + } + else if (unformat (input, "table_id %d", &dp_table)) + { + dp_table_set = 1; + } + else if (unformat (input, "bd_id %d", &dp_table)) + { + dp_table_set = 1; + is_l2 = 1; + } + else if (unformat (input, "vni %d", &vni)) + { + vni_set = 1; + } + else + break; + } + + if (action_set == 0) + { + errmsg ("Action not set"); + return -99; + } + if (dp_table_set == 0 || vni_set == 0) + { + errmsg ("vni and dp_table must be set"); + return -99; + } + + /* Construct the API message */ + M (GPE_ADD_DEL_IFACE, mp); + + mp->is_add = is_add; + mp->dp_table = clib_host_to_net_u32 (dp_table); + mp->is_l2 = is_l2; + mp->vni = clib_host_to_net_u32 (vni); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_fwd_entries_get (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_gpe_fwd_entries_get_t *mp; + u8 vni_set = 0; + u32 vni = ~0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "vni %d", &vni)) + { + vni_set = 1; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!vni_set) + { + errmsg ("vni not set!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "%10s %10s %s %40s", "fwd_index", "dp_table", + "leid", "reid"); + } + + M (GPE_FWD_ENTRIES_GET, mp); + mp->vni = clib_host_to_net_u32 (vni); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_native_fwd_rpaths_get (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_gpe_native_fwd_rpaths_get_t *mp; + int ret; + u8 ip_family_set = 0, is_ip4 = 1; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "ip4")) + { + ip_family_set = 1; + is_ip4 = 1; + } + else if (unformat (i, "ip6")) + { + ip_family_set = 1; + is_ip4 = 0; + } + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!ip_family_set) + { + errmsg ("ip family not set!"); + return -99; + } + + M (GPE_NATIVE_FWD_RPATHS_GET, mp); + mp->is_ip4 = is_ip4; + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_fwd_entry_vnis_get (vat_main_t * vam) +{ + vl_api_gpe_fwd_entry_vnis_get_t *mp; + int ret; + + if (!vam->json_output) + { + print (vam->ofp, "VNIs"); + } + + M (GPE_FWD_ENTRY_VNIS_GET, mp); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_add_del_native_fwd_rpath (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_gpe_add_del_native_fwd_rpath_t *mp; + int ret = 0; + u8 is_add = 1, ip_set = 0, is_ip4 = 1; + struct in_addr ip4; + struct in6_addr ip6; + u32 table_id = 0, nh_sw_if_index = ~0; + + clib_memset (&ip4, 0, sizeof (ip4)); + clib_memset (&ip6, 0, sizeof (ip6)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "via %U %U", unformat_ip4_address, &ip4, + unformat_sw_if_index, vam, &nh_sw_if_index)) + { + ip_set = 1; + is_ip4 = 1; + } + else if (unformat (i, "via %U %U", unformat_ip6_address, &ip6, + unformat_sw_if_index, vam, &nh_sw_if_index)) + { + ip_set = 1; + is_ip4 = 0; + } + else if (unformat (i, "via %U", unformat_ip4_address, &ip4)) + { + ip_set = 1; + is_ip4 = 1; + nh_sw_if_index = ~0; + } + else if (unformat (i, "via %U", unformat_ip6_address, &ip6)) + { + ip_set = 1; + is_ip4 = 0; + nh_sw_if_index = ~0; + } + else if (unformat (i, "table %d", &table_id)) + ; + else + { + errmsg ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!ip_set) + { + errmsg ("nh addr not set!"); + return -99; + } + + M (GPE_ADD_DEL_NATIVE_FWD_RPATH, mp); + mp->is_add = is_add; + mp->table_id = clib_host_to_net_u32 (table_id); + mp->nh_sw_if_index = clib_host_to_net_u32 (nh_sw_if_index); + mp->nh_addr.af = is_ip4 ? 0 : 1; + if (is_ip4) + clib_memcpy (mp->nh_addr.un.ip4, &ip4, sizeof (ip4)); + else + clib_memcpy (mp->nh_addr.un.ip6, &ip6, sizeof (ip6)); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_gpe_fwd_entry_path_dump (vat_main_t * vam) +{ + vl_api_gpe_fwd_entry_path_dump_t *mp; + vl_api_control_ping_t *mp_ping; + unformat_input_t *i = vam->input; + u32 fwd_entry_index = ~0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "index %d", &fwd_entry_index)) + ; + else + break; + } + + if (~0 == fwd_entry_index) + { + errmsg ("no index specified!"); + return -99; + } + + if (!vam->json_output) + { + print (vam->ofp, "first line"); + } + + M (GPE_FWD_ENTRY_PATH_DUMP, mp); + + /* send it... */ + S (mp); + /* Use a control ping for synchronization */ + LISP_PING (&lisp_gpe_test_main, mp_ping); + S (mp_ping); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +#define vat_plugin_register vat_plugin_register_gpe +#include + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ diff --git a/src/vnet/lisp-gpe/lisp_gpe_tunnel.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c similarity index 98% rename from src/vnet/lisp-gpe/lisp_gpe_tunnel.c rename to src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c index 0373542ba34..b2426429322 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_tunnel.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.c @@ -17,9 +17,9 @@ * @brief Common utility functions for IPv4, IPv6 and L2 LISP-GPE tunnels. * */ -#include -#include -#include +#include +#include +#include #include diff --git a/src/vnet/lisp-gpe/lisp_gpe_tunnel.h b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.h similarity index 96% rename from src/vnet/lisp-gpe/lisp_gpe_tunnel.h rename to src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.h index 333d2882883..7fe3062dc57 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_tunnel.h +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_tunnel.h @@ -21,8 +21,8 @@ #ifndef LISP_GPE_TUNNEL_H__ #define LISP_GPE_TUNNEL_H__ -#include -#include +#include +#include /** * Forward declaration diff --git a/src/vnet/lisp-gpe/lisp_types_api.c b/src/plugins/lisp/lisp-gpe/lisp_types_api.c similarity index 100% rename from src/vnet/lisp-gpe/lisp_types_api.c rename to src/plugins/lisp/lisp-gpe/lisp_types_api.c diff --git a/src/vnet/lisp-gpe/lisp_types_api.h b/src/plugins/lisp/lisp-gpe/lisp_types_api.h similarity index 100% rename from src/vnet/lisp-gpe/lisp_types_api.h rename to src/plugins/lisp/lisp-gpe/lisp_types_api.h diff --git a/src/vnet/lisp-gpe/rfc.txt b/src/plugins/lisp/lisp-gpe/rfc.txt similarity index 100% rename from src/vnet/lisp-gpe/rfc.txt rename to src/plugins/lisp/lisp-gpe/rfc.txt diff --git a/src/plugins/unittest/lisp_cp_test.c b/src/plugins/lisp/test/lisp_cp_test.c similarity index 98% rename from src/plugins/unittest/lisp_cp_test.c rename to src/plugins/lisp/test/lisp_cp_test.c index ac6f65c7e47..228ff32d010 100644 --- a/src/plugins/unittest/lisp_cp_test.c +++ b/src/plugins/lisp/test/lisp_cp_test.c @@ -15,11 +15,11 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #define _assert(e) \ error = CLIB_ERROR_ASSERT (e); \ @@ -1422,6 +1422,16 @@ VLIB_CLI_COMMAND (lisp_cp_command, static) = }; /* *INDENT-ON* */ +#include +#include + +/* *INDENT-OFF* */ +VLIB_PLUGIN_REGISTER () = { + .version = VPP_BUILD_VER, + .description = "Test Locator ID Separation Protocol (LISP)", + .default_disabled = 1, +}; +/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON diff --git a/test/test_lisp.py b/src/plugins/lisp/test/test_lisp.py similarity index 100% rename from test/test_lisp.py rename to src/plugins/lisp/test/test_lisp.py diff --git a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c index 6c5abcce052..b69cd745e9b 100644 --- a/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c +++ b/src/plugins/nsh/nsh-md2-ioam/md2_ioam_transit.c @@ -18,8 +18,7 @@ #include #include #include -#include -#include +#include #include #include #include diff --git a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_util.h b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_util.h index 77cc8792c93..cdb06dab996 100644 --- a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_util.h +++ b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_util.h @@ -15,8 +15,7 @@ #ifndef __included_nsh_md2_ioam_util_h__ #define __included_nsh_md2_ioam_util_h__ -#include -#include +#include #include #include #include diff --git a/src/plugins/unittest/CMakeLists.txt b/src/plugins/unittest/CMakeLists.txt index 18780b6a607..ba6a82280f6 100644 --- a/src/plugins/unittest/CMakeLists.txt +++ b/src/plugins/unittest/CMakeLists.txt @@ -33,7 +33,6 @@ add_vpp_plugin(unittest fib_test.c interface_test.c ipsec_test.c - lisp_cp_test.c llist_test.c mactime_test.c mfib_test.c diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 926f65dcd86..d24a406ce01 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -2295,131 +2294,6 @@ static void vl_api_mpls_tunnel_add_del_reply_t_handler_json vam->result_ready = 1; } -static void vl_api_gpe_add_del_fwd_entry_reply_t_handler - (vl_api_gpe_add_del_fwd_entry_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->result_ready = 1; - } -} - -static void vl_api_gpe_add_del_fwd_entry_reply_t_handler_json - (vl_api_gpe_add_del_fwd_entry_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "fwd_entry_index", - clib_net_to_host_u32 (mp->fwd_entry_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -u8 * -format_lisp_transport_protocol (u8 * s, va_list * args) -{ - u32 proto = va_arg (*args, u32); - - switch (proto) - { - case 1: - return format (s, "udp"); - case 2: - return format (s, "api"); - default: - return 0; - } - return 0; -} - -static void vl_api_one_get_transport_protocol_reply_t_handler - (vl_api_one_get_transport_protocol_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - u32 proto = mp->protocol; - print (vam->ofp, "Transport protocol: %U", - format_lisp_transport_protocol, proto); - vam->retval = retval; - vam->result_ready = 1; - } -} - -static void vl_api_one_get_transport_protocol_reply_t_handler_json - (vl_api_one_get_transport_protocol_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *s; - - s = format (0, "%U", format_lisp_transport_protocol, mp->protocol); - vec_add1 (s, 0); - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_string_copy (&node, "transport-protocol", s); - - vec_free (s); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_one_add_del_locator_set_reply_t_handler - (vl_api_one_add_del_locator_set_reply_t * mp) -{ - 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_one_add_del_locator_set_reply_t_handler_json - (vl_api_one_add_del_locator_set_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "locator_set_index", ntohl (mp->ls_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - static void vl_api_vxlan_add_del_tunnel_reply_t_handler (vl_api_vxlan_add_del_tunnel_reply_t * mp) { @@ -2802,287 +2676,164 @@ static void vl_api_get_node_graph_reply_t_handler_json vam->result_ready = 1; } -static void -vl_api_one_locator_details_t_handler (vl_api_one_locator_details_t * mp) +static u8 * +format_policer_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - u8 *s = 0; + u32 i = va_arg (*va, u32); - if (mp->local) - { - s = format (s, "%=16d%=16d%=16d", - ntohl (mp->sw_if_index), mp->priority, mp->weight); - } + if (i == SSE2_QOS_POLICER_TYPE_1R2C) + s = format (s, "1r2c"); + else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697) + s = format (s, "1r3c"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) + s = format (s, "2r3c-2698"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115) + s = format (s, "2r3c-4115"); + else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1) + s = format (s, "2r3c-mef5cf1"); else - { - s = format (s, "%=16U%=16d%=16d", - format_ip46_address, - mp->ip_address, mp->priority, mp->weight); - } - - print (vam->ofp, "%v", s); - vec_free (s); + s = format (s, "ILLEGAL"); + return s; } -static void -vl_api_one_locator_details_t_handler_json (vl_api_one_locator_details_t * mp) +static u8 * +format_policer_rate_type (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - - vat_json_object_add_uint (node, "local", mp->local ? 1 : 0); - vat_json_object_add_uint (node, "priority", mp->priority); - vat_json_object_add_uint (node, "weight", mp->weight); + u32 i = va_arg (*va, u32); - if (mp->local) - vat_json_object_add_uint (node, "sw_if_index", - clib_net_to_host_u32 (mp->sw_if_index)); + if (i == SSE2_QOS_RATE_KBPS) + s = format (s, "kbps"); + else if (i == SSE2_QOS_RATE_PPS) + s = format (s, "pps"); else - { - if (mp->ip_address.af) - { - clib_memcpy (&ip6, mp->ip_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "address", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "address", ip4); - } - } -} - -static void -vl_api_one_locator_set_details_t_handler (vl_api_one_locator_set_details_t * - mp) -{ - vat_main_t *vam = &vat_main; - u8 *ls_name = 0; - - ls_name = format (0, "%s", mp->ls_name); - - print (vam->ofp, "%=10d%=15v", clib_net_to_host_u32 (mp->ls_index), - ls_name); - vec_free (ls_name); -} - -static void - vl_api_one_locator_set_details_t_handler_json - (vl_api_one_locator_set_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = 0; - u8 *ls_name = 0; - - ls_name = format (0, "%s", mp->ls_name); - vec_add1 (ls_name, 0); - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "ls_name", ls_name); - vat_json_object_add_uint (node, "ls_index", - clib_net_to_host_u32 (mp->ls_index)); - vec_free (ls_name); + s = format (s, "ILLEGAL"); + return s; } -typedef struct +static u8 * +format_policer_round_type (u8 * s, va_list * va) { - u32 spi; - u8 si; -} __attribute__ ((__packed__)) lisp_nsh_api_t; + u32 i = va_arg (*va, u32); -uword -unformat_nsh_address (unformat_input_t * input, va_list * args) -{ - lisp_nsh_api_t *nsh = va_arg (*args, lisp_nsh_api_t *); - return unformat (input, "SPI:%d SI:%d", &nsh->spi, &nsh->si); + if (i == SSE2_QOS_ROUND_TO_CLOSEST) + s = format (s, "closest"); + else if (i == SSE2_QOS_ROUND_TO_UP) + s = format (s, "up"); + else if (i == SSE2_QOS_ROUND_TO_DOWN) + s = format (s, "down"); + else + s = format (s, "ILLEGAL"); + return s; } static u8 * -format_nsh_address_vat (u8 * s, va_list * args) +format_policer_action_type (u8 * s, va_list * va) { - nsh_t *a = va_arg (*args, nsh_t *); - return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); + u32 i = va_arg (*va, u32); + + if (i == SSE2_QOS_ACTION_DROP) + s = format (s, "drop"); + else if (i == SSE2_QOS_ACTION_TRANSMIT) + s = format (s, "transmit"); + else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) + s = format (s, "mark-and-transmit"); + else + s = format (s, "ILLEGAL"); + return s; } static u8 * -format_lisp_flat_eid (u8 * s, va_list * args) +format_dscp (u8 * s, va_list * va) { - vl_api_eid_t *eid = va_arg (*args, vl_api_eid_t *); + u32 i = va_arg (*va, u32); + char *t = 0; - switch (eid->type) + switch (i) { - case EID_TYPE_API_PREFIX: - if (eid->address.prefix.address.af) - return format (s, "%U/%d", format_ip6_address, - eid->address.prefix.address.un.ip6, - eid->address.prefix.len); - return format (s, "%U/%d", format_ip4_address, - eid->address.prefix.address.un.ip4, - eid->address.prefix.len); - case EID_TYPE_API_MAC: - return format (s, "%U", format_ethernet_address, eid->address.mac); - case EID_TYPE_API_NSH: - return format (s, "%U", format_nsh_address_vat, eid->address.nsh); +#define _(v,f,str) case VNET_DSCP_##f: t = str; break; + foreach_vnet_dscp +#undef _ + default: + return format (s, "ILLEGAL"); } - return 0; -} - -static u8 * -format_lisp_eid_vat (u8 * s, va_list * args) -{ - vl_api_eid_t *deid = va_arg (*args, vl_api_eid_t *); - vl_api_eid_t *seid = va_arg (*args, vl_api_eid_t *); - u8 is_src_dst = (u8) va_arg (*args, int); - - if (is_src_dst) - s = format (s, "%U|", format_lisp_flat_eid, seid); - - s = format (s, "%U", format_lisp_flat_eid, deid); - + s = format (s, "%s", t); return s; } static void -vl_api_one_eid_table_details_t_handler (vl_api_one_eid_table_details_t * mp) +vl_api_policer_details_t_handler (vl_api_policer_details_t * mp) { vat_main_t *vam = &vat_main; - u8 *s = 0, *eid = 0; + u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str; - if (~0 == mp->locator_set_index) - s = format (0, "action: %d", mp->action); + if (mp->conform_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) + conform_dscp_str = format (0, "%U", format_dscp, mp->conform_action.dscp); else - s = format (0, "%d", clib_net_to_host_u32 (mp->locator_set_index)); - - eid = format (0, "%U", format_lisp_eid_vat, - &mp->deid, &mp->seid, mp->is_src_dst); - vec_add1 (eid, 0); - - print (vam->ofp, "[%d] %-35s%-20s%-30s%-20d%-20d%-10d%-20s", - clib_net_to_host_u32 (mp->vni), - eid, - mp->is_local ? "local" : "remote", - s, clib_net_to_host_u32 (mp->ttl), mp->authoritative, - clib_net_to_host_u16 (mp->key.id), mp->key.key); - - vec_free (s); - vec_free (eid); -} - -static void -vl_api_one_eid_table_details_t_handler_json (vl_api_one_eid_table_details_t - * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = 0; - u8 *eid = 0; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); + conform_dscp_str = format (0, ""); - vat_json_init_object (node); - if (~0 == mp->locator_set_index) - vat_json_object_add_uint (node, "action", mp->action); + if (mp->exceed_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) + exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_action.dscp); else - vat_json_object_add_uint (node, "locator_set_index", - clib_net_to_host_u32 (mp->locator_set_index)); + exceed_dscp_str = format (0, ""); - vat_json_object_add_uint (node, "is_local", mp->is_local ? 1 : 0); - if (mp->deid.type == 3) - { - vat_json_node_t *nsh_json = vat_json_object_add (node, "eid"); - vat_json_init_object (nsh_json); - lisp_nsh_api_t *nsh = (lisp_nsh_api_t *) & mp->deid.address.nsh; - vat_json_object_add_uint (nsh_json, "spi", - clib_net_to_host_u32 (nsh->spi)); - vat_json_object_add_uint (nsh_json, "si", nsh->si); - } + if (mp->violate_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) + violate_dscp_str = format (0, "%U", format_dscp, mp->violate_action.dscp); else - { - eid = format (0, "%U", format_lisp_eid_vat, - &mp->deid, &mp->seid, mp->is_src_dst); - vec_add1 (eid, 0); - vat_json_object_add_string_copy (node, "eid", eid); - vec_free (eid); - } - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); - vat_json_object_add_uint (node, "ttl", clib_net_to_host_u32 (mp->ttl)); - vat_json_object_add_uint (node, "authoritative", (mp->authoritative)); + violate_dscp_str = format (0, ""); - if (mp->key.id) - { - vat_json_object_add_uint (node, "key_id", - clib_net_to_host_u16 (mp->key.id)); - vat_json_object_add_string_copy (node, "key", mp->key.key); - } -} - -static void -vl_api_one_stats_details_t_handler (vl_api_one_stats_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u8 *seid = 0, *deid = 0; - ip46_address_t lloc, rloc; - - deid = format (0, "%U", format_lisp_eid_vat, &mp->deid, 0, 0); - - seid = format (0, "%U", format_lisp_eid_vat, &mp->seid, 0, 0); - - vec_add1 (deid, 0); - vec_add1 (seid, 0); - - if (mp->lloc.af) - { - clib_memcpy (&lloc.ip6, mp->lloc.un.ip6, 16); - clib_memcpy (&rloc.ip6, mp->rloc.un.ip6, 16); - } - else - { - clib_memcpy (&lloc.ip4, mp->lloc.un.ip4, 4); - clib_memcpy (&rloc.ip4, mp->rloc.un.ip4, 4); - } - - - print (vam->ofp, "([%d] %s %s) (%U %U) %u %u", - clib_net_to_host_u32 (mp->vni), - seid, deid, - format_ip46_address, lloc, - format_ip46_address, rloc, - clib_net_to_host_u32 (mp->pkt_count), - clib_net_to_host_u32 (mp->bytes)); + print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, " + "rate type %U, round type %U, %s rate, %s color-aware, " + "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, " + "cur bkt %u, ext lim %u, ext bkt %u, last update %llu" + "conform action %U%s, exceed action %U%s, violate action %U%s", + mp->name, + format_policer_type, mp->type, + ntohl (mp->cir), + ntohl (mp->eir), + clib_net_to_host_u64 (mp->cb), + clib_net_to_host_u64 (mp->eb), + format_policer_rate_type, mp->rate_type, + format_policer_round_type, mp->round_type, + mp->single_rate ? "single" : "dual", + mp->color_aware ? "is" : "not", + ntohl (mp->cir_tokens_per_period), + ntohl (mp->pir_tokens_per_period), + ntohl (mp->scale), + ntohl (mp->current_limit), + ntohl (mp->current_bucket), + ntohl (mp->extended_limit), + ntohl (mp->extended_bucket), + clib_net_to_host_u64 (mp->last_update_time), + format_policer_action_type, mp->conform_action.type, + conform_dscp_str, + format_policer_action_type, mp->exceed_action.type, + exceed_dscp_str, + format_policer_action_type, mp->violate_action.type, + violate_dscp_str); - vec_free (deid); - vec_free (seid); + vec_free (conform_dscp_str); + vec_free (exceed_dscp_str); + vec_free (violate_dscp_str); } -static void -vl_api_one_stats_details_t_handler_json (vl_api_one_stats_details_t * mp) +static void vl_api_policer_details_t_handler_json + (vl_api_policer_details_t * mp) { - struct in6_addr ip6; - struct in_addr ip4; vat_main_t *vam = &vat_main; - vat_json_node_t *node = 0; - u8 *deid = 0, *seid = 0; + vat_json_node_t *node; + u8 *rate_type_str, *round_type_str, *type_str; + u8 *conform_action_str, *exceed_action_str, *violate_action_str; + + rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type); + round_type_str = + format (0, "%U", format_policer_round_type, mp->round_type); + type_str = format (0, "%U", format_policer_type, mp->type); + conform_action_str = format (0, "%U", format_policer_action_type, + mp->conform_action.type); + exceed_action_str = format (0, "%U", format_policer_action_type, + mp->exceed_action.type); + violate_action_str = format (0, "%U", format_policer_action_type, + mp->violate_action.type); if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -3092,350 +2843,289 @@ vl_api_one_stats_details_t_handler_json (vl_api_one_stats_details_t * mp) node = vat_json_array_add (&vam->json_tree); vat_json_init_object (node); - deid = format (0, "%U", format_lisp_eid_vat, &mp->deid, 0, 0); - - seid = format (0, "%U", format_lisp_eid_vat, &mp->seid, 0, 0); - - vec_add1 (deid, 0); - vec_add1 (seid, 0); - - vat_json_object_add_string_copy (node, "seid", seid); - vat_json_object_add_string_copy (node, "deid", deid); - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); - - if (mp->lloc.af) + vat_json_object_add_string_copy (node, "name", mp->name); + vat_json_object_add_uint (node, "cir", ntohl (mp->cir)); + vat_json_object_add_uint (node, "eir", ntohl (mp->eir)); + vat_json_object_add_uint (node, "cb", clib_net_to_host_u64 (mp->cb)); + vat_json_object_add_uint (node, "eb", clib_net_to_host_u64 (mp->eb)); + vat_json_object_add_string_copy (node, "rate_type", rate_type_str); + vat_json_object_add_string_copy (node, "round_type", round_type_str); + vat_json_object_add_string_copy (node, "type", type_str); + vat_json_object_add_uint (node, "single_rate", mp->single_rate); + vat_json_object_add_uint (node, "color_aware", mp->color_aware); + vat_json_object_add_uint (node, "scale", ntohl (mp->scale)); + vat_json_object_add_uint (node, "cir_tokens_per_period", + ntohl (mp->cir_tokens_per_period)); + vat_json_object_add_uint (node, "eir_tokens_per_period", + ntohl (mp->pir_tokens_per_period)); + vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit)); + vat_json_object_add_uint (node, "current_bucket", + ntohl (mp->current_bucket)); + vat_json_object_add_uint (node, "extended_limit", + ntohl (mp->extended_limit)); + vat_json_object_add_uint (node, "extended_bucket", + ntohl (mp->extended_bucket)); + vat_json_object_add_uint (node, "last_update_time", + ntohl (mp->last_update_time)); + vat_json_object_add_string_copy (node, "conform_action", + conform_action_str); + if (mp->conform_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) { - clib_memcpy (&ip6, mp->lloc.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "lloc", ip6); - clib_memcpy (&ip6, mp->rloc.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "rloc", ip6); - + u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_action.dscp); + vat_json_object_add_string_copy (node, "conform_dscp", dscp_str); + vec_free (dscp_str); } - else + vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str); + if (mp->exceed_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) { - clib_memcpy (&ip4, mp->lloc.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "lloc", ip4); - clib_memcpy (&ip4, mp->rloc.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "rloc", ip4); + u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_action.dscp); + vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str); + vec_free (dscp_str); } - vat_json_object_add_uint (node, "pkt_count", - clib_net_to_host_u32 (mp->pkt_count)); - vat_json_object_add_uint (node, "bytes", clib_net_to_host_u32 (mp->bytes)); - - vec_free (deid); - vec_free (seid); -} - -static void - vl_api_one_eid_table_map_details_t_handler - (vl_api_one_eid_table_map_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - u8 *line = format (0, "%=10d%=10d", - clib_net_to_host_u32 (mp->vni), - clib_net_to_host_u32 (mp->dp_table)); - print (vam->ofp, "%v", line); - vec_free (line); -} - -static void - vl_api_one_eid_table_map_details_t_handler_json - (vl_api_one_eid_table_map_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) + vat_json_object_add_string_copy (node, "violate_action", + violate_action_str); + if (mp->violate_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_action.dscp); + vat_json_object_add_string_copy (node, "violate_dscp", dscp_str); + vec_free (dscp_str); } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "dp_table", - clib_net_to_host_u32 (mp->dp_table)); - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); -} - -static void - vl_api_one_eid_table_vni_details_t_handler - (vl_api_one_eid_table_vni_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u8 *line = format (0, "%d", clib_net_to_host_u32 (mp->vni)); - print (vam->ofp, "%v", line); - vec_free (line); + vec_free (rate_type_str); + vec_free (round_type_str); + vec_free (type_str); + vec_free (conform_action_str); + vec_free (exceed_action_str); + vec_free (violate_action_str); } static void - vl_api_one_eid_table_vni_details_t_handler_json - (vl_api_one_eid_table_vni_details_t * mp) +vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t * + mp) { vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + int i, count = ntohl (mp->count); - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (count > 0) + print (vam->ofp, "classify table ids (%d) : ", count); + for (i = 0; i < count; i++) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + print (vam->ofp, "%d", ntohl (mp->ids[i])); + print (vam->ofp, (i < count - 1) ? "," : ""); } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "vni", clib_net_to_host_u32 (mp->vni)); -} - -static void - vl_api_show_one_map_register_fallback_threshold_reply_t_handler - (vl_api_show_one_map_register_fallback_threshold_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); - - vl_api_show_one_map_register_fallback_threshold_reply_t_endian (mp); - print (vam->ofp, "fallback threshold value: %d", mp->value); - - vam->retval = retval; + vam->retval = ntohl (mp->retval); vam->result_ready = 1; } static void - vl_api_show_one_map_register_fallback_threshold_reply_t_handler_json - (vl_api_show_one_map_register_fallback_threshold_reply_t * mp) + vl_api_classify_table_ids_reply_t_handler_json + (vl_api_classify_table_ids_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); - - vl_api_show_one_map_register_fallback_threshold_reply_t_endian (mp); - vat_json_init_object (node); - vat_json_object_add_uint (node, "value", mp->value); + int i, count = ntohl (mp->count); - vat_json_print (vam->ofp, node); - vat_json_free (node); + if (count > 0) + { + vat_json_node_t node; - vam->retval = retval; + vat_json_init_object (&node); + for (i = 0; i < count; i++) + { + vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i])); + } + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + } + vam->retval = ntohl (mp->retval); vam->result_ready = 1; } static void - vl_api_show_one_map_register_state_reply_t_handler - (vl_api_show_one_map_register_state_reply_t * mp) + vl_api_classify_table_by_interface_reply_t_handler + (vl_api_classify_table_by_interface_reply_t * mp) { vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); - - print (vam->ofp, "%s", mp->is_enable ? "enabled" : "disabled"); + u32 table_id; - vam->retval = retval; + table_id = ntohl (mp->l2_table_id); + if (table_id != ~0) + print (vam->ofp, "l2 table id : %d", table_id); + else + print (vam->ofp, "l2 table id : No input ACL tables configured"); + table_id = ntohl (mp->ip4_table_id); + if (table_id != ~0) + print (vam->ofp, "ip4 table id : %d", table_id); + else + print (vam->ofp, "ip4 table id : No input ACL tables configured"); + table_id = ntohl (mp->ip6_table_id); + if (table_id != ~0) + print (vam->ofp, "ip6 table id : %d", table_id); + else + print (vam->ofp, "ip6 table id : No input ACL tables configured"); + vam->retval = ntohl (mp->retval); vam->result_ready = 1; } static void - vl_api_show_one_map_register_state_reply_t_handler_json - (vl_api_show_one_map_register_state_reply_t * mp) + vl_api_classify_table_by_interface_reply_t_handler_json + (vl_api_classify_table_by_interface_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); + vat_json_node_t node; - u8 *s = format (0, "%s", mp->is_enable ? "enabled" : "disabled"); + vat_json_init_object (&node); - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "state", s); + vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id)); + vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id)); + vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id)); - vat_json_print (vam->ofp, node); - vat_json_free (node); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - vam->retval = retval; + vam->retval = ntohl (mp->retval); vam->result_ready = 1; - vec_free (s); } -static void - vl_api_show_one_rloc_probe_state_reply_t_handler - (vl_api_show_one_rloc_probe_state_reply_t * mp) +static void vl_api_policer_add_del_reply_t_handler + (vl_api_policer_add_del_reply_t * mp) { vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - print (vam->ofp, "%s", mp->is_enable ? "enabled" : "disabled"); -end: - vam->retval = retval; - vam->result_ready = 1; + i32 retval = ntohl (mp->retval); + if (vam->async_mode) + { + vam->async_errors += (retval < 0); + } + else + { + vam->retval = retval; + vam->result_ready = 1; + if (retval == 0 && mp->policer_index != 0xFFFFFFFF) + /* + * Note: this is just barely thread-safe, depends on + * the main thread spinning waiting for an answer... + */ + errmsg ("policer index %d", ntohl (mp->policer_index)); + } } -static void - vl_api_show_one_rloc_probe_state_reply_t_handler_json - (vl_api_show_one_rloc_probe_state_reply_t * mp) +static void vl_api_policer_add_del_reply_t_handler_json + (vl_api_policer_add_del_reply_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); + vat_json_node_t node; - u8 *s = format (0, "%s", mp->is_enable ? "enabled" : "disabled"); - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "state", s); + vat_json_init_object (&node); + vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); + vat_json_object_add_uint (&node, "policer_index", + ntohl (mp->policer_index)); - vat_json_print (vam->ofp, node); - vat_json_free (node); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); - vam->retval = retval; + vam->retval = ntohl (mp->retval); vam->result_ready = 1; - vec_free (s); } -static void - vl_api_show_one_stats_enable_disable_reply_t_handler - (vl_api_show_one_stats_enable_disable_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - print (vam->ofp, "%s", mp->is_enable ? "enabled" : "disabled"); -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_stats_enable_disable_reply_t_handler_json - (vl_api_show_one_stats_enable_disable_reply_t * mp) +/* Format hex dump. */ +u8 * +format_hex_bytes (u8 * s, va_list * va) { - vat_main_t *vam = &vat_main; - vat_json_node_t _node, *node = &_node; - int retval = clib_net_to_host_u32 (mp->retval); - - u8 *s = format (0, "%s", mp->is_enable ? "enabled" : "disabled"); - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "state", s); - - vat_json_print (vam->ofp, node); - vat_json_free (node); - - vam->retval = retval; - vam->result_ready = 1; - vec_free (s); -} + u8 *bytes = va_arg (*va, u8 *); + int n_bytes = va_arg (*va, int); + uword i; -static void -api_gpe_fwd_entry_net_to_host (vl_api_gpe_fwd_entry_t * e) -{ - e->dp_table = clib_net_to_host_u32 (e->dp_table); - e->fwd_entry_index = clib_net_to_host_u32 (e->fwd_entry_index); - e->vni = clib_net_to_host_u32 (e->vni); -} + /* Print short or long form depending on byte count. */ + uword short_form = n_bytes <= 32; + u32 indent = format_get_indent (s); -static void - gpe_fwd_entries_get_reply_t_net_to_host - (vl_api_gpe_fwd_entries_get_reply_t * mp) -{ - u32 i; + if (n_bytes == 0) + return s; - mp->count = clib_net_to_host_u32 (mp->count); - for (i = 0; i < mp->count; i++) + for (i = 0; i < n_bytes; i++) { - api_gpe_fwd_entry_net_to_host (&mp->entries[i]); + if (!short_form && (i % 32) == 0) + s = format (s, "%08x: ", i); + s = format (s, "%02x", bytes[i]); + if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes) + s = format (s, "\n%U", format_white_space, indent); } -} - -static u8 * -format_gpe_encap_mode (u8 * s, va_list * args) -{ - u32 mode = va_arg (*args, u32); - switch (mode) - { - case 0: - return format (s, "lisp"); - case 1: - return format (s, "vxlan"); - } - return 0; + return s; } static void - vl_api_gpe_get_encap_mode_reply_t_handler - (vl_api_gpe_get_encap_mode_reply_t * mp) +vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t + * mp) { vat_main_t *vam = &vat_main; - - print (vam->ofp, "gpe mode: %U", format_gpe_encap_mode, mp->encap_mode); - vam->retval = ntohl (mp->retval); + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + print (vam->ofp, "classify table info :"); + print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d", + ntohl (mp->active_sessions), ntohl (mp->next_table_index), + ntohl (mp->miss_next_index)); + print (vam->ofp, "nbuckets: %d skip: %d match: %d", + ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors), + ntohl (mp->match_n_vectors)); + print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask, + ntohl (mp->mask_length)); + } + vam->retval = retval; vam->result_ready = 1; } static void - vl_api_gpe_get_encap_mode_reply_t_handler_json - (vl_api_gpe_get_encap_mode_reply_t * mp) + vl_api_classify_table_info_reply_t_handler_json + (vl_api_classify_table_info_reply_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t node; - u8 *encap_mode = format (0, "%U", format_gpe_encap_mode, mp->encap_mode); - vec_add1 (encap_mode, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "gpe_mode", encap_mode); + i32 retval = ntohl (mp->retval); + if (retval == 0) + { + vat_json_init_object (&node); - vec_free (encap_mode); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); + vat_json_object_add_int (&node, "sessions", + ntohl (mp->active_sessions)); + vat_json_object_add_int (&node, "nexttbl", + ntohl (mp->next_table_index)); + vat_json_object_add_int (&node, "nextnode", + ntohl (mp->miss_next_index)); + vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets)); + vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors)); + vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors)); + u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask, + ntohl (mp->mask_length), 0); + vat_json_object_add_string_copy (&node, "mask", s); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + } vam->retval = ntohl (mp->retval); vam->result_ready = 1; } static void - vl_api_gpe_fwd_entry_path_details_t_handler - (vl_api_gpe_fwd_entry_path_details_t * mp) +vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * + mp) { vat_main_t *vam = &vat_main; - u8 *(*format_ip_address_fcn) (u8 *, va_list *) = 0; - - if (mp->lcl_loc.addr.af) - format_ip_address_fcn = format_ip6_address; - else - format_ip_address_fcn = format_ip4_address; - - print (vam->ofp, "w:%d %30U %30U", mp->rmt_loc.weight, - format_ip_address_fcn, &mp->lcl_loc.addr.un, - format_ip_address_fcn, &mp->rmt_loc.addr.un); -} - -static void -lisp_fill_locator_node (vat_json_node_t * n, vl_api_gpe_locator_t * loc) -{ - struct in6_addr ip6; - struct in_addr ip4; - if (loc->addr.af) - { - clib_memcpy (&ip6, loc->addr.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (n, "address", ip6); - } - else - { - clib_memcpy (&ip4, loc->addr.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (n, "address", ip4); - } - vat_json_object_add_uint (n, "weight", loc->weight); + print (vam->ofp, "next_index: %d advance: %d opaque: %d ", + ntohl (mp->hit_next_index), ntohl (mp->advance), + ntohl (mp->opaque_index)); + print (vam->ofp, "mask: %U", format_hex_bytes, mp->match, + ntohl (mp->match_length)); } static void - vl_api_gpe_fwd_entry_path_details_t_handler_json - (vl_api_gpe_fwd_entry_path_details_t * mp) + vl_api_classify_session_details_t_handler_json + (vl_api_classify_session_details_t * mp) { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; - vat_json_node_t *loc_node; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -3443,5501 +3133,1106 @@ static void vat_json_init_array (&vam->json_tree); } node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - - loc_node = vat_json_object_add (node, "local_locator"); - vat_json_init_object (loc_node); - lisp_fill_locator_node (loc_node, &mp->lcl_loc); - loc_node = vat_json_object_add (node, "remote_locator"); - vat_json_init_object (loc_node); - lisp_fill_locator_node (loc_node, &mp->rmt_loc); + vat_json_init_object (node); + vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index)); + vat_json_object_add_int (node, "advance", ntohl (mp->advance)); + vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index)); + u8 *s = + format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length), + 0); + vat_json_object_add_string_copy (node, "match", s); } -static void - vl_api_gpe_fwd_entries_get_reply_t_handler - (vl_api_gpe_fwd_entries_get_reply_t * mp) +static void vl_api_pg_create_interface_reply_t_handler + (vl_api_pg_create_interface_reply_t * mp) { vat_main_t *vam = &vat_main; - u32 i; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_fwd_entry_t *e; - - if (retval) - goto end; - gpe_fwd_entries_get_reply_t_net_to_host (mp); - - for (i = 0; i < mp->count; i++) - { - e = &mp->entries[i]; - print (vam->ofp, "%10d %10d %U %40U", e->fwd_entry_index, e->dp_table, - format_lisp_flat_eid, e->leid, format_lisp_flat_eid, e->reid); - } - -end: - vam->retval = retval; + vam->retval = ntohl (mp->retval); vam->result_ready = 1; } -static void - vl_api_gpe_fwd_entries_get_reply_t_handler_json - (vl_api_gpe_fwd_entries_get_reply_t * mp) +static void vl_api_pg_create_interface_reply_t_handler_json + (vl_api_pg_create_interface_reply_t * mp) { - u8 *s = 0; vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_fwd_entry_t *fwd; - - if (retval) - goto end; - - gpe_fwd_entries_get_reply_t_net_to_host (mp); - vat_json_init_array (&root); + vat_json_node_t node; - for (i = 0; i < mp->count; i++) + i32 retval = ntohl (mp->retval); + if (retval == 0) { - e = vat_json_array_add (&root); - fwd = &mp->entries[i]; - - vat_json_init_object (e); - vat_json_object_add_int (e, "fwd_entry_index", fwd->fwd_entry_index); - vat_json_object_add_int (e, "dp_table", fwd->dp_table); - vat_json_object_add_int (e, "vni", fwd->vni); - vat_json_object_add_int (e, "action", fwd->action); + vat_json_init_object (&node); - s = format (0, "%U", format_lisp_flat_eid, fwd->leid); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "leid", s); - vec_free (s); + vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index)); - s = format (0, "%U", format_lisp_flat_eid, fwd->reid); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "reid", s); - vec_free (s); + vat_json_print (vam->ofp, &node); + vat_json_free (&node); } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; + vam->retval = ntohl (mp->retval); vam->result_ready = 1; } -static void - vl_api_gpe_native_fwd_rpaths_get_reply_t_handler - (vl_api_gpe_native_fwd_rpaths_get_reply_t * mp) +static void vl_api_policer_classify_details_t_handler + (vl_api_policer_classify_details_t * mp) { vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_native_fwd_rpath_t *r; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - { - r = &mp->entries[i]; - print (vam->ofp, "fib_index: %d sw_if_index %d nh %U", - clib_net_to_host_u32 (r->fib_index), - clib_net_to_host_u32 (r->nh_sw_if_index), - r->nh_addr.af ? format_ip6_address : format_ip4_address, - r->nh_addr.un); - } -end: - vam->retval = retval; - vam->result_ready = 1; + print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), + ntohl (mp->table_index)); } -static void - vl_api_gpe_native_fwd_rpaths_get_reply_t_handler_json - (vl_api_gpe_native_fwd_rpaths_get_reply_t * mp) +static void vl_api_policer_classify_details_t_handler_json + (vl_api_policer_classify_details_t * mp) { vat_main_t *vam = &vat_main; - vat_json_node_t root, *e; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_gpe_native_fwd_rpath_t *r; - u8 *s; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); + vat_json_node_t *node; - for (i = 0; i < n; i++) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - e = vat_json_array_add (&root); - vat_json_init_object (e); - r = &mp->entries[i]; - s = - format (0, "%U", - r->nh_addr.af ? format_ip6_address : format_ip4_address, - r->nh_addr.un); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "ip4", s); - vec_free (s); - - vat_json_object_add_uint (e, "fib_index", - clib_net_to_host_u32 (r->fib_index)); - vat_json_object_add_uint (e, "nh_sw_if_index", - clib_net_to_host_u32 (r->nh_sw_if_index)); + 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_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_gpe_fwd_entry_vnis_get_reply_t_handler - (vl_api_gpe_fwd_entry_vnis_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - print (vam->ofp, "%d", clib_net_to_host_u32 (mp->vnis[i])); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_gpe_fwd_entry_vnis_get_reply_t_handler_json - (vl_api_gpe_fwd_entry_vnis_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - vat_json_array_add_uint (&root, clib_net_to_host_u32 (mp->vnis[i])); - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); } -static void - vl_api_one_ndp_entries_get_reply_t_handler - (vl_api_one_ndp_entries_get_reply_t * mp) +static void vl_api_flow_classify_details_t_handler + (vl_api_flow_classify_details_t * mp) { vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - print (vam->ofp, "%U -> %U", format_ip6_address, &mp->entries[i].ip6, - format_ethernet_address, mp->entries[i].mac); - -end: - vam->retval = retval; - vam->result_ready = 1; + print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), + ntohl (mp->table_index)); } -static void - vl_api_one_ndp_entries_get_reply_t_handler_json - (vl_api_one_ndp_entries_get_reply_t * mp) +static void vl_api_flow_classify_details_t_handler_json + (vl_api_flow_classify_details_t * mp) { - u8 *s = 0; vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_ndp_entry_t *arp_entry; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); + vat_json_node_t *node; - for (i = 0; i < n; i++) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - e = vat_json_array_add (&root); - arp_entry = &mp->entries[i]; - - vat_json_init_object (e); - s = format (0, "%U", format_ethernet_address, arp_entry->mac); - vec_add1 (s, 0); - - vat_json_object_add_string_copy (e, "mac", s); - vec_free (s); - - s = format (0, "%U", format_ip6_address, &arp_entry->ip6); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "ip6", s); - vec_free (s); + 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_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); } -static void - vl_api_one_l2_arp_entries_get_reply_t_handler - (vl_api_one_l2_arp_entries_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - print (vam->ofp, "%U -> %U", format_ip4_address, &mp->entries[i].ip4, - format_ethernet_address, mp->entries[i].mac); - -end: - vam->retval = retval; - vam->result_ready = 1; -} +/* + * Generate boilerplate reply handlers, which + * dig the return value out of the xxx_reply_t API message, + * stick it into vam->retval, and set vam->result_ready + * + * Could also do this by pointing N message decode slots at + * a single function, but that could break in subtle ways. + */ -static void - vl_api_one_l2_arp_entries_get_reply_t_handler_json - (vl_api_one_l2_arp_entries_get_reply_t * mp) -{ - u8 *s = 0; - vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_l2_arp_entry_t *arp_entry; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - e = vat_json_array_add (&root); - arp_entry = &mp->entries[i]; - - vat_json_init_object (e); - s = format (0, "%U", format_ethernet_address, arp_entry->mac); - vec_add1 (s, 0); - - vat_json_object_add_string_copy (e, "mac", s); - vec_free (s); - - s = format (0, "%U", format_ip4_address, &arp_entry->ip4); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "ip4", s); - vec_free (s); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void -vl_api_one_ndp_bd_get_reply_t_handler (vl_api_one_ndp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - { - print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); - } - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_ndp_bd_get_reply_t_handler_json - (vl_api_one_ndp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - vat_json_array_add_uint (&root, - clib_net_to_host_u32 (mp->bridge_domains[i])); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_l2_arp_bd_get_reply_t_handler - (vl_api_one_l2_arp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - { - print (vam->ofp, "%d", clib_net_to_host_u32 (mp->bridge_domains[i])); - } - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_l2_arp_bd_get_reply_t_handler_json - (vl_api_one_l2_arp_bd_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - vat_json_array_add_uint (&root, - clib_net_to_host_u32 (mp->bridge_domains[i])); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_adjacencies_get_reply_t_handler - (vl_api_one_adjacencies_get_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_adjacency_t *a; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - - for (i = 0; i < n; i++) - { - a = &mp->adjacencies[i]; - print (vam->ofp, "%U %40U", - format_lisp_flat_eid, a->leid, format_lisp_flat_eid, a->reid); - } - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_adjacencies_get_reply_t_handler_json - (vl_api_one_adjacencies_get_reply_t * mp) -{ - u8 *s = 0; - vat_main_t *vam = &vat_main; - vat_json_node_t *e = 0, root; - u32 i, n; - int retval = clib_net_to_host_u32 (mp->retval); - vl_api_one_adjacency_t *a; - - if (retval) - goto end; - - n = clib_net_to_host_u32 (mp->count); - vat_json_init_array (&root); - - for (i = 0; i < n; i++) - { - e = vat_json_array_add (&root); - a = &mp->adjacencies[i]; - - vat_json_init_object (e); - s = format (0, "%U", format_lisp_flat_eid, a->leid); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "leid", s); - vec_free (s); - - s = format (0, "%U", format_lisp_flat_eid, a->reid); - vec_add1 (s, 0); - vat_json_object_add_string_copy (e, "reid", s); - vec_free (s); - } - - vat_json_print (vam->ofp, &root); - vat_json_free (&root); - -end: - vam->retval = retval; - vam->result_ready = 1; -} - -static void -vl_api_one_map_server_details_t_handler (vl_api_one_map_server_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%=20U", - mp->ip_address.af ? format_ip6_address : format_ip4_address, - mp->ip_address.un); -} - -static void - vl_api_one_map_server_details_t_handler_json - (vl_api_one_map_server_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; +#define foreach_standard_reply_retval_handler \ +_(sw_interface_set_flags_reply) \ +_(sw_interface_add_del_address_reply) \ +_(sw_interface_set_rx_mode_reply) \ +_(sw_interface_set_rx_placement_reply) \ +_(sw_interface_set_table_reply) \ +_(sw_interface_set_mpls_enable_reply) \ +_(sw_interface_set_vpath_reply) \ +_(sw_interface_set_vxlan_bypass_reply) \ +_(sw_interface_set_vxlan_gpe_bypass_reply) \ +_(sw_interface_set_l2_bridge_reply) \ +_(sw_interface_set_bond_weight_reply) \ +_(bridge_domain_add_del_reply) \ +_(sw_interface_set_l2_xconnect_reply) \ +_(l2fib_add_del_reply) \ +_(l2fib_flush_int_reply) \ +_(l2fib_flush_bd_reply) \ +_(ip_route_add_del_reply) \ +_(ip_table_add_del_reply) \ +_(ip_table_replace_begin_reply) \ +_(ip_table_flush_reply) \ +_(ip_table_replace_end_reply) \ +_(ip_mroute_add_del_reply) \ +_(mpls_route_add_del_reply) \ +_(mpls_table_add_del_reply) \ +_(mpls_ip_bind_unbind_reply) \ +_(bier_route_add_del_reply) \ +_(bier_table_add_del_reply) \ +_(sw_interface_set_unnumbered_reply) \ +_(set_ip_flow_hash_reply) \ +_(sw_interface_ip6_enable_disable_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) \ +_(sr_localsid_add_del_reply) \ +_(sr_steering_add_del_reply) \ +_(classify_add_del_session_reply) \ +_(classify_set_interface_ip_table_reply) \ +_(classify_set_interface_l2_tables_reply) \ +_(l2_fib_clear_table_reply) \ +_(l2_interface_efp_filter_reply) \ +_(l2_interface_vlan_tag_rewrite_reply) \ +_(modify_vhost_user_if_reply) \ +_(delete_vhost_user_if_reply) \ +_(want_l2_macs_events_reply) \ +_(input_acl_set_interface_reply) \ +_(ipsec_spd_add_del_reply) \ +_(ipsec_interface_add_del_spd_reply) \ +_(ipsec_spd_entry_add_del_reply) \ +_(ipsec_sad_entry_add_del_reply) \ +_(ipsec_tunnel_if_add_del_reply) \ +_(ipsec_tunnel_if_set_sa_reply) \ +_(delete_loopback_reply) \ +_(bd_ip_mac_add_del_reply) \ +_(bd_ip_mac_flush_reply) \ +_(want_interface_events_reply) \ +_(cop_interface_enable_disable_reply) \ +_(cop_whitelist_enable_disable_reply) \ +_(sw_interface_clear_stats_reply) \ +_(ioam_enable_reply) \ +_(ioam_disable_reply) \ +_(af_packet_delete_reply) \ +_(policer_classify_set_interface_reply) \ +_(set_ipfix_exporter_reply) \ +_(set_ipfix_classify_stream_reply) \ +_(ipfix_classify_table_add_del_reply) \ +_(flow_classify_set_interface_reply) \ +_(sw_interface_span_enable_disable_reply) \ +_(pg_capture_reply) \ +_(pg_enable_disable_reply) \ +_(pg_interface_enable_disable_coalesce_reply) \ +_(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) \ +_(set_punt_reply) \ +_(feature_enable_disable_reply) \ +_(feature_gso_enable_disable_reply) \ +_(sw_interface_tag_add_del_reply) \ +_(sw_interface_add_del_mac_address_reply) \ +_(hw_interface_set_mtu_reply) \ +_(p2p_ethernet_add_reply) \ +_(p2p_ethernet_del_reply) \ +_(tcp_configure_src_addresses_reply) \ +_(session_rule_add_del_reply) \ +_(ip_container_proxy_add_del_reply) \ +_(output_acl_set_interface_reply) \ +_(qos_record_enable_disable_reply) \ +_(flow_add_reply) - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); +#define _(n) \ + static void vl_api_##n##_t_handler \ + (vl_api_##n##_t * mp) \ + { \ + vat_main_t * vam = &vat_main; \ + i32 retval = ntohl(mp->retval); \ + if (vam->async_mode) { \ + vam->async_errors += (retval < 0); \ + } else { \ + vam->retval = retval; \ + vam->result_ready = 1; \ + } \ } - node = vat_json_array_add (&vam->json_tree); +foreach_standard_reply_retval_handler; +#undef _ - vat_json_init_object (node); - if (mp->ip_address.af) - { - clib_memcpy (&ip6, mp->ip_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "map-server", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "map-server", ip4); +#define _(n) \ + static void vl_api_##n##_t_handler_json \ + (vl_api_##n##_t * mp) \ + { \ + vat_main_t * vam = &vat_main; \ + vat_json_node_t node; \ + vat_json_init_object(&node); \ + vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); \ + vat_json_print(vam->ofp, &node); \ + vam->retval = ntohl(mp->retval); \ + vam->result_ready = 1; \ } -} - -static void -vl_api_one_map_resolver_details_t_handler (vl_api_one_map_resolver_details_t - * mp) -{ - vat_main_t *vam = &vat_main; +foreach_standard_reply_retval_handler; +#undef _ - print (vam->ofp, "%=20U", - mp->ip_address.af ? format_ip6_address : format_ip4_address, - mp->ip_address.un); -} +/* + * Table of message reply handlers, must include boilerplate handlers + * we just generated + */ -static void - vl_api_one_map_resolver_details_t_handler_json - (vl_api_one_map_resolver_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in6_addr ip6; - struct in_addr ip4; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - if (mp->ip_address.af) - { - clib_memcpy (&ip6, mp->ip_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "map resolver", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "map resolver", ip4); - } -} - -static void -vl_api_show_one_status_reply_t_handler (vl_api_show_one_status_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "feature: %s\ngpe: %s", - mp->feature_status ? "enabled" : "disabled", - mp->gpe_status ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_status_reply_t_handler_json - (vl_api_show_one_status_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *gpe_status = NULL; - u8 *feature_status = NULL; - - gpe_status = format (0, "%s", mp->gpe_status ? "enabled" : "disabled"); - feature_status = format (0, "%s", - mp->feature_status ? "enabled" : "disabled"); - vec_add1 (gpe_status, 0); - vec_add1 (feature_status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "gpe_status", gpe_status); - vat_json_object_add_string_copy (&node, "feature_status", feature_status); - - vec_free (gpe_status); - vec_free (feature_status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_get_map_request_itr_rlocs_reply_t_handler - (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (retval >= 0) - { - print (vam->ofp, "%=20s", mp->locator_set_name); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_get_map_request_itr_rlocs_reply_t_handler_json - (vl_api_one_get_map_request_itr_rlocs_reply_t * mp) -{ - 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_string_copy (node, "itr-rlocs", mp->locator_set_name); - - vat_json_print (vam->ofp, node); - vat_json_free (node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static u8 * -format_lisp_map_request_mode (u8 * s, va_list * args) -{ - u32 mode = va_arg (*args, u32); - - switch (mode) - { - case 0: - return format (0, "dst-only"); - case 1: - return format (0, "src-dst"); - } - return 0; -} - -static void - vl_api_show_one_map_request_mode_reply_t_handler - (vl_api_show_one_map_request_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - u32 mode = mp->mode; - print (vam->ofp, "map_request_mode: %U", - format_lisp_map_request_mode, mode); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_map_request_mode_reply_t_handler_json - (vl_api_show_one_map_request_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *s = 0; - u32 mode; - - mode = mp->mode; - s = format (0, "%U", format_lisp_map_request_mode, mode); - vec_add1 (s, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "map_request_mode", s); - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vec_free (s); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_show_xtr_mode_reply_t_handler - (vl_api_one_show_xtr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->is_enable ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_show_xtr_mode_reply_t_handler_json - (vl_api_one_show_xtr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_enable ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_show_pitr_mode_reply_t_handler - (vl_api_one_show_pitr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->is_enable ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_show_pitr_mode_reply_t_handler_json - (vl_api_one_show_pitr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_enable ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_one_show_petr_mode_reply_t_handler - (vl_api_one_show_petr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->is_enable ? "enabled" : "disabled"); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_one_show_petr_mode_reply_t_handler_json - (vl_api_one_show_petr_mode_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_enable ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_show_one_use_petr_reply_t_handler - (vl_api_show_one_use_petr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%s\n", mp->status ? "enabled" : "disabled"); - if (mp->status) - { - print (vam->ofp, "Proxy-ETR address; %U", - mp->ip_address.af ? format_ip6_address : format_ip4_address, - mp->ip_address.un); - } - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_use_petr_reply_t_handler_json - (vl_api_show_one_use_petr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - struct in_addr ip4; - struct in6_addr ip6; - - status = format (0, "%s", mp->status ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - if (mp->status) - { - if (mp->ip_address.af) - { - clib_memcpy (&ip6, mp->ip_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (&node, "address", ip6); - } - else - { - clib_memcpy (&ip4, mp->ip_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (&node, "address", ip4); - } - } - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_show_one_nsh_mapping_reply_t_handler - (vl_api_show_one_nsh_mapping_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%-20s%-16s", - mp->is_set ? "set" : "not-set", - mp->is_set ? (char *) mp->locator_set_name : ""); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_nsh_mapping_reply_t_handler_json - (vl_api_show_one_nsh_mapping_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->is_set ? "yes" : "no"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "is_set", status); - if (mp->is_set) - { - vat_json_object_add_string_copy (&node, "locator_set", - mp->locator_set_name); - } - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_show_one_map_register_ttl_reply_t_handler - (vl_api_show_one_map_register_ttl_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - vl_api_show_one_map_register_ttl_reply_t_endian (mp); - - if (0 <= retval) - { - print (vam->ofp, "ttl: %u", mp->ttl); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_show_one_map_register_ttl_reply_t_handler_json - (vl_api_show_one_map_register_ttl_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vl_api_show_one_map_register_ttl_reply_t_endian (mp); - vat_json_init_object (&node); - vat_json_object_add_uint (&node, "ttl", mp->ttl); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void -vl_api_show_one_pitr_reply_t_handler (vl_api_show_one_pitr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - - if (0 <= retval) - { - print (vam->ofp, "%-20s%-16s", - mp->status ? "enabled" : "disabled", - mp->status ? (char *) mp->locator_set_name : ""); - } - - vam->retval = retval; - vam->result_ready = 1; -} - -static void -vl_api_show_one_pitr_reply_t_handler_json (vl_api_show_one_pitr_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - u8 *status = 0; - - status = format (0, "%s", mp->status ? "enabled" : "disabled"); - vec_add1 (status, 0); - - vat_json_init_object (&node); - vat_json_object_add_string_copy (&node, "status", status); - if (mp->status) - { - vat_json_object_add_string_copy (&node, "locator_set", - mp->locator_set_name); - } - - vec_free (status); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static u8 * -format_policer_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_POLICER_TYPE_1R2C) - s = format (s, "1r2c"); - else if (i == SSE2_QOS_POLICER_TYPE_1R3C_RFC_2697) - s = format (s, "1r3c"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_2698) - s = format (s, "2r3c-2698"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_4115) - s = format (s, "2r3c-4115"); - else if (i == SSE2_QOS_POLICER_TYPE_2R3C_RFC_MEF5CF1) - s = format (s, "2r3c-mef5cf1"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_policer_rate_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_RATE_KBPS) - s = format (s, "kbps"); - else if (i == SSE2_QOS_RATE_PPS) - s = format (s, "pps"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_policer_round_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_ROUND_TO_CLOSEST) - s = format (s, "closest"); - else if (i == SSE2_QOS_ROUND_TO_UP) - s = format (s, "up"); - else if (i == SSE2_QOS_ROUND_TO_DOWN) - s = format (s, "down"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_policer_action_type (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - - if (i == SSE2_QOS_ACTION_DROP) - s = format (s, "drop"); - else if (i == SSE2_QOS_ACTION_TRANSMIT) - s = format (s, "transmit"); - else if (i == SSE2_QOS_ACTION_MARK_AND_TRANSMIT) - s = format (s, "mark-and-transmit"); - else - s = format (s, "ILLEGAL"); - return s; -} - -static u8 * -format_dscp (u8 * s, va_list * va) -{ - u32 i = va_arg (*va, u32); - char *t = 0; - - switch (i) - { -#define _(v,f,str) case VNET_DSCP_##f: t = str; break; - foreach_vnet_dscp -#undef _ - default: - return format (s, "ILLEGAL"); - } - s = format (s, "%s", t); - return s; -} - -static void -vl_api_policer_details_t_handler (vl_api_policer_details_t * mp) -{ - vat_main_t *vam = &vat_main; - u8 *conform_dscp_str, *exceed_dscp_str, *violate_dscp_str; - - if (mp->conform_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) - conform_dscp_str = format (0, "%U", format_dscp, mp->conform_action.dscp); - else - conform_dscp_str = format (0, ""); - - if (mp->exceed_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) - exceed_dscp_str = format (0, "%U", format_dscp, mp->exceed_action.dscp); - else - exceed_dscp_str = format (0, ""); - - if (mp->violate_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) - violate_dscp_str = format (0, "%U", format_dscp, mp->violate_action.dscp); - else - violate_dscp_str = format (0, ""); - - print (vam->ofp, "Name \"%s\", type %U, cir %u, eir %u, cb %u, eb %u, " - "rate type %U, round type %U, %s rate, %s color-aware, " - "cir %u tok/period, pir %u tok/period, scale %u, cur lim %u, " - "cur bkt %u, ext lim %u, ext bkt %u, last update %llu" - "conform action %U%s, exceed action %U%s, violate action %U%s", - mp->name, - format_policer_type, mp->type, - ntohl (mp->cir), - ntohl (mp->eir), - clib_net_to_host_u64 (mp->cb), - clib_net_to_host_u64 (mp->eb), - format_policer_rate_type, mp->rate_type, - format_policer_round_type, mp->round_type, - mp->single_rate ? "single" : "dual", - mp->color_aware ? "is" : "not", - ntohl (mp->cir_tokens_per_period), - ntohl (mp->pir_tokens_per_period), - ntohl (mp->scale), - ntohl (mp->current_limit), - ntohl (mp->current_bucket), - ntohl (mp->extended_limit), - ntohl (mp->extended_bucket), - clib_net_to_host_u64 (mp->last_update_time), - format_policer_action_type, mp->conform_action.type, - conform_dscp_str, - format_policer_action_type, mp->exceed_action.type, - exceed_dscp_str, - format_policer_action_type, mp->violate_action.type, - violate_dscp_str); - - vec_free (conform_dscp_str); - vec_free (exceed_dscp_str); - vec_free (violate_dscp_str); -} - -static void vl_api_policer_details_t_handler_json - (vl_api_policer_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node; - u8 *rate_type_str, *round_type_str, *type_str; - u8 *conform_action_str, *exceed_action_str, *violate_action_str; - - rate_type_str = format (0, "%U", format_policer_rate_type, mp->rate_type); - round_type_str = - format (0, "%U", format_policer_round_type, mp->round_type); - type_str = format (0, "%U", format_policer_type, mp->type); - conform_action_str = format (0, "%U", format_policer_action_type, - mp->conform_action.type); - exceed_action_str = format (0, "%U", format_policer_action_type, - mp->exceed_action.type); - violate_action_str = format (0, "%U", format_policer_action_type, - mp->violate_action.type); - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_string_copy (node, "name", mp->name); - vat_json_object_add_uint (node, "cir", ntohl (mp->cir)); - vat_json_object_add_uint (node, "eir", ntohl (mp->eir)); - vat_json_object_add_uint (node, "cb", clib_net_to_host_u64 (mp->cb)); - vat_json_object_add_uint (node, "eb", clib_net_to_host_u64 (mp->eb)); - vat_json_object_add_string_copy (node, "rate_type", rate_type_str); - vat_json_object_add_string_copy (node, "round_type", round_type_str); - vat_json_object_add_string_copy (node, "type", type_str); - vat_json_object_add_uint (node, "single_rate", mp->single_rate); - vat_json_object_add_uint (node, "color_aware", mp->color_aware); - vat_json_object_add_uint (node, "scale", ntohl (mp->scale)); - vat_json_object_add_uint (node, "cir_tokens_per_period", - ntohl (mp->cir_tokens_per_period)); - vat_json_object_add_uint (node, "eir_tokens_per_period", - ntohl (mp->pir_tokens_per_period)); - vat_json_object_add_uint (node, "current_limit", ntohl (mp->current_limit)); - vat_json_object_add_uint (node, "current_bucket", - ntohl (mp->current_bucket)); - vat_json_object_add_uint (node, "extended_limit", - ntohl (mp->extended_limit)); - vat_json_object_add_uint (node, "extended_bucket", - ntohl (mp->extended_bucket)); - vat_json_object_add_uint (node, "last_update_time", - ntohl (mp->last_update_time)); - vat_json_object_add_string_copy (node, "conform_action", - conform_action_str); - if (mp->conform_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->conform_action.dscp); - vat_json_object_add_string_copy (node, "conform_dscp", dscp_str); - vec_free (dscp_str); - } - vat_json_object_add_string_copy (node, "exceed_action", exceed_action_str); - if (mp->exceed_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->exceed_action.dscp); - vat_json_object_add_string_copy (node, "exceed_dscp", dscp_str); - vec_free (dscp_str); - } - vat_json_object_add_string_copy (node, "violate_action", - violate_action_str); - if (mp->violate_action.type == SSE2_QOS_ACTION_API_MARK_AND_TRANSMIT) - { - u8 *dscp_str = format (0, "%U", format_dscp, mp->violate_action.dscp); - vat_json_object_add_string_copy (node, "violate_dscp", dscp_str); - vec_free (dscp_str); - } - - vec_free (rate_type_str); - vec_free (round_type_str); - vec_free (type_str); - vec_free (conform_action_str); - vec_free (exceed_action_str); - vec_free (violate_action_str); -} - -static void -vl_api_classify_table_ids_reply_t_handler (vl_api_classify_table_ids_reply_t * - mp) -{ - vat_main_t *vam = &vat_main; - int i, count = ntohl (mp->count); - - if (count > 0) - print (vam->ofp, "classify table ids (%d) : ", count); - for (i = 0; i < count; i++) - { - print (vam->ofp, "%d", ntohl (mp->ids[i])); - print (vam->ofp, (i < count - 1) ? "," : ""); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_classify_table_ids_reply_t_handler_json - (vl_api_classify_table_ids_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - int i, count = ntohl (mp->count); - - if (count > 0) - { - vat_json_node_t node; - - vat_json_init_object (&node); - for (i = 0; i < count; i++) - { - vat_json_object_add_uint (&node, "table_id", ntohl (mp->ids[i])); - } - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_classify_table_by_interface_reply_t_handler - (vl_api_classify_table_by_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - u32 table_id; - - table_id = ntohl (mp->l2_table_id); - if (table_id != ~0) - print (vam->ofp, "l2 table id : %d", table_id); - else - print (vam->ofp, "l2 table id : No input ACL tables configured"); - table_id = ntohl (mp->ip4_table_id); - if (table_id != ~0) - print (vam->ofp, "ip4 table id : %d", table_id); - else - print (vam->ofp, "ip4 table id : No input ACL tables configured"); - table_id = ntohl (mp->ip6_table_id); - if (table_id != ~0) - print (vam->ofp, "ip6 table id : %d", table_id); - else - print (vam->ofp, "ip6 table id : No input ACL tables configured"); - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void - vl_api_classify_table_by_interface_reply_t_handler_json - (vl_api_classify_table_by_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - - vat_json_object_add_int (&node, "l2_table_id", ntohl (mp->l2_table_id)); - vat_json_object_add_int (&node, "ip4_table_id", ntohl (mp->ip4_table_id)); - vat_json_object_add_int (&node, "ip6_table_id", ntohl (mp->ip6_table_id)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_policer_add_del_reply_t_handler - (vl_api_policer_add_del_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (vam->async_mode) - { - vam->async_errors += (retval < 0); - } - else - { - vam->retval = retval; - vam->result_ready = 1; - if (retval == 0 && mp->policer_index != 0xFFFFFFFF) - /* - * Note: this is just barely thread-safe, depends on - * the main thread spinning waiting for an answer... - */ - errmsg ("policer index %d", ntohl (mp->policer_index)); - } -} - -static void vl_api_policer_add_del_reply_t_handler_json - (vl_api_policer_add_del_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - vat_json_init_object (&node); - vat_json_object_add_int (&node, "retval", ntohl (mp->retval)); - vat_json_object_add_uint (&node, "policer_index", - ntohl (mp->policer_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -/* Format hex dump. */ -u8 * -format_hex_bytes (u8 * s, va_list * va) -{ - u8 *bytes = va_arg (*va, u8 *); - int n_bytes = va_arg (*va, int); - uword i; - - /* Print short or long form depending on byte count. */ - uword short_form = n_bytes <= 32; - u32 indent = format_get_indent (s); - - if (n_bytes == 0) - return s; - - for (i = 0; i < n_bytes; i++) - { - if (!short_form && (i % 32) == 0) - s = format (s, "%08x: ", i); - s = format (s, "%02x", bytes[i]); - if (!short_form && ((i + 1) % 32) == 0 && (i + 1) < n_bytes) - s = format (s, "\n%U", format_white_space, indent); - } - - return s; -} - -static void -vl_api_classify_table_info_reply_t_handler (vl_api_classify_table_info_reply_t - * mp) -{ - vat_main_t *vam = &vat_main; - i32 retval = ntohl (mp->retval); - if (retval == 0) - { - print (vam->ofp, "classify table info :"); - print (vam->ofp, "sessions: %d nexttbl: %d nextnode: %d", - ntohl (mp->active_sessions), ntohl (mp->next_table_index), - ntohl (mp->miss_next_index)); - print (vam->ofp, "nbuckets: %d skip: %d match: %d", - ntohl (mp->nbuckets), ntohl (mp->skip_n_vectors), - ntohl (mp->match_n_vectors)); - print (vam->ofp, "mask: %U", format_hex_bytes, mp->mask, - ntohl (mp->mask_length)); - } - vam->retval = retval; - vam->result_ready = 1; -} - -static void - vl_api_classify_table_info_reply_t_handler_json - (vl_api_classify_table_info_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - i32 retval = ntohl (mp->retval); - if (retval == 0) - { - vat_json_init_object (&node); - - vat_json_object_add_int (&node, "sessions", - ntohl (mp->active_sessions)); - vat_json_object_add_int (&node, "nexttbl", - ntohl (mp->next_table_index)); - vat_json_object_add_int (&node, "nextnode", - ntohl (mp->miss_next_index)); - vat_json_object_add_int (&node, "nbuckets", ntohl (mp->nbuckets)); - vat_json_object_add_int (&node, "skip", ntohl (mp->skip_n_vectors)); - vat_json_object_add_int (&node, "match", ntohl (mp->match_n_vectors)); - u8 *s = format (0, "%U%c", format_hex_bytes, mp->mask, - ntohl (mp->mask_length), 0); - vat_json_object_add_string_copy (&node, "mask", s); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void -vl_api_classify_session_details_t_handler (vl_api_classify_session_details_t * - mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "next_index: %d advance: %d opaque: %d ", - ntohl (mp->hit_next_index), ntohl (mp->advance), - ntohl (mp->opaque_index)); - print (vam->ofp, "mask: %U", format_hex_bytes, mp->match, - ntohl (mp->match_length)); -} - -static void - vl_api_classify_session_details_t_handler_json - (vl_api_classify_session_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_int (node, "next_index", ntohl (mp->hit_next_index)); - vat_json_object_add_int (node, "advance", ntohl (mp->advance)); - vat_json_object_add_int (node, "opaque", ntohl (mp->opaque_index)); - u8 *s = - format (0, "%U%c", format_hex_bytes, mp->match, ntohl (mp->match_length), - 0); - vat_json_object_add_string_copy (node, "match", s); -} - -static void vl_api_pg_create_interface_reply_t_handler - (vl_api_pg_create_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_pg_create_interface_reply_t_handler_json - (vl_api_pg_create_interface_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t node; - - i32 retval = ntohl (mp->retval); - if (retval == 0) - { - vat_json_init_object (&node); - - vat_json_object_add_int (&node, "sw_if_index", ntohl (mp->sw_if_index)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - } - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static void vl_api_policer_classify_details_t_handler - (vl_api_policer_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), - ntohl (mp->table_index)); -} - -static void vl_api_policer_classify_details_t_handler_json - (vl_api_policer_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); -} - -static void vl_api_flow_classify_details_t_handler - (vl_api_flow_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%10d%20d", ntohl (mp->sw_if_index), - ntohl (mp->table_index)); -} - -static void vl_api_flow_classify_details_t_handler_json - (vl_api_flow_classify_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "table_index", ntohl (mp->table_index)); -} - -#define vl_api_one_adjacencies_get_reply_t_endian vl_noop_handler -#define vl_api_one_adjacencies_get_reply_t_print vl_noop_handler -#define vl_api_one_l2_arp_bd_get_reply_t_print vl_noop_handler -#define vl_api_one_l2_arp_entries_get_reply_t_endian vl_noop_handler -#define vl_api_one_l2_arp_entries_get_reply_t_print vl_noop_handler -#define vl_api_one_l2_arp_bd_get_reply_t_endian vl_noop_handler -#define vl_api_one_ndp_bd_get_reply_t_endian vl_noop_handler -#define vl_api_one_ndp_bd_get_reply_t_print vl_noop_handler -#define vl_api_one_ndp_entries_get_reply_t_print vl_noop_handler -#define vl_api_one_ndp_entries_get_reply_t_endian vl_noop_handler - -/* - * Generate boilerplate reply handlers, which - * dig the return value out of the xxx_reply_t API message, - * stick it into vam->retval, and set vam->result_ready - * - * Could also do this by pointing N message decode slots at - * a single function, but that could break in subtle ways. - */ - -#define foreach_standard_reply_retval_handler \ -_(sw_interface_set_flags_reply) \ -_(sw_interface_add_del_address_reply) \ -_(sw_interface_set_rx_mode_reply) \ -_(sw_interface_set_rx_placement_reply) \ -_(sw_interface_set_table_reply) \ -_(sw_interface_set_mpls_enable_reply) \ -_(sw_interface_set_vpath_reply) \ -_(sw_interface_set_vxlan_bypass_reply) \ -_(sw_interface_set_vxlan_gpe_bypass_reply) \ -_(sw_interface_set_l2_bridge_reply) \ -_(sw_interface_set_bond_weight_reply) \ -_(bridge_domain_add_del_reply) \ -_(sw_interface_set_l2_xconnect_reply) \ -_(l2fib_add_del_reply) \ -_(l2fib_flush_int_reply) \ -_(l2fib_flush_bd_reply) \ -_(ip_route_add_del_reply) \ -_(ip_table_add_del_reply) \ -_(ip_table_replace_begin_reply) \ -_(ip_table_flush_reply) \ -_(ip_table_replace_end_reply) \ -_(ip_mroute_add_del_reply) \ -_(mpls_route_add_del_reply) \ -_(mpls_table_add_del_reply) \ -_(mpls_ip_bind_unbind_reply) \ -_(bier_route_add_del_reply) \ -_(bier_table_add_del_reply) \ -_(sw_interface_set_unnumbered_reply) \ -_(set_ip_flow_hash_reply) \ -_(sw_interface_ip6_enable_disable_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) \ -_(sr_localsid_add_del_reply) \ -_(sr_steering_add_del_reply) \ -_(classify_add_del_session_reply) \ -_(classify_set_interface_ip_table_reply) \ -_(classify_set_interface_l2_tables_reply) \ -_(l2_fib_clear_table_reply) \ -_(l2_interface_efp_filter_reply) \ -_(l2_interface_vlan_tag_rewrite_reply) \ -_(modify_vhost_user_if_reply) \ -_(delete_vhost_user_if_reply) \ -_(want_l2_macs_events_reply) \ -_(input_acl_set_interface_reply) \ -_(ipsec_spd_add_del_reply) \ -_(ipsec_interface_add_del_spd_reply) \ -_(ipsec_spd_entry_add_del_reply) \ -_(ipsec_sad_entry_add_del_reply) \ -_(ipsec_tunnel_if_add_del_reply) \ -_(ipsec_tunnel_if_set_sa_reply) \ -_(delete_loopback_reply) \ -_(bd_ip_mac_add_del_reply) \ -_(bd_ip_mac_flush_reply) \ -_(want_interface_events_reply) \ -_(cop_interface_enable_disable_reply) \ -_(cop_whitelist_enable_disable_reply) \ -_(sw_interface_clear_stats_reply) \ -_(ioam_enable_reply) \ -_(ioam_disable_reply) \ -_(one_add_del_locator_reply) \ -_(one_add_del_local_eid_reply) \ -_(one_add_del_remote_mapping_reply) \ -_(one_add_del_adjacency_reply) \ -_(one_add_del_map_resolver_reply) \ -_(one_add_del_map_server_reply) \ -_(one_enable_disable_reply) \ -_(one_rloc_probe_enable_disable_reply) \ -_(one_map_register_enable_disable_reply) \ -_(one_map_register_set_ttl_reply) \ -_(one_set_transport_protocol_reply) \ -_(one_map_register_fallback_threshold_reply) \ -_(one_pitr_set_locator_set_reply) \ -_(one_map_request_mode_reply) \ -_(one_add_del_map_request_itr_rlocs_reply) \ -_(one_eid_table_add_del_map_reply) \ -_(one_use_petr_reply) \ -_(one_stats_enable_disable_reply) \ -_(one_add_del_l2_arp_entry_reply) \ -_(one_add_del_ndp_entry_reply) \ -_(one_stats_flush_reply) \ -_(one_enable_disable_xtr_mode_reply) \ -_(one_enable_disable_pitr_mode_reply) \ -_(one_enable_disable_petr_mode_reply) \ -_(gpe_enable_disable_reply) \ -_(gpe_set_encap_mode_reply) \ -_(gpe_add_del_iface_reply) \ -_(gpe_add_del_native_fwd_rpath_reply) \ -_(af_packet_delete_reply) \ -_(policer_classify_set_interface_reply) \ -_(set_ipfix_exporter_reply) \ -_(set_ipfix_classify_stream_reply) \ -_(ipfix_classify_table_add_del_reply) \ -_(flow_classify_set_interface_reply) \ -_(sw_interface_span_enable_disable_reply) \ -_(pg_capture_reply) \ -_(pg_enable_disable_reply) \ -_(pg_interface_enable_disable_coalesce_reply) \ -_(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) \ -_(set_punt_reply) \ -_(feature_enable_disable_reply) \ -_(feature_gso_enable_disable_reply) \ -_(sw_interface_tag_add_del_reply) \ -_(sw_interface_add_del_mac_address_reply) \ -_(hw_interface_set_mtu_reply) \ -_(p2p_ethernet_add_reply) \ -_(p2p_ethernet_del_reply) \ -_(tcp_configure_src_addresses_reply) \ -_(session_rule_add_del_reply) \ -_(ip_container_proxy_add_del_reply) \ -_(output_acl_set_interface_reply) \ -_(qos_record_enable_disable_reply) \ -_(flow_add_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = &vat_main; \ - i32 retval = ntohl(mp->retval); \ - if (vam->async_mode) { \ - vam->async_errors += (retval < 0); \ - } else { \ - vam->retval = retval; \ - vam->result_ready = 1; \ - } \ - } -foreach_standard_reply_retval_handler; -#undef _ - -#define _(n) \ - static void vl_api_##n##_t_handler_json \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = &vat_main; \ - vat_json_node_t node; \ - vat_json_init_object(&node); \ - vat_json_object_add_int(&node, "retval", ntohl(mp->retval)); \ - vat_json_print(vam->ofp, &node); \ - vam->retval = ntohl(mp->retval); \ - vam->result_ready = 1; \ - } -foreach_standard_reply_retval_handler; -#undef _ - -/* - * Table of message reply handlers, must include boilerplate handlers - * we just generated - */ - -#define foreach_vpe_api_reply_msg \ -_(CREATE_LOOPBACK_REPLY, create_loopback_reply) \ -_(CREATE_LOOPBACK_INSTANCE_REPLY, create_loopback_instance_reply) \ -_(SW_INTERFACE_DETAILS, sw_interface_details) \ -_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply) \ -_(CONTROL_PING_REPLY, control_ping_reply) \ -_(CLI_REPLY, cli_reply) \ -_(CLI_INBAND_REPLY, cli_inband_reply) \ -_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \ - sw_interface_add_del_address_reply) \ -_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \ -_(SW_INTERFACE_SET_RX_PLACEMENT_REPLY, sw_interface_set_rx_placement_reply) \ -_(SW_INTERFACE_RX_PLACEMENT_DETAILS, sw_interface_rx_placement_details) \ -_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \ -_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \ -_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \ -_(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \ -_(SW_INTERFACE_SET_VXLAN_GPE_BYPASS_REPLY, sw_interface_set_vxlan_gpe_bypass_reply) \ -_(SW_INTERFACE_SET_L2_XCONNECT_REPLY, \ - sw_interface_set_l2_xconnect_reply) \ -_(SW_INTERFACE_SET_L2_BRIDGE_REPLY, \ - sw_interface_set_l2_bridge_reply) \ -_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply) \ -_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \ -_(BRIDGE_DOMAIN_SET_MAC_AGE_REPLY, bridge_domain_set_mac_age_reply) \ -_(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply) \ -_(L2FIB_FLUSH_INT_REPLY, l2fib_flush_int_reply) \ -_(L2FIB_FLUSH_BD_REPLY, l2fib_flush_bd_reply) \ -_(L2_FLAGS_REPLY, l2_flags_reply) \ -_(BRIDGE_FLAGS_REPLY, bridge_flags_reply) \ -_(TAP_CREATE_V2_REPLY, tap_create_v2_reply) \ -_(TAP_DELETE_V2_REPLY, tap_delete_v2_reply) \ -_(SW_INTERFACE_TAP_V2_DETAILS, sw_interface_tap_v2_details) \ -_(VIRTIO_PCI_CREATE_REPLY, virtio_pci_create_reply) \ -_(VIRTIO_PCI_CREATE_V2_REPLY, virtio_pci_create_v2_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_CREATE2_REPLY, bond_create2_reply) \ -_(BOND_DELETE_REPLY, bond_delete_reply) \ -_(BOND_ADD_MEMBER_REPLY, bond_add_member_reply) \ -_(BOND_DETACH_MEMBER_REPLY, bond_detach_member_reply) \ -_(SW_INTERFACE_SET_BOND_WEIGHT_REPLY, sw_interface_set_bond_weight_reply) \ -_(SW_BOND_INTERFACE_DETAILS, sw_bond_interface_details) \ -_(SW_MEMBER_INTERFACE_DETAILS, sw_member_interface_details) \ -_(IP_ROUTE_ADD_DEL_REPLY, ip_route_add_del_reply) \ -_(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \ -_(IP_TABLE_REPLACE_BEGIN_REPLY, ip_table_replace_begin_reply) \ -_(IP_TABLE_FLUSH_REPLY, ip_table_flush_reply) \ -_(IP_TABLE_REPLACE_END_REPLY, ip_table_replace_end_reply) \ -_(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \ -_(MPLS_TABLE_ADD_DEL_REPLY, mpls_table_add_del_reply) \ -_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \ -_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \ -_(BIER_ROUTE_ADD_DEL_REPLY, bier_route_add_del_reply) \ -_(BIER_TABLE_ADD_DEL_REPLY, bier_table_add_del_reply) \ -_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \ -_(SW_INTERFACE_SET_UNNUMBERED_REPLY, \ - sw_interface_set_unnumbered_reply) \ -_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply) \ -_(CREATE_SUBIF_REPLY, create_subif_reply) \ -_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply) \ -_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, \ - sw_interface_ip6_enable_disable_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) \ -_(SR_LOCALSID_ADD_DEL_REPLY, sr_localsid_add_del_reply) \ -_(SR_STEERING_ADD_DEL_REPLY, sr_steering_add_del_reply) \ -_(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply) \ -_(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply) \ -_(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY, \ -classify_set_interface_ip_table_reply) \ -_(CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY, \ - classify_set_interface_l2_tables_reply) \ -_(GET_NODE_INDEX_REPLY, get_node_index_reply) \ -_(ADD_NODE_NEXT_REPLY, add_node_next_reply) \ -_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \ -_(VXLAN_OFFLOAD_RX_REPLY, vxlan_offload_rx_reply) \ -_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \ -_(GRE_TUNNEL_ADD_DEL_REPLY, gre_tunnel_add_del_reply) \ -_(GRE_TUNNEL_DETAILS, gre_tunnel_details) \ -_(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply) \ -_(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply) \ -_(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \ -_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details) \ -_(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) \ -_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \ -_(WANT_L2_MACS_EVENTS_REPLY, want_l2_macs_events_reply) \ -_(L2_MACS_EVENT, l2_macs_event) \ -_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply) \ -_(IP_ADDRESS_DETAILS, ip_address_details) \ -_(IP_DETAILS, ip_details) \ -_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply) \ -_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \ -_(IPSEC_SPD_ENTRY_ADD_DEL_REPLY, ipsec_spd_entry_add_del_reply) \ -_(IPSEC_SAD_ENTRY_ADD_DEL_REPLY, ipsec_sad_entry_add_del_reply) \ -_(IPSEC_SA_DETAILS, ipsec_sa_details) \ -_(IPSEC_TUNNEL_IF_ADD_DEL_REPLY, ipsec_tunnel_if_add_del_reply) \ -_(IPSEC_TUNNEL_IF_SET_SA_REPLY, ipsec_tunnel_if_set_sa_reply) \ -_(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \ -_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \ -_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \ -_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \ -_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \ -_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \ -_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \ -_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \ -_(GET_NODE_GRAPH_REPLY, get_node_graph_reply) \ -_(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply) \ -_(IOAM_ENABLE_REPLY, ioam_enable_reply) \ -_(IOAM_DISABLE_REPLY, ioam_disable_reply) \ -_(ONE_ADD_DEL_LOCATOR_SET_REPLY, one_add_del_locator_set_reply) \ -_(ONE_ADD_DEL_LOCATOR_REPLY, one_add_del_locator_reply) \ -_(ONE_ADD_DEL_LOCAL_EID_REPLY, one_add_del_local_eid_reply) \ -_(ONE_ADD_DEL_REMOTE_MAPPING_REPLY, one_add_del_remote_mapping_reply) \ -_(ONE_ADD_DEL_ADJACENCY_REPLY, one_add_del_adjacency_reply) \ -_(ONE_ADD_DEL_MAP_RESOLVER_REPLY, one_add_del_map_resolver_reply) \ -_(ONE_ADD_DEL_MAP_SERVER_REPLY, one_add_del_map_server_reply) \ -_(ONE_ENABLE_DISABLE_REPLY, one_enable_disable_reply) \ -_(ONE_MAP_REGISTER_ENABLE_DISABLE_REPLY, \ - one_map_register_enable_disable_reply) \ -_(ONE_MAP_REGISTER_SET_TTL_REPLY, one_map_register_set_ttl_reply) \ -_(ONE_SET_TRANSPORT_PROTOCOL_REPLY, one_set_transport_protocol_reply) \ -_(ONE_GET_TRANSPORT_PROTOCOL_REPLY, one_get_transport_protocol_reply) \ -_(ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, \ - one_map_register_fallback_threshold_reply) \ -_(ONE_RLOC_PROBE_ENABLE_DISABLE_REPLY, \ - one_rloc_probe_enable_disable_reply) \ -_(ONE_PITR_SET_LOCATOR_SET_REPLY, one_pitr_set_locator_set_reply) \ -_(ONE_USE_PETR_REPLY, one_use_petr_reply) \ -_(ONE_MAP_REQUEST_MODE_REPLY, one_map_request_mode_reply) \ -_(ONE_EID_TABLE_ADD_DEL_MAP_REPLY, one_eid_table_add_del_map_reply) \ -_(ONE_LOCATOR_SET_DETAILS, one_locator_set_details) \ -_(ONE_LOCATOR_DETAILS, one_locator_details) \ -_(ONE_EID_TABLE_DETAILS, one_eid_table_details) \ -_(ONE_EID_TABLE_MAP_DETAILS, one_eid_table_map_details) \ -_(ONE_EID_TABLE_VNI_DETAILS, one_eid_table_vni_details) \ -_(ONE_MAP_RESOLVER_DETAILS, one_map_resolver_details) \ -_(ONE_MAP_SERVER_DETAILS, one_map_server_details) \ -_(ONE_ADJACENCIES_GET_REPLY, one_adjacencies_get_reply) \ -_(ONE_STATS_DETAILS, one_stats_details) \ -_(ONE_STATS_FLUSH_REPLY, one_stats_flush_reply) \ -_(ONE_STATS_ENABLE_DISABLE_REPLY, one_stats_enable_disable_reply) \ -_(SHOW_ONE_STATS_ENABLE_DISABLE_REPLY, \ - show_one_stats_enable_disable_reply) \ -_(ONE_ADD_DEL_NDP_ENTRY_REPLY, one_add_del_ndp_entry_reply) \ -_(ONE_NDP_BD_GET_REPLY, one_ndp_bd_get_reply) \ -_(ONE_NDP_ENTRIES_GET_REPLY, one_ndp_entries_get_reply) \ -_(ONE_ADD_DEL_L2_ARP_ENTRY_REPLY, one_add_del_l2_arp_entry_reply) \ -_(ONE_L2_ARP_BD_GET_REPLY, one_l2_arp_bd_get_reply) \ -_(ONE_L2_ARP_ENTRIES_GET_REPLY, one_l2_arp_entries_get_reply) \ -_(ONE_ENABLE_DISABLE_XTR_MODE_REPLY, one_enable_disable_xtr_mode_reply) \ -_(ONE_ENABLE_DISABLE_PITR_MODE_REPLY, \ - one_enable_disable_pitr_mode_reply) \ -_(ONE_ENABLE_DISABLE_PETR_MODE_REPLY, \ - one_enable_disable_petr_mode_reply) \ -_(ONE_SHOW_XTR_MODE_REPLY, one_show_xtr_mode_reply) \ -_(ONE_SHOW_PITR_MODE_REPLY, one_show_pitr_mode_reply) \ -_(ONE_SHOW_PETR_MODE_REPLY, one_show_petr_mode_reply) \ -_(GPE_SET_ENCAP_MODE_REPLY, gpe_set_encap_mode_reply) \ -_(GPE_GET_ENCAP_MODE_REPLY, gpe_get_encap_mode_reply) \ -_(GPE_ADD_DEL_IFACE_REPLY, gpe_add_del_iface_reply) \ -_(GPE_ENABLE_DISABLE_REPLY, gpe_enable_disable_reply) \ -_(GPE_ADD_DEL_FWD_ENTRY_REPLY, gpe_add_del_fwd_entry_reply) \ -_(GPE_FWD_ENTRY_VNIS_GET_REPLY, gpe_fwd_entry_vnis_get_reply) \ -_(GPE_FWD_ENTRIES_GET_REPLY, gpe_fwd_entries_get_reply) \ -_(GPE_NATIVE_FWD_RPATHS_GET_REPLY, gpe_native_fwd_rpaths_get_reply) \ -_(GPE_ADD_DEL_NATIVE_FWD_RPATH_REPLY, \ - gpe_add_del_native_fwd_rpath_reply) \ -_(GPE_FWD_ENTRY_PATH_DETAILS, \ - gpe_fwd_entry_path_details) \ -_(SHOW_ONE_STATUS_REPLY, show_one_status_reply) \ -_(ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS_REPLY, \ - one_add_del_map_request_itr_rlocs_reply) \ -_(ONE_GET_MAP_REQUEST_ITR_RLOCS_REPLY, \ - one_get_map_request_itr_rlocs_reply) \ -_(SHOW_ONE_NSH_MAPPING_REPLY, show_one_nsh_mapping_reply) \ -_(SHOW_ONE_PITR_REPLY, show_one_pitr_reply) \ -_(SHOW_ONE_USE_PETR_REPLY, show_one_use_petr_reply) \ -_(SHOW_ONE_MAP_REQUEST_MODE_REPLY, show_one_map_request_mode_reply) \ -_(SHOW_ONE_RLOC_PROBE_STATE_REPLY, show_one_rloc_probe_state_reply) \ -_(SHOW_ONE_MAP_REGISTER_STATE_REPLY, \ - show_one_map_register_state_reply) \ -_(SHOW_ONE_MAP_REGISTER_TTL_REPLY, show_one_map_register_ttl_reply) \ -_(SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD_REPLY, \ - show_one_map_register_fallback_threshold_reply) \ -_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \ -_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \ -_(AF_PACKET_DETAILS, af_packet_details) \ -_(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \ -_(POLICER_DETAILS, policer_details) \ -_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \ -_(POLICER_CLASSIFY_DETAILS, policer_classify_details) \ -_(MPLS_TUNNEL_DETAILS, mpls_tunnel_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) \ -_(CLASSIFY_SESSION_DETAILS, classify_session_details) \ -_(SET_IPFIX_EXPORTER_REPLY, set_ipfix_exporter_reply) \ -_(IPFIX_EXPORTER_DETAILS, ipfix_exporter_details) \ -_(SET_IPFIX_CLASSIFY_STREAM_REPLY, set_ipfix_classify_stream_reply) \ -_(IPFIX_CLASSIFY_STREAM_DETAILS, ipfix_classify_stream_details) \ -_(IPFIX_CLASSIFY_TABLE_ADD_DEL_REPLY, ipfix_classify_table_add_del_reply) \ -_(IPFIX_CLASSIFY_TABLE_DETAILS, ipfix_classify_table_details) \ -_(FLOW_CLASSIFY_SET_INTERFACE_REPLY, flow_classify_set_interface_reply) \ -_(FLOW_CLASSIFY_DETAILS, flow_classify_details) \ -_(SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY, sw_interface_span_enable_disable_reply) \ -_(SW_INTERFACE_SPAN_DETAILS, sw_interface_span_details) \ -_(GET_NEXT_INDEX_REPLY, get_next_index_reply) \ -_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply) \ -_(PG_CAPTURE_REPLY, pg_capture_reply) \ -_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply) \ -_(PG_INTERFACE_ENABLE_DISABLE_COALESCE_REPLY, pg_interface_enable_disable_coalesce_reply) \ -_(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) \ -_(DELETE_SUBIF_REPLY, delete_subif_reply) \ -_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \ -_(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) \ -_(FEATURE_GSO_ENABLE_DISABLE_REPLY, feature_gso_enable_disable_reply) \ -_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \ -_(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply) \ -_(L2_XCONNECT_DETAILS, l2_xconnect_details) \ -_(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \ -_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \ -_(P2P_ETHERNET_ADD_REPLY, p2p_ethernet_add_reply) \ -_(P2P_ETHERNET_DEL_REPLY, p2p_ethernet_del_reply) \ -_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) \ -_(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply) \ -_(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ -_(SESSION_RULES_DETAILS, session_rules_details) \ -_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \ -_(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \ -_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) \ -_(FLOW_ADD_REPLY, flow_add_reply) \ - -#define foreach_standalone_reply_msg \ -_(SW_INTERFACE_EVENT, sw_interface_event) - -typedef struct -{ - u8 *name; - u32 value; -} name_sort_t; - -#define STR_VTR_OP_CASE(op) \ - case L2_VTR_ ## op: \ - return "" # op; - -static const char * -str_vtr_op (u32 vtr_op) -{ - switch (vtr_op) - { - STR_VTR_OP_CASE (DISABLED); - STR_VTR_OP_CASE (PUSH_1); - STR_VTR_OP_CASE (PUSH_2); - STR_VTR_OP_CASE (POP_1); - STR_VTR_OP_CASE (POP_2); - STR_VTR_OP_CASE (TRANSLATE_1_1); - STR_VTR_OP_CASE (TRANSLATE_1_2); - STR_VTR_OP_CASE (TRANSLATE_2_1); - STR_VTR_OP_CASE (TRANSLATE_2_2); - } - - return "UNKNOWN"; -} - -static int -dump_sub_interface_table (vat_main_t * vam) -{ - const sw_interface_subif_t *sub = NULL; - - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - print (vam->ofp, - "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s", - "Interface", "sw_if_index", - "sub id", "dot1ad", "tags", "outer id", - "inner id", "exact", "default", "outer any", "inner any"); - - vec_foreach (sub, vam->sw_if_subif_table) - { - print (vam->ofp, - "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d", - sub->interface_name, - sub->sw_if_index, - sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q", - sub->sub_number_of_tags, sub->sub_outer_vlan_id, - sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default, - sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any); - if (sub->vtr_op != L2_VTR_DISABLED) - { - print (vam->ofp, - " vlan-tag-rewrite - op: %-14s [ dot1q: %d " - "tag1: %d tag2: %d ]", - str_vtr_op (sub->vtr_op), sub->vtr_push_dot1q, - sub->vtr_tag1, sub->vtr_tag2); - } - } - - return 0; -} - -static int -name_sort_cmp (void *a1, void *a2) -{ - name_sort_t *n1 = a1; - name_sort_t *n2 = a2; - - return strcmp ((char *) n1->name, (char *) n2->name); -} - -static int -dump_interface_table (vat_main_t * vam) -{ - hash_pair_t *p; - name_sort_t *nses = 0, *ns; - - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - /* *INDENT-OFF* */ - hash_foreach_pair (p, vam->sw_if_index_by_interface_name, - ({ - vec_add2 (nses, ns, 1); - ns->name = (u8 *)(p->key); - ns->value = (u32) p->value[0]; - })); - /* *INDENT-ON* */ - - vec_sort_with_function (nses, name_sort_cmp); - - print (vam->ofp, "%-25s%-15s", "Interface", "sw_if_index"); - vec_foreach (ns, nses) - { - print (vam->ofp, "%-25s%-15d", ns->name, ns->value); - } - vec_free (nses); - return 0; -} - -static int -dump_ip_table (vat_main_t * vam, int is_ipv6) -{ - const ip_details_t *det = NULL; - const ip_address_details_t *address = NULL; - u32 i = ~0; - - print (vam->ofp, "%-12s", "sw_if_index"); - - vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6]) - { - i++; - if (!det->present) - { - continue; - } - print (vam->ofp, "%-12d", i); - print (vam->ofp, " %-30s%-13s", "Address", "Prefix length"); - if (!det->addr) - { - continue; - } - vec_foreach (address, det->addr) - { - print (vam->ofp, - " %-30U%-13d", - is_ipv6 ? format_ip6_address : format_ip4_address, - address->ip, address->prefix_length); - } - } - - return 0; -} - -static int -dump_ipv4_table (vat_main_t * vam) -{ - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - return dump_ip_table (vam, 0); -} - -static int -dump_ipv6_table (vat_main_t * vam) -{ - if (vam->json_output) - { - clib_warning - ("JSON output supported only for VPE API calls and dump_stats_table"); - return -99; - } - - return dump_ip_table (vam, 1); -} - -/* - * Pass CLI buffers directly in the CLI_INBAND API message, - * instead of an additional shared memory area. - */ -static int -exec_inband (vat_main_t * vam) -{ - vl_api_cli_inband_t *mp; - unformat_input_t *i = vam->input; - int ret; - - if (vec_len (i->buffer) == 0) - return -1; - - if (vam->exec_mode == 0 && unformat (i, "mode")) - { - vam->exec_mode = 1; - return 0; - } - if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit"))) - { - vam->exec_mode = 0; - return 0; - } - - /* - * In order for the CLI command to work, it - * must be a vector ending in \n, not a C-string ending - * in \n\0. - */ - M2 (CLI_INBAND, mp, vec_len (vam->input->buffer)); - vl_api_vec_to_api_string (vam->input->buffer, &mp->cmd); - - S (mp); - W (ret); - /* json responses may or may not include a useful reply... */ - if (vec_len (vam->cmd_reply)) - print (vam->ofp, "%v", (char *) (vam->cmd_reply)); - return ret; -} - -int -exec (vat_main_t * vam) -{ - return exec_inband (vam); -} - -static int -api_create_loopback (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_create_loopback_t *mp; - vl_api_create_loopback_instance_t *mp_lbi; - u8 mac_address[6]; - u8 mac_set = 0; - u8 is_specified = 0; - u32 user_instance = 0; - int ret; - - clib_memset (mac_address, 0, sizeof (mac_address)); - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) - mac_set = 1; - if (unformat (i, "instance %d", &user_instance)) - is_specified = 1; - else - break; - } - - if (is_specified) - { - M (CREATE_LOOPBACK_INSTANCE, mp_lbi); - mp_lbi->is_specified = is_specified; - if (is_specified) - mp_lbi->user_instance = htonl (user_instance); - if (mac_set) - clib_memcpy (mp_lbi->mac_address, mac_address, sizeof (mac_address)); - S (mp_lbi); - } - else - { - /* Construct the API message */ - M (CREATE_LOOPBACK, mp); - if (mac_set) - clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address)); - S (mp); - } - - W (ret); - return ret; -} - -static int -api_delete_loopback (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_delete_loopback_t *mp; - u32 sw_if_index = ~0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - ; - else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("missing sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (DELETE_LOOPBACK, mp); - mp->sw_if_index = ntohl (sw_if_index); - - S (mp); - W (ret); - return ret; -} - -static int -api_want_interface_events (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_want_interface_events_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_INTERFACE_EVENTS, mp); - mp->enable_disable = enable; - - vam->interface_event_display = enable; - - S (mp); - W (ret); - return ret; -} - - -/* Note: non-static, called once to set up the initial intfc table */ -int -api_sw_interface_dump (vat_main_t * vam) -{ - vl_api_sw_interface_dump_t *mp; - vl_api_control_ping_t *mp_ping; - hash_pair_t *p; - name_sort_t *nses = 0, *ns; - sw_interface_subif_t *sub = NULL; - int ret; - - /* Toss the old name table */ - /* *INDENT-OFF* */ - hash_foreach_pair (p, vam->sw_if_index_by_interface_name, - ({ - vec_add2 (nses, ns, 1); - ns->name = (u8 *)(p->key); - ns->value = (u32) p->value[0]; - })); - /* *INDENT-ON* */ - - hash_free (vam->sw_if_index_by_interface_name); - - vec_foreach (ns, nses) vec_free (ns->name); - - vec_free (nses); - - vec_foreach (sub, vam->sw_if_subif_table) - { - vec_free (sub->interface_name); - } - vec_free (vam->sw_if_subif_table); - - /* recreate the interface name hash table */ - vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword)); - - /* - * Ask for all interface names. Otherwise, the epic catalog of - * name filters becomes ridiculously long, and vat ends up needing - * to be taught about new interface types. - */ - M (SW_INTERFACE_DUMP, mp); - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_sw_interface_set_flags (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_flags_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 admin_up = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "admin-up")) - admin_up = 1; - else if (unformat (i, "admin-down")) - admin_up = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_FLAGS, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->flags = ntohl ((admin_up) ? IF_STATUS_API_FLAG_ADMIN_UP : 0); - - /* send it... */ - S (mp); - - /* Wait for a reply, return the good/bad news... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_rx_mode (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_rx_mode_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; - u8 queue_id_valid = 0; - u32 queue_id; - vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "queue %d", &queue_id)) - queue_id_valid = 1; - else if (unformat (i, "polling")) - mode = VNET_HW_INTERFACE_RX_MODE_POLLING; - else if (unformat (i, "interrupt")) - mode = VNET_HW_INTERFACE_RX_MODE_INTERRUPT; - else if (unformat (i, "adaptive")) - mode = VNET_HW_INTERFACE_RX_MODE_ADAPTIVE; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - if (mode == VNET_HW_INTERFACE_RX_MODE_UNKNOWN) - { - errmsg ("missing rx-mode"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_RX_MODE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->mode = (vl_api_rx_mode_t) mode; - mp->queue_id_valid = queue_id_valid; - mp->queue_id = queue_id_valid ? ntohl (queue_id) : ~0; - - /* send it... */ - S (mp); - - /* Wait for a reply, return the good/bad news... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_rx_placement (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - 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, "queue %d", &queue_id)) - ; - else if (unformat (i, "main")) - is_main = 1; - else if (unformat (i, "worker %d", &thread_index)) - ; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - 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 - mp->sw_if_index = ~0; - - /* send it... */ - S (mp); - - /* Wait for a reply, return the good/bad news... */ - W (ret); - return ret; -} - -static int -api_sw_interface_add_del_address (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_add_del_address_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 is_add = 1, del_all = 0; - u32 address_length = 0; - u8 v4_address_set = 0; - u8 v6_address_set = 0; - ip4_address_t v4address; - ip6_address_t v6address; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "del-all")) - del_all = 1; - else if (unformat (i, "del")) - is_add = 0; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "%U/%d", - unformat_ip4_address, &v4address, &address_length)) - v4_address_set = 1; - else if (unformat (i, "%U/%d", - unformat_ip6_address, &v6address, &address_length)) - v6_address_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - if (v4_address_set && v6_address_set) - { - errmsg ("both v4 and v6 addresses set"); - return -99; - } - if (!v4_address_set && !v6_address_set && !del_all) - { - errmsg ("no addresses set"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_ADD_DEL_ADDRESS, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->is_add = is_add; - mp->del_all = del_all; - if (v6_address_set) - { - mp->prefix.address.af = ADDRESS_IP6; - clib_memcpy (mp->prefix.address.un.ip6, &v6address, sizeof (v6address)); - } - else - { - mp->prefix.address.af = ADDRESS_IP4; - clib_memcpy (mp->prefix.address.un.ip4, &v4address, sizeof (v4address)); - } - mp->prefix.len = address_length; - - /* send it... */ - S (mp); - - /* Wait for a reply, return good/bad news */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_mpls_enable (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_mpls_enable_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 enable = 1; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "disable")) - enable = 0; - else if (unformat (i, "dis")) - enable = 0; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_MPLS_ENABLE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_table (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_table_t *mp; - u32 sw_if_index, vrf_id = 0; - u8 sw_if_index_set = 0; - u8 is_ipv6 = 0; - int ret; - - /* 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, "vrf %d", &vrf_id)) - ; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_TABLE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->is_ipv6 = is_ipv6; - mp->vrf_id = ntohl (vrf_id); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static void vl_api_sw_interface_get_table_reply_t_handler - (vl_api_sw_interface_get_table_reply_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%d", ntohl (mp->vrf_id)); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; - -} - -static void vl_api_sw_interface_get_table_reply_t_handler_json - (vl_api_sw_interface_get_table_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_int (&node, "vrf_id", ntohl (mp->vrf_id)); - - vat_json_print (vam->ofp, &node); - vat_json_free (&node); - - vam->retval = ntohl (mp->retval); - vam->result_ready = 1; -} - -static int -api_sw_interface_get_table (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_get_table_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u8 is_ipv6 = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (SW_INTERFACE_GET_TABLE, mp); - mp->sw_if_index = htonl (sw_if_index); - mp->is_ipv6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - -static int -api_sw_interface_set_vpath (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_vpath_t *mp; - u32 sw_if_index = 0; - u8 sw_if_index_set = 0; - u8 is_enable = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - is_enable = 1; - else if (unformat (i, "disable")) - is_enable = 0; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_VPATH, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = is_enable; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_vxlan_bypass (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_vxlan_bypass_t *mp; - u32 sw_if_index = 0; - u8 sw_if_index_set = 0; - u8 is_enable = 1; - u8 is_ipv6 = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - is_enable = 1; - else if (unformat (i, "disable")) - is_enable = 0; - else if (unformat (i, "ip4")) - is_ipv6 = 0; - else if (unformat (i, "ip6")) - is_ipv6 = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - /* Construct the API message */ - M (SW_INTERFACE_SET_VXLAN_BYPASS, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable = is_enable; - mp->is_ipv6 = is_ipv6; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_sw_interface_set_l2_xconnect (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_sw_interface_set_l2_xconnect_t *mp; - u32 rx_sw_if_index; - u8 rx_sw_if_index_set = 0; - u32 tx_sw_if_index; - u8 tx_sw_if_index_set = 0; - u8 enable = 1; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) - tx_sw_if_index_set = 1; - else if (unformat (i, "rx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &rx_sw_if_index)) - rx_sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "tx")) - { - if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, - &tx_sw_if_index)) - tx_sw_if_index_set = 1; - } - else - break; - } - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; - else - break; - } - - if (rx_sw_if_index_set == 0) - { - errmsg ("missing rx interface name or rx_sw_if_index"); - return -99; - } - - if (enable && (tx_sw_if_index_set == 0)) - { - errmsg ("missing tx interface name or tx_sw_if_index"); - return -99; - } - - M (SW_INTERFACE_SET_L2_XCONNECT, mp); - - mp->rx_sw_if_index = ntohl (rx_sw_if_index); - mp->tx_sw_if_index = ntohl (tx_sw_if_index); - mp->enable = enable; - - S (mp); - W (ret); - return ret; -} - -static int -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; - 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) - { - if (unformat (i, "sw_if_index %d", &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; - else - if (unformat - (i, "%U", api_unformat_sw_if_index, vam, &rx_sw_if_index)) - rx_sw_if_index_set = 1; - else if (unformat (i, "shg %d", &shg)) - ; - else if (unformat (i, "bvi")) - 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")) - enable = 0; - else - break; - } - - if (rx_sw_if_index_set == 0) - { - errmsg ("missing rx interface name or sw_if_index"); - return -99; - } - - if (enable && (bd_id_set == 0)) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (SW_INTERFACE_SET_L2_BRIDGE, mp); - - mp->rx_sw_if_index = ntohl (rx_sw_if_index); - mp->bd_id = ntohl (bd_id); - mp->shg = (u8) shg; - mp->port_type = ntohl (port_type); - mp->enable = enable; - - S (mp); - W (ret); - return ret; -} - -static int -api_bridge_domain_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_domain_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 bd_id = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - ; - else - break; - } - - M (BRIDGE_DOMAIN_DUMP, mp); - mp->bd_id = ntohl (bd_id); - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_bridge_domain_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_domain_add_del_t *mp; - u32 bd_id = ~0; - u8 is_add = 1; - u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0; - u8 *bd_tag = NULL; - u32 mac_age = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - ; - else if (unformat (i, "flood %d", &flood)) - ; - else if (unformat (i, "uu-flood %d", &uu_flood)) - ; - else if (unformat (i, "forward %d", &forward)) - ; - else if (unformat (i, "learn %d", &learn)) - ; - else if (unformat (i, "arp-term %d", &arp_term)) - ; - else if (unformat (i, "mac-age %d", &mac_age)) - ; - else if (unformat (i, "bd-tag %s", &bd_tag)) - ; - else if (unformat (i, "del")) - { - is_add = 0; - flood = uu_flood = forward = learn = 0; - } - else - break; - } - - if (bd_id == ~0) - { - errmsg ("missing bridge domain"); - ret = -99; - goto done; - } - - if (mac_age > 255) - { - errmsg ("mac age must be less than 256 "); - ret = -99; - goto done; - } - - if ((bd_tag) && (vec_len (bd_tag) > 63)) - { - errmsg ("bd-tag cannot be longer than 63"); - ret = -99; - goto done; - } - - M (BRIDGE_DOMAIN_ADD_DEL, mp); - - mp->bd_id = ntohl (bd_id); - mp->flood = flood; - mp->uu_flood = uu_flood; - mp->forward = forward; - mp->learn = learn; - mp->arp_term = arp_term; - mp->is_add = is_add; - mp->mac_age = (u8) mac_age; - if (bd_tag) - { - clib_memcpy (mp->bd_tag, bd_tag, vec_len (bd_tag)); - mp->bd_tag[vec_len (bd_tag)] = 0; - } - S (mp); - W (ret); - -done: - vec_free (bd_tag); - return ret; -} - -static int -api_l2fib_flush_bd (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2fib_flush_bd_t *mp; - u32 bd_id = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)); - else - break; - } - - if (bd_id == ~0) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (L2FIB_FLUSH_BD, mp); - - mp->bd_id = htonl (bd_id); - - S (mp); - W (ret); - return ret; -} - -static int -api_l2fib_flush_int (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2fib_flush_int_t *mp; - u32 sw_if_index = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)); - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)); - else - break; - } - - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (L2FIB_FLUSH_INT, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - S (mp); - W (ret); - return ret; -} - -static int -api_l2fib_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2fib_add_del_t *mp; - f64 timeout; - u8 mac[6] = { 0 }; - u8 mac_set = 0; - u32 bd_id; - u8 bd_id_set = 0; - u32 sw_if_index = 0; - u8 sw_if_index_set = 0; - u8 is_add = 1; - u8 static_mac = 0; - u8 filter_mac = 0; - u8 bvi_mac = 0; - int count = 1; - f64 before = 0; - int j; - - /* 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)) - mac_set = 1; - else if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if")) - { - if (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 - break; - } - else if (unformat (i, "static")) - static_mac = 1; - else if (unformat (i, "filter")) - { - filter_mac = 1; - static_mac = 1; - } - else if (unformat (i, "bvi")) - { - bvi_mac = 1; - static_mac = 1; - } - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "count %d", &count)) - ; - else - break; - } - - if (mac_set == 0) - { - errmsg ("missing mac address"); - return -99; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - - if (is_add && sw_if_index_set == 0 && filter_mac == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } - - for (j = 0; j < count; j++) - { - M (L2FIB_ADD_DEL, mp); - - clib_memcpy (mp->mac, mac, 6); - mp->bd_id = ntohl (bd_id); - mp->is_add = is_add; - mp->sw_if_index = ntohl (sw_if_index); - - if (is_add) - { - mp->static_mac = static_mac; - mp->filter_mac = filter_mac; - mp->bvi_mac = bvi_mac; - } - increment_mac_address (mac); - /* send it... */ - S (mp); - } - - if (count > 1) - { - vl_api_control_ping_t *mp_ping; - f64 after; - - /* Shut off async mode */ - vam->async_mode = 0; - - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; - - out: - if (vam->retval == -99) - errmsg ("timeout"); - - if (vam->async_errors > 0) - { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; - } - vam->async_errors = 0; - after = vat_time_now (vam); - - print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", - count, after - before, count / (after - before)); - } - else - { - int ret; - - /* Wait for a reply... */ - W (ret); - return ret; - } - /* Return the good/bad news */ - return (vam->retval); -} - -static int -api_bridge_domain_set_mac_age (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_domain_set_mac_age_t *mp; - u32 bd_id = ~0; - u32 mac_age = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)); - else if (unformat (i, "mac-age %d", &mac_age)); - else - break; - } - - if (bd_id == ~0) - { - errmsg ("missing bridge domain"); - return -99; - } - - if (mac_age > 255) - { - errmsg ("mac age must be less than 256 "); - return -99; - } - - M (BRIDGE_DOMAIN_SET_MAC_AGE, mp); - - mp->bd_id = htonl (bd_id); - mp->mac_age = (u8) mac_age; - - S (mp); - W (ret); - return ret; -} - -static int -api_l2_flags (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_l2_flags_t *mp; - u32 sw_if_index; - u32 flags = 0; - u8 sw_if_index_set = 0; - u8 is_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 if (unformat (i, "sw_if")) - { - if (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 - break; - } - else if (unformat (i, "learn")) - flags |= L2_LEARN; - else if (unformat (i, "forward")) - flags |= L2_FWD; - else if (unformat (i, "flood")) - flags |= L2_FLOOD; - else if (unformat (i, "uu-flood")) - flags |= L2_UU_FLOOD; - else if (unformat (i, "arp-term")) - flags |= L2_ARP_TERM; - else if (unformat (i, "off")) - is_set = 0; - else if (unformat (i, "disable")) - is_set = 0; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } - - M (L2_FLAGS, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->feature_bitmap = ntohl (flags); - mp->is_set = is_set; - - S (mp); - W (ret); - return ret; -} - -static int -api_bridge_flags (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bridge_flags_t *mp; - u32 bd_id; - u8 bd_id_set = 0; - u8 is_set = 1; - bd_flags_t flags = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; - else if (unformat (i, "learn")) - flags |= BRIDGE_API_FLAG_LEARN; - else if (unformat (i, "forward")) - flags |= BRIDGE_API_FLAG_FWD; - else if (unformat (i, "flood")) - flags |= BRIDGE_API_FLAG_FLOOD; - else if (unformat (i, "uu-flood")) - flags |= BRIDGE_API_FLAG_UU_FLOOD; - else if (unformat (i, "arp-term")) - flags |= BRIDGE_API_FLAG_ARP_TERM; - else if (unformat (i, "off")) - is_set = 0; - else if (unformat (i, "disable")) - is_set = 0; - else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (BRIDGE_FLAGS, mp); - - mp->bd_id = ntohl (bd_id); - mp->flags = ntohl (flags); - mp->is_set = is_set; - - S (mp); - W (ret); - return ret; -} - -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_add = 1; - u8 bd_id_set = 0; - u8 ip_set = 0; - u8 mac_set = 0; - int ret; - - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - { - bd_id_set++; - } - else if (unformat (i, "%U", unformat_vl_api_address, &ip)) - { - ip_set++; - } - else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac)) - { - mac_set++; - } - else if (unformat (i, "del")) - is_add = 0; - else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - else if (ip_set == 0) - { - errmsg ("missing IP address"); - return -99; - } - else if (mac_set == 0) - { - errmsg ("missing MAC address"); - return -99; - } - - M (BD_IP_MAC_ADD_DEL, mp); - - mp->entry.bd_id = ntohl (bd_id); - mp->is_add = is_add; - - 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_bd_ip_mac_flush (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bd_ip_mac_flush_t *mp; - u32 bd_id; - u8 bd_id_set = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - { - bd_id_set++; - } - else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; - } - - M (BD_IP_MAC_FLUSH, mp); - - mp->bd_id = ntohl (bd_id); - - S (mp); - W (ret); - return ret; -} - -static void vl_api_bd_ip_mac_details_t_handler - (vl_api_bd_ip_mac_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, - "\n%-5d %U %U", - ntohl (mp->entry.bd_id), - format_vl_api_mac_address, mp->entry.mac, - format_vl_api_address, &mp->entry.ip); -} - -static void vl_api_bd_ip_mac_details_t_handler_json - (vl_api_bd_ip_mac_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - - if (VAT_JSON_ARRAY != vam->json_tree.type) - { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "bd_id", ntohl (mp->entry.bd_id)); - vat_json_object_add_string_copy (node, "mac_address", - format (0, "%U", format_vl_api_mac_address, - &mp->entry.mac)); - u8 *ip = 0; - - ip = format (0, "%U", format_vl_api_address, &mp->entry.ip); - vat_json_object_add_string_copy (node, "ip_address", ip); - vec_free (ip); -} - -static int -api_bd_ip_mac_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bd_ip_mac_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; - u32 bd_id; - u8 bd_id_set = 0; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "bd_id %d", &bd_id)) - { - bd_id_set++; - } - else - break; - } - - print (vam->ofp, - "\n%-5s %-7s %-20s %-30s", - "bd_id", "is_ipv6", "mac_address", "ip_address"); - - /* Dump Bridge Domain Ip to Mac entries */ - M (BD_IP_MAC_DUMP, mp); - - if (bd_id_set) - mp->bd_id = htonl (bd_id); - else - mp->bd_id = ~0; - - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - W (ret); - return ret; -} - -static int -api_tap_create_v2 (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_tap_create_v2_t *mp; - u8 mac_address[6]; - u8 random_mac = 1; - u32 id = ~0; - u32 num_rx_queues = 0; - u8 *host_if_name = 0; - u8 host_if_name_set = 0; - u8 *host_ns = 0; - u8 host_ns_set = 0; - u8 host_mac_addr[6]; - u8 host_mac_addr_set = 0; - u8 *host_bridge = 0; - u8 host_bridge_set = 0; - u8 host_ip4_prefix_set = 0; - u8 host_ip6_prefix_set = 0; - ip4_address_t host_ip4_addr; - ip4_address_t host_ip4_gw; - u8 host_ip4_gw_set = 0; - u32 host_ip4_prefix_len = 0; - ip6_address_t host_ip6_addr; - ip6_address_t host_ip6_gw; - u8 host_ip6_gw_set = 0; - u32 host_ip6_prefix_len = 0; - u32 host_mtu_size = 0; - u8 host_mtu_set = 0; - u32 tap_flags = 0; - int ret; - u32 rx_ring_sz = 0, tx_ring_sz = 0; - - 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, "id %u", &id)) - ; - else - if (unformat - (i, "hw-addr %U", unformat_ethernet_address, mac_address)) - random_mac = 0; - else if (unformat (i, "host-if-name %s", &host_if_name)) - host_if_name_set = 1; - else if (unformat (i, "num-rx-queues %u", &num_rx_queues)) - ; - else if (unformat (i, "host-ns %s", &host_ns)) - host_ns_set = 1; - else if (unformat (i, "host-mac-addr %U", unformat_ethernet_address, - host_mac_addr)) - host_mac_addr_set = 1; - else if (unformat (i, "host-bridge %s", &host_bridge)) - host_bridge_set = 1; - else if (unformat (i, "host-ip4-addr %U/%u", unformat_ip4_address, - &host_ip4_addr, &host_ip4_prefix_len)) - host_ip4_prefix_set = 1; - else if (unformat (i, "host-ip6-addr %U/%u", unformat_ip6_address, - &host_ip6_addr, &host_ip6_prefix_len)) - host_ip6_prefix_set = 1; - else if (unformat (i, "host-ip4-gw %U", unformat_ip4_address, - &host_ip4_gw)) - host_ip4_gw_set = 1; - else if (unformat (i, "host-ip6-gw %U", unformat_ip6_address, - &host_ip6_gw)) - host_ip6_gw_set = 1; - else if (unformat (i, "rx-ring-size %u", &rx_ring_sz)) - ; - else if (unformat (i, "tx-ring-size %u", &tx_ring_sz)) - ; - else if (unformat (i, "host-mtu-size %u", &host_mtu_size)) - host_mtu_set = 1; - else if (unformat (i, "no-gso")) - tap_flags &= ~TAP_API_FLAG_GSO; - else if (unformat (i, "gso")) - tap_flags |= TAP_API_FLAG_GSO; - else if (unformat (i, "csum-offload")) - tap_flags |= TAP_API_FLAG_CSUM_OFFLOAD; - else if (unformat (i, "persist")) - tap_flags |= TAP_API_FLAG_PERSIST; - else if (unformat (i, "attach")) - tap_flags |= TAP_API_FLAG_ATTACH; - else if (unformat (i, "tun")) - tap_flags |= TAP_API_FLAG_TUN; - else if (unformat (i, "gro-coalesce")) - tap_flags |= TAP_API_FLAG_GRO_COALESCE; - else if (unformat (i, "packed")) - tap_flags |= TAP_API_FLAG_PACKED; - else if (unformat (i, "in-order")) - tap_flags |= TAP_API_FLAG_IN_ORDER; - else - break; - } - - if (vec_len (host_if_name) > 63) - { - errmsg ("tap name too long. "); - return -99; - } - if (vec_len (host_ns) > 63) - { - errmsg ("host name space too long. "); - return -99; - } - if (vec_len (host_bridge) > 63) - { - errmsg ("host bridge name too long. "); - return -99; - } - if (host_ip4_prefix_len > 32) - { - errmsg ("host ip4 prefix length not valid. "); - return -99; - } - if (host_ip6_prefix_len > 128) - { - errmsg ("host ip6 prefix length not valid. "); - return -99; - } - if (!is_pow2 (rx_ring_sz)) - { - errmsg ("rx ring size must be power of 2. "); - return -99; - } - if (rx_ring_sz > 32768) - { - errmsg ("rx ring size must be 32768 or lower. "); - return -99; - } - if (!is_pow2 (tx_ring_sz)) - { - errmsg ("tx ring size must be power of 2. "); - return -99; - } - if (tx_ring_sz > 32768) - { - errmsg ("tx ring size must be 32768 or lower. "); - return -99; - } - if (host_mtu_set && (host_mtu_size < 64 || host_mtu_size > 65355)) - { - errmsg ("host MTU size must be in between 64 and 65355. "); - return -99; - } - - /* Construct the API message */ - M (TAP_CREATE_V2, mp); - - mp->id = ntohl (id); - mp->use_random_mac = random_mac; - mp->num_rx_queues = (u8) num_rx_queues; - mp->tx_ring_sz = ntohs (tx_ring_sz); - mp->rx_ring_sz = ntohs (rx_ring_sz); - mp->host_mtu_set = host_mtu_set; - mp->host_mtu_size = ntohl (host_mtu_size); - mp->host_mac_addr_set = host_mac_addr_set; - mp->host_ip4_prefix_set = host_ip4_prefix_set; - mp->host_ip6_prefix_set = host_ip6_prefix_set; - mp->host_ip4_gw_set = host_ip4_gw_set; - mp->host_ip6_gw_set = host_ip6_gw_set; - mp->tap_flags = ntohl (tap_flags); - mp->host_namespace_set = host_ns_set; - mp->host_if_name_set = host_if_name_set; - mp->host_bridge_set = host_bridge_set; - - if (random_mac == 0) - clib_memcpy (mp->mac_address, mac_address, 6); - if (host_mac_addr_set) - clib_memcpy (mp->host_mac_addr, host_mac_addr, 6); - if (host_if_name_set) - clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); - if (host_ns_set) - clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns)); - if (host_bridge_set) - clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge)); - if (host_ip4_prefix_set) - { - clib_memcpy (mp->host_ip4_prefix.address, &host_ip4_addr, 4); - mp->host_ip4_prefix.len = (u8) host_ip4_prefix_len; - } - if (host_ip6_prefix_set) - { - clib_memcpy (mp->host_ip6_prefix.address, &host_ip6_addr, 16); - mp->host_ip6_prefix.len = (u8) host_ip6_prefix_len; - } - if (host_ip4_gw_set) - clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4); - if (host_ip6_gw_set) - clib_memcpy (mp->host_ip6_gw, &host_ip6_gw, 16); - - vec_free (host_ns); - vec_free (host_if_name); - vec_free (host_bridge); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_tap_delete_v2 (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_tap_delete_v2_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - break; - } - - if (sw_if_index_set == 0) - { - errmsg ("missing vpp interface name. "); - return -99; - } - - /* Construct the API message */ - M (TAP_DELETE_V2, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -uword -unformat_vlib_pci_addr (unformat_input_t * input, va_list * args) -{ - vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *); - u32 x[4]; - - if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3])) - return 0; - - addr->domain = x[0]; - addr->bus = x[1]; - addr->slot = x[2]; - addr->function = x[3]; - - return 1; -} - -static int -api_virtio_pci_create_v2 (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_virtio_pci_create_v2_t *mp; - u8 mac_address[6]; - u8 random_mac = 1; - u32 pci_addr = 0; - u64 features = (u64) ~ (0ULL); - u32 virtio_flags = 0; - int ret; - - clib_memset (mac_address, 0, sizeof (mac_address)); - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) - { - random_mac = 0; - } - else if (unformat (i, "pci-addr %U", unformat_vlib_pci_addr, &pci_addr)) - ; - else if (unformat (i, "features 0x%llx", &features)) - ; - else if (unformat (i, "gso-enabled")) - virtio_flags |= VIRTIO_API_FLAG_GSO; - else if (unformat (i, "csum-offload-enabled")) - virtio_flags |= VIRTIO_API_FLAG_CSUM_OFFLOAD; - else if (unformat (i, "gro-coalesce")) - virtio_flags |= VIRTIO_API_FLAG_GRO_COALESCE; - else if (unformat (i, "packed")) - virtio_flags |= VIRTIO_API_FLAG_PACKED; - else if (unformat (i, "in-order")) - virtio_flags |= VIRTIO_API_FLAG_IN_ORDER; - else - break; - } - - if (pci_addr == 0) - { - errmsg ("pci address must be non zero. "); - return -99; - } - - /* Construct the API message */ - M (VIRTIO_PCI_CREATE_V2, mp); - - mp->use_random_mac = random_mac; - - mp->pci_addr.domain = htons (((vlib_pci_addr_t) pci_addr).domain); - mp->pci_addr.bus = ((vlib_pci_addr_t) pci_addr).bus; - mp->pci_addr.slot = ((vlib_pci_addr_t) pci_addr).slot; - mp->pci_addr.function = ((vlib_pci_addr_t) pci_addr).function; - - mp->features = clib_host_to_net_u64 (features); - mp->virtio_flags = clib_host_to_net_u32 (virtio_flags); - - 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; - u8 numa_only = 0; - - clib_memset (mac_address, 0, sizeof (mac_address)); - lb = BOND_LB_L2; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "mode %U", unformat_bond_mode, &mode)) - mode_is_set = 1; - else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR)) - && unformat (i, "lb %U", unformat_bond_load_balance, &lb)) - ; - else if (unformat (i, "hw-addr %U", unformat_ethernet_address, - mac_address)) - custom_mac = 1; - else if (unformat (i, "numa-only")) - numa_only = 1; - else if (unformat (i, "id %u", &id)) - ; - else - break; - } - - if (mode_is_set == 0) - { - errmsg ("Missing bond mode. "); - return -99; - } - - /* Construct the API message */ - M (BOND_CREATE, mp); - - mp->use_custom_mac = custom_mac; - - mp->mode = htonl (mode); - mp->lb = htonl (lb); - mp->id = htonl (id); - mp->numa_only = numa_only; - - if (custom_mac) - clib_memcpy (mp->mac_address, mac_address, 6); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_create2 (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_create2_t *mp; - u8 mac_address[6]; - u8 custom_mac = 0; - int ret; - u8 mode; - u8 lb; - u8 mode_is_set = 0; - u32 id = ~0; - u8 numa_only = 0; - u8 gso = 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, "numa-only")) - numa_only = 1; - else if (unformat (i, "gso")) - gso = 1; - else if (unformat (i, "id %u", &id)) - ; - else - break; - } - - if (mode_is_set == 0) - { - errmsg ("Missing bond mode. "); - return -99; - } - - /* Construct the API message */ - M (BOND_CREATE2, mp); - - mp->use_custom_mac = custom_mac; - - mp->mode = htonl (mode); - mp->lb = htonl (lb); - mp->id = htonl (id); - mp->numa_only = numa_only; - mp->enable_gso = gso; - - if (custom_mac) - clib_memcpy (mp->mac_address, mac_address, 6); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_delete (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_delete_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - int ret; - - /* 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 (BOND_DELETE, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_add_member (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_add_member_t *mp; - u32 bond_sw_if_index; - int ret; - u8 is_passive; - u8 is_long_timeout; - u32 bond_sw_if_index_is_set = 0; - u32 sw_if_index; - u8 sw_if_index_is_set = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_is_set = 1; - else if (unformat (i, "bond %u", &bond_sw_if_index)) - bond_sw_if_index_is_set = 1; - else if (unformat (i, "passive %d", &is_passive)) - ; - else if (unformat (i, "long-timeout %d", &is_long_timeout)) - ; - else - break; - } - - if (bond_sw_if_index_is_set == 0) - { - errmsg ("Missing bond sw_if_index. "); - return -99; - } - if (sw_if_index_is_set == 0) - { - errmsg ("Missing member sw_if_index. "); - return -99; - } - - /* Construct the API message */ - M (BOND_ADD_MEMBER, mp); - - mp->bond_sw_if_index = ntohl (bond_sw_if_index); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_long_timeout = is_long_timeout; - mp->is_passive = is_passive; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_bond_detach_member (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_bond_detach_member_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 (BOND_DETACH_MEMBER, mp); - - mp->sw_if_index = ntohl (sw_if_index); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_ip_table_add_del (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_table_add_del_t *mp; - u32 table_id = ~0; - u8 is_ipv6 = 0; - u8 is_add = 1; - int ret = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "ipv6")) - is_ipv6 = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "table %d", &table_id)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (~0 == table_id) - { - errmsg ("missing table-ID"); - return -99; - } - - /* Construct the API message */ - M (IP_TABLE_ADD_DEL, mp); - - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; - mp->is_add = is_add; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - - return ret; -} - -uword -unformat_fib_path (unformat_input_t * input, va_list * args) -{ - vat_main_t *vam = va_arg (*args, vat_main_t *); - vl_api_fib_path_t *path = va_arg (*args, vl_api_fib_path_t *); - u32 weight, preference; - mpls_label_t out_label; - - clib_memset (path, 0, sizeof (*path)); - path->weight = 1; - path->sw_if_index = ~0; - path->rpf_id = ~0; - path->n_labels = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "%U %U", - unformat_vl_api_ip4_address, - &path->nh.address.ip4, - api_unformat_sw_if_index, vam, &path->sw_if_index)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "%U %U", - unformat_vl_api_ip6_address, - &path->nh.address.ip6, - api_unformat_sw_if_index, vam, &path->sw_if_index)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "weight %u", &weight)) - { - path->weight = weight; - } - else if (unformat (input, "preference %u", &preference)) - { - path->preference = preference; - } - else if (unformat (input, "%U next-hop-table %d", - unformat_vl_api_ip4_address, - &path->nh.address.ip4, &path->table_id)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "%U next-hop-table %d", - unformat_vl_api_ip6_address, - &path->nh.address.ip6, &path->table_id)) - { - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "%U", - unformat_vl_api_ip4_address, &path->nh.address.ip4)) - { - /* - * the recursive next-hops are by default in the default table - */ - path->table_id = 0; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "%U", - unformat_vl_api_ip6_address, &path->nh.address.ip6)) - { - /* - * the recursive next-hops are by default in the default table - */ - path->table_id = 0; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "resolve-via-host")) - { - path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_HOST; - } - else if (unformat (input, "resolve-via-attached")) - { - path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_ATTACHED; - } - else if (unformat (input, "ip4-lookup-in-table %d", &path->table_id)) - { - path->type = FIB_API_PATH_TYPE_LOCAL; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP4; - } - else if (unformat (input, "ip6-lookup-in-table %d", &path->table_id)) - { - path->type = FIB_API_PATH_TYPE_LOCAL; - path->sw_if_index = ~0; - path->proto = FIB_API_PATH_NH_PROTO_IP6; - } - else if (unformat (input, "sw_if_index %d", &path->sw_if_index)) - ; - else if (unformat (input, "via-label %d", &path->nh.via_label)) - { - path->proto = FIB_API_PATH_NH_PROTO_MPLS; - path->sw_if_index = ~0; - } - else if (unformat (input, "l2-input-on %d", &path->sw_if_index)) - { - path->proto = FIB_API_PATH_NH_PROTO_ETHERNET; - path->type = FIB_API_PATH_TYPE_INTERFACE_RX; - } - else if (unformat (input, "local")) - { - path->type = FIB_API_PATH_TYPE_LOCAL; - } - else if (unformat (input, "out-labels")) - { - while (unformat (input, "%d", &out_label)) - { - path->label_stack[path->n_labels].label = out_label; - path->label_stack[path->n_labels].is_uniform = 0; - path->label_stack[path->n_labels].ttl = 64; - path->n_labels++; - } - } - else if (unformat (input, "via")) - { - /* new path, back up and return */ - unformat_put_input (input); - unformat_put_input (input); - unformat_put_input (input); - unformat_put_input (input); - break; - } - else - { - return (0); - } - } - - path->proto = ntohl (path->proto); - path->type = ntohl (path->type); - path->flags = ntohl (path->flags); - path->table_id = ntohl (path->table_id); - path->sw_if_index = ntohl (path->sw_if_index); +#define foreach_vpe_api_reply_msg \ +_(CREATE_LOOPBACK_REPLY, create_loopback_reply) \ +_(CREATE_LOOPBACK_INSTANCE_REPLY, create_loopback_instance_reply) \ +_(SW_INTERFACE_DETAILS, sw_interface_details) \ +_(SW_INTERFACE_SET_FLAGS_REPLY, sw_interface_set_flags_reply) \ +_(CONTROL_PING_REPLY, control_ping_reply) \ +_(CLI_REPLY, cli_reply) \ +_(CLI_INBAND_REPLY, cli_inband_reply) \ +_(SW_INTERFACE_ADD_DEL_ADDRESS_REPLY, \ + sw_interface_add_del_address_reply) \ +_(SW_INTERFACE_SET_RX_MODE_REPLY, sw_interface_set_rx_mode_reply) \ +_(SW_INTERFACE_SET_RX_PLACEMENT_REPLY, sw_interface_set_rx_placement_reply) \ +_(SW_INTERFACE_RX_PLACEMENT_DETAILS, sw_interface_rx_placement_details) \ +_(SW_INTERFACE_SET_TABLE_REPLY, sw_interface_set_table_reply) \ +_(SW_INTERFACE_SET_MPLS_ENABLE_REPLY, sw_interface_set_mpls_enable_reply) \ +_(SW_INTERFACE_SET_VPATH_REPLY, sw_interface_set_vpath_reply) \ +_(SW_INTERFACE_SET_VXLAN_BYPASS_REPLY, sw_interface_set_vxlan_bypass_reply) \ +_(SW_INTERFACE_SET_VXLAN_GPE_BYPASS_REPLY, sw_interface_set_vxlan_gpe_bypass_reply) \ +_(SW_INTERFACE_SET_L2_XCONNECT_REPLY, \ + sw_interface_set_l2_xconnect_reply) \ +_(SW_INTERFACE_SET_L2_BRIDGE_REPLY, \ + sw_interface_set_l2_bridge_reply) \ +_(BRIDGE_DOMAIN_ADD_DEL_REPLY, bridge_domain_add_del_reply) \ +_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \ +_(BRIDGE_DOMAIN_SET_MAC_AGE_REPLY, bridge_domain_set_mac_age_reply) \ +_(L2FIB_ADD_DEL_REPLY, l2fib_add_del_reply) \ +_(L2FIB_FLUSH_INT_REPLY, l2fib_flush_int_reply) \ +_(L2FIB_FLUSH_BD_REPLY, l2fib_flush_bd_reply) \ +_(L2_FLAGS_REPLY, l2_flags_reply) \ +_(BRIDGE_FLAGS_REPLY, bridge_flags_reply) \ +_(TAP_CREATE_V2_REPLY, tap_create_v2_reply) \ +_(TAP_DELETE_V2_REPLY, tap_delete_v2_reply) \ +_(SW_INTERFACE_TAP_V2_DETAILS, sw_interface_tap_v2_details) \ +_(VIRTIO_PCI_CREATE_REPLY, virtio_pci_create_reply) \ +_(VIRTIO_PCI_CREATE_V2_REPLY, virtio_pci_create_v2_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_CREATE2_REPLY, bond_create2_reply) \ +_(BOND_DELETE_REPLY, bond_delete_reply) \ +_(BOND_ADD_MEMBER_REPLY, bond_add_member_reply) \ +_(BOND_DETACH_MEMBER_REPLY, bond_detach_member_reply) \ +_(SW_INTERFACE_SET_BOND_WEIGHT_REPLY, sw_interface_set_bond_weight_reply) \ +_(SW_BOND_INTERFACE_DETAILS, sw_bond_interface_details) \ +_(SW_MEMBER_INTERFACE_DETAILS, sw_member_interface_details) \ +_(IP_ROUTE_ADD_DEL_REPLY, ip_route_add_del_reply) \ +_(IP_TABLE_ADD_DEL_REPLY, ip_table_add_del_reply) \ +_(IP_TABLE_REPLACE_BEGIN_REPLY, ip_table_replace_begin_reply) \ +_(IP_TABLE_FLUSH_REPLY, ip_table_flush_reply) \ +_(IP_TABLE_REPLACE_END_REPLY, ip_table_replace_end_reply) \ +_(IP_MROUTE_ADD_DEL_REPLY, ip_mroute_add_del_reply) \ +_(MPLS_TABLE_ADD_DEL_REPLY, mpls_table_add_del_reply) \ +_(MPLS_ROUTE_ADD_DEL_REPLY, mpls_route_add_del_reply) \ +_(MPLS_IP_BIND_UNBIND_REPLY, mpls_ip_bind_unbind_reply) \ +_(BIER_ROUTE_ADD_DEL_REPLY, bier_route_add_del_reply) \ +_(BIER_TABLE_ADD_DEL_REPLY, bier_table_add_del_reply) \ +_(MPLS_TUNNEL_ADD_DEL_REPLY, mpls_tunnel_add_del_reply) \ +_(SW_INTERFACE_SET_UNNUMBERED_REPLY, \ + sw_interface_set_unnumbered_reply) \ +_(CREATE_VLAN_SUBIF_REPLY, create_vlan_subif_reply) \ +_(CREATE_SUBIF_REPLY, create_subif_reply) \ +_(SET_IP_FLOW_HASH_REPLY, set_ip_flow_hash_reply) \ +_(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, \ + sw_interface_ip6_enable_disable_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) \ +_(SR_LOCALSID_ADD_DEL_REPLY, sr_localsid_add_del_reply) \ +_(SR_STEERING_ADD_DEL_REPLY, sr_steering_add_del_reply) \ +_(CLASSIFY_ADD_DEL_TABLE_REPLY, classify_add_del_table_reply) \ +_(CLASSIFY_ADD_DEL_SESSION_REPLY, classify_add_del_session_reply) \ +_(CLASSIFY_SET_INTERFACE_IP_TABLE_REPLY, \ +classify_set_interface_ip_table_reply) \ +_(CLASSIFY_SET_INTERFACE_L2_TABLES_REPLY, \ + classify_set_interface_l2_tables_reply) \ +_(GET_NODE_INDEX_REPLY, get_node_index_reply) \ +_(ADD_NODE_NEXT_REPLY, add_node_next_reply) \ +_(VXLAN_ADD_DEL_TUNNEL_REPLY, vxlan_add_del_tunnel_reply) \ +_(VXLAN_OFFLOAD_RX_REPLY, vxlan_offload_rx_reply) \ +_(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) \ +_(GRE_TUNNEL_ADD_DEL_REPLY, gre_tunnel_add_del_reply) \ +_(GRE_TUNNEL_DETAILS, gre_tunnel_details) \ +_(L2_FIB_CLEAR_TABLE_REPLY, l2_fib_clear_table_reply) \ +_(L2_INTERFACE_EFP_FILTER_REPLY, l2_interface_efp_filter_reply) \ +_(L2_INTERFACE_VLAN_TAG_REWRITE_REPLY, l2_interface_vlan_tag_rewrite_reply) \ +_(SW_INTERFACE_VHOST_USER_DETAILS, sw_interface_vhost_user_details) \ +_(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) \ +_(INTERFACE_NAME_RENUMBER_REPLY, interface_name_renumber_reply) \ +_(WANT_L2_MACS_EVENTS_REPLY, want_l2_macs_events_reply) \ +_(L2_MACS_EVENT, l2_macs_event) \ +_(INPUT_ACL_SET_INTERFACE_REPLY, input_acl_set_interface_reply) \ +_(IP_ADDRESS_DETAILS, ip_address_details) \ +_(IP_DETAILS, ip_details) \ +_(IPSEC_SPD_ADD_DEL_REPLY, ipsec_spd_add_del_reply) \ +_(IPSEC_INTERFACE_ADD_DEL_SPD_REPLY, ipsec_interface_add_del_spd_reply) \ +_(IPSEC_SPD_ENTRY_ADD_DEL_REPLY, ipsec_spd_entry_add_del_reply) \ +_(IPSEC_SAD_ENTRY_ADD_DEL_REPLY, ipsec_sad_entry_add_del_reply) \ +_(IPSEC_SA_DETAILS, ipsec_sa_details) \ +_(IPSEC_TUNNEL_IF_ADD_DEL_REPLY, ipsec_tunnel_if_add_del_reply) \ +_(IPSEC_TUNNEL_IF_SET_SA_REPLY, ipsec_tunnel_if_set_sa_reply) \ +_(DELETE_LOOPBACK_REPLY, delete_loopback_reply) \ +_(BD_IP_MAC_ADD_DEL_REPLY, bd_ip_mac_add_del_reply) \ +_(BD_IP_MAC_FLUSH_REPLY, bd_ip_mac_flush_reply) \ +_(BD_IP_MAC_DETAILS, bd_ip_mac_details) \ +_(WANT_INTERFACE_EVENTS_REPLY, want_interface_events_reply) \ +_(GET_FIRST_MSG_ID_REPLY, get_first_msg_id_reply) \ +_(COP_INTERFACE_ENABLE_DISABLE_REPLY, cop_interface_enable_disable_reply) \ +_(COP_WHITELIST_ENABLE_DISABLE_REPLY, cop_whitelist_enable_disable_reply) \ +_(GET_NODE_GRAPH_REPLY, get_node_graph_reply) \ +_(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply) \ +_(IOAM_ENABLE_REPLY, ioam_enable_reply) \ +_(IOAM_DISABLE_REPLY, ioam_disable_reply) \ +_(AF_PACKET_CREATE_REPLY, af_packet_create_reply) \ +_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply) \ +_(AF_PACKET_DETAILS, af_packet_details) \ +_(POLICER_ADD_DEL_REPLY, policer_add_del_reply) \ +_(POLICER_DETAILS, policer_details) \ +_(POLICER_CLASSIFY_SET_INTERFACE_REPLY, policer_classify_set_interface_reply) \ +_(POLICER_CLASSIFY_DETAILS, policer_classify_details) \ +_(MPLS_TUNNEL_DETAILS, mpls_tunnel_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) \ +_(CLASSIFY_SESSION_DETAILS, classify_session_details) \ +_(SET_IPFIX_EXPORTER_REPLY, set_ipfix_exporter_reply) \ +_(IPFIX_EXPORTER_DETAILS, ipfix_exporter_details) \ +_(SET_IPFIX_CLASSIFY_STREAM_REPLY, set_ipfix_classify_stream_reply) \ +_(IPFIX_CLASSIFY_STREAM_DETAILS, ipfix_classify_stream_details) \ +_(IPFIX_CLASSIFY_TABLE_ADD_DEL_REPLY, ipfix_classify_table_add_del_reply) \ +_(IPFIX_CLASSIFY_TABLE_DETAILS, ipfix_classify_table_details) \ +_(FLOW_CLASSIFY_SET_INTERFACE_REPLY, flow_classify_set_interface_reply) \ +_(FLOW_CLASSIFY_DETAILS, flow_classify_details) \ +_(SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY, sw_interface_span_enable_disable_reply) \ +_(SW_INTERFACE_SPAN_DETAILS, sw_interface_span_details) \ +_(GET_NEXT_INDEX_REPLY, get_next_index_reply) \ +_(PG_CREATE_INTERFACE_REPLY, pg_create_interface_reply) \ +_(PG_CAPTURE_REPLY, pg_capture_reply) \ +_(PG_ENABLE_DISABLE_REPLY, pg_enable_disable_reply) \ +_(PG_INTERFACE_ENABLE_DISABLE_COALESCE_REPLY, pg_interface_enable_disable_coalesce_reply) \ +_(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) \ +_(DELETE_SUBIF_REPLY, delete_subif_reply) \ +_(L2_INTERFACE_PBB_TAG_REWRITE_REPLY, l2_interface_pbb_tag_rewrite_reply) \ +_(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) \ +_(FEATURE_GSO_ENABLE_DISABLE_REPLY, feature_gso_enable_disable_reply) \ +_(SW_INTERFACE_TAG_ADD_DEL_REPLY, sw_interface_tag_add_del_reply) \ +_(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply) \ +_(L2_XCONNECT_DETAILS, l2_xconnect_details) \ +_(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \ +_(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \ +_(P2P_ETHERNET_ADD_REPLY, p2p_ethernet_add_reply) \ +_(P2P_ETHERNET_DEL_REPLY, p2p_ethernet_del_reply) \ +_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) \ +_(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply) \ +_(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ +_(SESSION_RULES_DETAILS, session_rules_details) \ +_(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply) \ +_(OUTPUT_ACL_SET_INTERFACE_REPLY, output_acl_set_interface_reply) \ +_(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply) \ +_(FLOW_ADD_REPLY, flow_add_reply) \ - return (1); -} +#define foreach_standalone_reply_msg \ +_(SW_INTERFACE_EVENT, sw_interface_event) -static int -api_ip_route_add_del (vat_main_t * vam) +typedef struct { - 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, "vrf %d", &vrf_id)) - ; - else if (unformat (i, "count %d", &count)) - ; - else if (unformat (i, "random")) - random_add_del = 1; - else if (unformat (i, "multipath")) - is_multipath = 1; - else if (unformat (i, "seed %d", &random_seed)) - ; - else - if (unformat - (i, "via %U", unformat_fib_path, vam, &paths[path_count])) - { - path_count++; - if (8 == path_count) - { - errmsg ("max 8 paths"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!path_count) - { - errmsg ("specify a path; via ..."); - return -99; - } - if (prefix_set == 0) - { - errmsg ("missing prefix"); - return -99; - } - - /* Generate a pile of unique, random routes */ - if (random_add_del) - { - ip4_address_t *i = (ip4_address_t *) & paths[0].nh.address.ip4; - u32 this_random_address; - uword *random_hash; - - random_hash = hash_create (count, sizeof (uword)); - - hash_set (random_hash, i->as_u32, 1); - for (j = 0; j <= count; j++) - { - do - { - this_random_address = random_u32 (&random_seed); - this_random_address = - clib_host_to_net_u32 (this_random_address); - } - while (hash_get (random_hash, this_random_address)); - vec_add1 (random_vector, this_random_address); - hash_set (random_hash, this_random_address, 1); - } - hash_free (random_hash); - set_ip4_address (&pfx.address, random_vector[0]); - } - - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } - - for (j = 0; j < count; j++) - { - /* Construct the API message */ - M2 (IP_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - - mp->is_add = is_add; - mp->is_multipath = is_multipath; - - clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); - mp->route.table_id = ntohl (vrf_id); - mp->route.n_paths = path_count; - - clib_memcpy (&mp->route.paths, &paths, sizeof (paths[0]) * path_count); - - if (random_add_del) - set_ip4_address (&pfx.address, random_vector[j + 1]); - else - increment_address (&pfx.address); - /* send it... */ - S (mp); - /* If we receive SIGTERM, stop now... */ - if (vam->do_exit) - break; - } - - /* When testing multiple add/del ops, use a control-ping to sync */ - if (count > 1) - { - vl_api_control_ping_t *mp_ping; - f64 after; - f64 timeout; - - /* Shut off async mode */ - vam->async_mode = 0; - - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; - - out: - if (vam->retval == -99) - errmsg ("timeout"); - - if (vam->async_errors > 0) - { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; - } - vam->async_errors = 0; - after = vat_time_now (vam); + u8 *name; + u32 value; +} name_sort_t; - /* slim chance, but we might have eaten SIGTERM on the first iteration */ - if (j > 0) - count = j; +#define STR_VTR_OP_CASE(op) \ + case L2_VTR_ ## op: \ + return "" # op; - print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", - count, after - before, count / (after - before)); - } - else +static const char * +str_vtr_op (u32 vtr_op) +{ + switch (vtr_op) { - int ret; - - /* Wait for a reply... */ - W (ret); - return ret; + STR_VTR_OP_CASE (DISABLED); + STR_VTR_OP_CASE (PUSH_1); + STR_VTR_OP_CASE (PUSH_2); + STR_VTR_OP_CASE (POP_1); + STR_VTR_OP_CASE (POP_2); + STR_VTR_OP_CASE (TRANSLATE_1_1); + STR_VTR_OP_CASE (TRANSLATE_1_2); + STR_VTR_OP_CASE (TRANSLATE_2_1); + STR_VTR_OP_CASE (TRANSLATE_2_2); } - /* Return the good/bad news */ - return (vam->retval); + return "UNKNOWN"; } static int -api_ip_mroute_add_del (vat_main_t * vam) +dump_sub_interface_table (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; - mfib_entry_flags_t eflags = 0; - vl_api_mfib_path_t path; - vl_api_mprefix_t pfx = { }; - u32 vrf_id = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", unformat_vl_api_mprefix, &pfx)) - { - prefix_set = 1; - pfx.grp_address_length = htons (pfx.grp_address_length); - } - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "vrf %d", &vrf_id)) - ; - else if (unformat (i, "%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); - return -99; - } - } + const sw_interface_subif_t *sub = NULL; - if (prefix_set == 0) - { - errmsg ("missing addresses\n"); - return -99; - } - if (path_set == 0) + if (vam->json_output) { - errmsg ("missing path\n"); + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); return -99; } - /* Construct the API message */ - M (IP_MROUTE_ADD_DEL, mp); - - mp->is_add = is_add; - mp->is_multipath = 1; - - 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); + print (vam->ofp, + "%-30s%-12s%-11s%-7s%-5s%-9s%-9s%-6s%-8s%-10s%-10s", + "Interface", "sw_if_index", + "sub id", "dot1ad", "tags", "outer id", + "inner id", "exact", "default", "outer any", "inner any"); - clib_memcpy (&mp->route.paths, &path, sizeof (path)); + vec_foreach (sub, vam->sw_if_subif_table) + { + print (vam->ofp, + "%-30s%-12d%-11d%-7s%-5d%-9d%-9d%-6d%-8d%-10d%-10d", + sub->interface_name, + sub->sw_if_index, + sub->sub_id, sub->sub_dot1ad ? "dot1ad" : "dot1q", + sub->sub_number_of_tags, sub->sub_outer_vlan_id, + sub->sub_inner_vlan_id, sub->sub_exact_match, sub->sub_default, + sub->sub_outer_vlan_id_any, sub->sub_inner_vlan_id_any); + if (sub->vtr_op != L2_VTR_DISABLED) + { + print (vam->ofp, + " vlan-tag-rewrite - op: %-14s [ dot1q: %d " + "tag1: %d tag2: %d ]", + str_vtr_op (sub->vtr_op), sub->vtr_push_dot1q, + sub->vtr_tag1, sub->vtr_tag2); + } + } - /* send it... */ - S (mp); - /* Wait for a reply... */ - W (ret); - return ret; + return 0; } static int -api_mpls_table_add_del (vat_main_t * vam) +name_sort_cmp (void *a1, void *a2) { - unformat_input_t *i = vam->input; - vl_api_mpls_table_add_del_t *mp; - u32 table_id = ~0; - u8 is_add = 1; - int ret = 0; + name_sort_t *n1 = a1; + name_sort_t *n2 = a2; - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "table %d", &table_id)) - ; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } + return strcmp ((char *) n1->name, (char *) n2->name); +} - if (~0 == table_id) +static int +dump_interface_table (vat_main_t * vam) +{ + hash_pair_t *p; + name_sort_t *nses = 0, *ns; + + if (vam->json_output) { - errmsg ("missing table-ID"); + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); return -99; } - /* Construct the API message */ - M (MPLS_TABLE_ADD_DEL, mp); - - mp->mt_table.mt_table_id = ntohl (table_id); - mp->mt_is_add = is_add; - - /* send it... */ - S (mp); + /* *INDENT-OFF* */ + hash_foreach_pair (p, vam->sw_if_index_by_interface_name, + ({ + vec_add2 (nses, ns, 1); + ns->name = (u8 *)(p->key); + ns->value = (u32) p->value[0]; + })); + /* *INDENT-ON* */ - /* Wait for a reply... */ - W (ret); + vec_sort_with_function (nses, name_sort_cmp); - return ret; + print (vam->ofp, "%-25s%-15s", "Interface", "sw_if_index"); + vec_foreach (ns, nses) + { + print (vam->ofp, "%-25s%-15d", ns->name, ns->value); + } + vec_free (nses); + return 0; } static int -api_mpls_route_add_del (vat_main_t * vam) +dump_ip_table (vat_main_t * vam, int is_ipv6) { - 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; - vl_api_fib_path_t paths[8]; - int count = 1, j; - f64 before = 0; + const ip_details_t *det = NULL; + const ip_address_details_t *address = NULL; + u32 i = ~0; - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%d", &local_label)) - ; - else if (unformat (i, "eos")) - is_eos = 1; - else if (unformat (i, "non-eos")) - is_eos = 0; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "multipath")) - is_multipath = 1; - else if (unformat (i, "count %d", &count)) - ; - else - if (unformat - (i, "via %U", unformat_fib_path, vam, &paths[path_count])) - { - path_count++; - if (8 == path_count) - { - errmsg ("max 8 paths"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } + print (vam->ofp, "%-12s", "sw_if_index"); - if (!path_count) + vec_foreach (det, vam->ip_details_by_sw_if_index[is_ipv6]) + { + i++; + if (!det->present) + { + continue; + } + print (vam->ofp, "%-12d", i); + print (vam->ofp, " %-30s%-13s", "Address", "Prefix length"); + if (!det->addr) + { + continue; + } + vec_foreach (address, det->addr) { - errmsg ("specify a path; via ..."); - return -99; + print (vam->ofp, + " %-30U%-13d", + is_ipv6 ? format_ip6_address : format_ip4_address, + address->ip, address->prefix_length); } + } - if (MPLS_LABEL_INVALID == local_label) + return 0; +} + +static int +dump_ipv4_table (vat_main_t * vam) +{ + if (vam->json_output) { - errmsg ("missing label"); + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); return -99; } - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } + return dump_ip_table (vam, 0); +} - for (j = 0; j < count; j++) +static int +dump_ipv6_table (vat_main_t * vam) +{ + if (vam->json_output) { - /* Construct the API message */ - M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - - mp->mr_is_add = is_add; - mp->mr_is_multipath = is_multipath; + clib_warning + ("JSON output supported only for VPE API calls and dump_stats_table"); + return -99; + } - 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; + return dump_ip_table (vam, 1); +} - clib_memcpy (&mp->mr_route.mr_paths, paths, - sizeof (paths[0]) * path_count); +/* + * Pass CLI buffers directly in the CLI_INBAND API message, + * instead of an additional shared memory area. + */ +static int +exec_inband (vat_main_t * vam) +{ + vl_api_cli_inband_t *mp; + unformat_input_t *i = vam->input; + int ret; - local_label++; + if (vec_len (i->buffer) == 0) + return -1; - /* send it... */ - S (mp); - /* If we receive SIGTERM, stop now... */ - if (vam->do_exit) - break; + if (vam->exec_mode == 0 && unformat (i, "mode")) + { + vam->exec_mode = 1; + return 0; } - - /* When testing multiple add/del ops, use a control-ping to sync */ - if (count > 1) + if (vam->exec_mode == 1 && (unformat (i, "exit") || unformat (i, "quit"))) { - vl_api_control_ping_t *mp_ping; - f64 after; - f64 timeout; - - /* Shut off async mode */ - vam->async_mode = 0; + vam->exec_mode = 0; + return 0; + } - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + /* + * In order for the CLI command to work, it + * must be a vector ending in \n, not a C-string ending + * in \n\0. + */ + M2 (CLI_INBAND, mp, vec_len (vam->input->buffer)); + vl_api_vec_to_api_string (vam->input->buffer, &mp->cmd); - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; + S (mp); + W (ret); + /* json responses may or may not include a useful reply... */ + if (vec_len (vam->cmd_reply)) + print (vam->ofp, "%v", (char *) (vam->cmd_reply)); + return ret; +} - out: - if (vam->retval == -99) - errmsg ("timeout"); +int +exec (vat_main_t * vam) +{ + return exec_inband (vam); +} - if (vam->async_errors > 0) - { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; - } - vam->async_errors = 0; - after = vat_time_now (vam); +static int +api_create_loopback (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_create_loopback_t *mp; + vl_api_create_loopback_instance_t *mp_lbi; + u8 mac_address[6]; + u8 mac_set = 0; + u8 is_specified = 0; + u32 user_instance = 0; + int ret; - /* slim chance, but we might have eaten SIGTERM on the first iteration */ - if (j > 0) - count = j; + clib_memset (mac_address, 0, sizeof (mac_address)); - print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", - count, after - before, count / (after - before)); + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "mac %U", unformat_ethernet_address, mac_address)) + mac_set = 1; + if (unformat (i, "instance %d", &user_instance)) + is_specified = 1; + else + break; + } + + if (is_specified) + { + M (CREATE_LOOPBACK_INSTANCE, mp_lbi); + mp_lbi->is_specified = is_specified; + if (is_specified) + mp_lbi->user_instance = htonl (user_instance); + if (mac_set) + clib_memcpy (mp_lbi->mac_address, mac_address, sizeof (mac_address)); + S (mp_lbi); } else { - int ret; - - /* Wait for a reply... */ - W (ret); - return ret; + /* Construct the API message */ + M (CREATE_LOOPBACK, mp); + if (mac_set) + clib_memcpy (mp->mac_address, mac_address, sizeof (mac_address)); + S (mp); } - /* Return the good/bad news */ - return (vam->retval); - return (0); + W (ret); + return ret; } static int -api_mpls_ip_bind_unbind (vat_main_t * vam) +api_delete_loopback (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_mpls_ip_bind_unbind_t *mp; - u32 ip_table_id = 0; - u8 is_bind = 1; - vl_api_prefix_t pfx; - u8 prefix_set = 0; - mpls_label_t local_label = MPLS_LABEL_INVALID; + vl_api_delete_loopback_t *mp; + u32 sw_if_index = ~0; int ret; - /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", 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)) + if (unformat (i, "sw_if_index %d", &sw_if_index)) ; - else if (unformat (i, "unbind")) - is_bind = 0; - else if (unformat (i, "bind")) - is_bind = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (!prefix_set) - { - errmsg ("IP prefix not set"); - return -99; + break; } - if (MPLS_LABEL_INVALID == local_label) + if (sw_if_index == ~0) { - errmsg ("missing label"); + errmsg ("missing sw_if_index"); return -99; } /* Construct the API message */ - M (MPLS_IP_BIND_UNBIND, mp); - - mp->mb_is_bind = is_bind; - mp->mb_ip_table_id = ntohl (ip_table_id); - mp->mb_mpls_table_id = 0; - mp->mb_label = ntohl (local_label); - clib_memcpy (&mp->mb_prefix, &pfx, sizeof (pfx)); + M (DELETE_LOOPBACK, mp); + mp->sw_if_index = ntohl (sw_if_index); - /* 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) +api_want_interface_events (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; + vl_api_want_interface_events_t *mp; + int enable = -1; 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)); - } + if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (bsid == 0) + if (enable == -1) { - errmsg ("bsid not set"); + errmsg ("missing enable|disable"); return -99; } - if (n_segments == 0) - { - errmsg ("no sid in segment stack"); - return -99; - } + M (WANT_INTERFACE_EVENTS, mp); + mp->enable_disable = enable; - /* Construct the API message */ - M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments); + vam->interface_event_display = enable; - mp->bsid = htonl (bsid); - mp->weight = htonl (weight); - mp->is_spray = type; - mp->n_segments = n_segments; - memcpy (mp->segments, segments, sizeof (u32) * n_segments); - vec_free (segments); + S (mp); + W (ret); + return ret; +} - /* send it... */ + +/* Note: non-static, called once to set up the initial intfc table */ +int +api_sw_interface_dump (vat_main_t * vam) +{ + vl_api_sw_interface_dump_t *mp; + vl_api_control_ping_t *mp_ping; + hash_pair_t *p; + name_sort_t *nses = 0, *ns; + sw_interface_subif_t *sub = NULL; + int ret; + + /* Toss the old name table */ + /* *INDENT-OFF* */ + hash_foreach_pair (p, vam->sw_if_index_by_interface_name, + ({ + vec_add2 (nses, ns, 1); + ns->name = (u8 *)(p->key); + ns->value = (u32) p->value[0]; + })); + /* *INDENT-ON* */ + + hash_free (vam->sw_if_index_by_interface_name); + + vec_foreach (ns, nses) vec_free (ns->name); + + vec_free (nses); + + vec_foreach (sub, vam->sw_if_subif_table) + { + vec_free (sub->interface_name); + } + vec_free (vam->sw_if_subif_table); + + /* recreate the interface name hash table */ + vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword)); + + /* + * Ask for all interface names. Otherwise, the epic catalog of + * name filters becomes ridiculously long, and vat ends up needing + * to be taught about new interface types. + */ + M (SW_INTERFACE_DUMP, mp); S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_sr_mpls_policy_del (vat_main_t * vam) +api_sw_interface_set_flags (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sr_mpls_policy_del_t *mp; - u32 bsid = 0; + vl_api_sw_interface_set_flags_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 admin_up = 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)) - ; + if (unformat (i, "admin-up")) + admin_up = 1; + else if (unformat (i, "admin-down")) + admin_up = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; } - if (bsid == 0) + if (sw_if_index_set == 0) { - errmsg ("bsid not set"); + errmsg ("missing interface name or sw_if_index"); return -99; } /* Construct the API message */ - M (SR_MPLS_POLICY_DEL, mp); - - mp->bsid = htonl (bsid); + M (SW_INTERFACE_SET_FLAGS, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->flags = ntohl ((admin_up) ? IF_STATUS_API_FLAG_ADMIN_UP : 0); /* send it... */ S (mp); - /* Wait for a reply... */ + /* Wait for a reply, return the good/bad news... */ W (ret); return ret; } static int -api_bier_table_add_del (vat_main_t * vam) +api_sw_interface_set_rx_mode (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_bier_table_add_del_t *mp; - u8 is_add = 1; - u32 set = 0, sub_domain = 0, hdr_len = 3; - mpls_label_t local_label = MPLS_LABEL_INVALID; + vl_api_sw_interface_set_rx_mode_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; int ret; + u8 queue_id_valid = 0; + u32 queue_id; + vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sub-domain %d", &sub_domain)) - ; - else if (unformat (i, "set %d", &set)) - ; - else if (unformat (i, "label %d", &local_label)) - ; - else if (unformat (i, "hdr-len %d", &hdr_len)) - ; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "del")) - is_add = 0; + if (unformat (i, "queue %d", &queue_id)) + queue_id_valid = 1; + else if (unformat (i, "polling")) + mode = VNET_HW_INTERFACE_RX_MODE_POLLING; + else if (unformat (i, "interrupt")) + mode = VNET_HW_INTERFACE_RX_MODE_INTERRUPT; + else if (unformat (i, "adaptive")) + mode = VNET_HW_INTERFACE_RX_MODE_ADAPTIVE; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; } - if (MPLS_LABEL_INVALID == local_label) + if (sw_if_index_set == 0) { - errmsg ("missing label\n"); + errmsg ("missing interface name or sw_if_index"); + return -99; + } + if (mode == VNET_HW_INTERFACE_RX_MODE_UNKNOWN) + { + errmsg ("missing rx-mode"); return -99; } /* Construct the API message */ - M (BIER_TABLE_ADD_DEL, mp); - - mp->bt_is_add = is_add; - mp->bt_label = ntohl (local_label); - mp->bt_tbl_id.bt_set = set; - mp->bt_tbl_id.bt_sub_domain = sub_domain; - mp->bt_tbl_id.bt_hdr_len_id = hdr_len; + M (SW_INTERFACE_SET_RX_MODE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->mode = (vl_api_rx_mode_t) mode; + mp->queue_id_valid = queue_id_valid; + mp->queue_id = queue_id_valid ? ntohl (queue_id) : ~0; /* send it... */ S (mp); - /* Wait for a reply... */ + /* Wait for a reply, return the good/bad news... */ W (ret); - - return (ret); + return ret; } static int -api_bier_route_add_del (vat_main_t * vam) +api_sw_interface_set_rx_placement (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_bier_route_add_del_t *mp; - u8 is_add = 1; - u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0; - ip4_address_t v4_next_hop_address; - ip6_address_t v6_next_hop_address; - u8 next_hop_set = 0; - u8 next_hop_proto_is_ip4 = 1; - mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; + 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", unformat_ip4_address, &v4_next_hop_address)) - { - next_hop_proto_is_ip4 = 1; - next_hop_set = 1; - } - else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address)) - { - next_hop_proto_is_ip4 = 0; - next_hop_set = 1; - } - if (unformat (i, "sub-domain %d", &sub_domain)) - ; - else if (unformat (i, "set %d", &set)) - ; - else if (unformat (i, "hdr-len %d", &hdr_len)) - ; - else if (unformat (i, "bp %d", &bp)) + if (unformat (i, "queue %d", &queue_id)) ; - else if (unformat (i, "add")) - is_add = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "out-label %d", &next_hop_out_label)) + else if (unformat (i, "main")) + is_main = 1; + else if (unformat (i, "worker %d", &thread_index)) ; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + break; } - if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label)) - { - errmsg ("next hop / label set\n"); - return -99; - } - if (0 == bp) + if (sw_if_index_set == 0) { - errmsg ("bit=position not set\n"); + errmsg ("missing interface name or sw_if_index"); return -99; } + if (is_main) + thread_index = 0; /* Construct the API message */ - M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t)); - - mp->br_is_add = is_add; - mp->br_route.br_tbl_id.bt_set = set; - mp->br_route.br_tbl_id.bt_sub_domain = sub_domain; - mp->br_route.br_tbl_id.bt_hdr_len_id = hdr_len; - mp->br_route.br_bp = ntohs (bp); - mp->br_route.br_n_paths = 1; - mp->br_route.br_paths[0].n_labels = 1; - mp->br_route.br_paths[0].label_stack[0].label = ntohl (next_hop_out_label); - mp->br_route.br_paths[0].proto = (next_hop_proto_is_ip4 ? - FIB_API_PATH_NH_PROTO_IP4 : - FIB_API_PATH_NH_PROTO_IP6); - - if (next_hop_proto_is_ip4) - { - clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip4, - &v4_next_hop_address, sizeof (v4_next_hop_address)); - } - else - { - clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip6, - &v6_next_hop_address, sizeof (v6_next_hop_address)); - } + 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... */ + /* Wait for a reply, return the good/bad news... */ W (ret); + return 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_mpls_tunnel_add_del (vat_main_t * vam) +api_sw_interface_rx_placement_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_mpls_tunnel_add_del_t *mp; - - vl_api_fib_path_t paths[8]; - u32 sw_if_index = ~0; - u8 path_count = 0; - u8 l2_only = 0; - u8 is_add = 1; + 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, "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, "l2-only")) - l2_only = 1; - 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; - } - } + 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 - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); + print (vam->ofp, + "\n%-11s %-11s %-6s %-5s %-4s", + "sw_if_index", "main/worker", "thread", "queue", "mode"); - mp->mt_is_add = is_add; - mp->mt_tunnel.mt_sw_if_index = ntohl (sw_if_index); - mp->mt_tunnel.mt_l2_only = l2_only; - mp->mt_tunnel.mt_is_multicast = 0; - mp->mt_tunnel.mt_n_paths = path_count; + /* Dump Interface rx placement */ + M (SW_INTERFACE_RX_PLACEMENT_DUMP, mp); - clib_memcpy (&mp->mt_tunnel.mt_paths, &paths, - sizeof (paths[0]) * path_count); + 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_set_unnumbered (vat_main_t * vam) +api_sw_interface_clear_stats (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_set_unnumbered_t *mp; + vl_api_sw_interface_clear_stats_t *mp; u32 sw_if_index; - u32 unnum_sw_index = ~0; - u8 is_add = 1; 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 if (unformat (i, "unnum_if_index %d", &unnum_sw_index)) - ; - else if (unformat (i, "del")) - is_add = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - } - - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; + break; } - M (SW_INTERFACE_SET_UNNUMBERED, mp); + /* Construct the API message */ + M (SW_INTERFACE_CLEAR_STATS, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->unnumbered_sw_if_index = ntohl (unnum_sw_index); - mp->is_add = is_add; + if (sw_if_index_set == 1) + mp->sw_if_index = ntohl (sw_if_index); + else + mp->sw_if_index = ~0; + /* send it... */ S (mp); + + /* Wait for a reply, return the good/bad news... */ W (ret); return ret; } - static int -api_create_vlan_subif (vat_main_t * vam) +api_sw_interface_add_del_address (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_create_vlan_subif_t *mp; + vl_api_sw_interface_add_del_address_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; - u32 vlan_id; - u8 vlan_id_set = 0; + u8 is_add = 1, del_all = 0; + u32 address_length = 0; + u8 v4_address_set = 0; + u8 v6_address_set = 0; + ip4_address_t v4address; + ip6_address_t v6address; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (i, "del-all")) + del_all = 1; + else if (unformat (i, "del")) + is_add = 0; else if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) sw_if_index_set = 1; - else if (unformat (i, "vlan %d", &vlan_id)) - vlan_id_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "%U/%d", + unformat_ip4_address, &v4address, &address_length)) + v4_address_set = 1; + else if (unformat (i, "%U/%d", + unformat_ip6_address, &v6address, &address_length)) + v6_address_set = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } if (sw_if_index_set == 0) @@ -8945,86 +4240,66 @@ api_create_vlan_subif (vat_main_t * vam) errmsg ("missing interface name or sw_if_index"); return -99; } - - if (vlan_id_set == 0) + if (v4_address_set && v6_address_set) { - errmsg ("missing vlan_id"); + errmsg ("both v4 and v6 addresses set"); return -99; } - M (CREATE_VLAN_SUBIF, mp); + if (!v4_address_set && !v6_address_set && !del_all) + { + errmsg ("no addresses set"); + return -99; + } + + /* Construct the API message */ + M (SW_INTERFACE_ADD_DEL_ADDRESS, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->vlan_id = ntohl (vlan_id); + mp->is_add = is_add; + mp->del_all = del_all; + if (v6_address_set) + { + mp->prefix.address.af = ADDRESS_IP6; + clib_memcpy (mp->prefix.address.un.ip6, &v6address, sizeof (v6address)); + } + else + { + mp->prefix.address.af = ADDRESS_IP4; + clib_memcpy (mp->prefix.address.un.ip4, &v4address, sizeof (v4address)); + } + mp->prefix.len = address_length; + /* send it... */ S (mp); + + /* Wait for a reply, return good/bad news */ W (ret); return ret; } -#define foreach_create_subif_bit \ -_(no_tags) \ -_(one_tag) \ -_(two_tags) \ -_(dot1ad) \ -_(exact_match) \ -_(default_sub) \ -_(outer_vlan_id_any) \ -_(inner_vlan_id_any) - -#define foreach_create_subif_flag \ -_(0, "no_tags") \ -_(1, "one_tag") \ -_(2, "two_tags") \ -_(3, "dot1ad") \ -_(4, "exact_match") \ -_(5, "default_sub") \ -_(6, "outer_vlan_id_any") \ -_(7, "inner_vlan_id_any") - static int -api_create_subif (vat_main_t * vam) +api_sw_interface_set_mpls_enable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_create_subif_t *mp; + vl_api_sw_interface_set_mpls_enable_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; - u32 sub_id; - u8 sub_id_set = 0; - u32 __attribute__ ((unused)) no_tags = 0; - u32 __attribute__ ((unused)) one_tag = 0; - u32 __attribute__ ((unused)) two_tags = 0; - u32 __attribute__ ((unused)) dot1ad = 0; - u32 __attribute__ ((unused)) exact_match = 0; - u32 __attribute__ ((unused)) default_sub = 0; - u32 __attribute__ ((unused)) outer_vlan_id_any = 0; - u32 __attribute__ ((unused)) inner_vlan_id_any = 0; - u32 tmp; - u16 outer_vlan_id = 0; - u16 inner_vlan_id = 0; + u8 enable = 1; 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)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) sw_if_index_set = 1; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + else if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; - else if (unformat (i, "sub_id %d", &sub_id)) - sub_id_set = 1; - else if (unformat (i, "outer_vlan_id %d", &tmp)) - outer_vlan_id = tmp; - else if (unformat (i, "inner_vlan_id %d", &tmp)) - inner_vlan_id = tmp; - -#define _(a) else if (unformat (i, #a)) a = 1 ; - foreach_create_subif_bit -#undef _ - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + else if (unformat (i, "disable")) + enable = 0; + else if (unformat (i, "dis")) + enable = 0; + else + break; } if (sw_if_index_set == 0) @@ -9033,118 +4308,126 @@ api_create_subif (vat_main_t * vam) return -99; } - if (sub_id_set == 0) - { - errmsg ("missing sub_id"); - return -99; - } - M (CREATE_SUBIF, mp); + /* Construct the API message */ + M (SW_INTERFACE_SET_MPLS_ENABLE, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->sub_id = ntohl (sub_id); - -#define _(a,b) mp->sub_if_flags |= (1 << a); - foreach_create_subif_flag; -#undef _ - - mp->outer_vlan_id = ntohs (outer_vlan_id); - mp->inner_vlan_id = ntohs (inner_vlan_id); + mp->enable = enable; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_ip_table_replace_begin (vat_main_t * vam) +api_sw_interface_set_table (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ip_table_replace_begin_t *mp; - u32 table_id = 0; + vl_api_sw_interface_set_table_t *mp; + u32 sw_if_index, vrf_id = 0; + u8 sw_if_index_set = 0; u8 is_ipv6 = 0; - int ret; + + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "table %d", &table_id)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "vrf %d", &vrf_id)) ; else if (unformat (i, "ipv6")) is_ipv6 = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - M (IP_TABLE_REPLACE_BEGIN, mp); - - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; - - S (mp); - W (ret); - return ret; -} - -static int -api_ip_table_flush (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ip_table_flush_t *mp; - u32 table_id = 0; - u8 is_ipv6 = 0; - - int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (sw_if_index_set == 0) { - if (unformat (i, "table %d", &table_id)) - ; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + errmsg ("missing interface name or sw_if_index"); + return -99; } - M (IP_TABLE_FLUSH, mp); + /* Construct the API message */ + M (SW_INTERFACE_SET_TABLE, mp); - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; + mp->sw_if_index = ntohl (sw_if_index); + mp->is_ipv6 = is_ipv6; + mp->vrf_id = ntohl (vrf_id); + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } +static void vl_api_sw_interface_get_table_reply_t_handler + (vl_api_sw_interface_get_table_reply_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%d", ntohl (mp->vrf_id)); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; + +} + +static void vl_api_sw_interface_get_table_reply_t_handler_json + (vl_api_sw_interface_get_table_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_int (&node, "vrf_id", ntohl (mp->vrf_id)); + + vat_json_print (vam->ofp, &node); + vat_json_free (&node); + + vam->retval = ntohl (mp->retval); + vam->result_ready = 1; +} + static int -api_ip_table_replace_end (vat_main_t * vam) +api_sw_interface_get_table (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ip_table_replace_end_t *mp; - u32 table_id = 0; + vl_api_sw_interface_get_table_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; u8 is_ipv6 = 0; - int ret; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "table %d", &table_id)) - ; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else if (unformat (i, "ipv6")) is_ipv6 = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - M (IP_TABLE_REPLACE_END, mp); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - mp->table.table_id = ntohl (table_id); - mp->table.is_ip6 = is_ipv6; + M (SW_INTERFACE_GET_TABLE, mp); + mp->sw_if_index = htonl (sw_if_index); + mp->is_ipv6 = is_ipv6; S (mp); W (ret); @@ -9152,78 +4435,62 @@ api_ip_table_replace_end (vat_main_t * vam) } static int -api_set_ip_flow_hash (vat_main_t * vam) +api_sw_interface_set_vpath (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_set_ip_flow_hash_t *mp; - u32 vrf_id = 0; - u8 is_ipv6 = 0; - u8 vrf_id_set = 0; - u8 src = 0; - u8 dst = 0; - u8 sport = 0; - u8 dport = 0; - u8 proto = 0; - u8 reverse = 0; + vl_api_sw_interface_set_vpath_t *mp; + u32 sw_if_index = 0; + u8 sw_if_index_set = 0; + u8 is_enable = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "vrf %d", &vrf_id)) - vrf_id_set = 1; - else if (unformat (i, "ipv6")) - is_ipv6 = 1; - else if (unformat (i, "src")) - src = 1; - else if (unformat (i, "dst")) - dst = 1; - else if (unformat (i, "sport")) - sport = 1; - else if (unformat (i, "dport")) - dport = 1; - else if (unformat (i, "proto")) - proto = 1; - else if (unformat (i, "reverse")) - reverse = 1; - + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "enable")) + is_enable = 1; + else if (unformat (i, "disable")) + is_enable = 0; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } - if (vrf_id_set == 0) + if (sw_if_index_set == 0) { - errmsg ("missing vrf id"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (SET_IP_FLOW_HASH, mp); - mp->src = src; - mp->dst = dst; - mp->sport = sport; - mp->dport = dport; - mp->proto = proto; - mp->reverse = reverse; - mp->vrf_id = ntohl (vrf_id); - mp->is_ipv6 = is_ipv6; + /* Construct the API message */ + M (SW_INTERFACE_SET_VPATH, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->enable = is_enable; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_sw_interface_ip6_enable_disable (vat_main_t * vam) +api_sw_interface_set_vxlan_bypass (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sw_interface_ip6_enable_disable_t *mp; - u32 sw_if_index; + vl_api_sw_interface_set_vxlan_bypass_t *mp; + u32 sw_if_index = 0; u8 sw_if_index_set = 0; - u8 enable = 0; + u8 is_enable = 1; + u8 is_ipv6 = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) @@ -9231,14 +4498,15 @@ api_sw_interface_ip6_enable_disable (vat_main_t * vam) else if (unformat (i, "sw_if_index %d", &sw_if_index)) sw_if_index_set = 1; else if (unformat (i, "enable")) - enable = 1; + is_enable = 1; else if (unformat (i, "disable")) - enable = 0; + is_enable = 0; + else if (unformat (i, "ip4")) + is_ipv6 = 0; + else if (unformat (i, "ip6")) + is_ipv6 = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } if (sw_if_index_set == 0) @@ -9247,27 +4515,31 @@ api_sw_interface_ip6_enable_disable (vat_main_t * vam) return -99; } - M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp); + /* Construct the API message */ + M (SW_INTERFACE_SET_VXLAN_BYPASS, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->enable = enable; + mp->enable = is_enable; + mp->is_ipv6 = is_ipv6; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } - static int -api_l2_patch_add_del (vat_main_t * vam) +api_sw_interface_set_l2_xconnect (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2_patch_add_del_t *mp; + vl_api_sw_interface_set_l2_xconnect_t *mp; u32 rx_sw_if_index; u8 rx_sw_if_index_set = 0; u32 tx_sw_if_index; u8 tx_sw_if_index_set = 0; - u8 is_add = 1; + u8 enable = 1; int ret; /* Parse args required to build the message */ @@ -9299,8 +4571,10 @@ api_l2_patch_add_del (vat_main_t * vam) else break; } - else if (unformat (i, "del")) - is_add = 0; + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; else break; } @@ -9311,79 +4585,83 @@ api_l2_patch_add_del (vat_main_t * vam) return -99; } - if (tx_sw_if_index_set == 0) + if (enable && (tx_sw_if_index_set == 0)) { errmsg ("missing tx interface name or tx_sw_if_index"); return -99; } - M (L2_PATCH_ADD_DEL, mp); + M (SW_INTERFACE_SET_L2_XCONNECT, mp); mp->rx_sw_if_index = ntohl (rx_sw_if_index); mp->tx_sw_if_index = ntohl (tx_sw_if_index); - mp->is_add = is_add; + mp->enable = enable; S (mp); W (ret); return ret; } -u8 is_del; -u8 localsid_addr[16]; -u8 end_psp; -u8 behavior; -u32 sw_if_index; -u32 vlan_index; -u32 fib_table; -u8 nh_addr[16]; - static int -api_sr_localsid_add_del (vat_main_t * vam) +api_sw_interface_set_l2_bridge (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_sr_localsid_add_del_t *mp; - - u8 is_del; - ip6_address_t localsid; - u8 end_psp = 0; - u8 behavior = ~0; - u32 sw_if_index; - u32 fib_table = ~(u32) 0; - ip46_address_t nh_addr; - clib_memset (&nh_addr, 0, sizeof (ip46_address_t)); - - bool nexthop_set = 0; - + 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; + 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) { - 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_ip46_address, &nh_addr)) - nexthop_set = 1; - else if (unformat (i, "behavior %u", &behavior)); - else if (unformat (i, "sw_if_index %u", &sw_if_index)); - else if (unformat (i, "fib-table %u", &fib_table)); - else if (unformat (i, "end.psp %u", &behavior)); + if (unformat (i, "sw_if_index %d", &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; + else + if (unformat + (i, "%U", api_unformat_sw_if_index, vam, &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "shg %d", &shg)) + ; + else if (unformat (i, "bvi")) + 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")) + enable = 0; else break; } - M (SR_LOCALSID_ADD_DEL, mp); - - clib_memcpy (mp->localsid, &localsid, sizeof (mp->localsid)); + if (rx_sw_if_index_set == 0) + { + errmsg ("missing rx interface name or sw_if_index"); + return -99; + } - if (nexthop_set) + if (enable && (bd_id_set == 0)) { - clib_memcpy (&mp->nh_addr.un, &nh_addr, sizeof (mp->nh_addr.un)); + errmsg ("missing bridge domain"); + return -99; } - mp->behavior = behavior; - mp->sw_if_index = ntohl (sw_if_index); - mp->fib_table = ntohl (fib_table); - mp->end_psp = end_psp; - mp->is_del = is_del; + + M (SW_INTERFACE_SET_L2_BRIDGE, mp); + + mp->rx_sw_if_index = ntohl (rx_sw_if_index); + mp->bd_id = ntohl (bd_id); + mp->shg = (u8) shg; + mp->port_type = ntohl (port_type); + mp->enable = enable; S (mp); W (ret); @@ -9391,1394 +4669,1314 @@ api_sr_localsid_add_del (vat_main_t * vam) } static int -api_ioam_enable (vat_main_t * vam) +api_bridge_domain_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_ioam_enable_t *mp; - u32 id = 0; - int has_trace_option = 0; - int has_pot_option = 0; - int has_seqno_option = 0; - int has_analyse_option = 0; + unformat_input_t *i = vam->input; + vl_api_bridge_domain_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 bd_id = ~0; int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "trace")) - has_trace_option = 1; - else if (unformat (input, "pot")) - has_pot_option = 1; - else if (unformat (input, "seqno")) - has_seqno_option = 1; - else if (unformat (input, "analyse")) - has_analyse_option = 1; + if (unformat (i, "bd_id %d", &bd_id)) + ; else break; } - M (IOAM_ENABLE, mp); - mp->id = htons (id); - mp->seqno = has_seqno_option; - mp->analyse = has_analyse_option; - mp->pot_enable = has_pot_option; - mp->trace_enable = has_trace_option; + M (BRIDGE_DOMAIN_DUMP, mp); + mp->bd_id = ntohl (bd_id); S (mp); - W (ret); - return ret; -} - -static int -api_ioam_disable (vat_main_t * vam) -{ - vl_api_ioam_disable_t *mp; - int ret; + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - M (IOAM_DISABLE, mp); - S (mp); W (ret); return ret; } -#define foreach_tcp_proto_field \ -_(src_port) \ -_(dst_port) - -#define foreach_udp_proto_field \ -_(src_port) \ -_(dst_port) - -#define foreach_ip4_proto_field \ -_(src_address) \ -_(dst_address) \ -_(tos) \ -_(length) \ -_(fragment_id) \ -_(ttl) \ -_(protocol) \ -_(checksum) - -typedef struct -{ - u16 src_port, dst_port; -} tcpudp_header_t; - -#if VPP_API_TEST_BUILTIN == 0 -uword -unformat_tcp_mask (unformat_input_t * input, va_list * args) +static int +api_bridge_domain_add_del (vat_main_t * vam) { - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - tcp_header_t *tcp; - -#define _(a) u8 a=0; - foreach_tcp_proto_field; -#undef _ + unformat_input_t *i = vam->input; + vl_api_bridge_domain_add_del_t *mp; + u32 bd_id = ~0; + u8 is_add = 1; + u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0; + u8 *bd_tag = NULL; + u32 mac_age = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (0); -#define _(a) else if (unformat (input, #a)) a=1; - foreach_tcp_proto_field -#undef _ - else + if (unformat (i, "bd_id %d", &bd_id)) + ; + else if (unformat (i, "flood %d", &flood)) + ; + else if (unformat (i, "uu-flood %d", &uu_flood)) + ; + else if (unformat (i, "forward %d", &forward)) + ; + else if (unformat (i, "learn %d", &learn)) + ; + else if (unformat (i, "arp-term %d", &arp_term)) + ; + else if (unformat (i, "mac-age %d", &mac_age)) + ; + else if (unformat (i, "bd-tag %s", &bd_tag)) + ; + else if (unformat (i, "del")) + { + is_add = 0; + flood = uu_flood = forward = learn = 0; + } + else break; } -#define _(a) found_something += a; - foreach_tcp_proto_field; -#undef _ + if (bd_id == ~0) + { + errmsg ("missing bridge domain"); + ret = -99; + goto done; + } - if (found_something == 0) - return 0; + if (mac_age > 255) + { + errmsg ("mac age must be less than 256 "); + ret = -99; + goto done; + } - vec_validate (mask, sizeof (*tcp) - 1); + if ((bd_tag) && (vec_len (bd_tag) > 63)) + { + errmsg ("bd-tag cannot be longer than 63"); + ret = -99; + goto done; + } - tcp = (tcp_header_t *) mask; + M (BRIDGE_DOMAIN_ADD_DEL, mp); -#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a)); - foreach_tcp_proto_field; -#undef _ + mp->bd_id = ntohl (bd_id); + mp->flood = flood; + mp->uu_flood = uu_flood; + mp->forward = forward; + mp->learn = learn; + mp->arp_term = arp_term; + mp->is_add = is_add; + mp->mac_age = (u8) mac_age; + if (bd_tag) + { + clib_memcpy (mp->bd_tag, bd_tag, vec_len (bd_tag)); + mp->bd_tag[vec_len (bd_tag)] = 0; + } + S (mp); + W (ret); - *maskp = mask; - return 1; +done: + vec_free (bd_tag); + return ret; } -uword -unformat_udp_mask (unformat_input_t * input, va_list * args) +static int +api_l2fib_flush_bd (vat_main_t * vam) { - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - udp_header_t *udp; - -#define _(a) u8 a=0; - foreach_udp_proto_field; -#undef _ + unformat_input_t *i = vam->input; + vl_api_l2fib_flush_bd_t *mp; + u32 bd_id = ~0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (0); -#define _(a) else if (unformat (input, #a)) a=1; - foreach_udp_proto_field -#undef _ - else + if (unformat (i, "bd_id %d", &bd_id)); + else break; } -#define _(a) found_something += a; - foreach_udp_proto_field; -#undef _ - - if (found_something == 0) - return 0; - - vec_validate (mask, sizeof (*udp) - 1); + if (bd_id == ~0) + { + errmsg ("missing bridge domain"); + return -99; + } - udp = (udp_header_t *) mask; + M (L2FIB_FLUSH_BD, mp); -#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a)); - foreach_udp_proto_field; -#undef _ + mp->bd_id = htonl (bd_id); - *maskp = mask; - return 1; + S (mp); + W (ret); + return ret; } -uword -unformat_l4_mask (unformat_input_t * input, va_list * args) +static int +api_l2fib_flush_int (vat_main_t * vam) { - u8 **maskp = va_arg (*args, u8 **); - u16 src_port = 0, dst_port = 0; - tcpudp_header_t *tcpudp; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "tcp %U", unformat_tcp_mask, maskp)) - return 1; - else if (unformat (input, "udp %U", unformat_udp_mask, maskp)) - return 1; - else if (unformat (input, "src_port")) - src_port = 0xFFFF; - else if (unformat (input, "dst_port")) - dst_port = 0xFFFF; + unformat_input_t *i = vam->input; + vl_api_l2fib_flush_int_t *mp; + u32 sw_if_index = ~0; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "sw_if_index %d", &sw_if_index)); else - return 0; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)); + else + break; } - if (!src_port && !dst_port) - return 0; - - u8 *mask = 0; - vec_validate (mask, sizeof (tcpudp_header_t) - 1); + if (sw_if_index == ~0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - tcpudp = (tcpudp_header_t *) mask; - tcpudp->src_port = src_port; - tcpudp->dst_port = dst_port; + M (L2FIB_FLUSH_INT, mp); - *maskp = mask; + mp->sw_if_index = ntohl (sw_if_index); - return 1; + S (mp); + W (ret); + return ret; } -uword -unformat_ip4_mask (unformat_input_t * input, va_list * args) +static int +api_l2fib_add_del (vat_main_t * vam) { - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - ip4_header_t *ip; + unformat_input_t *i = vam->input; + vl_api_l2fib_add_del_t *mp; + f64 timeout; + u8 mac[6] = { 0 }; + u8 mac_set = 0; + u32 bd_id; + u8 bd_id_set = 0; + u32 sw_if_index = 0; + u8 sw_if_index_set = 0; + u8 is_add = 1; + u8 static_mac = 0; + u8 filter_mac = 0; + u8 bvi_mac = 0; + int count = 1; + f64 before = 0; + int j; -#define _(a) u8 a=0; - foreach_ip4_proto_field; -#undef _ - u8 version = 0; - u8 hdr_length = 0; + /* 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)) + mac_set = 1; + else if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if")) + { + if (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 + break; + } + else if (unformat (i, "static")) + static_mac = 1; + else if (unformat (i, "filter")) + { + filter_mac = 1; + static_mac = 1; + } + else if (unformat (i, "bvi")) + { + bvi_mac = 1; + static_mac = 1; + } + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "count %d", &count)) + ; + else + break; + } + if (mac_set == 0) + { + errmsg ("missing mac address"); + return -99; + } - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (bd_id_set == 0) { - if (unformat (input, "version")) - version = 1; - else if (unformat (input, "hdr_length")) - hdr_length = 1; - else if (unformat (input, "src")) - src_address = 1; - else if (unformat (input, "dst")) - dst_address = 1; - else if (unformat (input, "proto")) - protocol = 1; + errmsg ("missing bridge domain"); + return -99; + } -#define _(a) else if (unformat (input, #a)) a=1; - foreach_ip4_proto_field -#undef _ - else - break; + if (is_add && sw_if_index_set == 0 && filter_mac == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; } -#define _(a) found_something += a; - foreach_ip4_proto_field; -#undef _ + if (count > 1) + { + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); + } - if (found_something == 0) - return 0; + for (j = 0; j < count; j++) + { + M (L2FIB_ADD_DEL, mp); - vec_validate (mask, sizeof (*ip) - 1); + clib_memcpy (mp->mac, mac, 6); + mp->bd_id = ntohl (bd_id); + mp->is_add = is_add; + mp->sw_if_index = ntohl (sw_if_index); - ip = (ip4_header_t *) mask; + if (is_add) + { + mp->static_mac = static_mac; + mp->filter_mac = filter_mac; + mp->bvi_mac = bvi_mac; + } + increment_mac_address (mac); + /* send it... */ + S (mp); + } -#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); - foreach_ip4_proto_field; -#undef _ + if (count > 1) + { + vl_api_control_ping_t *mp_ping; + f64 after; - ip->ip_version_and_header_length = 0; + /* Shut off async mode */ + vam->async_mode = 0; - if (version) - ip->ip_version_and_header_length |= 0xF0; + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - if (hdr_length) - ip->ip_version_and_header_length |= 0x0F; + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; - *maskp = mask; - return 1; -} + out: + if (vam->retval == -99) + errmsg ("timeout"); -#define foreach_ip6_proto_field \ -_(src_address) \ -_(dst_address) \ -_(payload_length) \ -_(hop_limit) \ -_(protocol) + if (vam->async_errors > 0) + { + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; + } + vam->async_errors = 0; + after = vat_time_now (vam); -uword -unformat_ip6_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 found_something = 0; - ip6_header_t *ip; - u32 ip_version_traffic_class_and_flow_label; + print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", + count, after - before, count / (after - before)); + } + else + { + int ret; -#define _(a) u8 a=0; - foreach_ip6_proto_field; -#undef _ - u8 version = 0; - u8 traffic_class = 0; - u8 flow_label = 0; + /* Wait for a reply... */ + W (ret); + return ret; + } + /* Return the good/bad news */ + return (vam->retval); +} - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "version")) - version = 1; - else if (unformat (input, "traffic-class")) - traffic_class = 1; - else if (unformat (input, "flow-label")) - flow_label = 1; - else if (unformat (input, "src")) - src_address = 1; - else if (unformat (input, "dst")) - dst_address = 1; - else if (unformat (input, "proto")) - protocol = 1; +static int +api_bridge_domain_set_mac_age (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bridge_domain_set_mac_age_t *mp; + u32 bd_id = ~0; + u32 mac_age = 0; + int ret; -#define _(a) else if (unformat (input, #a)) a=1; - foreach_ip6_proto_field -#undef _ - else + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "bd_id %d", &bd_id)); + else if (unformat (i, "mac-age %d", &mac_age)); + else break; } -#define _(a) found_something += a; - foreach_ip6_proto_field; -#undef _ - - if (found_something == 0) - return 0; - - vec_validate (mask, sizeof (*ip) - 1); - - ip = (ip6_header_t *) mask; - -#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); - foreach_ip6_proto_field; -#undef _ - - ip_version_traffic_class_and_flow_label = 0; - - if (version) - ip_version_traffic_class_and_flow_label |= 0xF0000000; + if (bd_id == ~0) + { + errmsg ("missing bridge domain"); + return -99; + } - if (traffic_class) - ip_version_traffic_class_and_flow_label |= 0x0FF00000; + if (mac_age > 255) + { + errmsg ("mac age must be less than 256 "); + return -99; + } - if (flow_label) - ip_version_traffic_class_and_flow_label |= 0x000FFFFF; + M (BRIDGE_DOMAIN_SET_MAC_AGE, mp); - ip->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + mp->bd_id = htonl (bd_id); + mp->mac_age = (u8) mac_age; - *maskp = mask; - return 1; + S (mp); + W (ret); + return ret; } -uword -unformat_l3_mask (unformat_input_t * input, va_list * args) +static int +api_l2_flags (vat_main_t * vam) { - u8 **maskp = va_arg (*args, u8 **); + unformat_input_t *i = vam->input; + vl_api_l2_flags_t *mp; + u32 sw_if_index; + u32 flags = 0; + u8 sw_if_index_set = 0; + u8 is_set = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp)) - return 1; - else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp)) - return 1; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if")) + { + if (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 + break; + } + else if (unformat (i, "learn")) + flags |= L2_LEARN; + else if (unformat (i, "forward")) + flags |= L2_FWD; + else if (unformat (i, "flood")) + flags |= L2_FLOOD; + else if (unformat (i, "uu-flood")) + flags |= L2_UU_FLOOD; + else if (unformat (i, "arp-term")) + flags |= L2_ARP_TERM; + else if (unformat (i, "off")) + is_set = 0; + else if (unformat (i, "disable")) + is_set = 0; else break; } - return 0; -} - -uword -unformat_l2_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u8 *mask = 0; - u8 src = 0; - u8 dst = 0; - u8 proto = 0; - u8 tag1 = 0; - u8 tag2 = 0; - u8 ignore_tag1 = 0; - u8 ignore_tag2 = 0; - u8 cos1 = 0; - u8 cos2 = 0; - u8 dot1q = 0; - u8 dot1ad = 0; - int len = 14; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (sw_if_index_set == 0) { - if (unformat (input, "src")) - src = 1; - else if (unformat (input, "dst")) - dst = 1; - else if (unformat (input, "proto")) - proto = 1; - else if (unformat (input, "tag1")) - tag1 = 1; - else if (unformat (input, "tag2")) - tag2 = 1; - else if (unformat (input, "ignore-tag1")) - ignore_tag1 = 1; - else if (unformat (input, "ignore-tag2")) - ignore_tag2 = 1; - else if (unformat (input, "cos1")) - cos1 = 1; - else if (unformat (input, "cos2")) - cos2 = 1; - else if (unformat (input, "dot1q")) - dot1q = 1; - else if (unformat (input, "dot1ad")) - dot1ad = 1; - else - break; + errmsg ("missing interface name or sw_if_index"); + return -99; } - if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad + - ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) - return 0; - if (tag1 || ignore_tag1 || cos1 || dot1q) - len = 18; - if (tag2 || ignore_tag2 || cos2 || dot1ad) - len = 22; + M (L2_FLAGS, mp); - vec_validate (mask, len - 1); + mp->sw_if_index = ntohl (sw_if_index); + mp->feature_bitmap = ntohl (flags); + mp->is_set = is_set; - if (dst) - clib_memset (mask, 0xff, 6); + S (mp); + W (ret); + return ret; +} - if (src) - clib_memset (mask + 6, 0xff, 6); +static int +api_bridge_flags (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bridge_flags_t *mp; + u32 bd_id; + u8 bd_id_set = 0; + u8 is_set = 1; + bd_flags_t flags = 0; + int ret; - if (tag2 || dot1ad) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - /* inner vlan tag */ - if (tag2) - { - mask[19] = 0xff; - mask[18] = 0x0f; - } - if (cos2) - mask[18] |= 0xe0; - if (proto) - mask[21] = mask[20] = 0xff; - if (tag1) - { - mask[15] = 0xff; - mask[14] = 0x0f; - } - if (cos1) - mask[14] |= 0xe0; - *maskp = mask; - return 1; + if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; + else if (unformat (i, "learn")) + flags |= BRIDGE_API_FLAG_LEARN; + else if (unformat (i, "forward")) + flags |= BRIDGE_API_FLAG_FWD; + else if (unformat (i, "flood")) + flags |= BRIDGE_API_FLAG_FLOOD; + else if (unformat (i, "uu-flood")) + flags |= BRIDGE_API_FLAG_UU_FLOOD; + else if (unformat (i, "arp-term")) + flags |= BRIDGE_API_FLAG_ARP_TERM; + else if (unformat (i, "off")) + is_set = 0; + else if (unformat (i, "disable")) + is_set = 0; + else + break; } - if (tag1 | dot1q) - { - if (tag1) - { - mask[15] = 0xff; - mask[14] = 0x0f; - } - if (cos1) - mask[14] |= 0xe0; - if (proto) - mask[16] = mask[17] = 0xff; - *maskp = mask; - return 1; + if (bd_id_set == 0) + { + errmsg ("missing bridge domain"); + return -99; } - if (cos2) - mask[18] |= 0xe0; - if (cos1) - mask[14] |= 0xe0; - if (proto) - mask[12] = mask[13] = 0xff; - *maskp = mask; - return 1; + M (BRIDGE_FLAGS, mp); + + mp->bd_id = ntohl (bd_id); + mp->flags = ntohl (flags); + mp->is_set = is_set; + + S (mp); + W (ret); + return ret; } -uword -unformat_classify_mask (unformat_input_t * input, va_list * args) -{ - u8 **maskp = va_arg (*args, u8 **); - u32 *skipp = va_arg (*args, u32 *); - u32 *matchp = va_arg (*args, u32 *); - u32 match; - u8 *mask = 0; - u8 *l2 = 0; - u8 *l3 = 0; - u8 *l4 = 0; - int i; +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_add = 1; + u8 bd_id_set = 0; + u8 ip_set = 0; + u8 mac_set = 0; + int ret; + - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "hex %U", unformat_hex_string, &mask)) - ; - else if (unformat (input, "l2 %U", unformat_l2_mask, &l2)) - ; - else if (unformat (input, "l3 %U", unformat_l3_mask, &l3)) - ; - else if (unformat (input, "l4 %U", unformat_l4_mask, &l4)) - ; + if (unformat (i, "bd_id %d", &bd_id)) + { + bd_id_set++; + } + else if (unformat (i, "%U", unformat_vl_api_address, &ip)) + { + ip_set++; + } + else if (unformat (i, "%U", unformat_vl_api_mac_address, &mac)) + { + mac_set++; + } + else if (unformat (i, "del")) + is_add = 0; else break; } - if (l4 && !l3) + if (bd_id_set == 0) { - vec_free (mask); - vec_free (l2); - vec_free (l4); - return 0; + errmsg ("missing bridge domain"); + return -99; } - - if (mask || l2 || l3 || l4) + else if (ip_set == 0) { - if (l2 || l3 || l4) - { - /* "With a free Ethernet header in every package" */ - if (l2 == 0) - vec_validate (l2, 13); - mask = l2; - if (vec_len (l3)) - { - vec_append (mask, l3); - vec_free (l3); - } - if (vec_len (l4)) - { - vec_append (mask, l4); - vec_free (l4); - } - } + errmsg ("missing IP address"); + return -99; + } + else if (mac_set == 0) + { + errmsg ("missing MAC address"); + return -99; + } - /* Scan forward looking for the first significant mask octet */ - for (i = 0; i < vec_len (mask); i++) - if (mask[i]) - break; + M (BD_IP_MAC_ADD_DEL, mp); - /* compute (skip, match) params */ - *skipp = i / sizeof (u32x4); - vec_delete (mask, *skipp * sizeof (u32x4), 0); + mp->entry.bd_id = ntohl (bd_id); + mp->is_add = is_add; - /* Pad mask to an even multiple of the vector size */ - while (vec_len (mask) % sizeof (u32x4)) - vec_add1 (mask, 0); + clib_memcpy (&mp->entry.ip, &ip, sizeof (ip)); + clib_memcpy (&mp->entry.mac, &mac, sizeof (mac)); - match = vec_len (mask) / sizeof (u32x4); + S (mp); + W (ret); + return ret; +} - for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4)) +static int +api_bd_ip_mac_flush (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bd_ip_mac_flush_t *mp; + u32 bd_id; + u8 bd_id_set = 0; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "bd_id %d", &bd_id)) { - u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4))); - if (*tmp || *(tmp + 1)) - break; - match--; + bd_id_set++; } - if (match == 0) - clib_warning ("BUG: match 0"); + else + break; + } - _vec_len (mask) = match * sizeof (u32x4); + if (bd_id_set == 0) + { + errmsg ("missing bridge domain"); + return -99; + } - *matchp = match; - *maskp = mask; + M (BD_IP_MAC_FLUSH, mp); - return 1; - } + mp->bd_id = ntohl (bd_id); - return 0; + S (mp); + W (ret); + return ret; } -#endif /* VPP_API_TEST_BUILTIN */ - -#define foreach_l2_next \ -_(drop, DROP) \ -_(ethernet, ETHERNET_INPUT) \ -_(ip4, IP4_INPUT) \ -_(ip6, IP6_INPUT) -uword -unformat_l2_next_index (unformat_input_t * input, va_list * args) +static void vl_api_bd_ip_mac_details_t_handler + (vl_api_bd_ip_mac_details_t * mp) { - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; - -#define _(n,N) \ - if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;} - foreach_l2_next; -#undef _ - - if (unformat (input, "%d", &tmp)) - { - next_index = tmp; - goto out; - } - - return 0; + vat_main_t *vam = &vat_main; -out: - *miss_next_indexp = next_index; - return 1; + 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); } -#define foreach_ip_next \ -_(drop, DROP) \ -_(local, LOCAL) \ -_(rewrite, REWRITE) - -uword -api_unformat_ip_next_index (unformat_input_t * input, va_list * args) +static void vl_api_bd_ip_mac_details_t_handler_json + (vl_api_bd_ip_mac_details_t * mp) { - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; - -#define _(n,N) \ - if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;} - foreach_ip_next; -#undef _ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - if (unformat (input, "%d", &tmp)) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - next_index = tmp; - goto out; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - return 0; + 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; -out: - *miss_next_indexp = next_index; - return 1; + ip = format (0, "%U", format_vl_api_address, &mp->entry.ip); + vat_json_object_add_string_copy (node, "ip_address", ip); + vec_free (ip); } -#define foreach_acl_next \ -_(deny, DENY) - -uword -api_unformat_acl_next_index (unformat_input_t * input, va_list * args) +static int +api_bd_ip_mac_dump (vat_main_t * vam) { - u32 *miss_next_indexp = va_arg (*args, u32 *); - u32 next_index = 0; - u32 tmp; - -#define _(n,N) \ - if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;} - foreach_acl_next; -#undef _ + unformat_input_t *i = vam->input; + vl_api_bd_ip_mac_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + u32 bd_id; + u8 bd_id_set = 0; - if (unformat (input, "permit")) - { - next_index = ~0; - goto out; - } - else if (unformat (input, "%d", &tmp)) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - next_index = tmp; - goto out; + if (unformat (i, "bd_id %d", &bd_id)) + { + bd_id_set++; + } + else + break; } - return 0; - -out: - *miss_next_indexp = next_index; - return 1; -} - -uword -unformat_policer_precolor (unformat_input_t * input, va_list * args) -{ - u32 *r = va_arg (*args, u32 *); + print (vam->ofp, + "\n%-5s %-7s %-20s %-30s", + "bd_id", "is_ipv6", "mac_address", "ip_address"); - if (unformat (input, "conform-color")) - *r = POLICE_CONFORM; - else if (unformat (input, "exceed-color")) - *r = POLICE_EXCEED; + /* Dump Bridge Domain Ip to Mac entries */ + M (BD_IP_MAC_DUMP, mp); + + if (bd_id_set) + mp->bd_id = htonl (bd_id); else - return 0; + mp->bd_id = ~0; - return 1; + S (mp); + + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + W (ret); + return ret; } static int -api_classify_add_del_table (vat_main_t * vam) +api_tap_create_v2 (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_add_del_table_t *mp; - - u32 nbuckets = 2; - u32 skip = ~0; - u32 match = ~0; - int is_add = 1; - int del_chain = 0; - u32 table_index = ~0; - u32 next_table_index = ~0; - u32 miss_next_index = ~0; - u32 memory_size = 32 << 20; - u8 *mask = 0; - u32 current_data_flag = 0; - int current_data_offset = 0; + vl_api_tap_create_v2_t *mp; + u8 mac_address[6]; + u8 random_mac = 1; + u32 id = ~0; + u32 num_rx_queues = 0; + u8 *host_if_name = 0; + u8 host_if_name_set = 0; + u8 *host_ns = 0; + u8 host_ns_set = 0; + u8 host_mac_addr[6]; + u8 host_mac_addr_set = 0; + u8 *host_bridge = 0; + u8 host_bridge_set = 0; + u8 host_ip4_prefix_set = 0; + u8 host_ip6_prefix_set = 0; + ip4_address_t host_ip4_addr; + ip4_address_t host_ip4_gw; + u8 host_ip4_gw_set = 0; + u32 host_ip4_prefix_len = 0; + ip6_address_t host_ip6_addr; + ip6_address_t host_ip6_gw; + u8 host_ip6_gw_set = 0; + u32 host_ip6_prefix_len = 0; + u32 host_mtu_size = 0; + u8 host_mtu_set = 0; + u32 tap_flags = 0; int ret; + u32 rx_ring_sz = 0, tx_ring_sz = 0; + 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, "del")) - is_add = 0; - else if (unformat (i, "del-chain")) - { - is_add = 0; - del_chain = 1; - } - else if (unformat (i, "buckets %d", &nbuckets)) - ; - else if (unformat (i, "memory_size %d", &memory_size)) - ; - else if (unformat (i, "skip %d", &skip)) - ; - else if (unformat (i, "match %d", &match)) - ; - else if (unformat (i, "table %d", &table_index)) - ; - else if (unformat (i, "mask %U", unformat_classify_mask, - &mask, &skip, &match)) - ; - else if (unformat (i, "next-table %d", &next_table_index)) - ; - else if (unformat (i, "miss-next %U", api_unformat_ip_next_index, - &miss_next_index)) - ; - else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index, - &miss_next_index)) + if (unformat (i, "id %u", &id)) ; - else if (unformat (i, "acl-miss-next %U", api_unformat_acl_next_index, - &miss_next_index)) + else + if (unformat + (i, "hw-addr %U", unformat_ethernet_address, mac_address)) + random_mac = 0; + else if (unformat (i, "host-if-name %s", &host_if_name)) + host_if_name_set = 1; + else if (unformat (i, "num-rx-queues %u", &num_rx_queues)) ; - else if (unformat (i, "current-data-flag %d", ¤t_data_flag)) + else if (unformat (i, "host-ns %s", &host_ns)) + host_ns_set = 1; + else if (unformat (i, "host-mac-addr %U", unformat_ethernet_address, + host_mac_addr)) + host_mac_addr_set = 1; + else if (unformat (i, "host-bridge %s", &host_bridge)) + host_bridge_set = 1; + else if (unformat (i, "host-ip4-addr %U/%u", unformat_ip4_address, + &host_ip4_addr, &host_ip4_prefix_len)) + host_ip4_prefix_set = 1; + else if (unformat (i, "host-ip6-addr %U/%u", unformat_ip6_address, + &host_ip6_addr, &host_ip6_prefix_len)) + host_ip6_prefix_set = 1; + else if (unformat (i, "host-ip4-gw %U", unformat_ip4_address, + &host_ip4_gw)) + host_ip4_gw_set = 1; + else if (unformat (i, "host-ip6-gw %U", unformat_ip6_address, + &host_ip6_gw)) + host_ip6_gw_set = 1; + else if (unformat (i, "rx-ring-size %u", &rx_ring_sz)) ; - else if (unformat (i, "current-data-offset %d", ¤t_data_offset)) + else if (unformat (i, "tx-ring-size %u", &tx_ring_sz)) ; + else if (unformat (i, "host-mtu-size %u", &host_mtu_size)) + host_mtu_set = 1; + else if (unformat (i, "no-gso")) + tap_flags &= ~TAP_API_FLAG_GSO; + else if (unformat (i, "gso")) + tap_flags |= TAP_API_FLAG_GSO; + else if (unformat (i, "csum-offload")) + tap_flags |= TAP_API_FLAG_CSUM_OFFLOAD; + else if (unformat (i, "persist")) + tap_flags |= TAP_API_FLAG_PERSIST; + else if (unformat (i, "attach")) + tap_flags |= TAP_API_FLAG_ATTACH; + else if (unformat (i, "tun")) + tap_flags |= TAP_API_FLAG_TUN; + else if (unformat (i, "gro-coalesce")) + tap_flags |= TAP_API_FLAG_GRO_COALESCE; + else if (unformat (i, "packed")) + tap_flags |= TAP_API_FLAG_PACKED; + else if (unformat (i, "in-order")) + tap_flags |= TAP_API_FLAG_IN_ORDER; else break; } - if (is_add && mask == 0) + if (vec_len (host_if_name) > 63) { - errmsg ("Mask required"); + errmsg ("tap name too long. "); return -99; } - - if (is_add && skip == ~0) + if (vec_len (host_ns) > 63) { - errmsg ("skip count required"); + errmsg ("host name space too long. "); return -99; } - - if (is_add && match == ~0) + if (vec_len (host_bridge) > 63) { - errmsg ("match count required"); + errmsg ("host bridge name too long. "); return -99; } - - if (!is_add && table_index == ~0) + if (host_ip4_prefix_len > 32) { - errmsg ("table index required for delete"); + errmsg ("host ip4 prefix length not valid. "); + return -99; + } + if (host_ip6_prefix_len > 128) + { + errmsg ("host ip6 prefix length not valid. "); + return -99; + } + if (!is_pow2 (rx_ring_sz)) + { + errmsg ("rx ring size must be power of 2. "); + return -99; + } + if (rx_ring_sz > 32768) + { + errmsg ("rx ring size must be 32768 or lower. "); + return -99; + } + if (!is_pow2 (tx_ring_sz)) + { + errmsg ("tx ring size must be power of 2. "); + return -99; + } + if (tx_ring_sz > 32768) + { + errmsg ("tx ring size must be 32768 or lower. "); + return -99; + } + if (host_mtu_set && (host_mtu_size < 64 || host_mtu_size > 65355)) + { + errmsg ("host MTU size must be in between 64 and 65355. "); return -99; } - M2 (CLASSIFY_ADD_DEL_TABLE, mp, vec_len (mask)); - - mp->is_add = is_add; - mp->del_chain = del_chain; - mp->table_index = ntohl (table_index); - mp->nbuckets = ntohl (nbuckets); - mp->memory_size = ntohl (memory_size); - mp->skip_n_vectors = ntohl (skip); - mp->match_n_vectors = ntohl (match); - mp->next_table_index = ntohl (next_table_index); - mp->miss_next_index = ntohl (miss_next_index); - mp->current_data_flag = ntohl (current_data_flag); - mp->current_data_offset = ntohl (current_data_offset); - mp->mask_len = ntohl (vec_len (mask)); - clib_memcpy (mp->mask, mask, vec_len (mask)); - - vec_free (mask); - - S (mp); - W (ret); - return ret; -} - -#if VPP_API_TEST_BUILTIN == 0 -uword -unformat_l4_match (unformat_input_t * input, va_list * args) -{ - u8 **matchp = va_arg (*args, u8 **); - - u8 *proto_header = 0; - int src_port = 0; - int dst_port = 0; + /* Construct the API message */ + M (TAP_CREATE_V2, mp); - tcpudp_header_t h; + mp->id = ntohl (id); + mp->use_random_mac = random_mac; + mp->num_rx_queues = (u8) num_rx_queues; + mp->tx_ring_sz = ntohs (tx_ring_sz); + mp->rx_ring_sz = ntohs (rx_ring_sz); + mp->host_mtu_set = host_mtu_set; + mp->host_mtu_size = ntohl (host_mtu_size); + mp->host_mac_addr_set = host_mac_addr_set; + mp->host_ip4_prefix_set = host_ip4_prefix_set; + mp->host_ip6_prefix_set = host_ip6_prefix_set; + mp->host_ip4_gw_set = host_ip4_gw_set; + mp->host_ip6_gw_set = host_ip6_gw_set; + mp->tap_flags = ntohl (tap_flags); + mp->host_namespace_set = host_ns_set; + mp->host_if_name_set = host_if_name_set; + mp->host_bridge_set = host_bridge_set; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (random_mac == 0) + clib_memcpy (mp->mac_address, mac_address, 6); + if (host_mac_addr_set) + clib_memcpy (mp->host_mac_addr, host_mac_addr, 6); + if (host_if_name_set) + clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name)); + if (host_ns_set) + clib_memcpy (mp->host_namespace, host_ns, vec_len (host_ns)); + if (host_bridge_set) + clib_memcpy (mp->host_bridge, host_bridge, vec_len (host_bridge)); + if (host_ip4_prefix_set) { - if (unformat (input, "src_port %d", &src_port)) - ; - else if (unformat (input, "dst_port %d", &dst_port)) - ; - else - return 0; + clib_memcpy (mp->host_ip4_prefix.address, &host_ip4_addr, 4); + mp->host_ip4_prefix.len = (u8) host_ip4_prefix_len; + } + if (host_ip6_prefix_set) + { + clib_memcpy (mp->host_ip6_prefix.address, &host_ip6_addr, 16); + mp->host_ip6_prefix.len = (u8) host_ip6_prefix_len; } + if (host_ip4_gw_set) + clib_memcpy (mp->host_ip4_gw, &host_ip4_gw, 4); + if (host_ip6_gw_set) + clib_memcpy (mp->host_ip6_gw, &host_ip6_gw, 16); - h.src_port = clib_host_to_net_u16 (src_port); - h.dst_port = clib_host_to_net_u16 (dst_port); - vec_validate (proto_header, sizeof (h) - 1); - memcpy (proto_header, &h, sizeof (h)); + vec_free (host_ns); + vec_free (host_if_name); + vec_free (host_bridge); - *matchp = proto_header; + /* send it... */ + S (mp); - return 1; + /* Wait for a reply... */ + W (ret); + return ret; } -uword -unformat_ip4_match (unformat_input_t * input, va_list * args) +static int +api_tap_delete_v2 (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - ip4_header_t *ip; - int version = 0; - u32 version_val; - int hdr_length = 0; - u32 hdr_length_val; - int src = 0, dst = 0; - ip4_address_t src_val, dst_val; - int proto = 0; - u32 proto_val; - int tos = 0; - u32 tos_val; - int length = 0; - u32 length_val; - int fragment_id = 0; - u32 fragment_id_val; - int ttl = 0; - int ttl_val; - int checksum = 0; - u32 checksum_val; + unformat_input_t *i = vam->input; + vl_api_tap_delete_v2_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "version %d", &version_val)) - version = 1; - else if (unformat (input, "hdr_length %d", &hdr_length_val)) - hdr_length = 1; - else if (unformat (input, "src %U", unformat_ip4_address, &src_val)) - src = 1; - else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %d", &proto_val)) - proto = 1; - else if (unformat (input, "tos %d", &tos_val)) - tos = 1; - else if (unformat (input, "length %d", &length_val)) - length = 1; - else if (unformat (input, "fragment_id %d", &fragment_id_val)) - fragment_id = 1; - else if (unformat (input, "ttl %d", &ttl_val)) - ttl = 1; - else if (unformat (input, "checksum %d", &checksum_val)) - checksum = 1; + if (unformat (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 (version + hdr_length + src + dst + proto + tos + length + fragment_id - + ttl + checksum == 0) - return 0; - - /* - * Aligned because we use the real comparison functions - */ - vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - - ip = (ip4_header_t *) match; - - /* These are realistically matched in practice */ - if (src) - ip->src_address.as_u32 = src_val.as_u32; - - if (dst) - ip->dst_address.as_u32 = dst_val.as_u32; - - if (proto) - ip->protocol = proto_val; + if (sw_if_index_set == 0) + { + errmsg ("missing vpp interface name. "); + return -99; + } + /* Construct the API message */ + M (TAP_DELETE_V2, mp); - /* These are not, but they're included for completeness */ - if (version) - ip->ip_version_and_header_length |= (version_val & 0xF) << 4; + mp->sw_if_index = ntohl (sw_if_index); - if (hdr_length) - ip->ip_version_and_header_length |= (hdr_length_val & 0xF); + /* send it... */ + S (mp); - if (tos) - ip->tos = tos_val; + /* Wait for a reply... */ + W (ret); + return ret; +} - if (length) - ip->length = clib_host_to_net_u16 (length_val); +uword +unformat_vlib_pci_addr (unformat_input_t * input, va_list * args) +{ + vlib_pci_addr_t *addr = va_arg (*args, vlib_pci_addr_t *); + u32 x[4]; - if (ttl) - ip->ttl = ttl_val; + if (!unformat (input, "%x:%x:%x.%x", &x[0], &x[1], &x[2], &x[3])) + return 0; - if (checksum) - ip->checksum = clib_host_to_net_u16 (checksum_val); + addr->domain = x[0]; + addr->bus = x[1]; + addr->slot = x[2]; + addr->function = x[3]; - *matchp = match; return 1; } -uword -unformat_ip6_match (unformat_input_t * input, va_list * args) +static int +api_virtio_pci_create_v2 (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - ip6_header_t *ip; - int version = 0; - u32 version_val; - u8 traffic_class = 0; - u32 traffic_class_val = 0; - u8 flow_label = 0; - u8 flow_label_val; - int src = 0, dst = 0; - ip6_address_t src_val, dst_val; - int proto = 0; - u32 proto_val; - int payload_length = 0; - u32 payload_length_val; - int hop_limit = 0; - int hop_limit_val; - u32 ip_version_traffic_class_and_flow_label; + unformat_input_t *i = vam->input; + vl_api_virtio_pci_create_v2_t *mp; + u8 mac_address[6]; + u8 random_mac = 1; + u32 pci_addr = 0; + u64 features = (u64) ~ (0ULL); + u32 virtio_flags = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + 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 (input, "version %d", &version_val)) - version = 1; - else if (unformat (input, "traffic_class %d", &traffic_class_val)) - traffic_class = 1; - else if (unformat (input, "flow_label %d", &flow_label_val)) - flow_label = 1; - else if (unformat (input, "src %U", unformat_ip6_address, &src_val)) - src = 1; - else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %d", &proto_val)) - proto = 1; - else if (unformat (input, "payload_length %d", &payload_length_val)) - payload_length = 1; - else if (unformat (input, "hop_limit %d", &hop_limit_val)) - hop_limit = 1; + if (unformat (i, "hw-addr %U", unformat_ethernet_address, mac_address)) + { + random_mac = 0; + } + else if (unformat (i, "pci-addr %U", unformat_vlib_pci_addr, &pci_addr)) + ; + else if (unformat (i, "features 0x%llx", &features)) + ; + else if (unformat (i, "gso-enabled")) + virtio_flags |= VIRTIO_API_FLAG_GSO; + else if (unformat (i, "csum-offload-enabled")) + virtio_flags |= VIRTIO_API_FLAG_CSUM_OFFLOAD; + else if (unformat (i, "gro-coalesce")) + virtio_flags |= VIRTIO_API_FLAG_GRO_COALESCE; + else if (unformat (i, "packed")) + virtio_flags |= VIRTIO_API_FLAG_PACKED; + else if (unformat (i, "in-order")) + virtio_flags |= VIRTIO_API_FLAG_IN_ORDER; else break; } - if (version + traffic_class + flow_label + src + dst + proto + - payload_length + hop_limit == 0) - return 0; - - /* - * Aligned because we use the real comparison functions - */ - vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - - ip = (ip6_header_t *) match; - - if (src) - clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); - - if (dst) - clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); - - if (proto) - ip->protocol = proto_val; - - ip_version_traffic_class_and_flow_label = 0; - - if (version) - ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28; + if (pci_addr == 0) + { + errmsg ("pci address must be non zero. "); + return -99; + } - if (traffic_class) - ip_version_traffic_class_and_flow_label |= - (traffic_class_val & 0xFF) << 20; + /* Construct the API message */ + M (VIRTIO_PCI_CREATE_V2, mp); - if (flow_label) - ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF); + mp->use_random_mac = random_mac; - ip->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + mp->pci_addr.domain = htons (((vlib_pci_addr_t) pci_addr).domain); + mp->pci_addr.bus = ((vlib_pci_addr_t) pci_addr).bus; + mp->pci_addr.slot = ((vlib_pci_addr_t) pci_addr).slot; + mp->pci_addr.function = ((vlib_pci_addr_t) pci_addr).function; - if (payload_length) - ip->payload_length = clib_host_to_net_u16 (payload_length_val); + mp->features = clib_host_to_net_u64 (features); + mp->virtio_flags = clib_host_to_net_u32 (virtio_flags); - if (hop_limit) - ip->hop_limit = hop_limit_val; + if (random_mac == 0) + clib_memcpy (mp->mac_address, mac_address, 6); - *matchp = match; - return 1; + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; } -uword -unformat_l3_match (unformat_input_t * input, va_list * args) +static int +api_virtio_pci_delete (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); + 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; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ip4 %U", unformat_ip4_match, matchp)) - return 1; - else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp)) - return 1; + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - return 0; -} - -uword -unformat_vlan_tag (unformat_input_t * input, va_list * args) -{ - u8 *tagp = va_arg (*args, u8 *); - u32 tag; - if (unformat (input, "%d", &tag)) + if (sw_if_index_set == 0) { - tagp[0] = (tag >> 8) & 0x0F; - tagp[1] = tag & 0xFF; - return 1; + errmsg ("missing vpp interface name. "); + return -99; } - return 0; + /* Construct the API message */ + M (VIRTIO_PCI_DELETE, mp); + + mp->sw_if_index = htonl (sw_if_index); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; } -uword -unformat_l2_match (unformat_input_t * input, va_list * args) +static int +api_bond_create (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u8 *match = 0; - u8 src = 0; - u8 src_val[6]; - u8 dst = 0; - u8 dst_val[6]; - u8 proto = 0; - u16 proto_val; - u8 tag1 = 0; - u8 tag1_val[2]; - u8 tag2 = 0; - u8 tag2_val[2]; - int len = 14; - u8 ignore_tag1 = 0; - u8 ignore_tag2 = 0; - u8 cos1 = 0; - u8 cos2 = 0; - u32 cos1_val = 0; - u32 cos2_val = 0; + unformat_input_t *i = vam->input; + vl_api_bond_create_t *mp; + u8 mac_address[6]; + u8 custom_mac = 0; + int ret; + u8 mode; + u8 lb; + u8 mode_is_set = 0; + u32 id = ~0; + u8 numa_only = 0; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + 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 (input, "src %U", unformat_ethernet_address, &src_val)) - src = 1; - else - if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val)) - dst = 1; - else if (unformat (input, "proto %U", - unformat_ethernet_type_host_byte_order, &proto_val)) - proto = 1; - else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val)) - tag1 = 1; - else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val)) - tag2 = 1; - else if (unformat (input, "ignore-tag1")) - ignore_tag1 = 1; - else if (unformat (input, "ignore-tag2")) - ignore_tag2 = 1; - else if (unformat (input, "cos1 %d", &cos1_val)) - cos1 = 1; - else if (unformat (input, "cos2 %d", &cos2_val)) - cos2 = 1; + if (unformat (i, "mode %U", unformat_bond_mode, &mode)) + mode_is_set = 1; + else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR)) + && unformat (i, "lb %U", unformat_bond_load_balance, &lb)) + ; + else if (unformat (i, "hw-addr %U", unformat_ethernet_address, + mac_address)) + custom_mac = 1; + else if (unformat (i, "numa-only")) + numa_only = 1; + else if (unformat (i, "id %u", &id)) + ; else break; } - if ((src + dst + proto + tag1 + tag2 + - ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) - return 0; - if (tag1 || ignore_tag1 || cos1) - len = 18; - if (tag2 || ignore_tag2 || cos2) - len = 22; + if (mode_is_set == 0) + { + errmsg ("Missing bond mode. "); + return -99; + } - vec_validate_aligned (match, len - 1, sizeof (u32x4)); + /* Construct the API message */ + M (BOND_CREATE, mp); - if (dst) - clib_memcpy (match, dst_val, 6); + mp->use_custom_mac = custom_mac; - if (src) - clib_memcpy (match + 6, src_val, 6); + mp->mode = htonl (mode); + mp->lb = htonl (lb); + mp->id = htonl (id); + mp->numa_only = numa_only; - if (tag2) + if (custom_mac) + clib_memcpy (mp->mac_address, mac_address, 6); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; +} + +static int +api_bond_create2 (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_bond_create2_t *mp; + u8 mac_address[6]; + u8 custom_mac = 0; + int ret; + u8 mode; + u8 lb; + u8 mode_is_set = 0; + u32 id = ~0; + u8 numa_only = 0; + u8 gso = 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) { - /* inner vlan tag */ - match[19] = tag2_val[1]; - match[18] = tag2_val[0]; - if (cos2) - match[18] |= (cos2_val & 0x7) << 5; - if (proto) - { - match[21] = proto_val & 0xff; - match[20] = proto_val >> 8; - } - if (tag1) - { - match[15] = tag1_val[1]; - match[14] = tag1_val[0]; - } - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - *matchp = match; - return 1; + if (unformat (i, "mode %U", unformat_bond_mode, &mode)) + mode_is_set = 1; + else if (((mode == BOND_MODE_LACP) || (mode == BOND_MODE_XOR)) + && unformat (i, "lb %U", unformat_bond_load_balance, &lb)) + ; + else if (unformat (i, "hw-addr %U", unformat_ethernet_address, + mac_address)) + custom_mac = 1; + else if (unformat (i, "numa-only")) + numa_only = 1; + else if (unformat (i, "gso")) + gso = 1; + else if (unformat (i, "id %u", &id)) + ; + else + break; } - if (tag1) - { - match[15] = tag1_val[1]; - match[14] = tag1_val[0]; - if (proto) - { - match[17] = proto_val & 0xff; - match[16] = proto_val >> 8; - } - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - *matchp = match; - return 1; - } - if (cos2) - match[18] |= (cos2_val & 0x7) << 5; - if (cos1) - match[14] |= (cos1_val & 0x7) << 5; - if (proto) + if (mode_is_set == 0) { - match[13] = proto_val & 0xff; - match[12] = proto_val >> 8; + errmsg ("Missing bond mode. "); + return -99; } - *matchp = match; - return 1; -} + /* Construct the API message */ + M (BOND_CREATE2, mp); -uword -unformat_qos_source (unformat_input_t * input, va_list * args) -{ - int *qs = va_arg (*args, int *); + mp->use_custom_mac = custom_mac; - if (unformat (input, "ip")) - *qs = QOS_SOURCE_IP; - else if (unformat (input, "mpls")) - *qs = QOS_SOURCE_MPLS; - else if (unformat (input, "ext")) - *qs = QOS_SOURCE_EXT; - else if (unformat (input, "vlan")) - *qs = QOS_SOURCE_VLAN; - else - return 0; + mp->mode = htonl (mode); + mp->lb = htonl (lb); + mp->id = htonl (id); + mp->numa_only = numa_only; + mp->enable_gso = gso; - return 1; + if (custom_mac) + clib_memcpy (mp->mac_address, mac_address, 6); + + /* send it... */ + S (mp); + + /* Wait for a reply... */ + W (ret); + return ret; } -#endif -uword -api_unformat_classify_match (unformat_input_t * input, va_list * args) +static int +api_bond_delete (vat_main_t * vam) { - u8 **matchp = va_arg (*args, u8 **); - u32 skip_n_vectors = va_arg (*args, u32); - u32 match_n_vectors = va_arg (*args, u32); - - u8 *match = 0; - u8 *l2 = 0; - u8 *l3 = 0; - u8 *l4 = 0; + unformat_input_t *i = vam->input; + vl_api_bond_delete_t *mp; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + int ret; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "hex %U", unformat_hex_string, &match)) - ; - else if (unformat (input, "l2 %U", unformat_l2_match, &l2)) - ; - else if (unformat (input, "l3 %U", unformat_l3_match, &l3)) - ; - else if (unformat (input, "l4 %U", unformat_l4_match, &l4)) - ; + if (unformat (i, "%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 (l4 && !l3) + if (sw_if_index_set == 0) { - vec_free (match); - vec_free (l2); - vec_free (l4); - return 0; + errmsg ("missing vpp interface name. "); + return -99; } - if (match || l2 || l3 || l4) - { - if (l2 || l3 || l4) - { - /* "Win a free Ethernet header in every packet" */ - if (l2 == 0) - vec_validate_aligned (l2, 13, sizeof (u32x4)); - match = l2; - if (vec_len (l3)) - { - vec_append_aligned (match, l3, sizeof (u32x4)); - vec_free (l3); - } - if (vec_len (l4)) - { - vec_append_aligned (match, l4, sizeof (u32x4)); - vec_free (l4); - } - } - - /* Make sure the vector is big enough even if key is all 0's */ - vec_validate_aligned - (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1, - sizeof (u32x4)); - - /* Set size, include skipped vectors */ - _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4); + /* Construct the API message */ + M (BOND_DELETE, mp); - *matchp = match; + mp->sw_if_index = ntohl (sw_if_index); - return 1; - } + /* send it... */ + S (mp); - return 0; + /* Wait for a reply... */ + W (ret); + return ret; } static int -api_classify_add_del_session (vat_main_t * vam) +api_bond_add_member (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_add_del_session_t *mp; - int is_add = 1; - u32 table_index = ~0; - u32 hit_next_index = ~0; - u32 opaque_index = ~0; - u8 *match = 0; - i32 advance = 0; - u32 skip_n_vectors = 0; - u32 match_n_vectors = 0; - u32 action = 0; - u32 metadata = 0; + vl_api_bond_add_member_t *mp; + u32 bond_sw_if_index; int ret; + u8 is_passive; + u8 is_long_timeout; + u32 bond_sw_if_index_is_set = 0; + u32 sw_if_index; + u8 sw_if_index_is_set = 0; - /* - * Warning: you have to supply skip_n and match_n - * because the API client cant simply look at the classify - * table object. - */ - + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "hit-next %U", api_unformat_ip_next_index, - &hit_next_index)) - ; - else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index, - &hit_next_index)) - ; - else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index, - &hit_next_index)) - ; - else if (unformat (i, "policer-hit-next %d", &hit_next_index)) - ; - else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index)) - ; - else if (unformat (i, "opaque-index %d", &opaque_index)) - ; - else if (unformat (i, "skip_n %d", &skip_n_vectors)) - ; - else if (unformat (i, "match_n %d", &match_n_vectors)) - ; - else if (unformat (i, "match %U", api_unformat_classify_match, - &match, skip_n_vectors, match_n_vectors)) - ; - else if (unformat (i, "advance %d", &advance)) - ; - else if (unformat (i, "table-index %d", &table_index)) - ; - else if (unformat (i, "action set-ip4-fib-id %d", &metadata)) - action = 1; - else if (unformat (i, "action set-ip6-fib-id %d", &metadata)) - action = 2; - else if (unformat (i, "action %d", &action)) + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_is_set = 1; + else if (unformat (i, "bond %u", &bond_sw_if_index)) + bond_sw_if_index_is_set = 1; + else if (unformat (i, "passive %d", &is_passive)) ; - else if (unformat (i, "metadata %d", &metadata)) + else if (unformat (i, "long-timeout %d", &is_long_timeout)) ; else break; } - if (table_index == ~0) + if (bond_sw_if_index_is_set == 0) { - errmsg ("Table index required"); + errmsg ("Missing bond sw_if_index. "); return -99; } - - if (is_add && match == 0) + if (sw_if_index_is_set == 0) { - errmsg ("Match value required"); + errmsg ("Missing member sw_if_index. "); return -99; } - M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match)); + /* Construct the API message */ + M (BOND_ADD_MEMBER, mp); - mp->is_add = is_add; - mp->table_index = ntohl (table_index); - mp->hit_next_index = ntohl (hit_next_index); - mp->opaque_index = ntohl (opaque_index); - mp->advance = ntohl (advance); - mp->action = action; - mp->metadata = ntohl (metadata); - mp->match_len = ntohl (vec_len (match)); - clib_memcpy (mp->match, match, vec_len (match)); - vec_free (match); + mp->bond_sw_if_index = ntohl (bond_sw_if_index); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_long_timeout = is_long_timeout; + mp->is_passive = is_passive; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_classify_set_interface_ip_table (vat_main_t * vam) +api_bond_detach_member (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_set_interface_ip_table_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 table_index = ~0; - u8 is_ipv6 = 0; + vl_api_bond_detach_member_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 if (unformat (i, "table %d", &table_index)) - ; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + break; } if (sw_if_index_set == 0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing vpp interface name. "); return -99; } - - M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp); + /* Construct the API message */ + M (BOND_DETACH_MEMBER, mp); mp->sw_if_index = ntohl (sw_if_index); - mp->table_index = ntohl (table_index); - mp->is_ipv6 = is_ipv6; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); return ret; } static int -api_classify_set_interface_l2_tables (vat_main_t * vam) +api_ip_table_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_classify_set_interface_l2_tables_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 other_table_index = ~0; - u32 is_input = 1; - int ret; + vl_api_ip_table_add_del_t *mp; + u32 table_id = ~0; + u8 is_ipv6 = 0; + u8 is_add = 1; + int ret = 0; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "other-table %d", &other_table_index)) - ; - else if (unformat (i, "is-input %d", &is_input)) + if (unformat (i, "ipv6")) + is_ipv6 = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "table %d", &table_id)) ; else { @@ -10787,1002 +5985,1256 @@ api_classify_set_interface_l2_tables (vat_main_t * vam) } } - if (sw_if_index_set == 0) + if (~0 == table_id) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("missing table-ID"); return -99; } + /* Construct the API message */ + M (IP_TABLE_ADD_DEL, mp); - M (CLASSIFY_SET_INTERFACE_L2_TABLES, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->other_table_index = ntohl (other_table_index); - mp->is_input = (u8) is_input; + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; + mp->is_add = is_add; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); + return ret; } +uword +unformat_fib_path (unformat_input_t * input, va_list * args) +{ + vat_main_t *vam = va_arg (*args, vat_main_t *); + vl_api_fib_path_t *path = va_arg (*args, vl_api_fib_path_t *); + u32 weight, preference; + mpls_label_t out_label; + + clib_memset (path, 0, sizeof (*path)); + path->weight = 1; + path->sw_if_index = ~0; + path->rpf_id = ~0; + path->n_labels = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U %U", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, + api_unformat_sw_if_index, vam, &path->sw_if_index)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "%U %U", + unformat_vl_api_ip6_address, + &path->nh.address.ip6, + api_unformat_sw_if_index, vam, &path->sw_if_index)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "weight %u", &weight)) + { + path->weight = weight; + } + else if (unformat (input, "preference %u", &preference)) + { + path->preference = preference; + } + else if (unformat (input, "%U next-hop-table %d", + unformat_vl_api_ip4_address, + &path->nh.address.ip4, &path->table_id)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "%U next-hop-table %d", + unformat_vl_api_ip6_address, + &path->nh.address.ip6, &path->table_id)) + { + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "%U", + unformat_vl_api_ip4_address, &path->nh.address.ip4)) + { + /* + * the recursive next-hops are by default in the default table + */ + path->table_id = 0; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "%U", + unformat_vl_api_ip6_address, &path->nh.address.ip6)) + { + /* + * the recursive next-hops are by default in the default table + */ + path->table_id = 0; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "resolve-via-host")) + { + path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_HOST; + } + else if (unformat (input, "resolve-via-attached")) + { + path->flags |= FIB_API_PATH_FLAG_RESOLVE_VIA_ATTACHED; + } + else if (unformat (input, "ip4-lookup-in-table %d", &path->table_id)) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP4; + } + else if (unformat (input, "ip6-lookup-in-table %d", &path->table_id)) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + path->sw_if_index = ~0; + path->proto = FIB_API_PATH_NH_PROTO_IP6; + } + else if (unformat (input, "sw_if_index %d", &path->sw_if_index)) + ; + else if (unformat (input, "via-label %d", &path->nh.via_label)) + { + path->proto = FIB_API_PATH_NH_PROTO_MPLS; + path->sw_if_index = ~0; + } + else if (unformat (input, "l2-input-on %d", &path->sw_if_index)) + { + path->proto = FIB_API_PATH_NH_PROTO_ETHERNET; + path->type = FIB_API_PATH_TYPE_INTERFACE_RX; + } + else if (unformat (input, "local")) + { + path->type = FIB_API_PATH_TYPE_LOCAL; + } + else if (unformat (input, "out-labels")) + { + while (unformat (input, "%d", &out_label)) + { + path->label_stack[path->n_labels].label = out_label; + path->label_stack[path->n_labels].is_uniform = 0; + path->label_stack[path->n_labels].ttl = 64; + path->n_labels++; + } + } + else if (unformat (input, "via")) + { + /* new path, back up and return */ + unformat_put_input (input); + unformat_put_input (input); + unformat_put_input (input); + unformat_put_input (input); + break; + } + else + { + return (0); + } + } + + path->proto = ntohl (path->proto); + path->type = ntohl (path->type); + path->flags = ntohl (path->flags); + path->table_id = ntohl (path->table_id); + path->sw_if_index = ntohl (path->sw_if_index); + + return (1); +} + static int -api_set_ipfix_exporter (vat_main_t * vam) +api_ip_route_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_set_ipfix_exporter_t *mp; - ip4_address_t collector_address; - u8 collector_address_set = 0; - u32 collector_port = ~0; - ip4_address_t src_address; - u8 src_address_set = 0; - u32 vrf_id = ~0; - u32 path_mtu = ~0; - u32 template_interval = ~0; - u8 udp_checksum = 0; - int ret; + 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, "collector_address %U", unformat_ip4_address, - &collector_address)) - collector_address_set = 1; - else if (unformat (i, "collector_port %d", &collector_port)) - ; - else if (unformat (i, "src_address %U", unformat_ip4_address, - &src_address)) - src_address_set = 1; - else if (unformat (i, "vrf_id %d", &vrf_id)) + if (unformat (i, "%U", unformat_vl_api_prefix, &pfx)) + prefix_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "vrf %d", &vrf_id)) ; - else if (unformat (i, "path_mtu %d", &path_mtu)) + else if (unformat (i, "count %d", &count)) ; - else if (unformat (i, "template_interval %d", &template_interval)) + 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, "udp_checksum")) - udp_checksum = 1; else - break; + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) + { + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } + + if (!path_count) + { + errmsg ("specify a path; via ..."); + return -99; + } + if (prefix_set == 0) + { + errmsg ("missing prefix"); + return -99; } - if (collector_address_set == 0) + /* Generate a pile of unique, random routes */ + if (random_add_del) { - errmsg ("collector_address required"); - return -99; + ip4_address_t *i = (ip4_address_t *) & paths[0].nh.address.ip4; + u32 this_random_address; + uword *random_hash; + + random_hash = hash_create (count, sizeof (uword)); + + hash_set (random_hash, i->as_u32, 1); + for (j = 0; j <= count; j++) + { + do + { + this_random_address = random_u32 (&random_seed); + this_random_address = + clib_host_to_net_u32 (this_random_address); + } + while (hash_get (random_hash, this_random_address)); + vec_add1 (random_vector, this_random_address); + hash_set (random_hash, this_random_address, 1); + } + hash_free (random_hash); + set_ip4_address (&pfx.address, random_vector[0]); } - if (src_address_set == 0) + if (count > 1) { - errmsg ("src_address required"); - return -99; + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - M (SET_IPFIX_EXPORTER, mp); + for (j = 0; j < count; j++) + { + /* Construct the API message */ + M2 (IP_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); - memcpy (mp->collector_address.un.ip4, collector_address.data, - sizeof (collector_address.data)); - mp->collector_port = htons ((u16) collector_port); - memcpy (mp->src_address.un.ip4, src_address.data, - sizeof (src_address.data)); - mp->vrf_id = htonl (vrf_id); - mp->path_mtu = htonl (path_mtu); - mp->template_interval = htonl (template_interval); - mp->udp_checksum = udp_checksum; + mp->is_add = is_add; + mp->is_multipath = is_multipath; - S (mp); - W (ret); - return ret; -} + clib_memcpy (&mp->route.prefix, &pfx, sizeof (pfx)); + mp->route.table_id = ntohl (vrf_id); + mp->route.n_paths = path_count; -static int -api_set_ipfix_classify_stream (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_set_ipfix_classify_stream_t *mp; - u32 domain_id = 0; - u32 src_port = UDP_DST_PORT_ipfix; - int ret; + clib_memcpy (&mp->route.paths, &paths, sizeof (paths[0]) * path_count); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "domain %d", &domain_id)) - ; - else if (unformat (i, "src_port %d", &src_port)) - ; + 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... */ + if (vam->do_exit) + break; + } + + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) + { + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; + + /* Shut off async mode */ + vam->async_mode = 0; + + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; + + out: + if (vam->retval == -99) + errmsg ("timeout"); + + if (vam->async_errors > 0) { - errmsg ("unknown input `%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); - M (SET_IPFIX_CLASSIFY_STREAM, mp); + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (j > 0) + count = j; - mp->domain_id = htonl (domain_id); - mp->src_port = htons ((u16) src_port); + print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", + count, after - before, count / (after - before)); + } + else + { + int ret; - S (mp); - W (ret); - return ret; + /* Wait for a reply... */ + W (ret); + return ret; + } + + /* Return the good/bad news */ + return (vam->retval); } static int -api_ipfix_classify_table_add_del (vat_main_t * vam) +api_ip_mroute_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipfix_classify_table_add_del_t *mp; - int is_add = -1; - u32 classify_table_index = ~0; - u8 ip_version = 0; - u8 transport_protocol = 255; + u8 path_set = 0, prefix_set = 0, is_add = 1; + vl_api_ip_mroute_add_del_t *mp; + mfib_entry_flags_t eflags = 0; + vl_api_mfib_path_t path; + vl_api_mprefix_t pfx = { }; + u32 vrf_id = 0; int ret; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "add")) - is_add = 1; + if (unformat (i, "%U", unformat_vl_api_mprefix, &pfx)) + { + prefix_set = 1; + pfx.grp_address_length = htons (pfx.grp_address_length); + } else if (unformat (i, "del")) is_add = 0; - else if (unformat (i, "table %d", &classify_table_index)) + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "vrf %d", &vrf_id)) ; - else if (unformat (i, "ip4")) - ip_version = 4; - else if (unformat (i, "ip6")) - ip_version = 6; - else if (unformat (i, "tcp")) - transport_protocol = 6; - else if (unformat (i, "udp")) - transport_protocol = 17; + else 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 { - errmsg ("unknown input `%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (is_add == -1) - { - errmsg ("expecting: add|del"); - return -99; - } - if (classify_table_index == ~0) + if (prefix_set == 0) { - errmsg ("classifier table not specified"); + errmsg ("missing addresses\n"); return -99; } - if (ip_version == 0) + if (path_set == 0) { - errmsg ("IP version not specified"); + errmsg ("missing path\n"); return -99; } - M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp); + /* Construct the API message */ + M (IP_MROUTE_ADD_DEL, mp); mp->is_add = is_add; - mp->table_id = htonl (classify_table_index); - mp->ip_version = ip_version; - mp->transport_protocol = transport_protocol; - - S (mp); - W (ret); - return ret; -} - -static int -api_get_node_index (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_get_node_index_t *mp; - u8 *name = 0; - int ret; + mp->is_multipath = 1; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "node %s", &name)) - ; - else - break; - } - if (name == 0) - { - errmsg ("node name required"); - return -99; - } - if (vec_len (name) >= ARRAY_LEN (mp->node_name)) - { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); - return -99; - } + 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); - M (GET_NODE_INDEX, mp); - clib_memcpy (mp->node_name, name, vec_len (name)); - vec_free (name); + clib_memcpy (&mp->route.paths, &path, sizeof (path)); + /* send it... */ S (mp); + /* Wait for a reply... */ W (ret); return ret; } static int -api_get_next_index (vat_main_t * vam) +api_mpls_table_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_get_next_index_t *mp; - u8 *node_name = 0, *next_node_name = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "node-name %s", &node_name)) - ; - else if (unformat (i, "next-node-name %s", &next_node_name)) - break; - } + vl_api_mpls_table_add_del_t *mp; + u32 table_id = ~0; + u8 is_add = 1; + int ret = 0; - if (node_name == 0) - { - errmsg ("node name required"); - return -99; - } - if (vec_len (node_name) >= ARRAY_LEN (mp->node_name)) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); - return -99; + if (unformat (i, "table %d", &table_id)) + ; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (next_node_name == 0) - { - errmsg ("next node name required"); - return -99; - } - if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name)) + if (~0 == table_id) { - errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name)); + errmsg ("missing table-ID"); return -99; } - M (GET_NEXT_INDEX, mp); - clib_memcpy (mp->node_name, node_name, vec_len (node_name)); - clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name)); - vec_free (node_name); - vec_free (next_node_name); + /* Construct the API message */ + M (MPLS_TABLE_ADD_DEL, mp); + + mp->mt_table.mt_table_id = ntohl (table_id); + mp->mt_is_add = is_add; + /* send it... */ S (mp); + + /* Wait for a reply... */ W (ret); + return ret; } static int -api_add_node_next (vat_main_t * vam) +api_mpls_route_add_del (vat_main_t * vam) { + u8 is_add = 1, path_count = 0, is_multipath = 0, is_eos = 0; + mpls_label_t local_label = MPLS_LABEL_INVALID; unformat_input_t *i = vam->input; - vl_api_add_node_next_t *mp; - u8 *name = 0; - u8 *next = 0; - int ret; + vl_api_mpls_route_add_del_t *mp; + vl_api_fib_path_t paths[8]; + int count = 1, j; + f64 before = 0; + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "node %s", &name)) + if (unformat (i, "%d", &local_label)) ; - else if (unformat (i, "next %s", &next)) + else if (unformat (i, "eos")) + is_eos = 1; + else if (unformat (i, "non-eos")) + is_eos = 0; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "multipath")) + is_multipath = 1; + else if (unformat (i, "count %d", &count)) ; else - break; + if (unformat + (i, "via %U", unformat_fib_path, vam, &paths[path_count])) + { + path_count++; + if (8 == path_count) + { + errmsg ("max 8 paths"); + return -99; + } + } + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - if (name == 0) + + if (!path_count) { - errmsg ("node name required"); + errmsg ("specify a path; via ..."); return -99; } - if (vec_len (name) >= ARRAY_LEN (mp->node_name)) + + if (MPLS_LABEL_INVALID == local_label) { - errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + errmsg ("missing label"); return -99; } - if (next == 0) + + if (count > 1) { - errmsg ("next node required"); - return -99; + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - if (vec_len (next) >= ARRAY_LEN (mp->next_name)) + + for (j = 0; j < count; j++) { - errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name)); - return -99; + /* Construct the API message */ + M2 (MPLS_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); + + mp->mr_is_add = is_add; + mp->mr_is_multipath = is_multipath; + + 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; + + clib_memcpy (&mp->mr_route.mr_paths, paths, + sizeof (paths[0]) * path_count); + + local_label++; + + /* send it... */ + S (mp); + /* If we receive SIGTERM, stop now... */ + if (vam->do_exit) + break; } - M (ADD_NODE_NEXT, mp); - clib_memcpy (mp->node_name, name, vec_len (name)); - clib_memcpy (mp->next_name, next, vec_len (next)); - vec_free (name); - vec_free (next); + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) + { + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; - S (mp); - W (ret); - return ret; -} + /* Shut off async mode */ + vam->async_mode = 0; -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; + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - u8 *ip4 = - format (0, "%U/%d", format_ip4_address, mp->host_ip4_prefix.address, - mp->host_ip4_prefix.len); - u8 *ip6 = - format (0, "%U/%d", format_ip6_address, mp->host_ip6_prefix.address, - mp->host_ip6_prefix.len); + timeout = vat_time_now (vam) + 1.0; + while (vat_time_now (vam) < timeout) + if (vam->result_ready == 1) + goto out; + vam->retval = -99; - 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)); + out: + if (vam->retval == -99) + errmsg ("timeout"); - vec_free (ip4); - vec_free (ip6); -} + if (vam->async_errors > 0) + { + errmsg ("%d asynchronous errors", vam->async_errors); + vam->retval = -98; + } + vam->async_errors = 0; + after = vat_time_now (vam); -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; + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (j > 0) + count = j; - if (VAT_JSON_ARRAY != vam->json_tree.type) + print (vam->ofp, "%d routes in %.6f secs, %.2f routes/sec", + count, after - before, count / (after - before)); + } + else { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + int ret; + + /* Wait for a reply... */ + W (ret); + return ret; } - 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_prefix.address, - mp->host_ip4_prefix.len)); - vat_json_object_add_string_copy (node, "host_ip6_prefix", - format (0, "%U/%d", format_ip6_address, - mp->host_ip6_prefix.address, - mp->host_ip6_prefix.len)); + /* Return the good/bad news */ + return (vam->retval); + return (0); +} + +static int +api_mpls_ip_bind_unbind (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_mpls_ip_bind_unbind_t *mp; + u32 ip_table_id = 0; + u8 is_bind = 1; + vl_api_prefix_t pfx; + u8 prefix_set = 0; + mpls_label_t local_label = MPLS_LABEL_INVALID; + int ret; + + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", 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)) + ; + else if (unformat (i, "unbind")) + is_bind = 0; + else if (unformat (i, "bind")) + is_bind = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } -} + if (!prefix_set) + { + errmsg ("IP prefix not set"); + return -99; + } -static int -api_sw_interface_tap_v2_dump (vat_main_t * vam) -{ - vl_api_sw_interface_tap_v2_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + if (MPLS_LABEL_INVALID == local_label) + { + errmsg ("missing label"); + return -99; + } - 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"); + /* Construct the API message */ + M (MPLS_IP_BIND_UNBIND, mp); - /* Get list of tap interfaces */ - M (SW_INTERFACE_TAP_V2_DUMP, mp); - S (mp); + mp->mb_is_bind = is_bind; + mp->mb_ip_table_id = ntohl (ip_table_id); + mp->mb_mpls_table_id = 0; + mp->mb_label = ntohl (local_label); + clib_memcpy (&mp->mb_prefix, &pfx, sizeof (pfx)); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + /* send it... */ + S (mp); + /* Wait for a reply... */ W (ret); return ret; + return (0); } -static void vl_api_sw_interface_virtio_pci_details_t_handler - (vl_api_sw_interface_virtio_pci_details_t * mp) +static int +api_sr_mpls_policy_add (vat_main_t * vam) { - vat_main_t *vam = &vat_main; + 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; - typedef union - { - struct + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - u16 domain; - u8 bus; - u8 slot:5; - u8 function:3; - }; - u32 as_u32; - } pci_addr_t; - pci_addr_t addr; - - addr.domain = ntohs (mp->pci_addr.domain); - addr.bus = mp->pci_addr.bus; - addr.slot = mp->pci_addr.slot; - addr.function = mp->pci_addr.function; - - u8 *pci_addr = format (0, "%04x:%02x:%02x.%x", addr.domain, addr.bus, - addr.slot, addr.function); - - print (vam->ofp, - "\n%-12s %-12d %-12d %-12d %-17U 0x%-08llx", - pci_addr, ntohl (mp->sw_if_index), - ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), - format_ethernet_address, mp->mac_addr, - clib_net_to_host_u64 (mp->features)); - vec_free (pci_addr); -} + 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; + } + } -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; - vlib_pci_addr_t pci_addr; + if (bsid == 0) + { + errmsg ("bsid not set"); + return -99; + } - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (n_segments == 0) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + errmsg ("no sid in segment stack"); + return -99; } - node = vat_json_array_add (&vam->json_tree); - pci_addr.domain = ntohs (mp->pci_addr.domain); - pci_addr.bus = mp->pci_addr.bus; - pci_addr.slot = mp->pci_addr.slot; - pci_addr.function = mp->pci_addr.function; + /* Construct the API message */ + M2 (SR_MPLS_POLICY_ADD, mp, sizeof (u32) * n_segments); - vat_json_init_object (node); - vat_json_object_add_uint (node, "pci-addr", pci_addr.as_u32); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); - vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); - vat_json_object_add_uint (node, "features", - clib_net_to_host_u64 (mp->features)); - vat_json_object_add_string_copy (node, "mac_addr", - format (0, "%U", format_ethernet_address, - &mp->mac_addr)); + mp->bsid = htonl (bsid); + mp->weight = htonl (weight); + mp->is_spray = 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_sw_interface_virtio_pci_dump (vat_main_t * vam) +api_sr_mpls_policy_del (vat_main_t * vam) { - vl_api_sw_interface_virtio_pci_dump_t *mp; - vl_api_control_ping_t *mp_ping; + unformat_input_t *i = vam->input; + vl_api_sr_mpls_policy_del_t *mp; + u32 bsid = 0; int ret; - print (vam->ofp, - "\n%-12s %-12s %-12s %-12s %-17s %-08s", - "pci_addr", "sw_if_index", "rx_ring_sz", "tx_ring_sz", - "mac_addr", "features"); + /* 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; + } + } - /* Get list of tap interfaces */ - M (SW_INTERFACE_VIRTIO_PCI_DUMP, mp); - S (mp); + if (bsid == 0) + { + errmsg ("bsid not set"); + return -99; + } - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + /* Construct the API message */ + M (SR_MPLS_POLICY_DEL, mp); + + mp->bsid = htonl (bsid); + + /* send it... */ + S (mp); + /* Wait for a reply... */ W (ret); return ret; } static int -api_vxlan_offload_rx (vat_main_t * vam) +api_bier_table_add_del (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; + unformat_input_t *i = vam->input; + vl_api_bier_table_add_del_t *mp; u8 is_add = 1; + u32 set = 0, sub_domain = 0, hdr_len = 3; + mpls_label_t local_label = MPLS_LABEL_INVALID; int ret; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != 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)) + if (unformat (i, "sub-domain %d", &sub_domain)) ; - else if (unformat (line_input, "hw hw_if_index %u", &hw_if_index)) + else if (unformat (i, "set %d", &set)) ; - else if (unformat (line_input, "rx %U", api_unformat_sw_if_index, vam, - &rx_if_index)) + else if (unformat (i, "label %d", &local_label)) ; - else if (unformat (line_input, "rx sw_if_index %u", &rx_if_index)) + else if (unformat (i, "hdr-len %d", &hdr_len)) ; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; else { - errmsg ("parse error '%U'", format_unformat_error, line_input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (hw_if_index == ~0) - { - errmsg ("no hw interface"); - return -99; - } - - if (rx_if_index == ~0) + if (MPLS_LABEL_INVALID == local_label) { - errmsg ("no rx tunnel"); + errmsg ("missing label\n"); return -99; } - M (VXLAN_OFFLOAD_RX, mp); + /* Construct the API message */ + M (BIER_TABLE_ADD_DEL, mp); - mp->hw_if_index = ntohl (hw_if_index); - mp->sw_if_index = ntohl (rx_if_index); - mp->enable = is_add; + mp->bt_is_add = is_add; + mp->bt_label = ntohl (local_label); + mp->bt_tbl_id.bt_set = set; + mp->bt_tbl_id.bt_sub_domain = sub_domain; + mp->bt_tbl_id.bt_hdr_len_id = hdr_len; + /* send it... */ S (mp); - W (ret); - return ret; -} -static uword unformat_vxlan_decap_next - (unformat_input_t * input, va_list * args) -{ - u32 *result = va_arg (*args, u32 *); - u32 tmp; + /* Wait for a reply... */ + W (ret); - if (unformat (input, "l2")) - *result = VXLAN_INPUT_NEXT_L2_INPUT; - else if (unformat (input, "%d", &tmp)) - *result = tmp; - else - return 0; - return 1; + return (ret); } static int -api_vxlan_add_del_tunnel (vat_main_t * vam) +api_bier_route_add_del (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_vxlan_add_del_tunnel_t *mp; - ip46_address_t src, dst; + unformat_input_t *i = vam->input; + vl_api_bier_route_add_del_t *mp; u8 is_add = 1; - u8 ipv4_set = 0, ipv6_set = 0; - u8 src_set = 0; - u8 dst_set = 0; - u8 grp_set = 0; - u32 instance = ~0; - u32 mcast_sw_if_index = ~0; - u32 encap_vrf_id = 0; - u32 decap_next_index = ~0; - u32 vni = 0; + u32 set = 0, sub_domain = 0, hdr_len = 3, bp = 0; + ip4_address_t v4_next_hop_address; + ip6_address_t v6_next_hop_address; + u8 next_hop_set = 0; + u8 next_hop_proto_is_ip4 = 1; + mpls_label_t next_hop_out_label = MPLS_LABEL_INVALID; int ret; - /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ - clib_memset (&src, 0, sizeof src); - clib_memset (&dst, 0, sizeof dst); - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "instance %d", &instance)) - ; - else - if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) - { - ipv4_set = 1; - src_set = 1; - } - else - if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4)) - { - ipv4_set = 1; - dst_set = 1; - } - else - if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6)) - { - ipv6_set = 1; - src_set = 1; - } - else - if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6)) - { - ipv6_set = 1; - dst_set = 1; - } - else if (unformat (line_input, "group %U %U", - unformat_ip4_address, &dst.ip4, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) - { - grp_set = dst_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "group %U", - unformat_ip4_address, &dst.ip4)) - { - grp_set = dst_set = 1; - ipv4_set = 1; - } - else if (unformat (line_input, "group %U %U", - unformat_ip6_address, &dst.ip6, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + if (unformat (i, "%U", unformat_ip4_address, &v4_next_hop_address)) { - grp_set = dst_set = 1; - ipv6_set = 1; + next_hop_proto_is_ip4 = 1; + next_hop_set = 1; } - else if (unformat (line_input, "group %U", - unformat_ip6_address, &dst.ip6)) + else if (unformat (i, "%U", unformat_ip6_address, &v6_next_hop_address)) { - grp_set = dst_set = 1; - ipv6_set = 1; + next_hop_proto_is_ip4 = 0; + next_hop_set = 1; } - else - if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + if (unformat (i, "sub-domain %d", &sub_domain)) ; - else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + else if (unformat (i, "set %d", &set)) ; - else if (unformat (line_input, "decap-next %U", - unformat_vxlan_decap_next, &decap_next_index)) + else if (unformat (i, "hdr-len %d", &hdr_len)) ; - else if (unformat (line_input, "vni %d", &vni)) + else if (unformat (i, "bp %d", &bp)) + ; + else if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "out-label %d", &next_hop_out_label)) ; else { - errmsg ("parse error '%U'", format_unformat_error, line_input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (src_set == 0) + if (!next_hop_set || (MPLS_LABEL_INVALID == next_hop_out_label)) { - errmsg ("tunnel src address not specified"); + errmsg ("next hop / label set\n"); return -99; } - if (dst_set == 0) + if (0 == bp) { - errmsg ("tunnel dst address not specified"); + errmsg ("bit=position not set\n"); return -99; } - if (grp_set && !ip46_address_is_multicast (&dst)) - { - errmsg ("tunnel group address not multicast"); - return -99; - } - if (grp_set && mcast_sw_if_index == ~0) + /* Construct the API message */ + M2 (BIER_ROUTE_ADD_DEL, mp, sizeof (vl_api_fib_path_t)); + + mp->br_is_add = is_add; + mp->br_route.br_tbl_id.bt_set = set; + mp->br_route.br_tbl_id.bt_sub_domain = sub_domain; + mp->br_route.br_tbl_id.bt_hdr_len_id = hdr_len; + mp->br_route.br_bp = ntohs (bp); + mp->br_route.br_n_paths = 1; + mp->br_route.br_paths[0].n_labels = 1; + mp->br_route.br_paths[0].label_stack[0].label = ntohl (next_hop_out_label); + mp->br_route.br_paths[0].proto = (next_hop_proto_is_ip4 ? + FIB_API_PATH_NH_PROTO_IP4 : + FIB_API_PATH_NH_PROTO_IP6); + + if (next_hop_proto_is_ip4) { - errmsg ("tunnel nonexistent multicast device"); - return -99; + clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip4, + &v4_next_hop_address, sizeof (v4_next_hop_address)); } - if (grp_set == 0 && ip46_address_is_multicast (&dst)) + else { - errmsg ("tunnel dst address must be unicast"); - return -99; + clib_memcpy (&mp->br_route.br_paths[0].nh.address.ip6, + &v6_next_hop_address, sizeof (v6_next_hop_address)); } + /* send it... */ + S (mp); - if (ipv4_set && ipv6_set) - { - errmsg ("both IPv4 and IPv6 addresses specified"); - return -99; - } + /* Wait for a reply... */ + W (ret); - if ((vni == 0) || (vni >> 24)) - { - errmsg ("vni not specified or out of range"); - return -99; - } + return (ret); +} - M (VXLAN_ADD_DEL_TUNNEL, mp); +static int +api_mpls_tunnel_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_mpls_tunnel_add_del_t *mp; - if (ipv6_set) - { - clib_memcpy (mp->src_address.un.ip6, &src.ip6, sizeof (src.ip6)); - clib_memcpy (mp->dst_address.un.ip6, &dst.ip6, sizeof (dst.ip6)); - } - else + vl_api_fib_path_t paths[8]; + u32 sw_if_index = ~0; + u8 path_count = 0; + u8 l2_only = 0; + u8 is_add = 1; + int ret; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - clib_memcpy (mp->src_address.un.ip4, &src.ip4, sizeof (src.ip4)); - clib_memcpy (mp->dst_address.un.ip4, &dst.ip4, sizeof (dst.ip4)); + 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, "l2-only")) + l2_only = 1; + 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); + return -99; + } } - mp->src_address.af = ipv6_set; - mp->dst_address.af = ipv6_set; - mp->instance = htonl (instance); - mp->encap_vrf_id = ntohl (encap_vrf_id); - mp->decap_next_index = ntohl (decap_next_index); - mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); - mp->vni = ntohl (vni); - mp->is_add = is_add; + M2 (MPLS_TUNNEL_ADD_DEL, mp, sizeof (vl_api_fib_path_t) * path_count); + + mp->mt_is_add = is_add; + mp->mt_tunnel.mt_sw_if_index = ntohl (sw_if_index); + mp->mt_tunnel.mt_l2_only = l2_only; + mp->mt_tunnel.mt_is_multicast = 0; + mp->mt_tunnel.mt_n_paths = path_count; + + clib_memcpy (&mp->mt_tunnel.mt_paths, &paths, + sizeof (paths[0]) * path_count); S (mp); W (ret); return ret; } -static void vl_api_vxlan_tunnel_details_t_handler - (vl_api_vxlan_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - ip46_address_t src = - to_ip46 (mp->dst_address.af, (u8 *) & mp->dst_address.un); - ip46_address_t dst = - to_ip46 (mp->dst_address.af, (u8 *) & mp->src_address.un); - - print (vam->ofp, "%11d%11d%24U%24U%14d%18d%13d%19d", - ntohl (mp->sw_if_index), - ntohl (mp->instance), - format_ip46_address, &src, IP46_TYPE_ANY, - format_ip46_address, &dst, IP46_TYPE_ANY, - ntohl (mp->encap_vrf_id), - ntohl (mp->decap_next_index), ntohl (mp->vni), - ntohl (mp->mcast_sw_if_index)); -} - -static void vl_api_vxlan_tunnel_details_t_handler_json - (vl_api_vxlan_tunnel_details_t * mp) +static int +api_sw_interface_set_unnumbered (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + unformat_input_t *i = vam->input; + vl_api_sw_interface_set_unnumbered_t *mp; + u32 sw_if_index; + u32 unnum_sw_index = ~0; + u8 is_add = 1; + u8 sw_if_index_set = 0; + int ret; - if (VAT_JSON_ARRAY != vam->json_tree.type) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "unnum_if_index %d", &unnum_sw_index)) + ; + else if (unformat (i, "del")) + is_add = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - 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->src_address.af) + if (sw_if_index_set == 0) { - struct in6_addr ip6; - - clib_memcpy (&ip6, mp->src_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "src_address", ip6); - clib_memcpy (&ip6, mp->dst_address.un.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "dst_address", ip6); + errmsg ("missing interface name or sw_if_index"); + return -99; } - else - { - struct in_addr ip4; - clib_memcpy (&ip4, mp->src_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "src_address", ip4); - clib_memcpy (&ip4, mp->dst_address.un.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "dst_address", ip4); - } - vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); - vat_json_object_add_uint (node, "decap_next_index", - ntohl (mp->decap_next_index)); - vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); - vat_json_object_add_uint (node, "mcast_sw_if_index", - ntohl (mp->mcast_sw_if_index)); + M (SW_INTERFACE_SET_UNNUMBERED, mp); + + mp->sw_if_index = ntohl (sw_if_index); + mp->unnumbered_sw_if_index = ntohl (unnum_sw_index); + mp->is_add = is_add; + + S (mp); + W (ret); + return ret; } + static int -api_vxlan_tunnel_dump (vat_main_t * vam) +api_create_vlan_subif (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_vxlan_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_create_vlan_subif_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; + u32 vlan_id; + u8 vlan_id_set = 0; int ret; - /* 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 (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "vlan %d", &vlan_id)) + vlan_id_set = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } if (sw_if_index_set == 0) { - sw_if_index = ~0; + errmsg ("missing interface name or sw_if_index"); + return -99; } - if (!vam->json_output) + if (vlan_id_set == 0) { - print (vam->ofp, "%11s%11s%24s%24s%14s%18s%13s%19s", - "sw_if_index", "instance", "src_address", "dst_address", - "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); + errmsg ("missing vlan_id"); + return -99; } + M (CREATE_VLAN_SUBIF, mp); - /* Get list of vxlan-tunnel interfaces */ - M (VXLAN_TUNNEL_DUMP, mp); - - mp->sw_if_index = htonl (sw_if_index); + mp->sw_if_index = ntohl (sw_if_index); + mp->vlan_id = ntohl (vlan_id); S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); return ret; } +#define foreach_create_subif_bit \ +_(no_tags) \ +_(one_tag) \ +_(two_tags) \ +_(dot1ad) \ +_(exact_match) \ +_(default_sub) \ +_(outer_vlan_id_any) \ +_(inner_vlan_id_any) + +#define foreach_create_subif_flag \ +_(0, "no_tags") \ +_(1, "one_tag") \ +_(2, "two_tags") \ +_(3, "dot1ad") \ +_(4, "exact_match") \ +_(5, "default_sub") \ +_(6, "outer_vlan_id_any") \ +_(7, "inner_vlan_id_any") + static int -api_gre_tunnel_add_del (vat_main_t * vam) +api_create_subif (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_address_t src = { }, dst = - { - }; - vl_api_gre_tunnel_add_del_t *mp; - vl_api_gre_tunnel_type_t t_type; - u8 is_add = 1; - u8 src_set = 0; - u8 dst_set = 0; - u32 outer_table_id = 0; - u32 session_id = 0; - u32 instance = ~0; + unformat_input_t *i = vam->input; + vl_api_create_subif_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u32 sub_id; + u8 sub_id_set = 0; + u32 __attribute__ ((unused)) no_tags = 0; + u32 __attribute__ ((unused)) one_tag = 0; + u32 __attribute__ ((unused)) two_tags = 0; + u32 __attribute__ ((unused)) dot1ad = 0; + u32 __attribute__ ((unused)) exact_match = 0; + u32 __attribute__ ((unused)) default_sub = 0; + u32 __attribute__ ((unused)) outer_vlan_id_any = 0; + u32 __attribute__ ((unused)) inner_vlan_id_any = 0; + u32 tmp; + u16 outer_vlan_id = 0; + u16 inner_vlan_id = 0; int ret; - t_type = GRE_API_TUNNEL_TYPE_L3; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "instance %d", &instance)) - ; - else if (unformat (line_input, "src %U", unformat_vl_api_address, &src)) - { - src_set = 1; - } - else if (unformat (line_input, "dst %U", unformat_vl_api_address, &dst)) - { - dst_set = 1; - } - else if (unformat (line_input, "outer-table-id %d", &outer_table_id)) - ; - else if (unformat (line_input, "teb")) - t_type = GRE_API_TUNNEL_TYPE_TEB; - else if (unformat (line_input, "erspan %d", &session_id)) - t_type = GRE_API_TUNNEL_TYPE_ERSPAN; + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sub_id %d", &sub_id)) + sub_id_set = 1; + else if (unformat (i, "outer_vlan_id %d", &tmp)) + outer_vlan_id = tmp; + else if (unformat (i, "inner_vlan_id %d", &tmp)) + inner_vlan_id = tmp; + +#define _(a) else if (unformat (i, #a)) a = 1 ; + foreach_create_subif_bit +#undef _ + else { - errmsg ("parse error '%U'", format_unformat_error, line_input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (src_set == 0) + if (sw_if_index_set == 0) { - errmsg ("tunnel src address not specified"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (dst_set == 0) + + if (sub_id_set == 0) { - errmsg ("tunnel dst address not specified"); + errmsg ("missing sub_id"); return -99; } + M (CREATE_SUBIF, mp); - M (GRE_TUNNEL_ADD_DEL, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->sub_id = ntohl (sub_id); - clib_memcpy (&mp->tunnel.src, &src, sizeof (mp->tunnel.src)); - clib_memcpy (&mp->tunnel.dst, &dst, sizeof (mp->tunnel.dst)); +#define _(a,b) mp->sub_if_flags |= (1 << a); + foreach_create_subif_flag; +#undef _ - mp->tunnel.instance = htonl (instance); - mp->tunnel.outer_table_id = htonl (outer_table_id); - mp->is_add = is_add; - mp->tunnel.session_id = htons ((u16) session_id); - mp->tunnel.type = htonl (t_type); + mp->outer_vlan_id = ntohs (outer_vlan_id); + mp->inner_vlan_id = ntohs (inner_vlan_id); S (mp); W (ret); return ret; } -static void vl_api_gre_tunnel_details_t_handler - (vl_api_gre_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - - print (vam->ofp, "%11d%11d%24U%24U%13d%14d%12d", - ntohl (mp->tunnel.sw_if_index), - ntohl (mp->tunnel.instance), - format_vl_api_address, &mp->tunnel.src, - format_vl_api_address, &mp->tunnel.dst, - mp->tunnel.type, ntohl (mp->tunnel.outer_table_id), - ntohl (mp->tunnel.session_id)); -} - -static void vl_api_gre_tunnel_details_t_handler_json - (vl_api_gre_tunnel_details_t * mp) +static int +api_ip_table_replace_begin (vat_main_t * vam) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + unformat_input_t *i = vam->input; + vl_api_ip_table_replace_begin_t *mp; + u32 table_id = 0; + u8 is_ipv6 = 0; - if (VAT_JSON_ARRAY != vam->json_tree.type) + int ret; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (i, "table %d", &table_id)) + ; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", - ntohl (mp->tunnel.sw_if_index)); - vat_json_object_add_uint (node, "instance", ntohl (mp->tunnel.instance)); + M (IP_TABLE_REPLACE_BEGIN, mp); - 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_table_id", - ntohl (mp->tunnel.outer_table_id)); - vat_json_object_add_uint (node, "session_id", mp->tunnel.session_id); + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; + + S (mp); + W (ret); + return ret; } static int -api_gre_tunnel_dump (vat_main_t * vam) +api_ip_table_flush (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_gre_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; + vl_api_ip_table_flush_t *mp; + u32 table_id = 0; + u8 is_ipv6 = 0; - /* Parse args required to build the message */ + int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (i, "table %d", &table_id)) + ; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; else - break; - } - - if (sw_if_index_set == 0) - { - sw_if_index = ~0; - } - - if (!vam->json_output) - { - print (vam->ofp, "%11s%11s%24s%24s%13s%14s%12s", - "sw_if_index", "instance", "src_address", "dst_address", - "tunnel_type", "outer_fib_id", "session_id"); + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } } - /* Get list of gre-tunnel interfaces */ - M (GRE_TUNNEL_DUMP, mp); + M (IP_TABLE_FLUSH, mp); - mp->sw_if_index = htonl (sw_if_index); + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - W (ret); return ret; } static int -api_l2_fib_clear_table (vat_main_t * vam) +api_ip_table_replace_end (vat_main_t * vam) { -// unformat_input_t * i = vam->input; - vl_api_l2_fib_clear_table_t *mp; + unformat_input_t *i = vam->input; + vl_api_ip_table_replace_end_t *mp; + u32 table_id = 0; + u8 is_ipv6 = 0; + int ret; + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "table %d", &table_id)) + ; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } - M (L2_FIB_CLEAR_TABLE, mp); + M (IP_TABLE_REPLACE_END, mp); + + mp->table.table_id = ntohl (table_id); + mp->table.is_ip6 = is_ipv6; S (mp); W (ret); @@ -11790,25 +7242,40 @@ api_l2_fib_clear_table (vat_main_t * vam) } static int -api_l2_interface_efp_filter (vat_main_t * vam) +api_set_ip_flow_hash (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2_interface_efp_filter_t *mp; - u32 sw_if_index; - u8 enable = 1; - u8 sw_if_index_set = 0; + vl_api_set_ip_flow_hash_t *mp; + u32 vrf_id = 0; + u8 is_ipv6 = 0; + u8 vrf_id_set = 0; + u8 src = 0; + u8 dst = 0; + u8 sport = 0; + u8 dport = 0; + u8 proto = 0; + u8 reverse = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "enable")) - enable = 1; - else if (unformat (i, "disable")) - enable = 0; + if (unformat (i, "vrf %d", &vrf_id)) + vrf_id_set = 1; + else if (unformat (i, "ipv6")) + is_ipv6 = 1; + else if (unformat (i, "src")) + src = 1; + else if (unformat (i, "dst")) + dst = 1; + else if (unformat (i, "sport")) + sport = 1; + else if (unformat (i, "dport")) + dport = 1; + else if (unformat (i, "proto")) + proto = 1; + else if (unformat (i, "reverse")) + reverse = 1; + else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -11816,45 +7283,35 @@ api_l2_interface_efp_filter (vat_main_t * vam) } } - if (sw_if_index_set == 0) + if (vrf_id_set == 0) { - errmsg ("missing sw_if_index"); + errmsg ("missing vrf id"); return -99; } - M (L2_INTERFACE_EFP_FILTER, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable; + M (SET_IP_FLOW_HASH, mp); + mp->src = src; + mp->dst = dst; + mp->sport = sport; + mp->dport = dport; + mp->proto = proto; + mp->reverse = reverse; + mp->vrf_id = ntohl (vrf_id); + mp->is_ipv6 = is_ipv6; S (mp); W (ret); return ret; } -#define foreach_vtr_op \ -_("disable", L2_VTR_DISABLED) \ -_("push-1", L2_VTR_PUSH_1) \ -_("push-2", L2_VTR_PUSH_2) \ -_("pop-1", L2_VTR_POP_1) \ -_("pop-2", L2_VTR_POP_2) \ -_("translate-1-1", L2_VTR_TRANSLATE_1_1) \ -_("translate-1-2", L2_VTR_TRANSLATE_1_2) \ -_("translate-2-1", L2_VTR_TRANSLATE_2_1) \ -_("translate-2-2", L2_VTR_TRANSLATE_2_2) - static int -api_l2_interface_vlan_tag_rewrite (vat_main_t * vam) +api_sw_interface_ip6_enable_disable (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_l2_interface_vlan_tag_rewrite_t *mp; + vl_api_sw_interface_ip6_enable_disable_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; - u8 vtr_op_set = 0; - u32 vtr_op = 0; - u32 push_dot1q = 1; - u32 tag1 = ~0; - u32 tag2 = ~0; + u8 enable = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) @@ -11863,17 +7320,10 @@ api_l2_interface_vlan_tag_rewrite (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, "vtr_op %d", &vtr_op)) - vtr_op_set = 1; -#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;} - foreach_vtr_op -#undef _ - else if (unformat (i, "push_dot1q %d", &push_dot1q)) - ; - else if (unformat (i, "tag1 %d", &tag1)) - ; - else if (unformat (i, "tag2 %d", &tag2)) - ; + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -11881,179 +7331,149 @@ api_l2_interface_vlan_tag_rewrite (vat_main_t * vam) } } - if ((sw_if_index_set == 0) || (vtr_op_set == 0)) + if (sw_if_index_set == 0) { - errmsg ("missing vtr operation or sw_if_index"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (L2_INTERFACE_VLAN_TAG_REWRITE, mp); + M (SW_INTERFACE_IP6_ENABLE_DISABLE, mp); + mp->sw_if_index = ntohl (sw_if_index); - mp->vtr_op = ntohl (vtr_op); - mp->push_dot1q = ntohl (push_dot1q); - mp->tag1 = ntohl (tag1); - mp->tag2 = ntohl (tag2); + mp->enable = enable; S (mp); W (ret); return ret; } + static int -api_create_vhost_user_if (vat_main_t * vam) +api_l2_patch_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_create_vhost_user_if_t *mp; - u8 *file_name; - u8 is_server = 0; - u8 file_name_set = 0; - u32 custom_dev_instance = ~0; - u8 hwaddr[6]; - u8 use_custom_mac = 0; - u8 disable_mrg_rxbuf = 0; - u8 disable_indirect_desc = 0; - u8 *tag = 0; - u8 enable_gso = 0; - u8 enable_packed = 0; + vl_api_l2_patch_add_del_t *mp; + u32 rx_sw_if_index; + u8 rx_sw_if_index_set = 0; + u32 tx_sw_if_index; + u8 tx_sw_if_index_set = 0; + u8 is_add = 1; int ret; - /* Shut up coverity */ - clib_memset (hwaddr, 0, sizeof (hwaddr)); - + /* Parse args required to build the message */ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "socket %s", &file_name)) + if (unformat (i, "rx_sw_if_index %d", &rx_sw_if_index)) + rx_sw_if_index_set = 1; + else if (unformat (i, "tx_sw_if_index %d", &tx_sw_if_index)) + tx_sw_if_index_set = 1; + else if (unformat (i, "rx")) { - file_name_set = 1; + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &rx_sw_if_index)) + rx_sw_if_index_set = 1; + } + else + break; } - else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) - ; - else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr)) - use_custom_mac = 1; - else if (unformat (i, "server")) - is_server = 1; - else if (unformat (i, "disable_mrg_rxbuf")) - disable_mrg_rxbuf = 1; - else if (unformat (i, "disable_indirect_desc")) - disable_indirect_desc = 1; - else if (unformat (i, "gso")) - enable_gso = 1; - else if (unformat (i, "packed")) - enable_packed = 1; - else if (unformat (i, "tag %s", &tag)) - ; + else if (unformat (i, "tx")) + { + if (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, + &tx_sw_if_index)) + tx_sw_if_index_set = 1; + } + else + break; + } + else if (unformat (i, "del")) + is_add = 0; else break; } - if (file_name_set == 0) + if (rx_sw_if_index_set == 0) { - errmsg ("missing socket file name"); + errmsg ("missing rx interface name or rx_sw_if_index"); return -99; } - if (vec_len (file_name) > 255) + if (tx_sw_if_index_set == 0) { - errmsg ("socket file name too long"); + errmsg ("missing tx interface name or tx_sw_if_index"); return -99; } - vec_add1 (file_name, 0); - - M (CREATE_VHOST_USER_IF, mp); - mp->is_server = is_server; - mp->disable_mrg_rxbuf = disable_mrg_rxbuf; - mp->disable_indirect_desc = disable_indirect_desc; - mp->enable_gso = enable_gso; - mp->enable_packed = enable_packed; - clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); - vec_free (file_name); - if (custom_dev_instance != ~0) - { - mp->renumber = 1; - mp->custom_dev_instance = ntohl (custom_dev_instance); - } + M (L2_PATCH_ADD_DEL, mp); - mp->use_custom_mac = use_custom_mac; - clib_memcpy (mp->mac_address, hwaddr, 6); - if (tag) - strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); - vec_free (tag); + mp->rx_sw_if_index = ntohl (rx_sw_if_index); + mp->tx_sw_if_index = ntohl (tx_sw_if_index); + mp->is_add = is_add; S (mp); W (ret); return ret; } +u8 is_del; +u8 localsid_addr[16]; +u8 end_psp; +u8 behavior; +u32 sw_if_index; +u32 vlan_index; +u32 fib_table; +u8 nh_addr[16]; + static int -api_modify_vhost_user_if (vat_main_t * vam) +api_sr_localsid_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_modify_vhost_user_if_t *mp; - u8 *file_name; - u8 is_server = 0; - u8 file_name_set = 0; - u32 custom_dev_instance = ~0; - u8 sw_if_index_set = 0; - u32 sw_if_index = (u32) ~ 0; - u8 enable_gso = 0; - u8 enable_packed = 0; + vl_api_sr_localsid_add_del_t *mp; + + u8 is_del; + ip6_address_t localsid; + u8 end_psp = 0; + u8 behavior = ~0; + u32 sw_if_index; + u32 fib_table = ~(u32) 0; + ip46_address_t nh_addr; + clib_memset (&nh_addr, 0, sizeof (ip46_address_t)); + + bool nexthop_set = 0; + int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "socket %s", &file_name)) - { - file_name_set = 1; - } - else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) - ; - else if (unformat (i, "server")) - is_server = 1; - else if (unformat (i, "gso")) - enable_gso = 1; - else if (unformat (i, "packed")) - enable_packed = 1; + 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_ip46_address, &nh_addr)) + nexthop_set = 1; + else if (unformat (i, "behavior %u", &behavior)); + else if (unformat (i, "sw_if_index %u", &sw_if_index)); + else if (unformat (i, "fib-table %u", &fib_table)); + else if (unformat (i, "end.psp %u", &behavior)); else break; } - if (sw_if_index_set == 0) - { - errmsg ("missing sw_if_index or interface name"); - return -99; - } + M (SR_LOCALSID_ADD_DEL, mp); - if (file_name_set == 0) - { - errmsg ("missing socket file name"); - return -99; - } + clib_memcpy (mp->localsid, &localsid, sizeof (mp->localsid)); - if (vec_len (file_name) > 255) + if (nexthop_set) { - errmsg ("socket file name too long"); - return -99; + clib_memcpy (&mp->nh_addr.un, &nh_addr, sizeof (mp->nh_addr.un)); } - vec_add1 (file_name, 0); - - M (MODIFY_VHOST_USER_IF, mp); - + mp->behavior = behavior; mp->sw_if_index = ntohl (sw_if_index); - mp->is_server = is_server; - mp->enable_gso = enable_gso; - mp->enable_packed = enable_packed; - clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); - vec_free (file_name); - if (custom_dev_instance != ~0) - { - mp->renumber = 1; - mp->custom_dev_instance = ntohl (custom_dev_instance); - } + mp->fib_table = ntohl (fib_table); + mp->end_psp = end_psp; + mp->is_del = is_del; S (mp); W (ret); @@ -12061,1317 +7481,1342 @@ api_modify_vhost_user_if (vat_main_t * vam) } static int -api_delete_vhost_user_if (vat_main_t * vam) +api_ioam_enable (vat_main_t * vam) { - unformat_input_t *i = vam->input; - vl_api_delete_vhost_user_if_t *mp; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; + unformat_input_t *input = vam->input; + vl_api_ioam_enable_t *mp; + u32 id = 0; + int has_trace_option = 0; + int has_pot_option = 0; + int has_seqno_option = 0; + int has_analyse_option = 0; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; + if (unformat (input, "trace")) + has_trace_option = 1; + else if (unformat (input, "pot")) + has_pot_option = 1; + else if (unformat (input, "seqno")) + has_seqno_option = 1; + else if (unformat (input, "analyse")) + has_analyse_option = 1; else break; } + M (IOAM_ENABLE, mp); + mp->id = htons (id); + mp->seqno = has_seqno_option; + mp->analyse = has_analyse_option; + mp->pot_enable = has_pot_option; + mp->trace_enable = has_trace_option; - if (sw_if_index_set == 0) - { - errmsg ("missing sw_if_index or interface name"); - return -99; - } - + S (mp); + W (ret); + return ret; +} - M (DELETE_VHOST_USER_IF, mp); - mp->sw_if_index = ntohl (sw_if_index); +static int +api_ioam_disable (vat_main_t * vam) +{ + vl_api_ioam_disable_t *mp; + int ret; + M (IOAM_DISABLE, mp); S (mp); W (ret); return ret; } -static void vl_api_sw_interface_vhost_user_details_t_handler - (vl_api_sw_interface_vhost_user_details_t * mp) +#define foreach_tcp_proto_field \ +_(src_port) \ +_(dst_port) + +#define foreach_udp_proto_field \ +_(src_port) \ +_(dst_port) + +#define foreach_ip4_proto_field \ +_(src_address) \ +_(dst_address) \ +_(tos) \ +_(length) \ +_(fragment_id) \ +_(ttl) \ +_(protocol) \ +_(checksum) + +typedef struct { - vat_main_t *vam = &vat_main; - u64 features; + u16 src_port, dst_port; +} tcpudp_header_t; - features = - clib_net_to_host_u32 (mp->features_first_32) | ((u64) - clib_net_to_host_u32 - (mp->features_last_32) << - 32); +#if VPP_API_TEST_BUILTIN == 0 +uword +unformat_tcp_mask (unformat_input_t * input, va_list * args) +{ + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + tcp_header_t *tcp; + +#define _(a) u8 a=0; + foreach_tcp_proto_field; +#undef _ + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (0); +#define _(a) else if (unformat (input, #a)) a=1; + foreach_tcp_proto_field +#undef _ + else + break; + } + +#define _(a) found_something += a; + foreach_tcp_proto_field; +#undef _ + + if (found_something == 0) + return 0; + + vec_validate (mask, sizeof (*tcp) - 1); + + tcp = (tcp_header_t *) mask; + +#define _(a) if (a) clib_memset (&tcp->a, 0xff, sizeof (tcp->a)); + foreach_tcp_proto_field; +#undef _ - print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s", - (char *) mp->interface_name, - ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz), - features, mp->is_server, - ntohl (mp->num_regions), (char *) mp->sock_filename); - print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno))); + *maskp = mask; + return 1; } -static void vl_api_sw_interface_vhost_user_details_t_handler_json - (vl_api_sw_interface_vhost_user_details_t * mp) +uword +unformat_udp_mask (unformat_input_t * input, va_list * args) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + udp_header_t *udp; - if (VAT_JSON_ARRAY != vam->json_tree.type) +#define _(a) u8 a=0; + foreach_udp_proto_field; +#undef _ + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (0); +#define _(a) else if (unformat (input, #a)) a=1; + foreach_udp_proto_field +#undef _ + else + break; } - node = vat_json_array_add (&vam->json_tree); - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_string_copy (node, "interface_name", - mp->interface_name); - vat_json_object_add_uint (node, "virtio_net_hdr_sz", - ntohl (mp->virtio_net_hdr_sz)); - vat_json_object_add_uint (node, "features_first_32", - clib_net_to_host_u32 (mp->features_first_32)); - vat_json_object_add_uint (node, "features_last_32", - clib_net_to_host_u32 (mp->features_last_32)); - vat_json_object_add_uint (node, "is_server", mp->is_server); - vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename); - vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions)); - vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno)); +#define _(a) found_something += a; + foreach_udp_proto_field; +#undef _ + + if (found_something == 0) + return 0; + + vec_validate (mask, sizeof (*udp) - 1); + + udp = (udp_header_t *) mask; + +#define _(a) if (a) clib_memset (&udp->a, 0xff, sizeof (udp->a)); + foreach_udp_proto_field; +#undef _ + + *maskp = mask; + return 1; } -static int -api_sw_interface_vhost_user_dump (vat_main_t * vam) +uword +unformat_l4_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_sw_interface_vhost_user_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; - u32 sw_if_index = ~0; + u8 **maskp = va_arg (*args, u8 **); + u16 src_port = 0, dst_port = 0; + tcpudp_header_t *tcpudp; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + 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)) - ; + if (unformat (input, "tcp %U", unformat_tcp_mask, maskp)) + return 1; + else if (unformat (input, "udp %U", unformat_udp_mask, maskp)) + return 1; + else if (unformat (input, "src_port")) + src_port = 0xFFFF; + else if (unformat (input, "dst_port")) + dst_port = 0xFFFF; else - break; + return 0; } - print (vam->ofp, - "Interface name idx hdr_sz features server regions filename"); + if (!src_port && !dst_port) + return 0; - /* Get list of vhost-user interfaces */ - M (SW_INTERFACE_VHOST_USER_DUMP, mp); - mp->sw_if_index = ntohl (sw_if_index); - S (mp); + u8 *mask = 0; + vec_validate (mask, sizeof (tcpudp_header_t) - 1); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + tcpudp = (tcpudp_header_t *) mask; + tcpudp->src_port = src_port; + tcpudp->dst_port = dst_port; - W (ret); - return ret; + *maskp = mask; + + return 1; } -static int -api_show_version (vat_main_t * vam) +uword +unformat_ip4_mask (unformat_input_t * input, va_list * args) { - vl_api_show_version_t *mp; - int ret; - - M (SHOW_VERSION, mp); - - S (mp); - W (ret); - return ret; -} + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + ip4_header_t *ip; +#define _(a) u8 a=0; + foreach_ip4_proto_field; +#undef _ + u8 version = 0; + u8 hdr_length = 0; -static int -api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_vxlan_gpe_add_del_tunnel_t *mp; - ip46_address_t local, remote; - u8 is_add = 1; - u8 local_set = 0; - u8 remote_set = 0; - u8 grp_set = 0; - u32 mcast_sw_if_index = ~0; - u32 encap_vrf_id = 0; - u32 decap_vrf_id = 0; - u8 protocol = ~0; - u32 vni; - u8 vni_set = 0; - int ret; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "local %U", - unformat_ip46_address, &local)) - { - local_set = 1; - } - else if (unformat (line_input, "remote %U", - unformat_ip46_address, &remote)) - { - remote_set = 1; - } - else if (unformat (line_input, "group %U %U", - unformat_ip46_address, &remote, - api_unformat_sw_if_index, vam, &mcast_sw_if_index)) - { - grp_set = remote_set = 1; - } - else if (unformat (line_input, "group %U", - unformat_ip46_address, &remote)) - { - grp_set = remote_set = 1; - } - else - if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) - ; - else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) - ; - else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id)) - ; - else if (unformat (line_input, "vni %d", &vni)) - vni_set = 1; - else if (unformat (line_input, "next-ip4")) + if (unformat (input, "version")) + version = 1; + else if (unformat (input, "hdr_length")) + hdr_length = 1; + else if (unformat (input, "src")) + src_address = 1; + else if (unformat (input, "dst")) + dst_address = 1; + else if (unformat (input, "proto")) protocol = 1; - else if (unformat (line_input, "next-ip6")) - protocol = 2; - else if (unformat (line_input, "next-ethernet")) - protocol = 3; - else if (unformat (line_input, "next-nsh")) - protocol = 4; - else - { - errmsg ("parse error '%U'", format_unformat_error, line_input); - return -99; - } - } - if (local_set == 0) - { - errmsg ("tunnel local address not specified"); - return -99; - } - if (remote_set == 0) - { - errmsg ("tunnel remote address not specified"); - return -99; - } - if (grp_set && mcast_sw_if_index == ~0) - { - errmsg ("tunnel nonexistent multicast device"); - return -99; - } - if (ip46_address_is_ip4 (&local) != ip46_address_is_ip4 (&remote)) - { - errmsg ("both IPv4 and IPv6 addresses specified"); - return -99; +#define _(a) else if (unformat (input, #a)) a=1; + foreach_ip4_proto_field +#undef _ + else + break; } - if (vni_set == 0) - { - errmsg ("vni not specified"); - return -99; - } +#define _(a) found_something += a; + foreach_ip4_proto_field; +#undef _ - M (VXLAN_GPE_ADD_DEL_TUNNEL, mp); + if (found_something == 0) + return 0; - ip_address_encode (&local, - ip46_address_is_ip4 (&local) ? IP46_TYPE_IP4 : - IP46_TYPE_IP6, &mp->local); - ip_address_encode (&remote, - ip46_address_is_ip4 (&remote) ? IP46_TYPE_IP4 : - IP46_TYPE_IP6, &mp->remote); + vec_validate (mask, sizeof (*ip) - 1); - mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); - mp->encap_vrf_id = ntohl (encap_vrf_id); - mp->decap_vrf_id = ntohl (decap_vrf_id); - mp->protocol = protocol; - mp->vni = ntohl (vni); - mp->is_add = is_add; + ip = (ip4_header_t *) mask; - S (mp); - W (ret); - return ret; -} +#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); + foreach_ip4_proto_field; +#undef _ -static void vl_api_vxlan_gpe_tunnel_details_t_handler - (vl_api_vxlan_gpe_tunnel_details_t * mp) -{ - vat_main_t *vam = &vat_main; - ip46_address_t local, remote; + ip->ip_version_and_header_length = 0; - ip_address_decode (&mp->local, &local); - ip_address_decode (&mp->remote, &remote); + if (version) + ip->ip_version_and_header_length |= 0xF0; - print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d", - ntohl (mp->sw_if_index), - format_ip46_address, &local, IP46_TYPE_ANY, - format_ip46_address, &remote, IP46_TYPE_ANY, - ntohl (mp->vni), mp->protocol, - ntohl (mp->mcast_sw_if_index), - ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id)); + if (hdr_length) + ip->ip_version_and_header_length |= 0x0F; + + *maskp = mask; + return 1; } +#define foreach_ip6_proto_field \ +_(src_address) \ +_(dst_address) \ +_(payload_length) \ +_(hop_limit) \ +_(protocol) -static void vl_api_vxlan_gpe_tunnel_details_t_handler_json - (vl_api_vxlan_gpe_tunnel_details_t * mp) +uword +unformat_ip6_mask (unformat_input_t * input, va_list * args) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - struct in_addr ip4; - struct in6_addr ip6; - ip46_address_t local, remote; + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 found_something = 0; + ip6_header_t *ip; + u32 ip_version_traffic_class_and_flow_label; - ip_address_decode (&mp->local, &local); - ip_address_decode (&mp->remote, &remote); +#define _(a) u8 a=0; + foreach_ip6_proto_field; +#undef _ + u8 version = 0; + u8 traffic_class = 0; + u8 flow_label = 0; - if (VAT_JSON_ARRAY != vam->json_tree.type) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); - } - node = vat_json_array_add (&vam->json_tree); + if (unformat (input, "version")) + version = 1; + else if (unformat (input, "traffic-class")) + traffic_class = 1; + else if (unformat (input, "flow-label")) + flow_label = 1; + else if (unformat (input, "src")) + src_address = 1; + else if (unformat (input, "dst")) + dst_address = 1; + else if (unformat (input, "proto")) + protocol = 1; - vat_json_init_object (node); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - if (ip46_address_is_ip4 (&local)) - { - clib_memcpy (&ip4, &local.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "local", ip4); - clib_memcpy (&ip4, &remote.ip4, sizeof (ip4)); - vat_json_object_add_ip4 (node, "remote", ip4); - } - else - { - clib_memcpy (&ip6, &local.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "local", ip6); - clib_memcpy (&ip6, &remote.ip6, sizeof (ip6)); - vat_json_object_add_ip6 (node, "remote", ip6); +#define _(a) else if (unformat (input, #a)) a=1; + foreach_ip6_proto_field +#undef _ + else + break; } - vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); - vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol)); - vat_json_object_add_uint (node, "mcast_sw_if_index", - ntohl (mp->mcast_sw_if_index)); - vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); - vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id)); - vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); -} -static int -api_vxlan_gpe_tunnel_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_vxlan_gpe_tunnel_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index; - u8 sw_if_index_set = 0; - int ret; +#define _(a) found_something += a; + foreach_ip6_proto_field; +#undef _ - /* 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 (found_something == 0) + return 0; - if (sw_if_index_set == 0) - { - sw_if_index = ~0; - } + vec_validate (mask, sizeof (*ip) - 1); - if (!vam->json_output) - { - print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s", - "sw_if_index", "local", "remote", "vni", - "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id"); - } + ip = (ip6_header_t *) mask; - /* Get list of vxlan-tunnel interfaces */ - M (VXLAN_GPE_TUNNEL_DUMP, mp); +#define _(a) if (a) clib_memset (&ip->a, 0xff, sizeof (ip->a)); + foreach_ip6_proto_field; +#undef _ - mp->sw_if_index = htonl (sw_if_index); + ip_version_traffic_class_and_flow_label = 0; - S (mp); + if (version) + ip_version_traffic_class_and_flow_label |= 0xF0000000; - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + if (traffic_class) + ip_version_traffic_class_and_flow_label |= 0x0FF00000; - W (ret); - return ret; -} + if (flow_label) + ip_version_traffic_class_and_flow_label |= 0x000FFFFF; -static void vl_api_l2_fib_table_details_t_handler - (vl_api_l2_fib_table_details_t * mp) -{ - vat_main_t *vam = &vat_main; + ip->ip_version_traffic_class_and_flow_label = + clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); - print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32 - " %d %d %d", - ntohl (mp->bd_id), format_ethernet_address, mp->mac, - ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac, - mp->bvi_mac); + *maskp = mask; + return 1; } -static void vl_api_l2_fib_table_details_t_handler_json - (vl_api_l2_fib_table_details_t * mp) +uword +unformat_l3_mask (unformat_input_t * input, va_list * args) { - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; + u8 **maskp = va_arg (*args, u8 **); - if (VAT_JSON_ARRAY != vam->json_tree.type) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + if (unformat (input, "ip4 %U", unformat_ip4_mask, maskp)) + return 1; + else if (unformat (input, "ip6 %U", unformat_ip6_mask, maskp)) + return 1; + else + break; } - node = vat_json_array_add (&vam->json_tree); - - vat_json_init_object (node); - vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id)); - vat_json_object_add_bytes (node, "mac", mp->mac, 6); - vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - vat_json_object_add_uint (node, "static_mac", mp->static_mac); - vat_json_object_add_uint (node, "filter_mac", mp->filter_mac); - vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac); + return 0; } -static int -api_l2_fib_table_dump (vat_main_t * vam) +uword +unformat_l2_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_l2_fib_table_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 bd_id; - u8 bd_id_set = 0; - int ret; + u8 **maskp = va_arg (*args, u8 **); + u8 *mask = 0; + u8 src = 0; + u8 dst = 0; + u8 proto = 0; + u8 tag1 = 0; + u8 tag2 = 0; + u8 ignore_tag1 = 0; + u8 ignore_tag2 = 0; + u8 cos1 = 0; + u8 cos2 = 0; + u8 dot1q = 0; + u8 dot1ad = 0; + int len = 14; - /* Parse args required to build the message */ - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "bd_id %d", &bd_id)) - bd_id_set = 1; + if (unformat (input, "src")) + src = 1; + else if (unformat (input, "dst")) + dst = 1; + else if (unformat (input, "proto")) + proto = 1; + else if (unformat (input, "tag1")) + tag1 = 1; + else if (unformat (input, "tag2")) + tag2 = 1; + else if (unformat (input, "ignore-tag1")) + ignore_tag1 = 1; + else if (unformat (input, "ignore-tag2")) + ignore_tag2 = 1; + else if (unformat (input, "cos1")) + cos1 = 1; + else if (unformat (input, "cos2")) + cos2 = 1; + else if (unformat (input, "dot1q")) + dot1q = 1; + else if (unformat (input, "dot1ad")) + dot1ad = 1; else - break; - } - - if (bd_id_set == 0) - { - errmsg ("missing bridge domain"); - return -99; + break; } + if ((src + dst + proto + tag1 + tag2 + dot1q + dot1ad + + ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) + return 0; - print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI"); - - /* Get list of l2 fib entries */ - M (L2_FIB_TABLE_DUMP, mp); - - mp->bd_id = ntohl (bd_id); - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + if (tag1 || ignore_tag1 || cos1 || dot1q) + len = 18; + if (tag2 || ignore_tag2 || cos2 || dot1ad) + len = 22; - W (ret); - return ret; -} + vec_validate (mask, len - 1); + if (dst) + clib_memset (mask, 0xff, 6); -static int -api_interface_name_renumber (vat_main_t * vam) -{ - unformat_input_t *line_input = vam->input; - vl_api_interface_name_renumber_t *mp; - u32 sw_if_index = ~0; - u32 new_show_dev_instance = ~0; - int ret; + if (src) + clib_memset (mask + 6, 0xff, 6); - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + if (tag2 || dot1ad) { - if (unformat (line_input, "%U", api_unformat_sw_if_index, vam, - &sw_if_index)) - ; - else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (line_input, "new_show_dev_instance %d", - &new_show_dev_instance)) - ; - else - break; + /* inner vlan tag */ + if (tag2) + { + mask[19] = 0xff; + mask[18] = 0x0f; + } + if (cos2) + mask[18] |= 0xe0; + if (proto) + mask[21] = mask[20] = 0xff; + if (tag1) + { + mask[15] = 0xff; + mask[14] = 0x0f; + } + if (cos1) + mask[14] |= 0xe0; + *maskp = mask; + return 1; } - - if (sw_if_index == ~0) + if (tag1 | dot1q) { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + if (tag1) + { + mask[15] = 0xff; + mask[14] = 0x0f; + } + if (cos1) + mask[14] |= 0xe0; + if (proto) + mask[16] = mask[17] = 0xff; - if (new_show_dev_instance == ~0) - { - errmsg ("missing new_show_dev_instance"); - return -99; + *maskp = mask; + return 1; } + if (cos2) + mask[18] |= 0xe0; + if (cos1) + mask[14] |= 0xe0; + if (proto) + mask[12] = mask[13] = 0xff; - M (INTERFACE_NAME_RENUMBER, mp); - - mp->sw_if_index = ntohl (sw_if_index); - mp->new_show_dev_instance = ntohl (new_show_dev_instance); - - S (mp); - W (ret); - return ret; + *maskp = mask; + return 1; } -static int -api_want_l2_macs_events (vat_main_t * vam) +uword +unformat_classify_mask (unformat_input_t * input, va_list * args) { - unformat_input_t *line_input = vam->input; - vl_api_want_l2_macs_events_t *mp; - u8 enable_disable = 1; - u32 scan_delay = 0; - u32 max_macs_in_event = 0; - u32 learn_limit = 0; - int ret; + u8 **maskp = va_arg (*args, u8 **); + u32 *skipp = va_arg (*args, u32 *); + u32 *matchp = va_arg (*args, u32 *); + u32 match; + u8 *mask = 0; + u8 *l2 = 0; + u8 *l3 = 0; + u8 *l4 = 0; + int i; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "learn-limit %d", &learn_limit)) + if (unformat (input, "hex %U", unformat_hex_string, &mask)) ; - else if (unformat (line_input, "scan-delay %d", &scan_delay)) + else if (unformat (input, "l2 %U", unformat_l2_mask, &l2)) ; - else if (unformat (line_input, "max-entries %d", &max_macs_in_event)) + else if (unformat (input, "l3 %U", unformat_l3_mask, &l3)) + ; + else if (unformat (input, "l4 %U", unformat_l4_mask, &l4)) ; - else if (unformat (line_input, "disable")) - enable_disable = 0; else break; } - M (WANT_L2_MACS_EVENTS, mp); - mp->enable_disable = enable_disable; - mp->pid = htonl (getpid ()); - mp->learn_limit = htonl (learn_limit); - mp->scan_delay = (u8) scan_delay; - mp->max_macs_in_event = (u8) (max_macs_in_event / 10); - S (mp); - W (ret); - return ret; -} - -static int -api_input_acl_set_interface (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_input_acl_set_interface_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 l2_table_index = ~0; - u8 is_add = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (l4 && !l3) { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "l2-table %d", &l2_table_index)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + vec_free (mask); + vec_free (l2); + vec_free (l4); + return 0; } - if (sw_if_index_set == 0) + if (mask || l2 || l3 || l4) { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + if (l2 || l3 || l4) + { + /* "With a free Ethernet header in every package" */ + if (l2 == 0) + vec_validate (l2, 13); + mask = l2; + if (vec_len (l3)) + { + vec_append (mask, l3); + vec_free (l3); + } + if (vec_len (l4)) + { + vec_append (mask, l4); + vec_free (l4); + } + } - M (INPUT_ACL_SET_INTERFACE, mp); + /* Scan forward looking for the first significant mask octet */ + for (i = 0; i < vec_len (mask); i++) + if (mask[i]) + break; - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->l2_table_index = ntohl (l2_table_index); - mp->is_add = is_add; + /* compute (skip, match) params */ + *skipp = i / sizeof (u32x4); + vec_delete (mask, *skipp * sizeof (u32x4), 0); - S (mp); - W (ret); - return ret; -} + /* Pad mask to an even multiple of the vector size */ + while (vec_len (mask) % sizeof (u32x4)) + vec_add1 (mask, 0); -static int -api_output_acl_set_interface (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_output_acl_set_interface_t *mp; - u32 sw_if_index; - int sw_if_index_set; - u32 ip4_table_index = ~0; - u32 ip6_table_index = ~0; - u32 l2_table_index = ~0; - u8 is_add = 1; - int ret; + match = vec_len (mask) / sizeof (u32x4); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "ip4-table %d", &ip4_table_index)) - ; - else if (unformat (i, "ip6-table %d", &ip6_table_index)) - ; - else if (unformat (i, "l2-table %d", &l2_table_index)) - ; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + for (i = match * sizeof (u32x4); i > 0; i -= sizeof (u32x4)) + { + u64 *tmp = (u64 *) (mask + (i - sizeof (u32x4))); + if (*tmp || *(tmp + 1)) + break; + match--; } - } + if (match == 0) + clib_warning ("BUG: match 0"); - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + _vec_len (mask) = match * sizeof (u32x4); - M (OUTPUT_ACL_SET_INTERFACE, mp); + *matchp = match; + *maskp = mask; - mp->sw_if_index = ntohl (sw_if_index); - mp->ip4_table_index = ntohl (ip4_table_index); - mp->ip6_table_index = ntohl (ip6_table_index); - mp->l2_table_index = ntohl (l2_table_index); - mp->is_add = is_add; + return 1; + } - S (mp); - W (ret); - return ret; + return 0; } +#endif /* VPP_API_TEST_BUILTIN */ -static int -api_ip_address_dump (vat_main_t * vam) +#define foreach_l2_next \ +_(drop, DROP) \ +_(ethernet, ETHERNET_INPUT) \ +_(ip4, IP4_INPUT) \ +_(ip6, IP6_INPUT) + +uword +unformat_l2_next_index (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ip_address_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - int ret; + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "ipv4")) - ipv4_set = 1; - else if (unformat (i, "ipv6")) - ipv6_set = 1; - else - break; - } +#define _(n,N) \ + if (unformat (input, #n)) { next_index = L2_INPUT_CLASSIFY_NEXT_##N; goto out;} + foreach_l2_next; +#undef _ - if (ipv4_set && ipv6_set) + if (unformat (input, "%d", &tmp)) { - errmsg ("ipv4 and ipv6 flags cannot be both set"); - return -99; + next_index = tmp; + goto out; } - if ((!ipv4_set) && (!ipv6_set)) - { - errmsg ("no ipv4 nor ipv6 flag set"); - return -99; - } + return 0; - if (sw_if_index_set == 0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } +out: + *miss_next_indexp = next_index; + return 1; +} - vam->current_sw_if_index = sw_if_index; - vam->is_ipv6 = ipv6_set; +#define foreach_ip_next \ +_(drop, DROP) \ +_(local, LOCAL) \ +_(rewrite, REWRITE) - M (IP_ADDRESS_DUMP, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->is_ipv6 = ipv6_set; - S (mp); +uword +api_unformat_ip_next_index (unformat_input_t * input, va_list * args) +{ + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); +#define _(n,N) \ + if (unformat (input, #n)) { next_index = IP_LOOKUP_NEXT_##N; goto out;} + foreach_ip_next; +#undef _ - W (ret); - return ret; + if (unformat (input, "%d", &tmp)) + { + next_index = tmp; + goto out; + } + + return 0; + +out: + *miss_next_indexp = next_index; + return 1; } -static int -api_ip_dump (vat_main_t * vam) +#define foreach_acl_next \ +_(deny, DENY) + +uword +api_unformat_acl_next_index (unformat_input_t * input, va_list * args) { - vl_api_ip_dump_t *mp; - vl_api_control_ping_t *mp_ping; - unformat_input_t *in = vam->input; - int ipv4_set = 0; - int ipv6_set = 0; - int is_ipv6; - int i; - int ret; + u32 *miss_next_indexp = va_arg (*args, u32 *); + u32 next_index = 0; + u32 tmp; - while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) - { - if (unformat (in, "ipv4")) - ipv4_set = 1; - else if (unformat (in, "ipv6")) - ipv6_set = 1; - else - break; - } +#define _(n,N) \ + if (unformat (input, #n)) { next_index = ACL_NEXT_INDEX_##N; goto out;} + foreach_acl_next; +#undef _ - if (ipv4_set && ipv6_set) + if (unformat (input, "permit")) { - errmsg ("ipv4 and ipv6 flags cannot be both set"); - return -99; + next_index = ~0; + goto out; } - - if ((!ipv4_set) && (!ipv6_set)) + else if (unformat (input, "%d", &tmp)) { - errmsg ("no ipv4 nor ipv6 flag set"); - return -99; + next_index = tmp; + goto out; } - is_ipv6 = ipv6_set; - vam->is_ipv6 = is_ipv6; + return 0; - /* free old data */ - for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++) - { - vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr); - } - vec_free (vam->ip_details_by_sw_if_index[is_ipv6]); +out: + *miss_next_indexp = next_index; + return 1; +} - M (IP_DUMP, mp); - mp->is_ipv6 = ipv6_set; - S (mp); +uword +unformat_policer_precolor (unformat_input_t * input, va_list * args) +{ + u32 *r = va_arg (*args, u32 *); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + if (unformat (input, "conform-color")) + *r = POLICE_CONFORM; + else if (unformat (input, "exceed-color")) + *r = POLICE_EXCEED; + else + return 0; - W (ret); - return ret; + return 1; } static int -api_ipsec_spd_add_del (vat_main_t * vam) +api_classify_add_del_table (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_ipsec_spd_add_del_t *mp; - u32 spd_id = ~0; - u8 is_add = 1; + vl_api_classify_add_del_table_t *mp; + + u32 nbuckets = 2; + u32 skip = ~0; + u32 match = ~0; + int is_add = 1; + int del_chain = 0; + u32 table_index = ~0; + u32 next_table_index = ~0; + u32 miss_next_index = ~0; + u32 memory_size = 32 << 20; + u8 *mask = 0; + u32 current_data_flag = 0; + int current_data_offset = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "spd_id %d", &spd_id)) - ; - else if (unformat (i, "del")) + if (unformat (i, "del")) is_add = 0; - else + else if (unformat (i, "del-chain")) { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; + is_add = 0; + del_chain = 1; } + else if (unformat (i, "buckets %d", &nbuckets)) + ; + else if (unformat (i, "memory_size %d", &memory_size)) + ; + else if (unformat (i, "skip %d", &skip)) + ; + else if (unformat (i, "match %d", &match)) + ; + else if (unformat (i, "table %d", &table_index)) + ; + else if (unformat (i, "mask %U", unformat_classify_mask, + &mask, &skip, &match)) + ; + else if (unformat (i, "next-table %d", &next_table_index)) + ; + else if (unformat (i, "miss-next %U", api_unformat_ip_next_index, + &miss_next_index)) + ; + else if (unformat (i, "l2-miss-next %U", unformat_l2_next_index, + &miss_next_index)) + ; + else if (unformat (i, "acl-miss-next %U", api_unformat_acl_next_index, + &miss_next_index)) + ; + else if (unformat (i, "current-data-flag %d", ¤t_data_flag)) + ; + else if (unformat (i, "current-data-offset %d", ¤t_data_offset)) + ; + else + break; } - if (spd_id == ~0) + + if (is_add && mask == 0) { - errmsg ("spd_id must be set"); + errmsg ("Mask required"); return -99; } - M (IPSEC_SPD_ADD_DEL, mp); - - mp->spd_id = ntohl (spd_id); - mp->is_add = is_add; - - S (mp); - W (ret); - return ret; -} - -static int -api_ipsec_interface_add_del_spd (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_ipsec_interface_add_del_spd_t *mp; - u32 sw_if_index; - u8 sw_if_index_set = 0; - u32 spd_id = (u32) ~ 0; - u8 is_add = 1; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + if (is_add && skip == ~0) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "spd_id %d", &spd_id)) - ; - else - if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) - sw_if_index_set = 1; - else if (unformat (i, "sw_if_index %d", &sw_if_index)) - sw_if_index_set = 1; - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - + errmsg ("skip count required"); + return -99; } - if (spd_id == (u32) ~ 0) + if (is_add && match == ~0) { - errmsg ("spd_id must be set"); + errmsg ("match count required"); return -99; } - if (sw_if_index_set == 0) + if (!is_add && table_index == ~0) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("table index required for delete"); return -99; } - M (IPSEC_INTERFACE_ADD_DEL_SPD, mp); + M2 (CLASSIFY_ADD_DEL_TABLE, mp, vec_len (mask)); - mp->spd_id = ntohl (spd_id); - mp->sw_if_index = ntohl (sw_if_index); mp->is_add = is_add; + mp->del_chain = del_chain; + mp->table_index = ntohl (table_index); + mp->nbuckets = ntohl (nbuckets); + mp->memory_size = ntohl (memory_size); + mp->skip_n_vectors = ntohl (skip); + mp->match_n_vectors = ntohl (match); + mp->next_table_index = ntohl (next_table_index); + mp->miss_next_index = ntohl (miss_next_index); + mp->current_data_flag = ntohl (current_data_flag); + mp->current_data_offset = ntohl (current_data_offset); + mp->mask_len = ntohl (vec_len (mask)); + clib_memcpy (mp->mask, mask, vec_len (mask)); + + vec_free (mask); S (mp); W (ret); return ret; } -static int -api_ipsec_spd_entry_add_del (vat_main_t * vam) +#if VPP_API_TEST_BUILTIN == 0 +uword +unformat_l4_match (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_spd_entry_add_del_t *mp; - u8 is_add = 1, is_outbound = 0; - u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0; - i32 priority = 0; - u32 rport_start = 0, rport_stop = (u32) ~ 0; - u32 lport_start = 0, lport_stop = (u32) ~ 0; - vl_api_address_t laddr_start = { }, laddr_stop = - { - }, raddr_start = - { - }, raddr_stop = - { - }; - int ret; + u8 **matchp = va_arg (*args, u8 **); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + u8 *proto_header = 0; + int src_port = 0; + int dst_port = 0; + + tcpudp_header_t h; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - if (unformat (i, "outbound")) - is_outbound = 1; - if (unformat (i, "inbound")) - is_outbound = 0; - else if (unformat (i, "spd_id %d", &spd_id)) - ; - else if (unformat (i, "sa_id %d", &sa_id)) - ; - else if (unformat (i, "priority %d", &priority)) - ; - else if (unformat (i, "protocol %d", &protocol)) - ; - else if (unformat (i, "lport_start %d", &lport_start)) - ; - else if (unformat (i, "lport_stop %d", &lport_stop)) - ; - else if (unformat (i, "rport_start %d", &rport_start)) - ; - else if (unformat (i, "rport_stop %d", &rport_stop)) - ; - else if (unformat (i, "laddr_start %U", - unformat_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)) + if (unformat (input, "src_port %d", &src_port)) ; - else if (unformat (i, "raddr_stop %U", unformat_vl_api_address, - &raddr_stop)) + else if (unformat (input, "dst_port %d", &dst_port)) ; else - if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy)) - { - if (policy == IPSEC_POLICY_ACTION_RESOLVE) - { - clib_warning ("unsupported action: 'resolve'"); - return -99; - } - } - else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } + return 0; + } + + h.src_port = clib_host_to_net_u16 (src_port); + h.dst_port = clib_host_to_net_u16 (dst_port); + vec_validate (proto_header, sizeof (h) - 1); + memcpy (proto_header, &h, sizeof (h)); + + *matchp = proto_header; + return 1; +} + +uword +unformat_ip4_match (unformat_input_t * input, va_list * args) +{ + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + ip4_header_t *ip; + int version = 0; + u32 version_val; + int hdr_length = 0; + u32 hdr_length_val; + int src = 0, dst = 0; + ip4_address_t src_val, dst_val; + int proto = 0; + u32 proto_val; + int tos = 0; + u32 tos_val; + int length = 0; + u32 length_val; + int fragment_id = 0; + u32 fragment_id_val; + int ttl = 0; + int ttl_val; + int checksum = 0; + u32 checksum_val; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "version %d", &version_val)) + version = 1; + else if (unformat (input, "hdr_length %d", &hdr_length_val)) + hdr_length = 1; + else if (unformat (input, "src %U", unformat_ip4_address, &src_val)) + src = 1; + else if (unformat (input, "dst %U", unformat_ip4_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %d", &proto_val)) + proto = 1; + else if (unformat (input, "tos %d", &tos_val)) + tos = 1; + else if (unformat (input, "length %d", &length_val)) + length = 1; + else if (unformat (input, "fragment_id %d", &fragment_id_val)) + fragment_id = 1; + else if (unformat (input, "ttl %d", &ttl_val)) + ttl = 1; + else if (unformat (input, "checksum %d", &checksum_val)) + checksum = 1; + else + break; } - M (IPSEC_SPD_ENTRY_ADD_DEL, mp); + if (version + hdr_length + src + dst + proto + tos + length + fragment_id + + ttl + checksum == 0) + return 0; - mp->is_add = is_add; + /* + * Aligned because we use the real comparison functions + */ + vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - mp->entry.spd_id = ntohl (spd_id); - mp->entry.priority = ntohl (priority); - mp->entry.is_outbound = is_outbound; + ip = (ip4_header_t *) match; - 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)); + /* These are realistically matched in practice */ + if (src) + ip->src_address.as_u32 = src_val.as_u32; + + if (dst) + ip->dst_address.as_u32 = dst_val.as_u32; + + if (proto) + ip->protocol = proto_val; + + + /* These are not, but they're included for completeness */ + if (version) + ip->ip_version_and_header_length |= (version_val & 0xF) << 4; + + if (hdr_length) + ip->ip_version_and_header_length |= (hdr_length_val & 0xF); + + if (tos) + ip->tos = tos_val; + + if (length) + ip->length = clib_host_to_net_u16 (length_val); - 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); + if (ttl) + ip->ttl = ttl_val; - S (mp); - W (ret); - return ret; + if (checksum) + ip->checksum = clib_host_to_net_u16 (checksum_val); + + *matchp = match; + return 1; } -static int -api_ipsec_sad_entry_add_del (vat_main_t * vam) +uword +unformat_ip6_match (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_sad_entry_add_del_t *mp; - u32 sad_id = 0, spi = 0; - u8 *ck = 0, *ik = 0; - u8 is_add = 1; - - vl_api_ipsec_crypto_alg_t crypto_alg = IPSEC_API_CRYPTO_ALG_NONE; - vl_api_ipsec_integ_alg_t integ_alg = IPSEC_API_INTEG_ALG_NONE; - vl_api_ipsec_sad_flags_t flags = IPSEC_API_SAD_FLAG_NONE; - vl_api_ipsec_proto_t protocol = IPSEC_API_PROTO_AH; - vl_api_address_t tun_src, tun_dst; - int ret; + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + ip6_header_t *ip; + int version = 0; + u32 version_val; + u8 traffic_class = 0; + u32 traffic_class_val = 0; + u8 flow_label = 0; + u8 flow_label_val; + int src = 0, dst = 0; + ip6_address_t src_val, dst_val; + int proto = 0; + u32 proto_val; + int payload_length = 0; + u32 payload_length_val; + int hop_limit = 0; + int hop_limit_val; + u32 ip_version_traffic_class_and_flow_label; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "sad_id %d", &sad_id)) - ; - else if (unformat (i, "spi %d", &spi)) - ; - else if (unformat (i, "esp")) - protocol = IPSEC_API_PROTO_ESP; - else - if (unformat (i, "tunnel_src %U", unformat_vl_api_address, &tun_src)) - { - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; - if (ADDRESS_IP6 == tun_src.af) - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; - } - else - if (unformat (i, "tunnel_dst %U", unformat_vl_api_address, &tun_dst)) - { - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL; - if (ADDRESS_IP6 == tun_src.af) - flags |= IPSEC_API_SAD_FLAG_IS_TUNNEL_V6; - } - else - if (unformat (i, "crypto_alg %U", - unformat_ipsec_api_crypto_alg, &crypto_alg)) - ; - else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck)) - ; - else if (unformat (i, "integ_alg %U", - unformat_ipsec_api_integ_alg, &integ_alg)) - ; - else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) - ; + if (unformat (input, "version %d", &version_val)) + version = 1; + else if (unformat (input, "traffic_class %d", &traffic_class_val)) + traffic_class = 1; + else if (unformat (input, "flow_label %d", &flow_label_val)) + flow_label = 1; + else if (unformat (input, "src %U", unformat_ip6_address, &src_val)) + src = 1; + else if (unformat (input, "dst %U", unformat_ip6_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %d", &proto_val)) + proto = 1; + else if (unformat (input, "payload_length %d", &payload_length_val)) + payload_length = 1; + else if (unformat (input, "hop_limit %d", &hop_limit_val)) + hop_limit = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, i); - return -99; - } - + break; } - M (IPSEC_SAD_ENTRY_ADD_DEL, mp); + if (version + traffic_class + flow_label + src + dst + proto + + payload_length + hop_limit == 0) + return 0; - mp->is_add = is_add; - mp->entry.sad_id = ntohl (sad_id); - mp->entry.protocol = protocol; - mp->entry.spi = ntohl (spi); - mp->entry.flags = flags; + /* + * Aligned because we use the real comparison functions + */ + vec_validate_aligned (match, sizeof (*ip) - 1, sizeof (u32x4)); - 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); + ip = (ip6_header_t *) match; - if (mp->entry.crypto_key.length > sizeof (mp->entry.crypto_key.data)) - mp->entry.crypto_key.length = sizeof (mp->entry.crypto_key.data); + if (src) + clib_memcpy (&ip->src_address, &src_val, sizeof (ip->src_address)); - if (mp->entry.integrity_key.length > sizeof (mp->entry.integrity_key.data)) - mp->entry.integrity_key.length = sizeof (mp->entry.integrity_key.data); + if (dst) + clib_memcpy (&ip->dst_address, &dst_val, sizeof (ip->dst_address)); - if (ck) - clib_memcpy (mp->entry.crypto_key.data, ck, mp->entry.crypto_key.length); - if (ik) - clib_memcpy (mp->entry.integrity_key.data, ik, - mp->entry.integrity_key.length); + if (proto) + ip->protocol = proto_val; - if (flags & IPSEC_API_SAD_FLAG_IS_TUNNEL) - { - 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)); - } + ip_version_traffic_class_and_flow_label = 0; - S (mp); - W (ret); - return ret; + if (version) + ip_version_traffic_class_and_flow_label |= (version_val & 0xF) << 28; + + if (traffic_class) + ip_version_traffic_class_and_flow_label |= + (traffic_class_val & 0xFF) << 20; + + if (flow_label) + ip_version_traffic_class_and_flow_label |= (flow_label_val & 0xFFFFF); + + ip->ip_version_traffic_class_and_flow_label = + clib_host_to_net_u32 (ip_version_traffic_class_and_flow_label); + + if (payload_length) + ip->payload_length = clib_host_to_net_u16 (payload_length_val); + + if (hop_limit) + ip->hop_limit = hop_limit_val; + + *matchp = match; + return 1; } -static int -api_ipsec_tunnel_if_add_del (vat_main_t * vam) +uword +unformat_l3_match (unformat_input_t * input, va_list * args) { - unformat_input_t *i = vam->input; - vl_api_ipsec_tunnel_if_add_del_t *mp; - u32 local_spi = 0, remote_spi = 0; - u32 crypto_alg = 0, integ_alg = 0; - u8 *lck = NULL, *rck = NULL; - u8 *lik = NULL, *rik = NULL; - vl_api_address_t local_ip = { 0 }; - vl_api_address_t remote_ip = { 0 }; - f64 before = 0; - u8 is_add = 1; - u8 esn = 0; - u8 anti_replay = 0; - u8 renumber = 0; - u32 instance = ~0; - u32 count = 1, jj; - int ret = -1; + u8 **matchp = va_arg (*args, u8 **); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "del")) - is_add = 0; - else if (unformat (i, "esn")) - esn = 1; - else if (unformat (i, "anti-replay")) - anti_replay = 1; - else if (unformat (i, "count %d", &count)) - ; - else if (unformat (i, "local_spi %d", &local_spi)) - ; - else if (unformat (i, "remote_spi %d", &remote_spi)) - ; - else - if (unformat (i, "local_ip %U", unformat_vl_api_address, &local_ip)) - ; - else - if (unformat (i, "remote_ip %U", unformat_vl_api_address, &remote_ip)) - ; - else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck)) - ; - else - if (unformat (i, "remote_crypto_key %U", unformat_hex_string, &rck)) - ; - else if (unformat (i, "local_integ_key %U", unformat_hex_string, &lik)) - ; - else if (unformat (i, "remote_integ_key %U", unformat_hex_string, &rik)) - ; - else - if (unformat - (i, "crypto_alg %U", unformat_ipsec_api_crypto_alg, &crypto_alg)) - { - if (crypto_alg >= IPSEC_CRYPTO_N_ALG) - { - errmsg ("unsupported crypto-alg: '%U'\n", - format_ipsec_crypto_alg, crypto_alg); - return -99; - } - } - else - if (unformat - (i, "integ_alg %U", unformat_ipsec_api_integ_alg, &integ_alg)) - { - if (integ_alg >= IPSEC_INTEG_N_ALG) - { - errmsg ("unsupported integ-alg: '%U'\n", - format_ipsec_integ_alg, integ_alg); - return -99; - } - } - else if (unformat (i, "instance %u", &instance)) - renumber = 1; - else - { - errmsg ("parse error '%U'\n", format_unformat_error, i); - return -99; - } + if (unformat (input, "ip4 %U", unformat_ip4_match, matchp)) + return 1; + else if (unformat (input, "ip6 %U", unformat_ip6_match, matchp)) + return 1; + else + break; } + return 0; +} - if (count > 1) - { - /* Turn on async mode */ - vam->async_mode = 1; - vam->async_errors = 0; - before = vat_time_now (vam); - } +uword +unformat_vlan_tag (unformat_input_t * input, va_list * args) +{ + u8 *tagp = va_arg (*args, u8 *); + u32 tag; - for (jj = 0; jj < count; jj++) + if (unformat (input, "%d", &tag)) { - M (IPSEC_TUNNEL_IF_ADD_DEL, mp); + tagp[0] = (tag >> 8) & 0x0F; + tagp[1] = tag & 0xFF; + return 1; + } - mp->is_add = is_add; - mp->esn = esn; - mp->anti_replay = anti_replay; + return 0; +} - if (jj > 0) - increment_address (&remote_ip); +uword +unformat_l2_match (unformat_input_t * input, va_list * args) +{ + u8 **matchp = va_arg (*args, u8 **); + u8 *match = 0; + u8 src = 0; + u8 src_val[6]; + u8 dst = 0; + u8 dst_val[6]; + u8 proto = 0; + u16 proto_val; + u8 tag1 = 0; + u8 tag1_val[2]; + u8 tag2 = 0; + u8 tag2_val[2]; + int len = 14; + u8 ignore_tag1 = 0; + u8 ignore_tag2 = 0; + u8 cos1 = 0; + u8 cos2 = 0; + u32 cos1_val = 0; + u32 cos2_val = 0; - clib_memcpy (&mp->local_ip, &local_ip, sizeof (local_ip)); - clib_memcpy (&mp->remote_ip, &remote_ip, sizeof (remote_ip)); + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "src %U", unformat_ethernet_address, &src_val)) + src = 1; + else + if (unformat (input, "dst %U", unformat_ethernet_address, &dst_val)) + dst = 1; + else if (unformat (input, "proto %U", + unformat_ethernet_type_host_byte_order, &proto_val)) + proto = 1; + else if (unformat (input, "tag1 %U", unformat_vlan_tag, tag1_val)) + tag1 = 1; + else if (unformat (input, "tag2 %U", unformat_vlan_tag, tag2_val)) + tag2 = 1; + else if (unformat (input, "ignore-tag1")) + ignore_tag1 = 1; + else if (unformat (input, "ignore-tag2")) + ignore_tag2 = 1; + else if (unformat (input, "cos1 %d", &cos1_val)) + cos1 = 1; + else if (unformat (input, "cos2 %d", &cos2_val)) + cos2 = 1; + else + break; + } + if ((src + dst + proto + tag1 + tag2 + + ignore_tag1 + ignore_tag2 + cos1 + cos2) == 0) + return 0; - mp->local_spi = htonl (local_spi + jj); - mp->remote_spi = htonl (remote_spi + jj); - mp->crypto_alg = (u8) crypto_alg; + if (tag1 || ignore_tag1 || cos1) + len = 18; + if (tag2 || ignore_tag2 || cos2) + len = 22; - 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); - } + vec_validate_aligned (match, len - 1, sizeof (u32x4)); - 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); - } + if (dst) + clib_memcpy (match, dst_val, 6); - mp->integ_alg = (u8) integ_alg; + if (src) + clib_memcpy (match + 6, src_val, 6); - mp->local_integ_key_len = 0; - if (lik) + if (tag2) + { + /* inner vlan tag */ + match[19] = tag2_val[1]; + match[18] = tag2_val[0]; + if (cos2) + match[18] |= (cos2_val & 0x7) << 5; + if (proto) { - 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); + match[21] = proto_val & 0xff; + match[20] = proto_val >> 8; } - - mp->remote_integ_key_len = 0; - if (rik) + if (tag1) { - 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); + match[15] = tag1_val[1]; + match[14] = tag1_val[0]; } - - if (renumber) + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; + *matchp = match; + return 1; + } + if (tag1) + { + match[15] = tag1_val[1]; + match[14] = tag1_val[0]; + if (proto) { - mp->renumber = renumber; - mp->show_instance = ntohl (instance); + match[17] = proto_val & 0xff; + match[16] = proto_val >> 8; } - S (mp); - } + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; - /* When testing multiple add/del ops, use a control-ping to sync */ - if (count > 1) + *matchp = match; + return 1; + } + if (cos2) + match[18] |= (cos2_val & 0x7) << 5; + if (cos1) + match[14] |= (cos1_val & 0x7) << 5; + if (proto) { - vl_api_control_ping_t *mp_ping; - f64 after; - f64 timeout; + match[13] = proto_val & 0xff; + match[12] = proto_val >> 8; + } - /* Shut off async mode */ - vam->async_mode = 0; + *matchp = match; + return 1; +} - MPING (CONTROL_PING, mp_ping); - S (mp_ping); +uword +unformat_qos_source (unformat_input_t * input, va_list * args) +{ + int *qs = va_arg (*args, int *); - timeout = vat_time_now (vam) + 1.0; - while (vat_time_now (vam) < timeout) - if (vam->result_ready == 1) - goto out; - vam->retval = -99; + if (unformat (input, "ip")) + *qs = QOS_SOURCE_IP; + else if (unformat (input, "mpls")) + *qs = QOS_SOURCE_MPLS; + else if (unformat (input, "ext")) + *qs = QOS_SOURCE_EXT; + else if (unformat (input, "vlan")) + *qs = QOS_SOURCE_VLAN; + else + return 0; - out: - if (vam->retval == -99) - errmsg ("timeout"); + return 1; +} +#endif - if (vam->async_errors > 0) +uword +api_unformat_classify_match (unformat_input_t * input, va_list * args) +{ + u8 **matchp = va_arg (*args, u8 **); + u32 skip_n_vectors = va_arg (*args, u32); + u32 match_n_vectors = va_arg (*args, u32); + + u8 *match = 0; + u8 *l2 = 0; + u8 *l3 = 0; + u8 *l4 = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "hex %U", unformat_hex_string, &match)) + ; + else if (unformat (input, "l2 %U", unformat_l2_match, &l2)) + ; + else if (unformat (input, "l3 %U", unformat_l3_match, &l3)) + ; + else if (unformat (input, "l4 %U", unformat_l4_match, &l4)) + ; + else + break; + } + + if (l4 && !l3) + { + vec_free (match); + vec_free (l2); + vec_free (l4); + return 0; + } + + if (match || l2 || l3 || l4) + { + if (l2 || l3 || l4) { - errmsg ("%d asynchronous errors", vam->async_errors); - vam->retval = -98; + /* "Win a free Ethernet header in every packet" */ + if (l2 == 0) + vec_validate_aligned (l2, 13, sizeof (u32x4)); + match = l2; + if (vec_len (l3)) + { + vec_append_aligned (match, l3, sizeof (u32x4)); + vec_free (l3); + } + if (vec_len (l4)) + { + vec_append_aligned (match, l4, sizeof (u32x4)); + vec_free (l4); + } } - vam->async_errors = 0; - after = vat_time_now (vam); - /* slim chance, but we might have eaten SIGTERM on the first iteration */ - if (jj > 0) - count = jj; + /* Make sure the vector is big enough even if key is all 0's */ + vec_validate_aligned + (match, ((match_n_vectors + skip_n_vectors) * sizeof (u32x4)) - 1, + sizeof (u32x4)); - print (vam->ofp, "%d tunnels in %.6f secs, %.2f tunnels/sec", - count, after - before, count / (after - before)); - } - else - { - /* Wait for a reply... */ - W (ret); - return ret; + /* Set size, include skipped vectors */ + _vec_len (match) = (match_n_vectors + skip_n_vectors) * sizeof (u32x4); + + *matchp = match; + + return 1; } - return ret; + return 0; } -static void -vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) +static int +api_classify_add_del_session (vat_main_t * vam) { - vat_main_t *vam = &vat_main; + unformat_input_t *i = vam->input; + vl_api_classify_add_del_session_t *mp; + int is_add = 1; + u32 table_index = ~0; + u32 hit_next_index = ~0; + u32 opaque_index = ~0; + u8 *match = 0; + i32 advance = 0; + u32 skip_n_vectors = 0; + u32 match_n_vectors = 0; + u32 action = 0; + u32 metadata = 0; + int ret; - 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 stat_index %u\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), ntohl (mp->stat_index)); -} + /* + * Warning: you have to supply skip_n and match_n + * because the API client cant simply look at the classify + * table object. + */ -#define vl_api_ipsec_sa_details_t_endian vl_noop_handler -#define vl_api_ipsec_sa_details_t_print vl_noop_handler + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "hit-next %U", api_unformat_ip_next_index, + &hit_next_index)) + ; + else if (unformat (i, "l2-hit-next %U", unformat_l2_next_index, + &hit_next_index)) + ; + else if (unformat (i, "acl-hit-next %U", api_unformat_acl_next_index, + &hit_next_index)) + ; + else if (unformat (i, "policer-hit-next %d", &hit_next_index)) + ; + else if (unformat (i, "%U", unformat_policer_precolor, &opaque_index)) + ; + else if (unformat (i, "opaque-index %d", &opaque_index)) + ; + else if (unformat (i, "skip_n %d", &skip_n_vectors)) + ; + else if (unformat (i, "match_n %d", &match_n_vectors)) + ; + else if (unformat (i, "match %U", api_unformat_classify_match, + &match, skip_n_vectors, match_n_vectors)) + ; + else if (unformat (i, "advance %d", &advance)) + ; + else if (unformat (i, "table-index %d", &table_index)) + ; + else if (unformat (i, "action set-ip4-fib-id %d", &metadata)) + action = 1; + else if (unformat (i, "action set-ip6-fib-id %d", &metadata)) + action = 2; + else if (unformat (i, "action %d", &action)) + ; + else if (unformat (i, "metadata %d", &metadata)) + ; + else + break; + } -static void vl_api_ipsec_sa_details_t_handler_json - (vl_api_ipsec_sa_details_t * mp) -{ - vat_main_t *vam = &vat_main; - vat_json_node_t *node = NULL; - vl_api_ipsec_sad_flags_t flags; + if (table_index == ~0) + { + errmsg ("Table index required"); + return -99; + } - if (VAT_JSON_ARRAY != vam->json_tree.type) + if (is_add && match == 0) { - ASSERT (VAT_JSON_NONE == vam->json_tree.type); - vat_json_init_array (&vam->json_tree); + errmsg ("Match value required"); + return -99; } - node = vat_json_array_add (&vam->json_tree); - 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)); - vat_json_object_add_uint (node, "stat_index", ntohl (mp->stat_index)); + M2 (CLASSIFY_ADD_DEL_SESSION, mp, vec_len (match)); + + mp->is_add = is_add; + mp->table_index = ntohl (table_index); + mp->hit_next_index = ntohl (hit_next_index); + mp->opaque_index = ntohl (opaque_index); + mp->advance = ntohl (advance); + mp->action = action; + mp->metadata = ntohl (metadata); + mp->match_len = ntohl (vec_len (match)); + clib_memcpy (mp->match, match, vec_len (match)); + vec_free (match); + + S (mp); + W (ret); + return ret; } static int -api_ipsec_sa_dump (vat_main_t * vam) +api_classify_set_interface_ip_table (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; + vl_api_classify_set_interface_ip_table_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 table_index = ~0; + u8 is_ipv6 = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "sa_id %d", &sa_id)) + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "table %d", &table_index)) ; else { @@ -13380,40 +8825,51 @@ api_ipsec_sa_dump (vat_main_t * vam) } } - M (IPSEC_SA_DUMP, mp); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - mp->sa_id = ntohl (sa_id); - S (mp); + M (CLASSIFY_SET_INTERFACE_IP_TABLE, mp); - /* Use a control ping for synchronization */ - M (CONTROL_PING, mp_ping); - S (mp_ping); + mp->sw_if_index = ntohl (sw_if_index); + mp->table_index = ntohl (table_index); + mp->is_ipv6 = is_ipv6; + S (mp); W (ret); return ret; } static int -api_ipsec_tunnel_if_set_sa (vat_main_t * vam) +api_classify_set_interface_l2_tables (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; + vl_api_classify_set_interface_l2_tables_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 other_table_index = ~0; + u32 is_input = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) ; - else if (unformat (i, "sa_id %d", &sa_id)) + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "other-table %d", &other_table_index)) + ; + else if (unformat (i, "is-input %d", &is_input)) ; - else if (unformat (i, "outbound")) - is_outbound = 1; - else if (unformat (i, "inbound")) - is_outbound = 0; else { clib_warning ("parse error '%U'", format_unformat_error, i); @@ -13421,3170 +8877,2808 @@ api_ipsec_tunnel_if_set_sa (vat_main_t * vam) } } - if (sw_if_index == ~0) + if (sw_if_index_set == 0) { - errmsg ("interface must be specified"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (sa_id == ~0) - { - errmsg ("SA ID must be specified"); - return -99; - } - M (IPSEC_TUNNEL_IF_SET_SA, mp); + M (CLASSIFY_SET_INTERFACE_L2_TABLES, mp); - mp->sw_if_index = htonl (sw_if_index); - mp->sa_id = htonl (sa_id); - mp->is_outbound = is_outbound; + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->other_table_index = ntohl (other_table_index); + mp->is_input = (u8) is_input; S (mp); W (ret); - return ret; } static int -api_get_first_msg_id (vat_main_t * vam) +api_set_ipfix_exporter (vat_main_t * vam) { - vl_api_get_first_msg_id_t *mp; unformat_input_t *i = vam->input; - u8 *name; - u8 name_set = 0; + vl_api_set_ipfix_exporter_t *mp; + ip4_address_t collector_address; + u8 collector_address_set = 0; + u32 collector_port = ~0; + ip4_address_t src_address; + u8 src_address_set = 0; + u32 vrf_id = ~0; + u32 path_mtu = ~0; + u32 template_interval = ~0; + u8 udp_checksum = 0; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "client %s", &name)) - name_set = 1; + if (unformat (i, "collector_address %U", unformat_ip4_address, + &collector_address)) + collector_address_set = 1; + else if (unformat (i, "collector_port %d", &collector_port)) + ; + else if (unformat (i, "src_address %U", unformat_ip4_address, + &src_address)) + src_address_set = 1; + else if (unformat (i, "vrf_id %d", &vrf_id)) + ; + else if (unformat (i, "path_mtu %d", &path_mtu)) + ; + else if (unformat (i, "template_interval %d", &template_interval)) + ; + else if (unformat (i, "udp_checksum")) + udp_checksum = 1; else break; } - if (name_set == 0) + if (collector_address_set == 0) { - errmsg ("missing client name"); + errmsg ("collector_address required"); return -99; } - vec_add1 (name, 0); - if (vec_len (name) > 63) + if (src_address_set == 0) { - errmsg ("client name too long"); + errmsg ("src_address required"); return -99; } - M (GET_FIRST_MSG_ID, mp); - clib_memcpy (mp->name, name, vec_len (name)); + M (SET_IPFIX_EXPORTER, mp); + + memcpy (mp->collector_address.un.ip4, collector_address.data, + sizeof (collector_address.data)); + mp->collector_port = htons ((u16) collector_port); + memcpy (mp->src_address.un.ip4, src_address.data, + sizeof (src_address.data)); + mp->vrf_id = htonl (vrf_id); + mp->path_mtu = htonl (path_mtu); + mp->template_interval = htonl (template_interval); + mp->udp_checksum = udp_checksum; + S (mp); W (ret); return ret; } static int -api_cop_interface_enable_disable (vat_main_t * vam) +api_set_ipfix_classify_stream (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_cop_interface_enable_disable_t *mp; - u32 sw_if_index = ~0; - u8 enable_disable = 1; + unformat_input_t *i = vam->input; + vl_api_set_ipfix_classify_stream_t *mp; + u32 domain_id = 0; + u32 src_port = UDP_DST_PORT_ipfix; int ret; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "disable")) - enable_disable = 0; - if (unformat (line_input, "enable")) - enable_disable = 1; - else if (unformat (line_input, "%U", api_unformat_sw_if_index, - vam, &sw_if_index)) + if (unformat (i, "domain %d", &domain_id)) ; - else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + else if (unformat (i, "src_port %d", &src_port)) ; else - break; + { + errmsg ("unknown input `%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index == ~0) - { - errmsg ("missing interface name or sw_if_index"); - return -99; - } + M (SET_IPFIX_CLASSIFY_STREAM, mp); - /* Construct the API message */ - M (COP_INTERFACE_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->enable_disable = enable_disable; + mp->domain_id = htonl (domain_id); + mp->src_port = htons ((u16) src_port); - /* send it... */ S (mp); - /* Wait for the reply */ W (ret); return ret; } static int -api_cop_whitelist_enable_disable (vat_main_t * vam) +api_ipfix_classify_table_add_del (vat_main_t * vam) { - unformat_input_t *line_input = vam->input; - vl_api_cop_whitelist_enable_disable_t *mp; - u32 sw_if_index = ~0; - u8 ip4 = 0, ip6 = 0, default_cop = 0; - u32 fib_id = 0; + unformat_input_t *i = vam->input; + vl_api_ipfix_classify_table_add_del_t *mp; + int is_add = -1; + u32 classify_table_index = ~0; + u8 ip_version = 0; + u8 transport_protocol = 255; int ret; - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "ip4")) - ip4 = 1; - else if (unformat (line_input, "ip6")) - ip6 = 1; - else if (unformat (line_input, "default")) - default_cop = 1; - else if (unformat (line_input, "%U", api_unformat_sw_if_index, - vam, &sw_if_index)) - ; - else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) - ; - else if (unformat (line_input, "fib-id %d", &fib_id)) + if (unformat (i, "add")) + is_add = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "table %d", &classify_table_index)) ; + else if (unformat (i, "ip4")) + ip_version = 4; + else if (unformat (i, "ip6")) + ip_version = 6; + else if (unformat (i, "tcp")) + transport_protocol = 6; + else if (unformat (i, "udp")) + transport_protocol = 17; else - break; + { + errmsg ("unknown input `%U'", format_unformat_error, i); + return -99; + } } - if (sw_if_index == ~0) + if (is_add == -1) { - errmsg ("missing interface name or sw_if_index"); + errmsg ("expecting: add|del"); + return -99; + } + if (classify_table_index == ~0) + { + errmsg ("classifier table not specified"); + return -99; + } + if (ip_version == 0) + { + errmsg ("IP version not specified"); return -99; } - /* Construct the API message */ - M (COP_WHITELIST_ENABLE_DISABLE, mp); - mp->sw_if_index = ntohl (sw_if_index); - mp->fib_id = ntohl (fib_id); - mp->ip4 = ip4; - mp->ip6 = ip6; - mp->default_cop = default_cop; + M (IPFIX_CLASSIFY_TABLE_ADD_DEL, mp); + + mp->is_add = is_add; + mp->table_id = htonl (classify_table_index); + mp->ip_version = ip_version; + mp->transport_protocol = transport_protocol; - /* send it... */ S (mp); - /* Wait for the reply */ W (ret); return ret; } static int -api_get_node_graph (vat_main_t * vam) +api_get_node_index (vat_main_t * vam) { - vl_api_get_node_graph_t *mp; + unformat_input_t *i = vam->input; + vl_api_get_node_index_t *mp; + u8 *name = 0; int ret; - M (GET_NODE_GRAPH, mp); - - /* send it... */ - S (mp); - /* Wait for the reply */ - W (ret); - return ret; -} - -/* *INDENT-OFF* */ -/** Used for parsing LISP eids */ -typedef CLIB_PACKED(struct{ - union { - ip46_address_t ip; - mac_address_t mac; - lisp_nsh_api_t nsh; - } addr; - u32 len; /**< prefix length if IP */ - u8 type; /**< type of eid */ -}) lisp_eid_vat_t; -/* *INDENT-ON* */ - -static uword -unformat_lisp_eid_vat (unformat_input_t * input, va_list * args) -{ - lisp_eid_vat_t *a = va_arg (*args, lisp_eid_vat_t *); - - clib_memset (a, 0, sizeof (a[0])); - - if (unformat (input, "%U/%d", unformat_ip46_address, a->addr.ip, &a->len)) - { - a->type = 0; /* ip prefix type */ - } - else if (unformat (input, "%U", unformat_ethernet_address, &a->addr.mac)) - { - a->type = 1; /* mac type */ - } - else if (unformat (input, "%U", unformat_nsh_address, a->addr.nsh)) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - a->type = 2; /* NSH type */ - a->addr.nsh.spi = clib_host_to_net_u32 (a->addr.nsh.spi); + if (unformat (i, "node %s", &name)) + ; + else + break; } - else + if (name == 0) { - return 0; + errmsg ("node name required"); + return -99; } - - if (a->type == 0) + if (vec_len (name) >= ARRAY_LEN (mp->node_name)) { - if (ip46_address_is_ip4 (&a->addr.ip)) - return a->len > 32 ? 1 : 0; - else - return a->len > 128 ? 1 : 0; + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); + return -99; } - return 1; -} + M (GET_NODE_INDEX, mp); + clib_memcpy (mp->node_name, name, vec_len (name)); + vec_free (name); -static void -lisp_eid_put_vat (vl_api_eid_t * eid, const lisp_eid_vat_t * vat_eid) -{ - eid->type = vat_eid->type; - switch (eid->type) - { - case EID_TYPE_API_PREFIX: - if (ip46_address_is_ip4 (&vat_eid->addr.ip)) - { - clib_memcpy (&eid->address.prefix.address.un.ip4, - &vat_eid->addr.ip.ip4, 4); - eid->address.prefix.address.af = ADDRESS_IP4; - eid->address.prefix.len = vat_eid->len; - } - else - { - clib_memcpy (&eid->address.prefix.address.un.ip6, - &vat_eid->addr.ip.ip6, 16); - eid->address.prefix.address.af = ADDRESS_IP6; - eid->address.prefix.len = vat_eid->len; - } - return; - case EID_TYPE_API_MAC: - clib_memcpy (&eid->address.mac, &vat_eid->addr.mac, - sizeof (eid->address.mac)); - return; - case EID_TYPE_API_NSH: - clib_memcpy (&eid->address.nsh, &vat_eid->addr.nsh, - sizeof (eid->address.nsh)); - return; - default: - ASSERT (0); - return; - } + S (mp); + W (ret); + return ret; } static int -api_one_add_del_locator_set (vat_main_t * vam) +api_get_next_index (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_locator_set_t *mp; - u8 is_add = 1; - u8 *locator_set_name = NULL; - u8 locator_set_name_set = 0; - vl_api_local_locator_t locator, *locators = 0; - u32 sw_if_index, priority, weight; - u32 data_len = 0; - + unformat_input_t *i = vam->input; + vl_api_get_next_index_t *mp; + u8 *node_name = 0, *next_node_name = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "locator-set %s", &locator_set_name)) - { - locator_set_name_set = 1; - } - else if (unformat (input, "sw_if_index %u p %u w %u", - &sw_if_index, &priority, &weight)) - { - locator.sw_if_index = htonl (sw_if_index); - locator.priority = priority; - locator.weight = weight; - vec_add1 (locators, locator); - } - else - if (unformat - (input, "iface %U p %u w %u", api_unformat_sw_if_index, vam, - &sw_if_index, &priority, &weight)) - { - locator.sw_if_index = htonl (sw_if_index); - locator.priority = priority; - locator.weight = weight; - vec_add1 (locators, locator); - } - else + if (unformat (i, "node-name %s", &node_name)) + ; + else if (unformat (i, "next-node-name %s", &next_node_name)) break; } - if (locator_set_name_set == 0) + if (node_name == 0) { - errmsg ("missing locator-set name"); - vec_free (locators); + errmsg ("node name required"); return -99; } - - if (vec_len (locator_set_name) > 64) + if (vec_len (node_name) >= ARRAY_LEN (mp->node_name)) { - errmsg ("locator-set name too long"); - vec_free (locator_set_name); - vec_free (locators); + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); return -99; } - vec_add1 (locator_set_name, 0); - - data_len = sizeof (vl_api_local_locator_t) * vec_len (locators); - - /* Construct the API message */ - M2 (ONE_ADD_DEL_LOCATOR_SET, mp, data_len); - mp->is_add = is_add; - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - vec_free (locator_set_name); + if (next_node_name == 0) + { + errmsg ("next node name required"); + return -99; + } + if (vec_len (next_node_name) >= ARRAY_LEN (mp->next_name)) + { + errmsg ("next node name too long, max %d", ARRAY_LEN (mp->next_name)); + return -99; + } - mp->locator_num = clib_host_to_net_u32 (vec_len (locators)); - if (locators) - clib_memcpy (mp->locators, locators, data_len); - vec_free (locators); + M (GET_NEXT_INDEX, mp); + clib_memcpy (mp->node_name, node_name, vec_len (node_name)); + clib_memcpy (mp->next_name, next_node_name, vec_len (next_node_name)); + vec_free (node_name); + vec_free (next_node_name); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_add_del_locator_set api_one_add_del_locator_set - static int -api_one_add_del_locator (vat_main_t * vam) +api_add_node_next (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_locator_t *mp; - u32 tmp_if_index = ~0; - u32 sw_if_index = ~0; - u8 sw_if_index_set = 0; - u8 sw_if_index_if_name_set = 0; - u32 priority = ~0; - u8 priority_set = 0; - u32 weight = ~0; - u8 weight_set = 0; - u8 is_add = 1; - u8 *locator_set_name = NULL; - u8 locator_set_name_set = 0; + unformat_input_t *i = vam->input; + vl_api_add_node_next_t *mp; + u8 *name = 0; + u8 *next = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "locator-set %s", &locator_set_name)) - { - locator_set_name_set = 1; - } - else if (unformat (input, "iface %U", api_unformat_sw_if_index, vam, - &tmp_if_index)) - { - sw_if_index_if_name_set = 1; - sw_if_index = tmp_if_index; - } - else if (unformat (input, "sw_if_index %d", &tmp_if_index)) - { - sw_if_index_set = 1; - sw_if_index = tmp_if_index; - } - else if (unformat (input, "p %d", &priority)) - { - priority_set = 1; - } - else if (unformat (input, "w %d", &weight)) - { - weight_set = 1; - } + if (unformat (i, "node %s", &name)) + ; + else if (unformat (i, "next %s", &next)) + ; else break; } - - if (locator_set_name_set == 0) - { - errmsg ("missing locator-set name"); - return -99; - } - - if (sw_if_index_set == 0 && sw_if_index_if_name_set == 0) - { - errmsg ("missing sw_if_index"); - vec_free (locator_set_name); - return -99; - } - - if (sw_if_index_set != 0 && sw_if_index_if_name_set != 0) + if (name == 0) { - errmsg ("cannot use both params interface name and sw_if_index"); - vec_free (locator_set_name); + errmsg ("node name required"); return -99; } - - if (priority_set == 0) + if (vec_len (name) >= ARRAY_LEN (mp->node_name)) { - errmsg ("missing locator-set priority"); - vec_free (locator_set_name); + errmsg ("node name too long, max %d", ARRAY_LEN (mp->node_name)); return -99; } - - if (weight_set == 0) + if (next == 0) { - errmsg ("missing locator-set weight"); - vec_free (locator_set_name); + errmsg ("next node required"); return -99; } - - if (vec_len (locator_set_name) > 64) + if (vec_len (next) >= ARRAY_LEN (mp->next_name)) { - errmsg ("locator-set name too long"); - vec_free (locator_set_name); + errmsg ("next name too long, max %d", ARRAY_LEN (mp->next_name)); return -99; } - vec_add1 (locator_set_name, 0); - - /* Construct the API message */ - M (ONE_ADD_DEL_LOCATOR, mp); - mp->is_add = is_add; - mp->sw_if_index = ntohl (sw_if_index); - mp->priority = priority; - mp->weight = weight; - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - vec_free (locator_set_name); + M (ADD_NODE_NEXT, mp); + clib_memcpy (mp->node_name, name, vec_len (name)); + clib_memcpy (mp->next_name, next, vec_len (next)); + vec_free (name); + vec_free (next); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_add_del_locator api_one_add_del_locator +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; -uword -unformat_hmac_key_id (unformat_input_t * input, va_list * args) + u8 *ip4 = + format (0, "%U/%d", format_ip4_address, mp->host_ip4_prefix.address, + mp->host_ip4_prefix.len); + u8 *ip6 = + format (0, "%U/%d", format_ip6_address, mp->host_ip6_prefix.address, + 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_v2_details_t_handler_json + (vl_api_sw_interface_tap_v2_details_t * mp) { - u32 *key_id = va_arg (*args, u32 *); - u8 *s = 0; + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - if (unformat (input, "%s", &s)) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - if (!strcmp ((char *) s, "sha1")) - key_id[0] = HMAC_SHA_1_96; - else if (!strcmp ((char *) s, "sha256")) - key_id[0] = HMAC_SHA_256_128; - else - { - clib_warning ("invalid key_id: '%s'", s); - key_id[0] = HMAC_NO_KEY; - } + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } - else - return 0; + 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_prefix.address, + mp->host_ip4_prefix.len)); + vat_json_object_add_string_copy (node, "host_ip6_prefix", + format (0, "%U/%d", format_ip6_address, + mp->host_ip6_prefix.address, + mp->host_ip6_prefix.len)); - vec_free (s); - return 1; } static int -api_one_add_del_local_eid (vat_main_t * vam) +api_sw_interface_tap_v2_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_local_eid_t *mp; - u8 is_add = 1; - u8 eid_set = 0; - lisp_eid_vat_t _eid, *eid = &_eid; - u8 *locator_set_name = 0; - u8 locator_set_name_set = 0; - u32 vni = 0; - u16 key_id = 0; - u8 *key = 0; + vl_api_sw_interface_tap_v2_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } - else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) - { - eid_set = 1; - } - else if (unformat (input, "locator-set %s", &locator_set_name)) - { - locator_set_name_set = 1; - } - else if (unformat (input, "key-id %U", unformat_hmac_key_id, &key_id)) - ; - else if (unformat (input, "secret-key %_%v%_", &key)) - ; - else - break; - } + 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"); - if (locator_set_name_set == 0) - { - errmsg ("missing locator-set name"); - return -99; - } + /* Get list of tap interfaces */ + M (SW_INTERFACE_TAP_V2_DUMP, mp); + S (mp); - if (0 == eid_set) - { - errmsg ("EID address not set!"); - vec_free (locator_set_name); - return -99; - } + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - if (key && (0 == key_id)) - { - errmsg ("invalid key_id!"); - return -99; - } + W (ret); + return ret; +} + +static void vl_api_sw_interface_virtio_pci_details_t_handler + (vl_api_sw_interface_virtio_pci_details_t * mp) +{ + vat_main_t *vam = &vat_main; - if (vec_len (key) > 64) + typedef union + { + struct { - errmsg ("key too long"); - vec_free (key); - return -99; - } + u16 domain; + u8 bus; + u8 slot:5; + u8 function:3; + }; + u32 as_u32; + } pci_addr_t; + pci_addr_t addr; + + addr.domain = ntohs (mp->pci_addr.domain); + addr.bus = mp->pci_addr.bus; + addr.slot = mp->pci_addr.slot; + addr.function = mp->pci_addr.function; + + u8 *pci_addr = format (0, "%04x:%02x:%02x.%x", addr.domain, addr.bus, + addr.slot, addr.function); - if (vec_len (locator_set_name) > 64) + print (vam->ofp, + "\n%-12s %-12d %-12d %-12d %-17U 0x%-08llx", + pci_addr, ntohl (mp->sw_if_index), + ntohs (mp->rx_ring_sz), ntohs (mp->tx_ring_sz), + format_ethernet_address, mp->mac_addr, + clib_net_to_host_u64 (mp->features)); + vec_free (pci_addr); +} + +static void vl_api_sw_interface_virtio_pci_details_t_handler_json + (vl_api_sw_interface_virtio_pci_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + vlib_pci_addr_t pci_addr; + + if (VAT_JSON_ARRAY != vam->json_tree.type) { - errmsg ("locator-set name too long"); - vec_free (locator_set_name); - return -99; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } - vec_add1 (locator_set_name, 0); + node = vat_json_array_add (&vam->json_tree); - /* Construct the API message */ - M (ONE_ADD_DEL_LOCAL_EID, mp); + pci_addr.domain = ntohs (mp->pci_addr.domain); + pci_addr.bus = mp->pci_addr.bus; + pci_addr.slot = mp->pci_addr.slot; + pci_addr.function = mp->pci_addr.function; + + vat_json_init_object (node); + vat_json_object_add_uint (node, "pci-addr", pci_addr.as_u32); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "rx_ring_sz", ntohs (mp->rx_ring_sz)); + vat_json_object_add_uint (node, "tx_ring_sz", ntohs (mp->tx_ring_sz)); + vat_json_object_add_uint (node, "features", + clib_net_to_host_u64 (mp->features)); + vat_json_object_add_string_copy (node, "mac_addr", + format (0, "%U", format_ethernet_address, + &mp->mac_addr)); +} - mp->is_add = is_add; - lisp_eid_put_vat (&mp->eid, eid); - mp->vni = clib_host_to_net_u32 (vni); - mp->key.id = key_id; - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - clib_memcpy (mp->key.key, key, vec_len (key)); +static int +api_sw_interface_virtio_pci_dump (vat_main_t * vam) +{ + vl_api_sw_interface_virtio_pci_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; - vec_free (locator_set_name); - vec_free (key); + print (vam->ofp, + "\n%-12s %-12s %-12s %-12s %-17s %-08s", + "pci_addr", "sw_if_index", "rx_ring_sz", "tx_ring_sz", + "mac_addr", "features"); - /* send it... */ + /* Get list of tap interfaces */ + M (SW_INTERFACE_VIRTIO_PCI_DUMP, mp); S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -#define api_lisp_add_del_local_eid api_one_add_del_local_eid - static int -api_lisp_gpe_add_del_fwd_entry (vat_main_t * vam) +api_vxlan_offload_rx (vat_main_t * vam) { - u32 dp_table = 0, vni = 0;; - unformat_input_t *input = vam->input; - vl_api_gpe_add_del_fwd_entry_t *mp; + 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; - lisp_eid_vat_t _rmt_eid, *rmt_eid = &_rmt_eid; - lisp_eid_vat_t _lcl_eid, *lcl_eid = &_lcl_eid; - u8 rmt_eid_set = 0, lcl_eid_set = 0; - u32 action = ~0, w; - ip4_address_t rmt_rloc4, lcl_rloc4; - ip6_address_t rmt_rloc6, lcl_rloc6; - vl_api_gpe_locator_t *rmt_locs = 0, *lcl_locs = 0, rloc, *curr_rloc = 0; int ret; - clib_memset (&rloc, 0, sizeof (rloc)); - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) + if (unformat (line_input, "del")) is_add = 0; - else if (unformat (input, "add")) - is_add = 1; - else if (unformat (input, "reid %U", unformat_lisp_eid_vat, rmt_eid)) - { - rmt_eid_set = 1; - } - else if (unformat (input, "leid %U", unformat_lisp_eid_vat, lcl_eid)) - { - lcl_eid_set = 1; - } - else if (unformat (input, "vrf %d", &dp_table)) + else if (unformat (line_input, "hw %U", api_unformat_hw_if_index, vam, + &hw_if_index)) ; - else if (unformat (input, "bd %d", &dp_table)) + else if (unformat (line_input, "hw hw_if_index %u", &hw_if_index)) ; - else if (unformat (input, "vni %d", &vni)) + 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 if (unformat (input, "w %d", &w)) - { - if (!curr_rloc) - { - errmsg ("No RLOC configured for setting priority/weight!"); - return -99; - } - curr_rloc->weight = w; - } - else if (unformat (input, "loc-pair %U %U", unformat_ip4_address, - &lcl_rloc4, unformat_ip4_address, &rmt_rloc4)) - { - rloc.addr.af = 0; - clib_memcpy (&rloc.addr.un.ip4, &lcl_rloc4, sizeof (lcl_rloc4)); - rloc.weight = 0; - vec_add1 (lcl_locs, rloc); - - clib_memcpy (&rloc.addr.un.ip4, &rmt_rloc4, sizeof (rmt_rloc4)); - vec_add1 (rmt_locs, rloc); - /* weight saved in rmt loc */ - curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1]; - } - else if (unformat (input, "loc-pair %U %U", unformat_ip6_address, - &lcl_rloc6, unformat_ip6_address, &rmt_rloc6)) - { - rloc.addr.af = 1; - clib_memcpy (&rloc.addr.un.ip6, &lcl_rloc6, sizeof (lcl_rloc6)); - rloc.weight = 0; - vec_add1 (lcl_locs, rloc); - - clib_memcpy (&rloc.addr.un.ip6, &rmt_rloc6, sizeof (rmt_rloc6)); - vec_add1 (rmt_locs, rloc); - /* weight saved in rmt loc */ - curr_rloc = &rmt_locs[vec_len (rmt_locs) - 1]; - } - else if (unformat (input, "action %d", &action)) - { - ; - } else { - clib_warning ("parse error '%U'", format_unformat_error, input); + errmsg ("parse error '%U'", format_unformat_error, line_input); return -99; } } - if (!rmt_eid_set) - { - errmsg ("remote eid addresses not set"); - return -99; - } - - if (lcl_eid_set && rmt_eid->type != lcl_eid->type) + if (hw_if_index == ~0) { - errmsg ("eid types don't match"); + errmsg ("no hw interface"); return -99; } - if (0 == rmt_locs && (u32) ~ 0 == action) + if (rx_if_index == ~0) { - errmsg ("action not set for negative mapping"); + errmsg ("no rx tunnel"); return -99; } - /* Construct the API message */ - M2 (GPE_ADD_DEL_FWD_ENTRY, mp, - sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs) * 2); - - mp->is_add = is_add; - lisp_eid_put_vat (&mp->rmt_eid, rmt_eid); - lisp_eid_put_vat (&mp->lcl_eid, lcl_eid); - mp->dp_table = clib_host_to_net_u32 (dp_table); - mp->vni = clib_host_to_net_u32 (vni); - mp->action = action; - - if (0 != rmt_locs && 0 != lcl_locs) - { - mp->loc_num = clib_host_to_net_u32 (vec_len (rmt_locs) * 2); - clib_memcpy (mp->locs, lcl_locs, - (sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs))); + M (VXLAN_OFFLOAD_RX, mp); - u32 offset = sizeof (vl_api_gpe_locator_t) * vec_len (lcl_locs); - clib_memcpy (((u8 *) mp->locs) + offset, rmt_locs, - (sizeof (vl_api_gpe_locator_t) * vec_len (rmt_locs))); - } - vec_free (lcl_locs); - vec_free (rmt_locs); + mp->hw_if_index = ntohl (hw_if_index); + mp->sw_if_index = ntohl (rx_if_index); + mp->enable = is_add; - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } +static uword unformat_vxlan_decap_next + (unformat_input_t * input, va_list * args) +{ + u32 *result = va_arg (*args, u32 *); + u32 tmp; + + if (unformat (input, "l2")) + *result = VXLAN_INPUT_NEXT_L2_INPUT; + else if (unformat (input, "%d", &tmp)) + *result = tmp; + else + return 0; + return 1; +} + static int -api_one_add_del_map_server (vat_main_t * vam) +api_vxlan_add_del_tunnel (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_map_server_t *mp; + unformat_input_t *line_input = vam->input; + vl_api_vxlan_add_del_tunnel_t *mp; + ip46_address_t src, dst; u8 is_add = 1; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - ip4_address_t ipv4; - ip6_address_t ipv6; + u8 ipv4_set = 0, ipv6_set = 0; + u8 src_set = 0; + u8 dst_set = 0; + u8 grp_set = 0; + u32 instance = ~0; + u32 mcast_sw_if_index = ~0; + u32 encap_vrf_id = 0; + u32 decap_next_index = ~0; + u32 vni = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Can't "universally zero init" (={0}) due to GCC bug 53119 */ + clib_memset (&src, 0, sizeof src); + clib_memset (&dst, 0, sizeof dst); + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "instance %d", &instance)) + ; + else + if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) { - is_add = 0; + ipv4_set = 1; + src_set = 1; } - else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) + else + if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4)) { ipv4_set = 1; + dst_set = 1; } - else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) + else + if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6)) { ipv6_set = 1; + src_set = 1; } else - break; - } - - if (ipv4_set && ipv6_set) - { - errmsg ("both eid v4 and v6 addresses set"); - return -99; - } - - if (!ipv4_set && !ipv6_set) - { - errmsg ("eid addresses not set"); - return -99; - } - - /* Construct the API message */ - M (ONE_ADD_DEL_MAP_SERVER, mp); - - mp->is_add = is_add; - if (ipv6_set) - { - mp->ip_address.af = 1; - clib_memcpy (mp->ip_address.un.ip6, &ipv6, sizeof (ipv6)); - } - else - { - mp->ip_address.af = 0; - clib_memcpy (mp->ip_address.un.ip4, &ipv4, sizeof (ipv4)); - } - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_add_del_map_server api_one_add_del_map_server - -static int -api_one_add_del_map_resolver (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_one_add_del_map_resolver_t *mp; - u8 is_add = 1; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - ip4_address_t ipv4; - ip6_address_t ipv6; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "del")) + if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6)) { - is_add = 0; + ipv6_set = 1; + dst_set = 1; } - else if (unformat (input, "%U", unformat_ip4_address, &ipv4)) + else if (unformat (line_input, "group %U %U", + unformat_ip4_address, &dst.ip4, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) { + grp_set = dst_set = 1; ipv4_set = 1; } - else if (unformat (input, "%U", unformat_ip6_address, &ipv6)) + else if (unformat (line_input, "group %U", + unformat_ip4_address, &dst.ip4)) { - ipv6_set = 1; + grp_set = dst_set = 1; + ipv4_set = 1; } - else - break; - } - - if (ipv4_set && ipv6_set) - { - errmsg ("both eid v4 and v6 addresses set"); - return -99; - } - - if (!ipv4_set && !ipv6_set) - { - errmsg ("eid addresses not set"); - return -99; - } - - /* Construct the API message */ - M (ONE_ADD_DEL_MAP_RESOLVER, mp); - - mp->is_add = is_add; - if (ipv6_set) - { - mp->ip_address.af = 1; - clib_memcpy (mp->ip_address.un.ip6, &ipv6, sizeof (ipv6)); - } - else - { - mp->ip_address.af = 0; - clib_memcpy (mp->ip_address.un.ip6, &ipv4, sizeof (ipv4)); - } - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_add_del_map_resolver api_one_add_del_map_resolver - -static int -api_lisp_gpe_enable_disable (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_gpe_enable_disable_t *mp; - u8 is_set = 0; - u8 is_enable = 1; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "enable")) + else if (unformat (line_input, "group %U %U", + unformat_ip6_address, &dst.ip6, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) { - is_set = 1; - is_enable = 1; + grp_set = dst_set = 1; + ipv6_set = 1; } - else if (unformat (input, "disable")) + else if (unformat (line_input, "group %U", + unformat_ip6_address, &dst.ip6)) { - is_set = 1; - is_enable = 0; + grp_set = dst_set = 1; + ipv6_set = 1; } else - break; + if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + ; + else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + ; + else if (unformat (line_input, "decap-next %U", + unformat_vxlan_decap_next, &decap_next_index)) + ; + else if (unformat (line_input, "vni %d", &vni)) + ; + else + { + errmsg ("parse error '%U'", format_unformat_error, line_input); + return -99; + } } - if (is_set == 0) + if (src_set == 0) { - errmsg ("Value not set"); + errmsg ("tunnel src address not specified"); return -99; } - - /* Construct the API message */ - M (GPE_ENABLE_DISABLE, mp); - - mp->is_enable = is_enable; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_one_rloc_probe_enable_disable (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_one_rloc_probe_enable_disable_t *mp; - u8 is_set = 0; - u8 is_enable = 0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (dst_set == 0) { - if (unformat (input, "enable")) - { - is_set = 1; - is_enable = 1; - } - else if (unformat (input, "disable")) - is_set = 1; - else - break; + errmsg ("tunnel dst address not specified"); + return -99; } - if (!is_set) + if (grp_set && !ip46_address_is_multicast (&dst)) { - errmsg ("Value not set"); + errmsg ("tunnel group address not multicast"); + return -99; + } + if (grp_set && mcast_sw_if_index == ~0) + { + errmsg ("tunnel nonexistent multicast device"); + return -99; + } + if (grp_set == 0 && ip46_address_is_multicast (&dst)) + { + errmsg ("tunnel dst address must be unicast"); return -99; } - /* Construct the API message */ - M (ONE_RLOC_PROBE_ENABLE_DISABLE, mp); - - mp->is_enable = is_enable; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_rloc_probe_enable_disable api_one_rloc_probe_enable_disable - -static int -api_one_map_register_enable_disable (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_one_map_register_enable_disable_t *mp; - u8 is_set = 0; - u8 is_enable = 0; - int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (ipv4_set && ipv6_set) { - if (unformat (input, "enable")) - { - is_set = 1; - is_enable = 1; - } - else if (unformat (input, "disable")) - is_set = 1; - else - break; + errmsg ("both IPv4 and IPv6 addresses specified"); + return -99; } - if (!is_set) + if ((vni == 0) || (vni >> 24)) { - errmsg ("Value not set"); + errmsg ("vni not specified or out of range"); return -99; } - /* Construct the API message */ - M (ONE_MAP_REGISTER_ENABLE_DISABLE, mp); + M (VXLAN_ADD_DEL_TUNNEL, mp); - mp->is_enable = is_enable; + if (ipv6_set) + { + clib_memcpy (mp->src_address.un.ip6, &src.ip6, sizeof (src.ip6)); + clib_memcpy (mp->dst_address.un.ip6, &dst.ip6, sizeof (dst.ip6)); + } + else + { + clib_memcpy (mp->src_address.un.ip4, &src.ip4, sizeof (src.ip4)); + clib_memcpy (mp->dst_address.un.ip4, &dst.ip4, sizeof (dst.ip4)); + } + mp->src_address.af = ipv6_set; + mp->dst_address.af = ipv6_set; - /* send it... */ - S (mp); + mp->instance = htonl (instance); + mp->encap_vrf_id = ntohl (encap_vrf_id); + mp->decap_next_index = ntohl (decap_next_index); + mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); + mp->vni = ntohl (vni); + mp->is_add = is_add; - /* Wait for a reply... */ + S (mp); W (ret); return ret; } -#define api_lisp_map_register_enable_disable api_one_map_register_enable_disable +static void vl_api_vxlan_tunnel_details_t_handler + (vl_api_vxlan_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + ip46_address_t src = + to_ip46 (mp->dst_address.af, (u8 *) & mp->dst_address.un); + ip46_address_t dst = + to_ip46 (mp->dst_address.af, (u8 *) & mp->src_address.un); -static int -api_one_enable_disable (vat_main_t * vam) + print (vam->ofp, "%11d%11d%24U%24U%14d%18d%13d%19d", + ntohl (mp->sw_if_index), + ntohl (mp->instance), + format_ip46_address, &src, IP46_TYPE_ANY, + format_ip46_address, &dst, IP46_TYPE_ANY, + ntohl (mp->encap_vrf_id), + ntohl (mp->decap_next_index), ntohl (mp->vni), + ntohl (mp->mcast_sw_if_index)); +} + +static void vl_api_vxlan_tunnel_details_t_handler_json + (vl_api_vxlan_tunnel_details_t * mp) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_t *mp; - u8 is_set = 0; - u8 is_enable = 0; - int ret; + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - if (unformat (input, "enable")) - { - is_set = 1; - is_enable = 1; - } - else if (unformat (input, "disable")) - { - is_set = 1; - } - else - break; + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - if (!is_set) - { - errmsg ("Value not set"); - return -99; - } + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); - /* Construct the API message */ - M (ONE_ENABLE_DISABLE, mp); + vat_json_object_add_uint (node, "instance", ntohl (mp->instance)); - mp->is_enable = is_enable; + if (mp->src_address.af) + { + struct in6_addr ip6; - /* send it... */ - S (mp); + clib_memcpy (&ip6, mp->src_address.un.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "src_address", ip6); + clib_memcpy (&ip6, mp->dst_address.un.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "dst_address", ip6); + } + else + { + struct in_addr ip4; - /* Wait for a reply... */ - W (ret); - return ret; + clib_memcpy (&ip4, mp->src_address.un.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "src_address", ip4); + clib_memcpy (&ip4, mp->dst_address.un.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "dst_address", ip4); + } + vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); + vat_json_object_add_uint (node, "decap_next_index", + ntohl (mp->decap_next_index)); + vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); + vat_json_object_add_uint (node, "mcast_sw_if_index", + ntohl (mp->mcast_sw_if_index)); } -#define api_lisp_enable_disable api_one_enable_disable - static int -api_one_enable_disable_xtr_mode (vat_main_t * vam) +api_vxlan_tunnel_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_xtr_mode_t *mp; - u8 is_set = 0; - u8 is_enable = 0; + unformat_input_t *i = vam->input; + vl_api_vxlan_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index; + u8 sw_if_index_set = 0; int ret; /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_enable = 1; - } - else if (unformat (input, "disable")) - { - is_set = 1; - } + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - if (!is_set) + if (sw_if_index_set == 0) + { + sw_if_index = ~0; + } + + if (!vam->json_output) { - errmsg ("Value not set"); - return -99; + print (vam->ofp, "%11s%11s%24s%24s%14s%18s%13s%19s", + "sw_if_index", "instance", "src_address", "dst_address", + "encap_vrf_id", "decap_next_index", "vni", "mcast_sw_if_index"); } - /* Construct the API message */ - M (ONE_ENABLE_DISABLE_XTR_MODE, mp); + /* Get list of vxlan-tunnel interfaces */ + M (VXLAN_TUNNEL_DUMP, mp); - mp->is_enable = is_enable; + mp->sw_if_index = htonl (sw_if_index); - /* send it... */ S (mp); - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_one_show_xtr_mode (vat_main_t * vam) -{ - vl_api_one_show_xtr_mode_t *mp; - int ret; - - /* Construct the API message */ - M (ONE_SHOW_XTR_MODE, mp); - - /* send it... */ - S (mp); + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } static int -api_one_enable_disable_pitr_mode (vat_main_t * vam) +api_gre_tunnel_add_del (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_pitr_mode_t *mp; - u8 is_set = 0; - u8 is_enable = 0; + unformat_input_t *line_input = vam->input; + vl_api_address_t src = { }, dst = + { + }; + vl_api_gre_tunnel_add_del_t *mp; + vl_api_gre_tunnel_type_t t_type; + u8 is_add = 1; + u8 src_set = 0; + u8 dst_set = 0; + u32 outer_table_id = 0; + u32 session_id = 0; + u32 instance = ~0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + t_type = GRE_API_TUNNEL_TYPE_L3; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "instance %d", &instance)) + ; + else if (unformat (line_input, "src %U", unformat_vl_api_address, &src)) { - is_set = 1; - is_enable = 1; + src_set = 1; } - else if (unformat (input, "disable")) + else if (unformat (line_input, "dst %U", unformat_vl_api_address, &dst)) + { + dst_set = 1; + } + else if (unformat (line_input, "outer-table-id %d", &outer_table_id)) + ; + else if (unformat (line_input, "teb")) + t_type = GRE_API_TUNNEL_TYPE_TEB; + else if (unformat (line_input, "erspan %d", &session_id)) + t_type = GRE_API_TUNNEL_TYPE_ERSPAN; + else { - is_set = 1; + errmsg ("parse error '%U'", format_unformat_error, line_input); + return -99; } - else - break; } - if (!is_set) + if (src_set == 0) + { + errmsg ("tunnel src address not specified"); + return -99; + } + if (dst_set == 0) { - errmsg ("Value not set"); + errmsg ("tunnel dst address not specified"); return -99; } - /* Construct the API message */ - M (ONE_ENABLE_DISABLE_PITR_MODE, mp); + M (GRE_TUNNEL_ADD_DEL, mp); - mp->is_enable = is_enable; + clib_memcpy (&mp->tunnel.src, &src, sizeof (mp->tunnel.src)); + clib_memcpy (&mp->tunnel.dst, &dst, sizeof (mp->tunnel.dst)); - /* send it... */ - S (mp); + mp->tunnel.instance = htonl (instance); + mp->tunnel.outer_table_id = htonl (outer_table_id); + mp->is_add = is_add; + mp->tunnel.session_id = htons ((u16) session_id); + mp->tunnel.type = htonl (t_type); - /* Wait for a reply... */ + S (mp); W (ret); return ret; } -static int -api_one_show_pitr_mode (vat_main_t * vam) +static void vl_api_gre_tunnel_details_t_handler + (vl_api_gre_tunnel_details_t * mp) { - vl_api_one_show_pitr_mode_t *mp; - int ret; + vat_main_t *vam = &vat_main; - /* Construct the API message */ - M (ONE_SHOW_PITR_MODE, mp); + print (vam->ofp, "%11d%11d%24U%24U%13d%14d%12d", + ntohl (mp->tunnel.sw_if_index), + ntohl (mp->tunnel.instance), + format_vl_api_address, &mp->tunnel.src, + format_vl_api_address, &mp->tunnel.dst, + mp->tunnel.type, ntohl (mp->tunnel.outer_table_id), + ntohl (mp->tunnel.session_id)); +} - /* send it... */ - S (mp); +static void vl_api_gre_tunnel_details_t_handler_json + (vl_api_gre_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - /* Wait for a reply... */ - W (ret); - return ret; + if (VAT_JSON_ARRAY != vam->json_tree.type) + { + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); + } + node = vat_json_array_add (&vam->json_tree); + + vat_json_init_object (node); + vat_json_object_add_uint (node, "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_table_id", + ntohl (mp->tunnel.outer_table_id)); + vat_json_object_add_uint (node, "session_id", mp->tunnel.session_id); } static int -api_one_enable_disable_petr_mode (vat_main_t * vam) +api_gre_tunnel_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_enable_disable_petr_mode_t *mp; - u8 is_set = 0; - u8 is_enable = 0; + unformat_input_t *i = vam->input; + vl_api_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 (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_enable = 1; - } - else if (unformat (input, "disable")) - { - is_set = 1; - } + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - if (!is_set) + if (sw_if_index_set == 0) { - errmsg ("Value not set"); - return -99; + sw_if_index = ~0; } - /* Construct the API message */ - M (ONE_ENABLE_DISABLE_PETR_MODE, mp); + if (!vam->json_output) + { + print (vam->ofp, "%11s%11s%24s%24s%13s%14s%12s", + "sw_if_index", "instance", "src_address", "dst_address", + "tunnel_type", "outer_fib_id", "session_id"); + } - mp->is_enable = is_enable; + /* Get list of gre-tunnel interfaces */ + M (GRE_TUNNEL_DUMP, mp); + + mp->sw_if_index = htonl (sw_if_index); - /* send it... */ S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_one_show_petr_mode (vat_main_t * vam) +api_l2_fib_clear_table (vat_main_t * vam) { - vl_api_one_show_petr_mode_t *mp; +// unformat_input_t * i = vam->input; + vl_api_l2_fib_clear_table_t *mp; int ret; - /* Construct the API message */ - M (ONE_SHOW_PETR_MODE, mp); + M (L2_FIB_CLEAR_TABLE, mp); - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } static int -api_show_one_map_register_state (vat_main_t * vam) +api_l2_interface_efp_filter (vat_main_t * vam) { - vl_api_show_one_map_register_state_t *mp; + unformat_input_t *i = vam->input; + vl_api_l2_interface_efp_filter_t *mp; + u32 sw_if_index; + u8 enable = 1; + u8 sw_if_index_set = 0; int ret; - M (SHOW_ONE_MAP_REGISTER_STATE, mp); - - /* send */ - S (mp); - - /* wait for reply */ - W (ret); - return ret; -} + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "enable")) + enable = 1; + else if (unformat (i, "disable")) + enable = 0; + else + { + clib_warning ("parse error '%U'", format_unformat_error, i); + return -99; + } + } -#define api_show_lisp_map_register_state api_show_one_map_register_state + if (sw_if_index_set == 0) + { + errmsg ("missing sw_if_index"); + return -99; + } -static int -api_show_one_rloc_probe_state (vat_main_t * vam) -{ - vl_api_show_one_rloc_probe_state_t *mp; - int ret; + M (L2_INTERFACE_EFP_FILTER, mp); - M (SHOW_ONE_RLOC_PROBE_STATE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->enable_disable = enable; - /* send */ S (mp); - - /* wait for reply */ W (ret); return ret; } -#define api_show_lisp_rloc_probe_state api_show_one_rloc_probe_state +#define foreach_vtr_op \ +_("disable", L2_VTR_DISABLED) \ +_("push-1", L2_VTR_PUSH_1) \ +_("push-2", L2_VTR_PUSH_2) \ +_("pop-1", L2_VTR_POP_1) \ +_("pop-2", L2_VTR_POP_2) \ +_("translate-1-1", L2_VTR_TRANSLATE_1_1) \ +_("translate-1-2", L2_VTR_TRANSLATE_1_2) \ +_("translate-2-1", L2_VTR_TRANSLATE_2_1) \ +_("translate-2-2", L2_VTR_TRANSLATE_2_2) static int -api_one_add_del_ndp_entry (vat_main_t * vam) +api_l2_interface_vlan_tag_rewrite (vat_main_t * vam) { - vl_api_one_add_del_ndp_entry_t *mp; - unformat_input_t *input = vam->input; - u8 is_add = 1; - u8 mac_set = 0; - u8 bd_set = 0; - u8 ip_set = 0; - u8 mac[6] = { 0, }; - u8 ip6[16] = { 0, }; - u32 bd = ~0; + unformat_input_t *i = vam->input; + vl_api_l2_interface_vlan_tag_rewrite_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u8 vtr_op_set = 0; + u32 vtr_op = 0; + u32 push_dot1q = 1; + u32 tag1 = ~0; + u32 tag2 = ~0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) - mac_set = 1; - else if (unformat (input, "ip %U", unformat_ip6_address, ip6)) - ip_set = 1; - else if (unformat (input, "bd %d", &bd)) - bd_set = 1; + 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, "vtr_op %d", &vtr_op)) + vtr_op_set = 1; +#define _(n,v) else if (unformat(i, n)) {vtr_op = v; vtr_op_set = 1;} + foreach_vtr_op +#undef _ + else if (unformat (i, "push_dot1q %d", &push_dot1q)) + ; + else if (unformat (i, "tag1 %d", &tag1)) + ; + else if (unformat (i, "tag2 %d", &tag2)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (!bd_set || !ip_set || (!mac_set && is_add)) + if ((sw_if_index_set == 0) || (vtr_op_set == 0)) { - errmsg ("Missing BD, IP or MAC!"); + errmsg ("missing vtr operation or sw_if_index"); return -99; } - M (ONE_ADD_DEL_NDP_ENTRY, mp); - mp->is_add = is_add; - clib_memcpy (&mp->entry.mac, mac, 6); - mp->bd = clib_host_to_net_u32 (bd); - clib_memcpy (&mp->entry.ip6, ip6, sizeof (mp->entry.ip6)); + M (L2_INTERFACE_VLAN_TAG_REWRITE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->vtr_op = ntohl (vtr_op); + mp->push_dot1q = ntohl (push_dot1q); + mp->tag1 = ntohl (tag1); + mp->tag2 = ntohl (tag2); - /* send */ S (mp); - - /* wait for reply */ W (ret); return ret; } static int -api_one_add_del_l2_arp_entry (vat_main_t * vam) +api_create_vhost_user_if (vat_main_t * vam) { - vl_api_one_add_del_l2_arp_entry_t *mp; - unformat_input_t *input = vam->input; - u8 is_add = 1; - u8 mac_set = 0; - u8 bd_set = 0; - u8 ip_set = 0; - u8 mac[6] = { 0, }; - u32 ip4 = 0, bd = ~0; + unformat_input_t *i = vam->input; + vl_api_create_vhost_user_if_t *mp; + u8 *file_name; + u8 is_server = 0; + u8 file_name_set = 0; + u32 custom_dev_instance = ~0; + u8 hwaddr[6]; + u8 use_custom_mac = 0; + u8 disable_mrg_rxbuf = 0; + u8 disable_indirect_desc = 0; + u8 *tag = 0; + u8 enable_gso = 0; + u8 enable_packed = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Shut up coverity */ + clib_memset (hwaddr, 0, sizeof (hwaddr)); + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "mac %U", unformat_ethernet_address, mac)) - mac_set = 1; - else if (unformat (input, "ip %U", unformat_ip4_address, &ip4)) - ip_set = 1; - else if (unformat (input, "bd %d", &bd)) - bd_set = 1; + if (unformat (i, "socket %s", &file_name)) + { + file_name_set = 1; + } + else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) + ; + else if (unformat (i, "mac %U", unformat_ethernet_address, hwaddr)) + use_custom_mac = 1; + else if (unformat (i, "server")) + is_server = 1; + else if (unformat (i, "disable_mrg_rxbuf")) + disable_mrg_rxbuf = 1; + else if (unformat (i, "disable_indirect_desc")) + disable_indirect_desc = 1; + else if (unformat (i, "gso")) + enable_gso = 1; + else if (unformat (i, "packed")) + enable_packed = 1; + else if (unformat (i, "tag %s", &tag)) + ; else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if (!bd_set || !ip_set || (!mac_set && is_add)) + if (file_name_set == 0) { - errmsg ("Missing BD, IP or MAC!"); + errmsg ("missing socket file name"); return -99; } - M (ONE_ADD_DEL_L2_ARP_ENTRY, mp); - mp->is_add = is_add; - clib_memcpy (&mp->entry.mac, mac, 6); - mp->bd = clib_host_to_net_u32 (bd); - clib_memcpy (mp->entry.ip4, &ip4, sizeof (mp->entry.ip4)); - - /* send */ - S (mp); + if (vec_len (file_name) > 255) + { + errmsg ("socket file name too long"); + return -99; + } + vec_add1 (file_name, 0); - /* wait for reply */ - W (ret); - return ret; -} + M (CREATE_VHOST_USER_IF, mp); -static int -api_one_ndp_bd_get (vat_main_t * vam) -{ - vl_api_one_ndp_bd_get_t *mp; - int ret; + mp->is_server = is_server; + mp->disable_mrg_rxbuf = disable_mrg_rxbuf; + mp->disable_indirect_desc = disable_indirect_desc; + mp->enable_gso = enable_gso; + mp->enable_packed = enable_packed; + clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); + vec_free (file_name); + if (custom_dev_instance != ~0) + { + mp->renumber = 1; + mp->custom_dev_instance = ntohl (custom_dev_instance); + } - M (ONE_NDP_BD_GET, mp); + mp->use_custom_mac = use_custom_mac; + clib_memcpy (mp->mac_address, hwaddr, 6); + if (tag) + strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); + vec_free (tag); - /* send */ S (mp); - - /* wait for reply */ W (ret); return ret; } static int -api_one_ndp_entries_get (vat_main_t * vam) +api_modify_vhost_user_if (vat_main_t * vam) { - vl_api_one_ndp_entries_get_t *mp; - unformat_input_t *input = vam->input; - u8 bd_set = 0; - u32 bd = ~0; + unformat_input_t *i = vam->input; + vl_api_modify_vhost_user_if_t *mp; + u8 *file_name; + u8 is_server = 0; + u8 file_name_set = 0; + u32 custom_dev_instance = ~0; + u8 sw_if_index_set = 0; + u32 sw_if_index = (u32) ~ 0; + u8 enable_gso = 0; + u8 enable_packed = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "bd %d", &bd)) - bd_set = 1; - else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "socket %s", &file_name)) { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; + file_name_set = 1; } + else if (unformat (i, "renumber %" PRIu32, &custom_dev_instance)) + ; + else if (unformat (i, "server")) + is_server = 1; + else if (unformat (i, "gso")) + enable_gso = 1; + else if (unformat (i, "packed")) + enable_packed = 1; + else + break; } - if (!bd_set) + if (sw_if_index_set == 0) { - errmsg ("Expected bridge domain!"); + errmsg ("missing sw_if_index or interface name"); return -99; } - M (ONE_NDP_ENTRIES_GET, mp); - mp->bd = clib_host_to_net_u32 (bd); - - /* send */ - S (mp); - - /* wait for reply */ - W (ret); - return ret; -} - -static int -api_one_l2_arp_bd_get (vat_main_t * vam) -{ - vl_api_one_l2_arp_bd_get_t *mp; - int ret; - - M (ONE_L2_ARP_BD_GET, mp); - - /* send */ - S (mp); - - /* wait for reply */ - W (ret); - return ret; -} - -static int -api_one_l2_arp_entries_get (vat_main_t * vam) -{ - vl_api_one_l2_arp_entries_get_t *mp; - unformat_input_t *input = vam->input; - u8 bd_set = 0; - u32 bd = ~0; - int ret; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + if (file_name_set == 0) { - if (unformat (input, "bd %d", &bd)) - bd_set = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + errmsg ("missing socket file name"); + return -99; } - if (!bd_set) + if (vec_len (file_name) > 255) { - errmsg ("Expected bridge domain!"); + errmsg ("socket file name too long"); return -99; } + vec_add1 (file_name, 0); - M (ONE_L2_ARP_ENTRIES_GET, mp); - mp->bd = clib_host_to_net_u32 (bd); + M (MODIFY_VHOST_USER_IF, mp); - /* send */ - S (mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_server = is_server; + mp->enable_gso = enable_gso; + mp->enable_packed = enable_packed; + clib_memcpy (mp->sock_filename, file_name, vec_len (file_name)); + vec_free (file_name); + if (custom_dev_instance != ~0) + { + mp->renumber = 1; + mp->custom_dev_instance = ntohl (custom_dev_instance); + } - /* wait for reply */ + S (mp); W (ret); return ret; } static int -api_one_stats_enable_disable (vat_main_t * vam) +api_delete_vhost_user_if (vat_main_t * vam) { - vl_api_one_stats_enable_disable_t *mp; - unformat_input_t *input = vam->input; - u8 is_set = 0; - u8 is_enable = 0; + unformat_input_t *i = vam->input; + vl_api_delete_vhost_user_if_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 (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "enable")) - { - is_set = 1; - is_enable = 1; - } - else if (unformat (input, "disable")) - { - is_set = 1; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else break; } - if (!is_set) + if (sw_if_index_set == 0) { - errmsg ("Value not set"); + errmsg ("missing sw_if_index or interface name"); return -99; } - M (ONE_STATS_ENABLE_DISABLE, mp); - mp->is_enable = is_enable; - /* send */ - S (mp); + M (DELETE_VHOST_USER_IF, mp); + + mp->sw_if_index = ntohl (sw_if_index); - /* wait for reply */ + S (mp); W (ret); return ret; } -static int -api_show_one_stats_enable_disable (vat_main_t * vam) +static void vl_api_sw_interface_vhost_user_details_t_handler + (vl_api_sw_interface_vhost_user_details_t * mp) { - vl_api_show_one_stats_enable_disable_t *mp; - int ret; - - M (SHOW_ONE_STATS_ENABLE_DISABLE, mp); + vat_main_t *vam = &vat_main; + u64 features; - /* send */ - S (mp); + features = + clib_net_to_host_u32 (mp->features_first_32) | ((u64) + clib_net_to_host_u32 + (mp->features_last_32) << + 32); - /* wait for reply */ - W (ret); - return ret; + print (vam->ofp, "%-25s %3" PRIu32 " %6" PRIu32 " %8x %6d %7d %s", + (char *) mp->interface_name, + ntohl (mp->sw_if_index), ntohl (mp->virtio_net_hdr_sz), + features, mp->is_server, + ntohl (mp->num_regions), (char *) mp->sock_filename); + print (vam->ofp, " Status: '%s'", strerror (ntohl (mp->sock_errno))); } -static int -api_show_one_map_request_mode (vat_main_t * vam) +static void vl_api_sw_interface_vhost_user_details_t_handler_json + (vl_api_sw_interface_vhost_user_details_t * mp) { - vl_api_show_one_map_request_mode_t *mp; - int ret; - - M (SHOW_ONE_MAP_REQUEST_MODE, mp); + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - /* send */ - 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 reply */ - W (ret); - return ret; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_string_copy (node, "interface_name", + mp->interface_name); + vat_json_object_add_uint (node, "virtio_net_hdr_sz", + ntohl (mp->virtio_net_hdr_sz)); + vat_json_object_add_uint (node, "features_first_32", + clib_net_to_host_u32 (mp->features_first_32)); + vat_json_object_add_uint (node, "features_last_32", + clib_net_to_host_u32 (mp->features_last_32)); + vat_json_object_add_uint (node, "is_server", mp->is_server); + vat_json_object_add_string_copy (node, "sock_filename", mp->sock_filename); + vat_json_object_add_uint (node, "num_regions", ntohl (mp->num_regions)); + vat_json_object_add_uint (node, "sock_errno", ntohl (mp->sock_errno)); } -#define api_show_lisp_map_request_mode api_show_one_map_request_mode - static int -api_one_map_request_mode (vat_main_t * vam) +api_sw_interface_vhost_user_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_map_request_mode_t *mp; - u8 mode = 0; + unformat_input_t *i = vam->input; + vl_api_sw_interface_vhost_user_dump_t *mp; + vl_api_control_ping_t *mp_ping; int ret; + u32 sw_if_index = ~0; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "dst-only")) - mode = 0; - else if (unformat (input, "src-dst")) - mode = 1; + 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 - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - M (ONE_MAP_REQUEST_MODE, mp); - - mp->mode = mode; + print (vam->ofp, + "Interface name idx hdr_sz features server regions filename"); - /* send */ + /* Get list of vhost-user interfaces */ + M (SW_INTERFACE_VHOST_USER_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); S (mp); - /* wait for reply */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -#define api_lisp_map_request_mode api_one_map_request_mode - -/** - * Enable/disable ONE proxy ITR. - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_pitr_set_locator_set (vat_main_t * vam) +api_show_version (vat_main_t * vam) { - u8 ls_name_set = 0; - unformat_input_t *input = vam->input; - vl_api_one_pitr_set_locator_set_t *mp; - u8 is_add = 1; - u8 *ls_name = 0; + vl_api_show_version_t *mp; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "locator-set %s", &ls_name)) - ls_name_set = 1; - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } - - if (!ls_name_set) - { - errmsg ("locator-set name not set!"); - return -99; - } - - M (ONE_PITR_SET_LOCATOR_SET, mp); - - mp->is_add = is_add; - clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); - vec_free (ls_name); + M (SHOW_VERSION, mp); - /* send */ S (mp); - - /* wait for reply */ W (ret); return ret; } -#define api_lisp_pitr_set_locator_set api_one_pitr_set_locator_set static int -api_one_nsh_set_locator_set (vat_main_t * vam) +api_vxlan_gpe_add_del_tunnel (vat_main_t * vam) { - u8 ls_name_set = 0; - unformat_input_t *input = vam->input; - vl_api_one_nsh_set_locator_set_t *mp; + unformat_input_t *line_input = vam->input; + vl_api_vxlan_gpe_add_del_tunnel_t *mp; + ip46_address_t local, remote; u8 is_add = 1; - u8 *ls_name = 0; + u8 local_set = 0; + u8 remote_set = 0; + u8 grp_set = 0; + u32 mcast_sw_if_index = ~0; + u32 encap_vrf_id = 0; + u32 decap_vrf_id = 0; + u8 protocol = ~0; + u32 vni; + u8 vni_set = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) + if (unformat (line_input, "del")) is_add = 0; - else if (unformat (input, "ls %s", &ls_name)) - ls_name_set = 1; + else if (unformat (line_input, "local %U", + unformat_ip46_address, &local)) + { + local_set = 1; + } + else if (unformat (line_input, "remote %U", + unformat_ip46_address, &remote)) + { + remote_set = 1; + } + else if (unformat (line_input, "group %U %U", + unformat_ip46_address, &remote, + api_unformat_sw_if_index, vam, &mcast_sw_if_index)) + { + grp_set = remote_set = 1; + } + else if (unformat (line_input, "group %U", + unformat_ip46_address, &remote)) + { + grp_set = remote_set = 1; + } + else + if (unformat (line_input, "mcast_sw_if_index %u", &mcast_sw_if_index)) + ; + else if (unformat (line_input, "encap-vrf-id %d", &encap_vrf_id)) + ; + else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id)) + ; + else if (unformat (line_input, "vni %d", &vni)) + vni_set = 1; + else if (unformat (line_input, "next-ip4")) + protocol = 1; + else if (unformat (line_input, "next-ip6")) + protocol = 2; + else if (unformat (line_input, "next-ethernet")) + protocol = 3; + else if (unformat (line_input, "next-nsh")) + protocol = 4; else { - errmsg ("parse error '%U'", format_unformat_error, input); + errmsg ("parse error '%U'", format_unformat_error, line_input); return -99; } } - if (!ls_name_set && is_add) + if (local_set == 0) + { + errmsg ("tunnel local address not specified"); + return -99; + } + if (remote_set == 0) + { + errmsg ("tunnel remote address not specified"); + return -99; + } + if (grp_set && mcast_sw_if_index == ~0) + { + errmsg ("tunnel nonexistent multicast device"); + return -99; + } + if (ip46_address_is_ip4 (&local) != ip46_address_is_ip4 (&remote)) + { + errmsg ("both IPv4 and IPv6 addresses specified"); + return -99; + } + + if (vni_set == 0) { - errmsg ("locator-set name not set!"); + errmsg ("vni not specified"); return -99; } - M (ONE_NSH_SET_LOCATOR_SET, mp); + M (VXLAN_GPE_ADD_DEL_TUNNEL, mp); + + ip_address_encode (&local, + ip46_address_is_ip4 (&local) ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, &mp->local); + ip_address_encode (&remote, + ip46_address_is_ip4 (&remote) ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, &mp->remote); + mp->mcast_sw_if_index = ntohl (mcast_sw_if_index); + mp->encap_vrf_id = ntohl (encap_vrf_id); + mp->decap_vrf_id = ntohl (decap_vrf_id); + mp->protocol = protocol; + mp->vni = ntohl (vni); mp->is_add = is_add; - clib_memcpy (mp->ls_name, ls_name, vec_len (ls_name)); - vec_free (ls_name); - /* send */ S (mp); - - /* wait for reply */ W (ret); return ret; } -static int -api_show_one_pitr (vat_main_t * vam) +static void vl_api_vxlan_gpe_tunnel_details_t_handler + (vl_api_vxlan_gpe_tunnel_details_t * mp) { - vl_api_show_one_pitr_t *mp; - int ret; + vat_main_t *vam = &vat_main; + ip46_address_t local, remote; - if (!vam->json_output) + ip_address_decode (&mp->local, &local); + ip_address_decode (&mp->remote, &remote); + + print (vam->ofp, "%11d%24U%24U%13d%12d%19d%14d%14d", + ntohl (mp->sw_if_index), + format_ip46_address, &local, IP46_TYPE_ANY, + format_ip46_address, &remote, IP46_TYPE_ANY, + ntohl (mp->vni), mp->protocol, + ntohl (mp->mcast_sw_if_index), + ntohl (mp->encap_vrf_id), ntohl (mp->decap_vrf_id)); +} + + +static void vl_api_vxlan_gpe_tunnel_details_t_handler_json + (vl_api_vxlan_gpe_tunnel_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + struct in_addr ip4; + struct in6_addr ip6; + ip46_address_t local, remote; + + ip_address_decode (&mp->local, &local); + ip_address_decode (&mp->remote, &remote); + + if (VAT_JSON_ARRAY != vam->json_tree.type) { - print (vam->ofp, "%=20s", "lisp status:"); + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - M (SHOW_ONE_PITR, mp); - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; + vat_json_init_object (node); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + if (ip46_address_is_ip4 (&local)) + { + clib_memcpy (&ip4, &local.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "local", ip4); + clib_memcpy (&ip4, &remote.ip4, sizeof (ip4)); + vat_json_object_add_ip4 (node, "remote", ip4); + } + else + { + clib_memcpy (&ip6, &local.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "local", ip6); + clib_memcpy (&ip6, &remote.ip6, sizeof (ip6)); + vat_json_object_add_ip6 (node, "remote", ip6); + } + vat_json_object_add_uint (node, "vni", ntohl (mp->vni)); + vat_json_object_add_uint (node, "protocol", ntohl (mp->protocol)); + vat_json_object_add_uint (node, "mcast_sw_if_index", + ntohl (mp->mcast_sw_if_index)); + vat_json_object_add_uint (node, "encap_vrf_id", ntohl (mp->encap_vrf_id)); + vat_json_object_add_uint (node, "decap_vrf_id", ntohl (mp->decap_vrf_id)); + vat_json_object_add_uint (node, "is_ipv6", mp->is_ipv6 ? 1 : 0); } -#define api_show_lisp_pitr api_show_one_pitr - static int -api_one_use_petr (vat_main_t * vam) +api_vxlan_gpe_tunnel_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_use_petr_t *mp; - u8 is_add = 0; - ip_address_t ip; + unformat_input_t *i = vam->input; + vl_api_vxlan_gpe_tunnel_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index; + u8 sw_if_index_set = 0; int ret; - clib_memset (&ip, 0, sizeof (ip)); - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "disable")) - is_add = 0; - else - if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (&ip))) - { - is_add = 1; - ip_addr_version (&ip) = AF_IP4; - } - else - if (unformat (input, "%U", unformat_ip6_address, &ip_addr_v6 (&ip))) - { - is_add = 1; - ip_addr_version (&ip) = AF_IP6; - } + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - M (ONE_USE_PETR, mp); + if (sw_if_index_set == 0) + { + sw_if_index = ~0; + } - mp->is_add = is_add; - if (is_add) + if (!vam->json_output) { - mp->ip_address.af = ip_addr_version (&ip) == AF_IP4 ? 0 : 1; - if (mp->ip_address.af) - clib_memcpy (mp->ip_address.un.ip6, &ip, 16); - else - clib_memcpy (mp->ip_address.un.ip4, &ip, 4); + print (vam->ofp, "%11s%24s%24s%13s%15s%19s%14s%14s", + "sw_if_index", "local", "remote", "vni", + "protocol", "mcast_sw_if_index", "encap_vrf_id", "decap_vrf_id"); } - /* send */ + /* Get list of vxlan-tunnel interfaces */ + M (VXLAN_GPE_TUNNEL_DUMP, mp); + + mp->sw_if_index = htonl (sw_if_index); + S (mp); - /* wait for reply */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -#define api_lisp_use_petr api_one_use_petr +static void vl_api_l2_fib_table_details_t_handler + (vl_api_l2_fib_table_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%3" PRIu32 " %U %3" PRIu32 + " %d %d %d", + ntohl (mp->bd_id), format_ethernet_address, mp->mac, + ntohl (mp->sw_if_index), mp->static_mac, mp->filter_mac, + mp->bvi_mac); +} -static int -api_show_one_nsh_mapping (vat_main_t * vam) +static void vl_api_l2_fib_table_details_t_handler_json + (vl_api_l2_fib_table_details_t * mp) { - vl_api_show_one_use_petr_t *mp; - int ret; + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; - if (!vam->json_output) + if (VAT_JSON_ARRAY != vam->json_tree.type) { - print (vam->ofp, "%=20s", "local ONE NSH mapping:"); + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - M (SHOW_ONE_NSH_MAPPING, mp); - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; + vat_json_init_object (node); + vat_json_object_add_uint (node, "bd_id", ntohl (mp->bd_id)); + vat_json_object_add_bytes (node, "mac", mp->mac, 6); + vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index)); + vat_json_object_add_uint (node, "static_mac", mp->static_mac); + vat_json_object_add_uint (node, "filter_mac", mp->filter_mac); + vat_json_object_add_uint (node, "bvi_mac", mp->bvi_mac); } static int -api_show_one_use_petr (vat_main_t * vam) +api_l2_fib_table_dump (vat_main_t * vam) { - vl_api_show_one_use_petr_t *mp; + unformat_input_t *i = vam->input; + vl_api_l2_fib_table_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 bd_id; + u8 bd_id_set = 0; int ret; - if (!vam->json_output) + /* Parse args required to build the message */ + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "bd_id %d", &bd_id)) + bd_id_set = 1; + else + break; + } + + if (bd_id_set == 0) { - print (vam->ofp, "%=20s", "Proxy-ETR status:"); + errmsg ("missing bridge domain"); + return -99; } - M (SHOW_ONE_USE_PETR, mp); - /* send it... */ + print (vam->ofp, "BD-ID Mac Address sw-ndx Static Filter BVI"); + + /* Get list of l2 fib entries */ + M (L2_FIB_TABLE_DUMP, mp); + + mp->bd_id = ntohl (bd_id); S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -#define api_show_lisp_use_petr api_show_one_use_petr -/** - * Add/delete mapping between vni and vrf - */ static int -api_one_eid_table_add_del_map (vat_main_t * vam) +api_interface_name_renumber (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_eid_table_add_del_map_t *mp; - u8 is_add = 1, vni_set = 0, vrf_set = 0, bd_index_set = 0; - u32 vni, vrf, bd_index; + unformat_input_t *line_input = vam->input; + vl_api_interface_name_renumber_t *mp; + u32 sw_if_index = ~0; + u32 new_show_dev_instance = ~0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - is_add = 0; - else if (unformat (input, "vrf %d", &vrf)) - vrf_set = 1; - else if (unformat (input, "bd_index %d", &bd_index)) - bd_index_set = 1; - else if (unformat (input, "vni %d", &vni)) - vni_set = 1; + if (unformat (line_input, "%U", api_unformat_sw_if_index, vam, + &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (line_input, "new_show_dev_instance %d", + &new_show_dev_instance)) + ; else break; } - if (!vni_set || (!vrf_set && !bd_index_set)) + if (sw_if_index == ~0) { - errmsg ("missing arguments!"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (vrf_set && bd_index_set) + if (new_show_dev_instance == ~0) { - errmsg ("error: both vrf and bd entered!"); + errmsg ("missing new_show_dev_instance"); return -99; } - M (ONE_EID_TABLE_ADD_DEL_MAP, mp); + M (INTERFACE_NAME_RENUMBER, mp); - mp->is_add = is_add; - mp->vni = htonl (vni); - mp->dp_table = vrf_set ? htonl (vrf) : htonl (bd_index); - mp->is_l2 = bd_index_set; + mp->sw_if_index = ntohl (sw_if_index); + mp->new_show_dev_instance = ntohl (new_show_dev_instance); - /* send */ S (mp); - - /* wait for reply */ W (ret); return ret; } -#define api_lisp_eid_table_add_del_map api_one_eid_table_add_del_map - -uword -unformat_negative_mapping_action (unformat_input_t * input, va_list * args) +static int +api_want_l2_macs_events (vat_main_t * vam) { - u32 *action = va_arg (*args, u32 *); - u8 *s = 0; + unformat_input_t *line_input = vam->input; + vl_api_want_l2_macs_events_t *mp; + u8 enable_disable = 1; + u32 scan_delay = 0; + u32 max_macs_in_event = 0; + u32 learn_limit = 0; + int ret; - if (unformat (input, "%s", &s)) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (!strcmp ((char *) s, "no-action")) - action[0] = 0; - else if (!strcmp ((char *) s, "natively-forward")) - action[0] = 1; - else if (!strcmp ((char *) s, "send-map-request")) - action[0] = 2; - else if (!strcmp ((char *) s, "drop")) - action[0] = 3; + if (unformat (line_input, "learn-limit %d", &learn_limit)) + ; + else if (unformat (line_input, "scan-delay %d", &scan_delay)) + ; + else if (unformat (line_input, "max-entries %d", &max_macs_in_event)) + ; + else if (unformat (line_input, "disable")) + enable_disable = 0; else - { - clib_warning ("invalid action: '%s'", s); - action[0] = 3; - } + break; } - else - return 0; - vec_free (s); - return 1; + M (WANT_L2_MACS_EVENTS, mp); + mp->enable_disable = enable_disable; + mp->pid = htonl (getpid ()); + mp->learn_limit = htonl (learn_limit); + mp->scan_delay = (u8) scan_delay; + mp->max_macs_in_event = (u8) (max_macs_in_event / 10); + S (mp); + W (ret); + return ret; } -/** - * Add/del remote mapping to/from ONE control plane - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_add_del_remote_mapping (vat_main_t * vam) +api_input_acl_set_interface (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_remote_mapping_t *mp; - u32 vni = 0; - lisp_eid_vat_t _eid, *eid = &_eid; - lisp_eid_vat_t _seid, *seid = &_seid; - u8 is_add = 1, del_all = 0, eid_set = 0, seid_set = 0; - u32 action = ~0, p, w, data_len; - ip4_address_t rloc4; - ip6_address_t rloc6; - vl_api_remote_locator_t *rlocs = 0, rloc, *curr_rloc = 0; + unformat_input_t *i = vam->input; + vl_api_input_acl_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 l2_table_index = ~0; + u8 is_add = 1; int ret; - clib_memset (&rloc, 0, sizeof (rloc)); - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del-all")) - { - del_all = 1; - } - else if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "add")) - { - is_add = 1; - } - else if (unformat (input, "eid %U", unformat_lisp_eid_vat, eid)) - { - eid_set = 1; - } - else if (unformat (input, "seid %U", unformat_lisp_eid_vat, seid)) - { - seid_set = 1; - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } - else if (unformat (input, "p %d w %d", &p, &w)) - { - if (!curr_rloc) - { - errmsg ("No RLOC configured for setting priority/weight!"); - return -99; - } - curr_rloc->priority = p; - curr_rloc->weight = w; - } - else if (unformat (input, "rloc %U", unformat_ip4_address, &rloc4)) - { - rloc.ip_address.af = 0; - clib_memcpy (&rloc.ip_address.un.ip6, &rloc6, sizeof (rloc6)); - vec_add1 (rlocs, rloc); - curr_rloc = &rlocs[vec_len (rlocs) - 1]; - } - else if (unformat (input, "rloc %U", unformat_ip6_address, &rloc6)) - { - rloc.ip_address.af = 1; - clib_memcpy (&rloc.ip_address.un.ip4, &rloc4, sizeof (rloc4)); - vec_add1 (rlocs, rloc); - curr_rloc = &rlocs[vec_len (rlocs) - 1]; - } - else if (unformat (input, "action %U", - unformat_negative_mapping_action, &action)) - { - ; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "l2-table %d", &l2_table_index)) + ; else { - clib_warning ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (0 == eid_set) - { - errmsg ("missing params!"); - return -99; - } - - if (is_add && (~0 == action) && 0 == vec_len (rlocs)) + if (sw_if_index_set == 0) { - errmsg ("no action set for negative map-reply!"); + errmsg ("missing interface name or sw_if_index"); return -99; } - data_len = vec_len (rlocs) * sizeof (vl_api_remote_locator_t); + M (INPUT_ACL_SET_INTERFACE, mp); - M2 (ONE_ADD_DEL_REMOTE_MAPPING, mp, data_len); + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->l2_table_index = ntohl (l2_table_index); mp->is_add = is_add; - mp->vni = htonl (vni); - mp->action = (u8) action; - mp->is_src_dst = seid_set; - mp->del_all = del_all; - lisp_eid_put_vat (&mp->deid, eid); - lisp_eid_put_vat (&mp->seid, seid); - mp->rloc_num = clib_host_to_net_u32 (vec_len (rlocs)); - clib_memcpy (mp->rlocs, rlocs, data_len); - vec_free (rlocs); - - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_add_del_remote_mapping api_one_add_del_remote_mapping - -/** - * Add/del ONE adjacency. Saves mapping in ONE control plane and updates - * forwarding entries in data-plane accordingly. - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_add_del_adjacency (vat_main_t * vam) +api_output_acl_set_interface (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_adjacency_t *mp; - u32 vni = 0; + unformat_input_t *i = vam->input; + vl_api_output_acl_set_interface_t *mp; + u32 sw_if_index; + int sw_if_index_set; + u32 ip4_table_index = ~0; + u32 ip6_table_index = ~0; + u32 l2_table_index = ~0; u8 is_add = 1; int ret; - lisp_eid_vat_t leid, reid; - - leid.type = reid.type = (u8) ~ 0; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "add")) - { - is_add = 1; - } - else if (unformat (input, "reid %U/%d", unformat_ip46_address, - &reid.addr.ip, &reid.len)) - { - reid.type = 0; /* ipv4 */ - } - else if (unformat (input, "reid %U", unformat_ethernet_address, - &reid.addr.mac)) - { - reid.type = 1; /* mac */ - } - else if (unformat (input, "leid %U/%d", unformat_ip46_address, - &leid.addr.ip, &leid.len)) - { - leid.type = 0; /* ipv4 */ - } - else if (unformat (input, "leid %U", unformat_ethernet_address, - &leid.addr.mac)) - { - leid.type = 1; /* mac */ - } - else if (unformat (input, "vni %d", &vni)) - { - ; - } + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "ip4-table %d", &ip4_table_index)) + ; + else if (unformat (i, "ip6-table %d", &ip6_table_index)) + ; + else if (unformat (i, "l2-table %d", &l2_table_index)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if ((u8) ~ 0 == reid.type) - { - errmsg ("missing params!"); - return -99; - } - - if (leid.type != reid.type) + if (sw_if_index_set == 0) { - errmsg ("remote and local EIDs are of different types!"); + errmsg ("missing interface name or sw_if_index"); return -99; } - M (ONE_ADD_DEL_ADJACENCY, mp); - mp->is_add = is_add; - mp->vni = htonl (vni); - lisp_eid_put_vat (&mp->leid, &leid); - lisp_eid_put_vat (&mp->reid, &reid); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_add_del_adjacency api_one_add_del_adjacency - -uword -unformat_gpe_encap_mode (unformat_input_t * input, va_list * args) -{ - u32 *mode = va_arg (*args, u32 *); - - if (unformat (input, "lisp")) - *mode = 0; - else if (unformat (input, "vxlan")) - *mode = 1; - else - return 0; - - return 1; -} - -static int -api_gpe_get_encap_mode (vat_main_t * vam) -{ - vl_api_gpe_get_encap_mode_t *mp; - int ret; - - /* Construct the API message */ - M (GPE_GET_ENCAP_MODE, mp); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_gpe_set_encap_mode (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_gpe_set_encap_mode_t *mp; - int ret; - u32 mode = 0; - - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "%U", unformat_gpe_encap_mode, &mode)) - ; - else - break; - } - - /* Construct the API message */ - M (GPE_SET_ENCAP_MODE, mp); + M (OUTPUT_ACL_SET_INTERFACE, mp); - mp->is_vxlan = mode; + mp->sw_if_index = ntohl (sw_if_index); + mp->ip4_table_index = ntohl (ip4_table_index); + mp->ip6_table_index = ntohl (ip6_table_index); + mp->l2_table_index = ntohl (l2_table_index); + mp->is_add = is_add; - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } static int -api_lisp_gpe_add_del_iface (vat_main_t * vam) +api_ip_address_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_gpe_add_del_iface_t *mp; - u8 action_set = 0, is_add = 1, is_l2 = 0, dp_table_set = 0, vni_set = 0; - u32 dp_table = 0, vni = 0; + unformat_input_t *i = vam->input; + vl_api_ip_address_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sw_if_index = ~0; + u8 sw_if_index_set = 0; + u8 ipv4_set = 0; + u8 ipv6_set = 0; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "up")) - { - action_set = 1; - is_add = 1; - } - else if (unformat (input, "down")) - { - action_set = 1; - is_add = 0; - } - else if (unformat (input, "table_id %d", &dp_table)) - { - dp_table_set = 1; - } - else if (unformat (input, "bd_id %d", &dp_table)) - { - dp_table_set = 1; - is_l2 = 1; - } - else if (unformat (input, "vni %d", &vni)) - { - vni_set = 1; - } + if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "ipv4")) + ipv4_set = 1; + else if (unformat (i, "ipv6")) + ipv6_set = 1; else break; } - if (action_set == 0) + if (ipv4_set && ipv6_set) { - errmsg ("Action not set"); + errmsg ("ipv4 and ipv6 flags cannot be both set"); return -99; } - if (dp_table_set == 0 || vni_set == 0) + + if ((!ipv4_set) && (!ipv6_set)) { - errmsg ("vni and dp_table must be set"); + errmsg ("no ipv4 nor ipv6 flag set"); return -99; } - /* Construct the API message */ - M (GPE_ADD_DEL_IFACE, mp); + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } - mp->is_add = is_add; - mp->dp_table = clib_host_to_net_u32 (dp_table); - mp->is_l2 = is_l2; - mp->vni = clib_host_to_net_u32 (vni); + vam->current_sw_if_index = sw_if_index; + vam->is_ipv6 = ipv6_set; - /* send it... */ + M (IP_ADDRESS_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_ipv6 = ipv6_set; S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } static int -api_one_map_register_fallback_threshold (vat_main_t * vam) +api_ip_dump (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_map_register_fallback_threshold_t *mp; - u32 value = 0; - u8 is_set = 0; + vl_api_ip_dump_t *mp; + vl_api_control_ping_t *mp_ping; + unformat_input_t *in = vam->input; + int ipv4_set = 0; + int ipv6_set = 0; + int is_ipv6; + int i; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (in) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%u", &value)) - is_set = 1; + if (unformat (in, "ipv4")) + ipv4_set = 1; + else if (unformat (in, "ipv6")) + ipv6_set = 1; else - { - clib_warning ("parse error '%U'", format_unformat_error, input); - return -99; - } + break; } - if (!is_set) + if (ipv4_set && ipv6_set) { - errmsg ("fallback threshold value is missing!"); + errmsg ("ipv4 and ipv6 flags cannot be both set"); return -99; } - M (ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); - mp->value = clib_host_to_net_u32 (value); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} + if ((!ipv4_set) && (!ipv6_set)) + { + errmsg ("no ipv4 nor ipv6 flag set"); + return -99; + } -static int -api_show_one_map_register_fallback_threshold (vat_main_t * vam) -{ - vl_api_show_one_map_register_fallback_threshold_t *mp; - int ret; + is_ipv6 = ipv6_set; + vam->is_ipv6 = is_ipv6; - M (SHOW_ONE_MAP_REGISTER_FALLBACK_THRESHOLD, mp); + /* free old data */ + for (i = 0; i < vec_len (vam->ip_details_by_sw_if_index[is_ipv6]); i++) + { + vec_free (vam->ip_details_by_sw_if_index[is_ipv6][i].addr); + } + vec_free (vam->ip_details_by_sw_if_index[is_ipv6]); - /* send it... */ + M (IP_DUMP, mp); + mp->is_ipv6 = ipv6_set; S (mp); - /* Wait for a reply... */ + /* Use a control ping for synchronization */ + MPING (CONTROL_PING, mp_ping); + S (mp_ping); + W (ret); return ret; } -uword -unformat_lisp_transport_protocol (unformat_input_t * input, va_list * args) -{ - u32 *proto = va_arg (*args, u32 *); - - if (unformat (input, "udp")) - *proto = 1; - else if (unformat (input, "api")) - *proto = 2; - else - return 0; - - return 1; -} - static int -api_one_set_transport_protocol (vat_main_t * vam) +api_ipsec_spd_add_del (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_set_transport_protocol_t *mp; - u8 is_set = 0; - u32 protocol = 0; + unformat_input_t *i = vam->input; + vl_api_ipsec_spd_add_del_t *mp; + u32 spd_id = ~0; + u8 is_add = 1; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%U", unformat_lisp_transport_protocol, &protocol)) - is_set = 1; + if (unformat (i, "spd_id %d", &spd_id)) + ; + else if (unformat (i, "del")) + is_add = 0; else { - clib_warning ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - - if (!is_set) + if (spd_id == ~0) { - errmsg ("Transport protocol missing!"); + errmsg ("spd_id must be set"); return -99; } - M (ONE_SET_TRANSPORT_PROTOCOL, mp); - mp->protocol = (u8) protocol; - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_one_get_transport_protocol (vat_main_t * vam) -{ - vl_api_one_get_transport_protocol_t *mp; - int ret; + M (IPSEC_SPD_ADD_DEL, mp); - M (ONE_GET_TRANSPORT_PROTOCOL, mp); + mp->spd_id = ntohl (spd_id); + mp->is_add = is_add; - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } static int -api_one_map_register_set_ttl (vat_main_t * vam) +api_ipsec_interface_add_del_spd (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_map_register_set_ttl_t *mp; - u32 ttl = 0; - u8 is_set = 0; + unformat_input_t *i = vam->input; + vl_api_ipsec_interface_add_del_spd_t *mp; + u32 sw_if_index; + u8 sw_if_index_set = 0; + u32 spd_id = (u32) ~ 0; + u8 is_add = 1; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "%u", &ttl)) - is_set = 1; + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "spd_id %d", &spd_id)) + ; + else + if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index)) + sw_if_index_set = 1; + else if (unformat (i, "sw_if_index %d", &sw_if_index)) + sw_if_index_set = 1; else { - clib_warning ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } + } - if (!is_set) + if (spd_id == (u32) ~ 0) { - errmsg ("TTL value missing!"); + errmsg ("spd_id must be set"); return -99; } - M (ONE_MAP_REGISTER_SET_TTL, mp); - mp->ttl = clib_host_to_net_u32 (ttl); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} + if (sw_if_index_set == 0) + { + errmsg ("missing interface name or sw_if_index"); + return -99; + } -static int -api_show_one_map_register_ttl (vat_main_t * vam) -{ - vl_api_show_one_map_register_ttl_t *mp; - int ret; + M (IPSEC_INTERFACE_ADD_DEL_SPD, mp); - M (SHOW_ONE_MAP_REGISTER_TTL, mp); + mp->spd_id = ntohl (spd_id); + mp->sw_if_index = ntohl (sw_if_index); + mp->is_add = is_add; - /* send it... */ S (mp); - - /* Wait for a reply... */ W (ret); return ret; } -/** - * Add/del map request itr rlocs from ONE control plane and updates - * - * @param vam vpp API test context - * @return return code - */ static int -api_one_add_del_map_request_itr_rlocs (vat_main_t * vam) +api_ipsec_spd_entry_add_del (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_add_del_map_request_itr_rlocs_t *mp; - u8 *locator_set_name = 0; - u8 locator_set_name_set = 0; - u8 is_add = 1; + unformat_input_t *i = vam->input; + vl_api_ipsec_spd_entry_add_del_t *mp; + u8 is_add = 1, is_outbound = 0; + u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0; + i32 priority = 0; + u32 rport_start = 0, rport_stop = (u32) ~ 0; + u32 lport_start = 0, lport_stop = (u32) ~ 0; + vl_api_address_t laddr_start = { }, laddr_stop = + { + }, raddr_start = + { + }, raddr_stop = + { + }; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "del")) - { - is_add = 0; - } - else if (unformat (input, "%_%v%_", &locator_set_name)) + if (unformat (i, "del")) + is_add = 0; + if (unformat (i, "outbound")) + is_outbound = 1; + if (unformat (i, "inbound")) + is_outbound = 0; + else if (unformat (i, "spd_id %d", &spd_id)) + ; + else if (unformat (i, "sa_id %d", &sa_id)) + ; + else if (unformat (i, "priority %d", &priority)) + ; + else if (unformat (i, "protocol %d", &protocol)) + ; + else if (unformat (i, "lport_start %d", &lport_start)) + ; + else if (unformat (i, "lport_stop %d", &lport_stop)) + ; + else if (unformat (i, "rport_start %d", &rport_start)) + ; + else if (unformat (i, "rport_stop %d", &rport_stop)) + ; + else if (unformat (i, "laddr_start %U", + unformat_vl_api_address, &laddr_start)) + ; + else if (unformat (i, "laddr_stop %U", unformat_vl_api_address, + &laddr_stop)) + ; + else if (unformat (i, "raddr_start %U", unformat_vl_api_address, + &raddr_start)) + ; + else if (unformat (i, "raddr_stop %U", unformat_vl_api_address, + &raddr_stop)) + ; + else + if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy)) { - locator_set_name_set = 1; + if (policy == IPSEC_POLICY_ACTION_RESOLVE) + { + clib_warning ("unsupported action: 'resolve'"); + return -99; + } } else { - clib_warning ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } - } - if (is_add && !locator_set_name_set) - { - errmsg ("itr-rloc is not set!"); - return -99; } - if (is_add && vec_len (locator_set_name) > 64) - { - errmsg ("itr-rloc locator-set name too long"); - vec_free (locator_set_name); - return -99; - } + M (IPSEC_SPD_ENTRY_ADD_DEL, mp); - M (ONE_ADD_DEL_MAP_REQUEST_ITR_RLOCS, mp); mp->is_add = is_add; - if (is_add) - { - clib_memcpy (mp->locator_set_name, locator_set_name, - vec_len (locator_set_name)); - } - else - { - clib_memset (mp->locator_set_name, 0, sizeof (mp->locator_set_name)); - } - vec_free (locator_set_name); - /* send it... */ - S (mp); + mp->entry.spd_id = ntohl (spd_id); + mp->entry.priority = ntohl (priority); + mp->entry.is_outbound = is_outbound; - /* Wait for a reply... */ + 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; } -#define api_lisp_add_del_map_request_itr_rlocs api_one_add_del_map_request_itr_rlocs - static int -api_one_locator_dump (vat_main_t * vam) +api_ipsec_sad_entry_add_del (vat_main_t * vam) { - unformat_input_t *input = vam->input; - vl_api_one_locator_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 is_index_set = 0, is_name_set = 0; - u8 *ls_name = 0; - u32 ls_index = ~0; + unformat_input_t *i = vam->input; + vl_api_ipsec_sad_entry_add_del_t *mp; + u32 sad_id = 0, spi = 0; + u8 *ck = 0, *ik = 0; + u8 is_add = 1; + + vl_api_ipsec_crypto_alg_t crypto_alg = IPSEC_API_CRYPTO_ALG_NONE; + vl_api_ipsec_integ_alg_t integ_alg = IPSEC_API_INTEG_ALG_NONE; + vl_api_ipsec_sad_flags_t flags = IPSEC_API_SAD_FLAG_NONE; + vl_api_ipsec_proto_t protocol = IPSEC_API_PROTO_AH; + vl_api_address_t tun_src, tun_dst; int ret; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ls_name %_%v%_", &ls_name)) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "sad_id %d", &sad_id)) + ; + else if (unformat (i, "spi %d", &spi)) + ; + else if (unformat (i, "esp")) + protocol = IPSEC_API_PROTO_ESP; + else + if (unformat (i, "tunnel_src %U", unformat_vl_api_address, &tun_src)) { - is_name_set = 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 (input, "ls_index %d", &ls_index)) + else + if (unformat (i, "tunnel_dst %U", unformat_vl_api_address, &tun_dst)) { - is_index_set = 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_api_crypto_alg, &crypto_alg)) + ; + else if (unformat (i, "crypto_key %U", unformat_hex_string, &ck)) + ; + else if (unformat (i, "integ_alg %U", + unformat_ipsec_api_integ_alg, &integ_alg)) + ; + else if (unformat (i, "integ_key %U", unformat_hex_string, &ik)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, input); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } - } - - if (!is_index_set && !is_name_set) - { - errmsg ("error: expected one of index or name!"); - return -99; - } - - if (is_index_set && is_name_set) - { - errmsg ("error: only one param expected!"); - return -99; - } - if (vec_len (ls_name) > 62) - { - errmsg ("error: locator set name too long!"); - return -99; - } - - if (!vam->json_output) - { - print (vam->ofp, "%=16s%=16s%=16s", "locator", "priority", "weight"); - } - - M (ONE_LOCATOR_DUMP, mp); - mp->is_index_set = is_index_set; - - if (is_index_set) - mp->ls_index = clib_host_to_net_u32 (ls_index); - else - { - vec_add1 (ls_name, 0); - strncpy ((char *) mp->ls_name, (char *) ls_name, - sizeof (mp->ls_name) - 1); } - /* send it... */ - S (mp); + M (IPSEC_SAD_ENTRY_ADD_DEL, mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + mp->is_add = is_add; + mp->entry.sad_id = ntohl (sad_id); + mp->entry.protocol = protocol; + mp->entry.spi = ntohl (spi); + mp->entry.flags = flags; - /* Wait for a reply... */ - W (ret); - return ret; -} + mp->entry.crypto_algorithm = crypto_alg; + mp->entry.integrity_algorithm = integ_alg; + mp->entry.crypto_key.length = vec_len (ck); + mp->entry.integrity_key.length = vec_len (ik); -#define api_lisp_locator_dump api_one_locator_dump + if (mp->entry.crypto_key.length > sizeof (mp->entry.crypto_key.data)) + mp->entry.crypto_key.length = sizeof (mp->entry.crypto_key.data); -static int -api_one_locator_set_dump (vat_main_t * vam) -{ - vl_api_one_locator_set_dump_t *mp; - vl_api_control_ping_t *mp_ping; - unformat_input_t *input = vam->input; - u8 filter = 0; - int ret; + if (mp->entry.integrity_key.length > sizeof (mp->entry.integrity_key.data)) + mp->entry.integrity_key.length = sizeof (mp->entry.integrity_key.data); - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "local")) - { - filter = 1; - } - else if (unformat (input, "remote")) - { - filter = 2; - } - else - { - errmsg ("parse error '%U'", format_unformat_error, input); - return -99; - } - } + if (ck) + clib_memcpy (mp->entry.crypto_key.data, ck, mp->entry.crypto_key.length); + if (ik) + clib_memcpy (mp->entry.integrity_key.data, ik, + mp->entry.integrity_key.length); - if (!vam->json_output) + if (flags & IPSEC_API_SAD_FLAG_IS_TUNNEL) { - print (vam->ofp, "%=10s%=15s", "ls_index", "ls_name"); + clib_memcpy (&mp->entry.tunnel_src, &tun_src, + sizeof (mp->entry.tunnel_src)); + clib_memcpy (&mp->entry.tunnel_dst, &tun_dst, + sizeof (mp->entry.tunnel_dst)); } - M (ONE_LOCATOR_SET_DUMP, mp); - - mp->filter = filter; - - /* send it... */ S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ W (ret); return ret; } -#define api_lisp_locator_set_dump api_one_locator_set_dump - static int -api_one_eid_table_map_dump (vat_main_t * vam) +api_ipsec_tunnel_if_add_del (vat_main_t * vam) { - u8 is_l2 = 0; - u8 mode_set = 0; - unformat_input_t *input = vam->input; - vl_api_one_eid_table_map_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; + unformat_input_t *i = vam->input; + vl_api_ipsec_tunnel_if_add_del_t *mp; + u32 local_spi = 0, remote_spi = 0; + u32 crypto_alg = 0, integ_alg = 0; + u8 *lck = NULL, *rck = NULL; + u8 *lik = NULL, *rik = NULL; + vl_api_address_t local_ip = { 0 }; + vl_api_address_t remote_ip = { 0 }; + f64 before = 0; + u8 is_add = 1; + u8 esn = 0; + u8 anti_replay = 0; + u8 renumber = 0; + u32 instance = ~0; + u32 count = 1, jj; + int ret = -1; - /* Parse args required to build the message */ - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "l2")) + if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "esn")) + esn = 1; + else if (unformat (i, "anti-replay")) + anti_replay = 1; + else if (unformat (i, "count %d", &count)) + ; + else if (unformat (i, "local_spi %d", &local_spi)) + ; + else if (unformat (i, "remote_spi %d", &remote_spi)) + ; + else + if (unformat (i, "local_ip %U", unformat_vl_api_address, &local_ip)) + ; + else + if (unformat (i, "remote_ip %U", unformat_vl_api_address, &remote_ip)) + ; + else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck)) + ; + else + if (unformat (i, "remote_crypto_key %U", unformat_hex_string, &rck)) + ; + else if (unformat (i, "local_integ_key %U", unformat_hex_string, &lik)) + ; + else if (unformat (i, "remote_integ_key %U", unformat_hex_string, &rik)) + ; + else + if (unformat + (i, "crypto_alg %U", unformat_ipsec_api_crypto_alg, &crypto_alg)) { - is_l2 = 1; - mode_set = 1; + if (crypto_alg >= IPSEC_CRYPTO_N_ALG) + { + errmsg ("unsupported crypto-alg: '%U'\n", + format_ipsec_crypto_alg, crypto_alg); + return -99; + } } - else if (unformat (input, "l3")) + else + if (unformat + (i, "integ_alg %U", unformat_ipsec_api_integ_alg, &integ_alg)) { - is_l2 = 0; - mode_set = 1; + if (integ_alg >= IPSEC_INTEG_N_ALG) + { + errmsg ("unsupported integ-alg: '%U'\n", + format_ipsec_integ_alg, integ_alg); + return -99; + } } + else if (unformat (i, "instance %u", &instance)) + renumber = 1; else { - errmsg ("parse error '%U'", format_unformat_error, input); + errmsg ("parse error '%U'\n", format_unformat_error, i); return -99; } } - if (!mode_set) - { - errmsg ("expected one of 'l2' or 'l3' parameter!"); - return -99; - } - - if (!vam->json_output) + if (count > 1) { - print (vam->ofp, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF"); + /* Turn on async mode */ + vam->async_mode = 1; + vam->async_errors = 0; + before = vat_time_now (vam); } - M (ONE_EID_TABLE_MAP_DUMP, mp); - mp->is_l2 = is_l2; - - /* send it... */ - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_eid_table_map_dump api_one_eid_table_map_dump - -static int -api_one_eid_table_vni_dump (vat_main_t * vam) -{ - vl_api_one_eid_table_vni_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; - - if (!vam->json_output) + for (jj = 0; jj < count; jj++) { - print (vam->ofp, "VNI"); - } - - M (ONE_EID_TABLE_VNI_DUMP, mp); - - /* send it... */ - S (mp); + M (IPSEC_TUNNEL_IF_ADD_DEL, mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + mp->is_add = is_add; + mp->esn = esn; + mp->anti_replay = anti_replay; - /* Wait for a reply... */ - W (ret); - return ret; -} + if (jj > 0) + increment_address (&remote_ip); -#define api_lisp_eid_table_vni_dump api_one_eid_table_vni_dump + clib_memcpy (&mp->local_ip, &local_ip, sizeof (local_ip)); + clib_memcpy (&mp->remote_ip, &remote_ip, sizeof (remote_ip)); -static int -api_one_eid_table_dump (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_one_eid_table_dump_t *mp; - vl_api_control_ping_t *mp_ping; - u8 filter = 0; - int ret; - u32 vni, t = 0; - lisp_eid_vat_t eid; - u8 eid_set = 0; + 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, "eid %U/%d", unformat_ip46_address, &eid.addr.ip, &eid.len)) - { - eid_set = 1; - eid.type = 0; - } - else - if (unformat (i, "eid %U", unformat_ethernet_address, &eid.addr.mac)) - { - eid_set = 1; - eid.type = 1; - } - else if (unformat (i, "eid %U", unformat_nsh_address, &eid.addr.nsh)) + mp->local_crypto_key_len = 0; + if (lck) { - eid_set = 1; - eid.type = 2; + 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); } - else if (unformat (i, "vni %d", &t)) + + mp->remote_crypto_key_len = 0; + if (rck) { - vni = t; + 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); } - else if (unformat (i, "local")) + + mp->integ_alg = (u8) integ_alg; + + mp->local_integ_key_len = 0; + if (lik) { - filter = 1; + 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); } - else if (unformat (i, "remote")) + + mp->remote_integ_key_len = 0; + if (rik) { - filter = 2; + 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); } - else + + if (renumber) { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; + mp->renumber = renumber; + mp->show_instance = ntohl (instance); } + S (mp); } - if (!vam->json_output) - { - print (vam->ofp, "%-35s%-20s%-30s%-20s%-20s%-10s%-20s", "EID", - "type", "ls_index", "ttl", "authoritative", "key_id", "key"); - } - - M (ONE_EID_TABLE_DUMP, mp); - - mp->filter = filter; - if (eid_set) + /* When testing multiple add/del ops, use a control-ping to sync */ + if (count > 1) { - mp->eid_set = 1; - mp->vni = htonl (vni); - lisp_eid_put_vat (&mp->eid, &eid); - } - - /* send it... */ - S (mp); + vl_api_control_ping_t *mp_ping; + f64 after; + f64 timeout; - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + /* Shut off async mode */ + vam->async_mode = 0; - /* Wait for a reply... */ - W (ret); - return ret; -} + MPING (CONTROL_PING, mp_ping); + S (mp_ping); -#define api_lisp_eid_table_dump api_one_eid_table_dump + 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_lisp_gpe_fwd_entries_get (vat_main_t * vam) -{ - unformat_input_t *i = vam->input; - vl_api_gpe_fwd_entries_get_t *mp; - u8 vni_set = 0; - u32 vni = ~0; - int ret; + out: + if (vam->retval == -99) + errmsg ("timeout"); - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "vni %d", &vni)) - { - vni_set = 1; - } - else + if (vam->async_errors > 0) { - errmsg ("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 (!vni_set) - { - errmsg ("vni not set!"); - return -99; - } + /* slim chance, but we might have eaten SIGTERM on the first iteration */ + if (jj > 0) + count = jj; - if (!vam->json_output) + print (vam->ofp, "%d tunnels in %.6f secs, %.2f tunnels/sec", + count, after - before, count / (after - before)); + } + else { - print (vam->ofp, "%10s %10s %s %40s", "fwd_index", "dp_table", - "leid", "reid"); + /* Wait for a reply... */ + W (ret); + return ret; } - M (GPE_FWD_ENTRIES_GET, mp); - mp->vni = clib_host_to_net_u32 (vni); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); return ret; } -#define vl_api_gpe_native_fwd_rpaths_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_native_fwd_rpaths_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entry_vnis_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entry_vnis_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entries_get_reply_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entries_get_reply_t_print vl_noop_handler -#define vl_api_gpe_fwd_entry_path_details_t_endian vl_noop_handler -#define vl_api_gpe_fwd_entry_path_details_t_print vl_noop_handler - -static int -api_one_adjacencies_get (vat_main_t * vam) +static void +vl_api_ipsec_sa_details_t_handler (vl_api_ipsec_sa_details_t * mp) { - unformat_input_t *i = vam->input; - vl_api_one_adjacencies_get_t *mp; - u8 vni_set = 0; - u32 vni = ~0; - int ret; + vat_main_t *vam = &vat_main; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "vni %d", &vni)) - { - vni_set = 1; - } - else - { - errmsg ("parse error '%U'", format_unformat_error, i); - return -99; - } - } + 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 stat_index %u\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), ntohl (mp->stat_index)); +} - if (!vni_set) - { - errmsg ("vni not set!"); - return -99; - } +#define vl_api_ipsec_sa_details_t_endian vl_noop_handler +#define vl_api_ipsec_sa_details_t_print vl_noop_handler - if (!vam->json_output) +static void vl_api_ipsec_sa_details_t_handler_json + (vl_api_ipsec_sa_details_t * mp) +{ + vat_main_t *vam = &vat_main; + vat_json_node_t *node = NULL; + vl_api_ipsec_sad_flags_t flags; + + if (VAT_JSON_ARRAY != vam->json_tree.type) { - print (vam->ofp, "%s %40s", "leid", "reid"); + ASSERT (VAT_JSON_NONE == vam->json_tree.type); + vat_json_init_array (&vam->json_tree); } + node = vat_json_array_add (&vam->json_tree); - M (ONE_ADJACENCIES_GET, mp); - mp->vni = clib_host_to_net_u32 (vni); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; + 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)); + vat_json_object_add_uint (node, "stat_index", ntohl (mp->stat_index)); } -#define api_lisp_adjacencies_get api_one_adjacencies_get - static int -api_gpe_native_fwd_rpaths_get (vat_main_t * vam) +api_ipsec_sa_dump (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_gpe_native_fwd_rpaths_get_t *mp; + vl_api_ipsec_sa_dump_t *mp; + vl_api_control_ping_t *mp_ping; + u32 sa_id = ~0; int ret; - u8 ip_family_set = 0, is_ip4 = 1; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "ip4")) - { - ip_family_set = 1; - is_ip4 = 1; - } - else if (unformat (i, "ip6")) - { - ip_family_set = 1; - is_ip4 = 0; - } + if (unformat (i, "sa_id %d", &sa_id)) + ; else { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (!ip_family_set) - { - errmsg ("ip family not set!"); - return -99; - } + M (IPSEC_SA_DUMP, mp); - M (GPE_NATIVE_FWD_RPATHS_GET, mp); - mp->is_ip4 = is_ip4; + mp->sa_id = ntohl (sa_id); - /* send it... */ S (mp); - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_gpe_fwd_entry_vnis_get (vat_main_t * vam) -{ - vl_api_gpe_fwd_entry_vnis_get_t *mp; - int ret; - - if (!vam->json_output) - { - print (vam->ofp, "VNIs"); - } - - M (GPE_FWD_ENTRY_VNIS_GET, mp); - - /* send it... */ - S (mp); + /* Use a control ping for synchronization */ + M (CONTROL_PING, mp_ping); + S (mp_ping); - /* Wait for a reply... */ W (ret); return ret; } static int -api_gpe_add_del_native_fwd_rpath (vat_main_t * vam) +api_ipsec_tunnel_if_set_sa (vat_main_t * vam) { unformat_input_t *i = vam->input; - vl_api_gpe_add_del_native_fwd_rpath_t *mp; - int ret = 0; - u8 is_add = 1, ip_set = 0, is_ip4 = 1; - struct in_addr ip4; - struct in6_addr ip6; - u32 table_id = 0, nh_sw_if_index = ~0; - - clib_memset (&ip4, 0, sizeof (ip4)); - clib_memset (&ip6, 0, sizeof (ip6)); + 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, "del")) - is_add = 0; - else if (unformat (i, "via %U %U", unformat_ip4_address, &ip4, - api_unformat_sw_if_index, vam, &nh_sw_if_index)) - { - ip_set = 1; - is_ip4 = 1; - } - else if (unformat (i, "via %U %U", unformat_ip6_address, &ip6, - api_unformat_sw_if_index, vam, &nh_sw_if_index)) - { - ip_set = 1; - is_ip4 = 0; - } - else if (unformat (i, "via %U", unformat_ip4_address, &ip4)) - { - ip_set = 1; - is_ip4 = 1; - nh_sw_if_index = ~0; - } - else if (unformat (i, "via %U", unformat_ip6_address, &ip6)) - { - ip_set = 1; - is_ip4 = 0; - nh_sw_if_index = ~0; - } - else if (unformat (i, "table %d", &table_id)) + 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 { - errmsg ("parse error '%U'", format_unformat_error, i); + clib_warning ("parse error '%U'", format_unformat_error, i); return -99; } } - if (!ip_set) + if (sw_if_index == ~0) { - errmsg ("nh addr not set!"); + errmsg ("interface must be specified"); return -99; } - M (GPE_ADD_DEL_NATIVE_FWD_RPATH, mp); - mp->is_add = is_add; - mp->table_id = clib_host_to_net_u32 (table_id); - mp->nh_sw_if_index = clib_host_to_net_u32 (nh_sw_if_index); - mp->nh_addr.af = is_ip4 ? 0 : 1; - if (is_ip4) - clib_memcpy (mp->nh_addr.un.ip4, &ip4, sizeof (ip4)); - else - clib_memcpy (mp->nh_addr.un.ip6, &ip6, sizeof (ip6)); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_one_map_server_dump (vat_main_t * vam) -{ - vl_api_one_map_server_dump_t *mp; - vl_api_control_ping_t *mp_ping; - int ret; - - if (!vam->json_output) + if (sa_id == ~0) { - print (vam->ofp, "%=20s", "Map server"); + errmsg ("SA ID must be specified"); + return -99; } - M (ONE_MAP_SERVER_DUMP, mp); - /* send it... */ - S (mp); + M (IPSEC_TUNNEL_IF_SET_SA, mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); + mp->sw_if_index = htonl (sw_if_index); + mp->sa_id = htonl (sa_id); + mp->is_outbound = is_outbound; - /* Wait for a reply... */ + S (mp); W (ret); + return ret; } -#define api_lisp_map_server_dump api_one_map_server_dump - static int -api_one_map_resolver_dump (vat_main_t * vam) +api_get_first_msg_id (vat_main_t * vam) { - vl_api_one_map_resolver_dump_t *mp; - vl_api_control_ping_t *mp_ping; + vl_api_get_first_msg_id_t *mp; + unformat_input_t *i = vam->input; + u8 *name; + u8 name_set = 0; int ret; - if (!vam->json_output) + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - print (vam->ofp, "%=20s", "Map resolver"); + if (unformat (i, "client %s", &name)) + name_set = 1; + else + break; } - M (ONE_MAP_RESOLVER_DUMP, mp); - /* send it... */ - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -#define api_lisp_map_resolver_dump api_one_map_resolver_dump + if (name_set == 0) + { + errmsg ("missing client name"); + return -99; + } + vec_add1 (name, 0); -static int -api_one_stats_flush (vat_main_t * vam) -{ - vl_api_one_stats_flush_t *mp; - int ret = 0; + if (vec_len (name) > 63) + { + errmsg ("client name too long"); + return -99; + } - M (ONE_STATS_FLUSH, mp); + M (GET_FIRST_MSG_ID, mp); + clib_memcpy (mp->name, name, vec_len (name)); S (mp); W (ret); return ret; } static int -api_one_stats_dump (vat_main_t * vam) +api_cop_interface_enable_disable (vat_main_t * vam) { - vl_api_one_stats_dump_t *mp; - vl_api_control_ping_t *mp_ping; + unformat_input_t *line_input = vam->input; + vl_api_cop_interface_enable_disable_t *mp; + u32 sw_if_index = ~0; + u8 enable_disable = 1; int ret; - M (ONE_STATS_DUMP, mp); - /* send it... */ - S (mp); - - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ - W (ret); - return ret; -} - -static int -api_show_one_status (vat_main_t * vam) -{ - vl_api_show_one_status_t *mp; - int ret; + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "disable")) + enable_disable = 0; + if (unformat (line_input, "enable")) + enable_disable = 1; + else if (unformat (line_input, "%U", api_unformat_sw_if_index, + vam, &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } - if (!vam->json_output) + if (sw_if_index == ~0) { - print (vam->ofp, "%-20s%-16s", "ONE status", "locator-set"); + errmsg ("missing interface name or sw_if_index"); + return -99; } - M (SHOW_ONE_STATUS, mp); + /* Construct the API message */ + M (COP_INTERFACE_ENABLE_DISABLE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->enable_disable = enable_disable; + /* send it... */ S (mp); - /* Wait for a reply... */ + /* Wait for the reply */ W (ret); return ret; } -#define api_show_lisp_status api_show_one_status - static int -api_lisp_gpe_fwd_entry_path_dump (vat_main_t * vam) +api_cop_whitelist_enable_disable (vat_main_t * vam) { - vl_api_gpe_fwd_entry_path_dump_t *mp; - vl_api_control_ping_t *mp_ping; - unformat_input_t *i = vam->input; - u32 fwd_entry_index = ~0; + unformat_input_t *line_input = vam->input; + vl_api_cop_whitelist_enable_disable_t *mp; + u32 sw_if_index = ~0; + u8 ip4 = 0, ip6 = 0, default_cop = 0; + u32 fib_id = 0; int ret; - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "index %d", &fwd_entry_index)) + if (unformat (line_input, "ip4")) + ip4 = 1; + else if (unformat (line_input, "ip6")) + ip6 = 1; + else if (unformat (line_input, "default")) + default_cop = 1; + else if (unformat (line_input, "%U", api_unformat_sw_if_index, + vam, &sw_if_index)) + ; + else if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (line_input, "fib-id %d", &fib_id)) ; else break; } - if (~0 == fwd_entry_index) + if (sw_if_index == ~0) { - errmsg ("no index specified!"); + errmsg ("missing interface name or sw_if_index"); return -99; } - if (!vam->json_output) - { - print (vam->ofp, "first line"); - } - - M (GPE_FWD_ENTRY_PATH_DUMP, mp); + /* Construct the API message */ + M (COP_WHITELIST_ENABLE_DISABLE, mp); + mp->sw_if_index = ntohl (sw_if_index); + mp->fib_id = ntohl (fib_id); + mp->ip4 = ip4; + mp->ip6 = ip6; + mp->default_cop = default_cop; /* send it... */ S (mp); - /* Use a control ping for synchronization */ - MPING (CONTROL_PING, mp_ping); - S (mp_ping); - - /* Wait for a reply... */ + /* Wait for the reply */ W (ret); return ret; } static int -api_one_get_map_request_itr_rlocs (vat_main_t * vam) +api_get_node_graph (vat_main_t * vam) { - vl_api_one_get_map_request_itr_rlocs_t *mp; + vl_api_get_node_graph_t *mp; int ret; - if (!vam->json_output) - { - print (vam->ofp, "%=20s", "itr-rlocs:"); - } + M (GET_NODE_GRAPH, mp); - M (ONE_GET_MAP_REQUEST_ITR_RLOCS, mp); /* send it... */ S (mp); - /* Wait for a reply... */ + /* Wait for the reply */ W (ret); return ret; } -#define api_lisp_get_map_request_itr_rlocs api_one_get_map_request_itr_rlocs - static int api_af_packet_create (vat_main_t * vam) { @@ -20187,128 +15281,6 @@ _(get_node_graph, " ") \ _(sw_interface_clear_stats," | sw_if_index ") \ _(ioam_enable, "[trace] [pow] [ppc ]") \ _(ioam_disable, "") \ -_(one_add_del_locator_set, "locator-set [iface |" \ - " sw_if_index p " \ - "w ] [del]") \ -_(one_add_del_locator, "locator-set " \ - "iface | sw_if_index " \ - "p w [del]") \ -_(one_add_del_local_eid,"vni eid " \ - "/ | " \ - "locator-set [del]" \ - "[key-id sha1|sha256 secret-key ]")\ -_(one_add_del_map_resolver, " [del]") \ -_(one_add_del_map_server, " [del]") \ -_(one_enable_disable, "enable|disable") \ -_(one_map_register_enable_disable, "enable|disable") \ -_(one_map_register_fallback_threshold, "") \ -_(one_rloc_probe_enable_disable, "enable|disable") \ -_(one_add_del_remote_mapping, "add|del vni eid " \ - "[seid ] " \ - "rloc p " \ - "w [rloc ... ] " \ - "action [del-all]") \ -_(one_add_del_adjacency, "add|del vni reid leid " \ - "") \ -_(one_pitr_set_locator_set, "locator-set | del") \ -_(one_use_petr, "ip-address> | disable") \ -_(one_map_request_mode, "src-dst|dst-only") \ -_(one_add_del_map_request_itr_rlocs, " [del]") \ -_(one_eid_table_add_del_map, "[del] vni vrf ") \ -_(one_locator_set_dump, "[local | remote]") \ -_(one_locator_dump, "ls_index | ls_name ") \ -_(one_eid_table_dump, "[eid / | ] [vni] " \ - "[local] | [remote]") \ -_(one_add_del_ndp_entry, "[del] mac bd ip6 ") \ -_(one_ndp_bd_get, "") \ -_(one_ndp_entries_get, "bd ") \ -_(one_add_del_l2_arp_entry, "[del] mac bd ip ") \ -_(one_l2_arp_bd_get, "") \ -_(one_l2_arp_entries_get, "bd ") \ -_(one_stats_enable_disable, "enable|disable") \ -_(show_one_stats_enable_disable, "") \ -_(one_eid_table_vni_dump, "") \ -_(one_eid_table_map_dump, "l2|l3") \ -_(one_map_resolver_dump, "") \ -_(one_map_server_dump, "") \ -_(one_adjacencies_get, "vni ") \ -_(one_nsh_set_locator_set, "[del] ls ") \ -_(show_one_rloc_probe_state, "") \ -_(show_one_map_register_state, "") \ -_(show_one_status, "") \ -_(one_stats_dump, "") \ -_(one_stats_flush, "") \ -_(one_get_map_request_itr_rlocs, "") \ -_(one_map_register_set_ttl, "") \ -_(one_set_transport_protocol, "udp|api") \ -_(one_get_transport_protocol, "") \ -_(one_enable_disable_xtr_mode, "enable|disable") \ -_(one_show_xtr_mode, "") \ -_(one_enable_disable_pitr_mode, "enable|disable") \ -_(one_show_pitr_mode, "") \ -_(one_enable_disable_petr_mode, "enable|disable") \ -_(one_show_petr_mode, "") \ -_(show_one_nsh_mapping, "") \ -_(show_one_pitr, "") \ -_(show_one_use_petr, "") \ -_(show_one_map_request_mode, "") \ -_(show_one_map_register_ttl, "") \ -_(show_one_map_register_fallback_threshold, "") \ -_(lisp_add_del_locator_set, "locator-set [iface |"\ - " sw_if_index p " \ - "w ] [del]") \ -_(lisp_add_del_locator, "locator-set " \ - "iface | sw_if_index " \ - "p w [del]") \ -_(lisp_add_del_local_eid,"vni eid " \ - "/ | " \ - "locator-set [del]" \ - "[key-id sha1|sha256 secret-key ]") \ -_(lisp_add_del_map_resolver, " [del]") \ -_(lisp_add_del_map_server, " [del]") \ -_(lisp_enable_disable, "enable|disable") \ -_(lisp_map_register_enable_disable, "enable|disable") \ -_(lisp_rloc_probe_enable_disable, "enable|disable") \ -_(lisp_add_del_remote_mapping, "add|del vni eid " \ - "[seid ] " \ - "rloc p " \ - "w [rloc ... ] " \ - "action [del-all]") \ -_(lisp_add_del_adjacency, "add|del vni reid leid " \ - "") \ -_(lisp_pitr_set_locator_set, "locator-set | del") \ -_(lisp_use_petr, " | disable") \ -_(lisp_map_request_mode, "src-dst|dst-only") \ -_(lisp_add_del_map_request_itr_rlocs, " [del]") \ -_(lisp_eid_table_add_del_map, "[del] vni vrf ") \ -_(lisp_locator_set_dump, "[local | remote]") \ -_(lisp_locator_dump, "ls_index | ls_name ") \ -_(lisp_eid_table_dump, "[eid / | ] [vni] " \ - "[local] | [remote]") \ -_(lisp_eid_table_vni_dump, "") \ -_(lisp_eid_table_map_dump, "l2|l3") \ -_(lisp_map_resolver_dump, "") \ -_(lisp_map_server_dump, "") \ -_(lisp_adjacencies_get, "vni ") \ -_(gpe_fwd_entry_vnis_get, "") \ -_(gpe_native_fwd_rpaths_get, "ip4 | ip6") \ -_(gpe_add_del_native_fwd_rpath, "[del] via [iface] " \ - "[table ]") \ -_(lisp_gpe_fwd_entries_get, "vni ") \ -_(lisp_gpe_fwd_entry_path_dump, "index ") \ -_(gpe_set_encap_mode, "lisp|vxlan") \ -_(gpe_get_encap_mode, "") \ -_(lisp_gpe_add_del_iface, "up|down") \ -_(lisp_gpe_enable_disable, "enable|disable") \ -_(lisp_gpe_add_del_fwd_entry, "reid [leid ] vni " \ - "vrf/bd loc-pair w ... [del]") \ -_(show_lisp_rloc_probe_state, "") \ -_(show_lisp_map_register_state, "") \ -_(show_lisp_status, "") \ -_(lisp_get_map_request_itr_rlocs, "") \ -_(show_lisp_pitr, "") \ -_(show_lisp_use_petr, "") \ -_(show_lisp_map_request_mode, "") \ _(af_packet_create, "name [hw_addr ]") \ _(af_packet_delete, "name ") \ _(af_packet_dump, "") \ diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index 124af13f202..4c65d71f3b2 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -817,64 +817,6 @@ list(APPEND VNET_HEADERS list(APPEND VNET_API_FILES vxlan-gpe/vxlan_gpe.api) -############################################################################## -# LISP control plane: lisp-cp -############################################################################## - -list(APPEND VNET_SOURCES - lisp-cp/lisp_types.c - lisp-cp/lisp_cp_dpo.c - lisp-cp/control.c - lisp-cp/gid_dictionary.c - lisp-cp/lisp_msg_serdes.c - lisp-cp/packets.c - lisp-cp/one_cli.c - lisp-cp/lisp_cli.c - lisp-cp/one_api.c - lisp-cp/lisp_api.c - lisp-cp/lisp_types_api.c -) - -list(APPEND VNET_HEADERS - lisp-cp/lisp_types.h - lisp-cp/packets.h - lisp-cp/gid_dictionary.h - lisp-cp/lisp_cp_messages.h - lisp-cp/lisp_msg_serdes.h - lisp-cp/control.h - lisp-cp/lisp_types_api.h -) - -list(APPEND VNET_API_FILES lisp-cp/lisp_types.api) -list(APPEND VNET_API_FILES lisp-cp/lisp.api) -list(APPEND VNET_API_FILES lisp-cp/one.api) - -############################################################################## -# Tunnel protocol: lisp-gpe -############################################################################## - -list(APPEND VNET_SOURCES - lisp-gpe/lisp_gpe.c - lisp-gpe/lisp_gpe_sub_interface.c - lisp-gpe/lisp_gpe_adjacency.c - lisp-gpe/lisp_gpe_tunnel.c - lisp-gpe/lisp_gpe_fwd_entry.c - lisp-gpe/lisp_gpe_tenant.c - lisp-gpe/interface.c - lisp-gpe/decap.c - lisp-gpe/lisp_gpe_api.c -) - -list(APPEND VNET_HEADERS - lisp-gpe/lisp_gpe.h - lisp-gpe/lisp_gpe_fwd_entry.h - lisp-gpe/lisp_gpe_tenant.h - lisp-gpe/lisp_gpe_packet.h - lisp-gpe/lisp_gpe_error.def -) - -list(APPEND VNET_API_FILES lisp-gpe/lisp_gpe.api) - ############################################################################## # ipv6 segment routing ############################################################################## diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c index bda98b7417c..1403e67482c 100644 --- a/src/vnet/session/session_api.c +++ b/src/vnet/session/session_api.c @@ -988,7 +988,7 @@ send_session_rules_table_details (session_rules_table_t * srt, u8 fib_proto, } static void -vl_api_session_rules_dump_t_handler (vl_api_one_map_server_dump_t * mp) +vl_api_session_rules_dump_t_handler (vl_api_session_rules_dump_t * mp) { vl_api_registration_t *reg; session_table_t *st; diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h index 86edc88ac49..e48d4395436 100644 --- a/src/vnet/vnet_all_api_h.h +++ b/src/vnet/vnet_all_api_h.h @@ -46,9 +46,6 @@ #include #include #include -#include -#include -#include #include #include #include diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index b17e7ded2b2..4a2c2cb7838 100644 --- a/src/vpp/api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -2523,364 +2522,6 @@ static void *vl_api_ip_source_and_port_range_check_interface_add_del_t_print FINISH; } -static void *vl_api_lisp_enable_disable_t_print - (vl_api_lisp_enable_disable_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_enable_disable %s", - mp->is_enable ? "enable" : "disable"); - - FINISH; -} - -static void *vl_api_gpe_add_del_iface_t_print - (vl_api_gpe_add_del_iface_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: gpe_add_del_iface "); - - s = format (s, "%s ", mp->is_add ? "up" : "down"); - s = format (s, "vni %d ", mp->vni); - s = format (s, "%s %d ", mp->is_l2 ? "bd_id" : "table_id", mp->dp_table); - - FINISH; -} - -static void *vl_api_lisp_pitr_set_locator_set_t_print - (vl_api_lisp_pitr_set_locator_set_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_pitr_set_locator_set "); - - if (mp->is_add) - s = format (s, "locator-set %s ", mp->ls_name); - else - s = format (s, "del"); - - FINISH; -} - -static u8 * -format_nsh_address_vat (u8 * s, va_list * args) -{ - nsh_t *a = va_arg (*args, nsh_t *); - return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); -} - -static u8 * -format_lisp_flat_eid (u8 * s, va_list * args) -{ - vl_api_eid_t *eid = va_arg (*args, vl_api_eid_t *); - - switch (eid->type) - { - case EID_TYPE_API_PREFIX: - if (eid->address.prefix.address.af) - return format (s, "%U/%d", format_ip6_address, - eid->address.prefix.address.un.ip6, - eid->address.prefix.len); - return format (s, "%U/%d", format_ip4_address, - eid->address.prefix.address.un.ip4, - eid->address.prefix.len); - case EID_TYPE_API_MAC: - return format (s, "%U", format_ethernet_address, eid->address.mac); - case EID_TYPE_API_NSH: - return format (s, "%U", format_nsh_address_vat, eid->address.nsh); - } - return 0; -} - -static void *vl_api_lisp_add_del_remote_mapping_t_print - (vl_api_lisp_add_del_remote_mapping_t * mp, void *handle) -{ - u8 *s; - u32 rloc_num = 0; - - s = format (0, "SCRIPT: lisp_add_del_remote_mapping "); - - if (mp->del_all) - s = format (s, "del-all "); - - s = format (s, "%s ", mp->is_add ? "add" : "del"); - s = format (s, "vni %d ", (mp->vni)); - - s = format (s, "eid %U ", format_lisp_flat_eid, &mp->deid); - - if (mp->is_src_dst) - { - s = format (s, "seid %U ", format_lisp_flat_eid, &mp->seid); - } - rloc_num = (mp->rloc_num); - - if (0 == rloc_num) - s = format (s, "action %d", mp->action); - - FINISH; -} - -static void *vl_api_lisp_add_del_adjacency_t_print - (vl_api_lisp_add_del_adjacency_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_add_del_adjacency "); - - s = format (s, "%s ", mp->is_add ? "add" : "del"); - s = format (s, "vni %d ", (mp->vni)); - s = format (s, "reid %U leid %U ", - format_lisp_flat_eid, &mp->reid, format_lisp_flat_eid, - &mp->leid); - - FINISH; -} - -static void *vl_api_lisp_add_del_map_request_itr_rlocs_t_print - (vl_api_lisp_add_del_map_request_itr_rlocs_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_add_del_map_request_itr_rlocs "); - - if (mp->is_add) - s = format (s, "%s", mp->locator_set_name); - else - s = format (s, "del"); - - FINISH; -} - -static void *vl_api_lisp_eid_table_add_del_map_t_print - (vl_api_lisp_eid_table_add_del_map_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_eid_table_add_del_map "); - - if (!mp->is_add) - s = format (s, "del "); - - s = format (s, "vni %d ", (mp->vni)); - s = format (s, "%s %d ", mp->is_l2 ? "bd_index" : "vrf", (mp->dp_table)); - FINISH; -} - -static void *vl_api_lisp_add_del_local_eid_t_print - (vl_api_lisp_add_del_local_eid_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_add_del_local_eid "); - - if (!mp->is_add) - s = format (s, "del "); - - s = format (s, "vni %d ", (mp->vni)); - s = format (s, "eid %U ", format_lisp_flat_eid, &mp->eid); - s = format (s, "locator-set %s ", mp->locator_set_name); - if (mp->key.id) - { - u32 key_id = mp->key.id; - s = format (s, "key-id %U", format_hmac_key_id, key_id); - s = format (s, "secret-key %s", mp->key.key); - } - FINISH; -} - -static void *vl_api_gpe_add_del_fwd_entry_t_print - (vl_api_gpe_add_del_fwd_entry_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: gpe_add_del_fwd_entry TODO"); - - FINISH; -} - -static void *vl_api_lisp_add_del_map_resolver_t_print - (vl_api_lisp_add_del_map_resolver_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_add_del_map_resolver "); - - if (!mp->is_add) - s = format (s, "del "); - - if (mp->ip_address.af) - s = format (s, "%U ", format_ip6_address, mp->ip_address.un.ip6); - else - s = format (s, "%U ", format_ip4_address, mp->ip_address.un.ip4); - - FINISH; -} - -static void *vl_api_gpe_enable_disable_t_print - (vl_api_gpe_enable_disable_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: gpe_enable_disable "); - - s = format (s, "%s ", mp->is_enable ? "enable" : "disable"); - - FINISH; -} - -static void *vl_api_lisp_add_del_locator_set_t_print - (vl_api_lisp_add_del_locator_set_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_add_del_locator_set "); - - if (!mp->is_add) - s = format (s, "del "); - - s = format (s, "locator-set %s ", mp->locator_set_name); - - FINISH; -} - -static void *vl_api_lisp_add_del_locator_t_print - (vl_api_lisp_add_del_locator_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_add_del_locator "); - - if (!mp->is_add) - s = format (s, "del "); - - s = format (s, "locator-set %s ", mp->locator_set_name); - s = format (s, "sw_if_index %d ", mp->sw_if_index); - s = format (s, "p %d w %d ", mp->priority, mp->weight); - - FINISH; -} - -static void *vl_api_lisp_locator_set_dump_t_print - (vl_api_lisp_locator_set_dump_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_locator_set_dump "); - if (mp->filter == 1) - s = format (s, "local"); - else if (mp->filter == 2) - s = format (s, "remote"); - - FINISH; -} - -static void *vl_api_lisp_locator_dump_t_print - (vl_api_lisp_locator_dump_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_locator_dump "); - if (mp->is_index_set) - s = format (s, "ls_index %d", (mp->ls_index)); - else - s = format (s, "ls_name %s", mp->ls_name); - - FINISH; -} - -static void *vl_api_lisp_map_request_mode_t_print - (vl_api_lisp_map_request_mode_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_map_request_mode "); - - s = mp->is_src_dst ? format (s, "src-dst") : format (s, "dst-only"); - - FINISH; -} - -static void *vl_api_lisp_eid_table_dump_t_print - (vl_api_lisp_eid_table_dump_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_eid_table_dump "); - - if (mp->eid_set) - { - s = format (s, "vni %d ", (mp->vni)); - s = format (s, "eid %U ", format_lisp_flat_eid, &mp->eid); - switch (mp->filter) - { - case 1: - s = format (s, "local "); - break; - case 2: - s = format (s, "remote "); - break; - default: - break; - } - } - FINISH; -} - -static void *vl_api_lisp_rloc_probe_enable_disable_t_print - (vl_api_lisp_rloc_probe_enable_disable_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_rloc_probe_enable_disable "); - if (mp->is_enable) - s = format (s, "enable"); - else - s = format (s, "disable"); - - FINISH; -} - -static void *vl_api_lisp_map_register_enable_disable_t_print - (vl_api_lisp_map_register_enable_disable_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_map_register_enable_disable "); - if (mp->is_enable) - s = format (s, "enable"); - else - s = format (s, "disable"); - - FINISH; -} - -static void *vl_api_lisp_adjacencies_get_t_print - (vl_api_lisp_adjacencies_get_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_adjacencies_get "); - s = format (s, "vni %d", (mp->vni)); - - FINISH; -} - -static void *vl_api_lisp_eid_table_map_dump_t_print - (vl_api_lisp_eid_table_map_dump_t * mp, void *handle) -{ - u8 *s; - - s = format (0, "SCRIPT: lisp_eid_table_map_dump "); - - if (mp->is_l2) - s = format (s, "l2"); - else - s = format (s, "l3"); - - FINISH; -} - static void *vl_api_ipsec_tunnel_if_add_del_t_print (vl_api_ipsec_tunnel_if_add_del_t * mp, void *handle) { @@ -2923,6 +2564,13 @@ static void *vl_api_ipsec_tunnel_if_add_del_t_print FINISH; } +/* static u8 * */ +/* format_nsh_address_vat (u8 * s, va_list * args) */ +/* { */ +/* nsh_t *a = va_arg (*args, nsh_t *); */ +/* return format (s, "SPI:%d SI:%d", clib_net_to_host_u32 (a->spi), a->si); */ +/* } */ + static const char *policy_strs[] = { "BYPASS", "DISCARD", @@ -3381,24 +3029,6 @@ static void * vl_api_ ## f ## _t_print \ foreach_no_print_function; #undef _ -#define foreach_custom_print_no_arg_function \ -_(lisp_eid_table_vni_dump) \ -_(lisp_map_resolver_dump) \ -_(lisp_map_server_dump) \ -_(show_lisp_rloc_probe_state) \ -_(show_lisp_map_register_state) \ -_(show_lisp_map_request_mode) - -#define _(f) \ -static void * vl_api_ ## f ## _t_print \ - (vl_api_ ## f ## _t * mp, void * handle) \ -{ \ - u8 * s; \ - s = format (0, "SCRIPT: " #f ); \ - FINISH; \ -} -foreach_custom_print_no_arg_function; -#undef _ #define foreach_custom_print_function \ _(CREATE_LOOPBACK, create_loopback) \ _(CREATE_LOOPBACK_INSTANCE, create_loopback_instance) \ @@ -3525,34 +3155,6 @@ _(IP_SOURCE_AND_PORT_RANGE_CHECK_ADD_DEL, \ ip_source_and_port_range_check_add_del) \ _(IP_SOURCE_AND_PORT_RANGE_CHECK_INTERFACE_ADD_DEL, \ ip_source_and_port_range_check_interface_add_del) \ -_(LISP_ENABLE_DISABLE, lisp_enable_disable) \ -_(GPE_ENABLE_DISABLE, gpe_enable_disable) \ -_(GPE_ADD_DEL_IFACE, gpe_add_del_iface) \ -_(LISP_PITR_SET_LOCATOR_SET, lisp_pitr_set_locator_set) \ -_(LISP_MAP_REQUEST_MODE, lisp_map_request_mode) \ -_(SHOW_LISP_MAP_REQUEST_MODE, show_lisp_map_request_mode) \ -_(LISP_ADD_DEL_REMOTE_MAPPING, lisp_add_del_remote_mapping) \ -_(LISP_ADD_DEL_ADJACENCY, lisp_add_del_adjacency) \ -_(LISP_ADD_DEL_MAP_REQUEST_ITR_RLOCS, \ - lisp_add_del_map_request_itr_rlocs) \ -_(LISP_EID_TABLE_ADD_DEL_MAP, lisp_eid_table_add_del_map) \ -_(LISP_ADD_DEL_LOCAL_EID, lisp_add_del_local_eid) \ -_(GPE_ADD_DEL_FWD_ENTRY, gpe_add_del_fwd_entry) \ -_(LISP_ADD_DEL_LOCATOR_SET, lisp_add_del_locator_set) \ -_(LISP_ADD_DEL_MAP_RESOLVER, lisp_add_del_map_resolver) \ -_(LISP_ADD_DEL_LOCATOR, lisp_add_del_locator) \ -_(LISP_EID_TABLE_DUMP, lisp_eid_table_dump) \ -_(LISP_EID_TABLE_MAP_DUMP, lisp_eid_table_map_dump) \ -_(LISP_EID_TABLE_VNI_DUMP, lisp_eid_table_vni_dump) \ -_(LISP_MAP_RESOLVER_DUMP, lisp_map_resolver_dump) \ -_(LISP_MAP_SERVER_DUMP, lisp_map_server_dump) \ -_(LISP_LOCATOR_SET_DUMP, lisp_locator_set_dump) \ -_(LISP_LOCATOR_DUMP, lisp_locator_dump) \ -_(LISP_ADJACENCIES_GET, lisp_adjacencies_get) \ -_(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state) \ -_(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state) \ -_(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable) \ -_(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable) \ _(IPSEC_INTERFACE_ADD_DEL_SPD, ipsec_interface_add_del_spd) \ _(IPSEC_SAD_ENTRY_ADD_DEL, ipsec_sad_entry_add_del) \ _(IPSEC_SPD_ADD_DEL, ipsec_spd_add_del) \ diff --git a/test/framework.py b/test/framework.py index ba5f4014798..82d1c35fd7c 100644 --- a/test/framework.py +++ b/test/framework.py @@ -419,6 +419,8 @@ class VppTestCase(unittest.TestCase): "plugins", "{", "plugin", "dpdk_plugin.so", "{", "disable", "}", "plugin", "rdma_plugin.so", "{", "disable", + "}", "plugin", "lisp_unittest_plugin.so", "{", + "enable", "}", "plugin", "unittest_plugin.so", "{", "enable", "}"] + cls.extra_vpp_plugin_config + ["}", ] -- 2.16.6