diff options
Diffstat (limited to 'src/plugins/ioam/lib-pot')
| -rw-r--r-- | src/plugins/ioam/lib-pot/pot_all_api_h.h | 16 | ||||
| -rw-r--r-- | src/plugins/ioam/lib-pot/pot_api.c | 80 | ||||
| -rw-r--r-- | src/plugins/ioam/lib-pot/pot_msg_enum.h | 28 | ||||
| -rw-r--r-- | src/plugins/ioam/lib-pot/pot_test.c | 27 |
4 files changed, 12 insertions, 139 deletions
diff --git a/src/plugins/ioam/lib-pot/pot_all_api_h.h b/src/plugins/ioam/lib-pot/pot_all_api_h.h deleted file mode 100644 index 63967c45444..00000000000 --- a/src/plugins/ioam/lib-pot/pot_all_api_h.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2016 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 the generated file, see BUILT_SOURCES in Makefile.am */ -#include <ioam/lib-pot/pot.api.h> diff --git a/src/plugins/ioam/lib-pot/pot_api.c b/src/plugins/ioam/lib-pot/pot_api.c index 52ea68e083d..0d0e49de20a 100644 --- a/src/plugins/ioam/lib-pot/pot_api.c +++ b/src/plugins/ioam/lib-pot/pot_api.c @@ -27,39 +27,12 @@ #include <vlibmemory/api.h> /* define message IDs */ -#include <ioam/lib-pot/pot_msg_enum.h> - -/* define message structures */ -#define vl_typedefs -#include <ioam/lib-pot/pot_all_api_h.h> -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include <ioam/lib-pot/pot_all_api_h.h> -#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 <ioam/lib-pot/pot_all_api_h.h> -#undef vl_printfun - -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <ioam/lib-pot/pot_all_api_h.h> -#undef vl_api_version +#include <ioam/lib-pot/pot.api_enum.h> +#include <ioam/lib-pot/pot.api_types.h> #define REPLY_MSG_ID_BASE sm->msg_id_base #include <vlibapi/api_helper_macros.h> -/* List of message types that this plugin understands */ -#define foreach_pot_plugin_api_msg \ -_(POT_PROFILE_ADD, pot_profile_add) \ -_(POT_PROFILE_ACTIVATE, pot_profile_activate) \ -_(POT_PROFILE_DEL, pot_profile_del) \ -_(POT_PROFILE_SHOW_CONFIG_DUMP, pot_profile_show_config_dump) \ - static void vl_api_pot_profile_add_t_handler (vl_api_pot_profile_add_t *mp) { @@ -175,43 +148,10 @@ static void vl_api_pot_profile_del_t_handler REPLY_MACRO(VL_API_POT_PROFILE_DEL_REPLY); } -/* Set up the API message handling tables */ -static clib_error_t * -pot_plugin_api_hookup (vlib_main_t *vm) -{ - pot_main_t * sm = &pot_main; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base), \ - #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_pot_plugin_api_msg; -#undef _ - - return 0; -} - -#define vl_msg_name_crc_list -#include <ioam/lib-pot/pot_all_api_h.h> -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (pot_main_t * sm, api_main_t * am) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base); - foreach_vl_msg_name_crc_pot; -#undef _ -} - +#include <ioam/lib-pot/pot.api.c> static clib_error_t * pot_init (vlib_main_t * vm) { pot_main_t * sm = &pot_main; - clib_error_t * error = 0; - u8 * name; bzero(sm, sizeof(pot_main)); (void)pot_util_init(); @@ -219,20 +159,10 @@ static clib_error_t * pot_init (vlib_main_t * vm) sm->vlib_main = vm; sm->vnet_main = vnet_get_main(); - name = format (0, "ioam_pot_%08x%c", api_version, 0); - /* Ask for a correctly-sized block of API message decode slots */ - sm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - - error = pot_plugin_api_hookup (vm); - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (sm, &api_main); - - vec_free(name); + sm->msg_id_base = setup_message_id_table (); - return error; + return 0; } VLIB_INIT_FUNCTION (pot_init); diff --git a/src/plugins/ioam/lib-pot/pot_msg_enum.h b/src/plugins/ioam/lib-pot/pot_msg_enum.h deleted file mode 100644 index a4a88bed20f..00000000000 --- a/src/plugins/ioam/lib-pot/pot_msg_enum.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2016 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. - */ -#ifndef included_pot_msg_enum_h -#define included_pot_msg_enum_h - -#include <vppinfra/byte_order.h> - -#define vl_msg_id(n,h) n, -typedef enum { -#include <ioam/lib-pot/pot_all_api_h.h> - /* We'll want to know how many messages IDs we need... */ - VL_MSG_FIRST_AVAILABLE, -} vl_msg_id_t; -#undef vl_msg_id - -#endif /* included_pot_msg_enum_h */ diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c index d0cf49eea37..1db4286b7dc 100644 --- a/src/plugins/ioam/lib-pot/pot_test.c +++ b/src/plugins/ioam/lib-pot/pot_test.c @@ -28,31 +28,18 @@ #include <vlibapi/vat_helper_macros.h> /* Declare message IDs */ -#include <ioam/lib-pot/pot_msg_enum.h> +#include <ioam/lib-pot/pot.api_enum.h> +#include <ioam/lib-pot/pot.api_types.h> -/* define message structures */ -#define vl_typedefs -#include <ioam/lib-pot/pot_all_api_h.h> -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include <ioam/lib-pot/pot_all_api_h.h> -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) +#define vl_endianfun /* define message structures */ #define vl_printfun -#include <ioam/lib-pot/pot_all_api_h.h> -#undef vl_printfun - -/* Get the API version number. */ #define vl_api_version(n,v) static u32 api_version=(v); -#include <ioam/lib-pot/pot_all_api_h.h> +#define vl_print(handle, ...) +#include <ioam/lib-pot/pot.api.h> +#undef vl_endianfun +#undef vl_printfun #undef vl_api_version - typedef struct { /* API message ID base */ u16 msg_id_base; |