diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/abf/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/abf/abf_all_api_h.h | 21 | ||||
| -rw-r--r-- | src/plugins/abf/abf_api.c | 81 | ||||
| -rw-r--r-- | src/plugins/abf/abf_msg_enum.h | 28 |
4 files changed, 6 insertions, 128 deletions
diff --git a/src/plugins/abf/CMakeLists.txt b/src/plugins/abf/CMakeLists.txt index 54eeecf4127..5db975771a4 100644 --- a/src/plugins/abf/CMakeLists.txt +++ b/src/plugins/abf/CMakeLists.txt @@ -19,8 +19,4 @@ add_vpp_plugin(abf API_FILES abf.api - - INSTALL_HEADERS - abf_all_api_h.h - abf_msg_enum.h ) diff --git a/src/plugins/abf/abf_all_api_h.h b/src/plugins/abf/abf_all_api_h.h deleted file mode 100644 index 702c975bce8..00000000000 --- a/src/plugins/abf/abf_all_api_h.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2017 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 */ - -#ifdef vl_printfun -#include <vnet/format_fns.h> -#endif - -#include <abf/abf.api.h> diff --git a/src/plugins/abf/abf_api.c b/src/plugins/abf/abf_api.c index a14c9008332..cc55b214e35 100644 --- a/src/plugins/abf/abf_api.c +++ b/src/plugins/abf/abf_api.c @@ -29,28 +29,9 @@ #include <vlibmemory/api.h> /* define message IDs */ -#include <abf/abf_msg_enum.h> - -/* define message structures */ -#define vl_typedefs -#include <abf/abf_all_api_h.h> -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include <abf/abf_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 <abf/abf_all_api_h.h> -#undef vl_printfun - -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <abf/abf_all_api_h.h> -#undef vl_api_version +#include <vnet/format_fns.h> +#include <abf/abf.api_enum.h> +#include <abf/abf.api_types.h> /** * Base message ID fot the plugin @@ -59,15 +40,6 @@ static u32 abf_base_msg_id; #include <vlibapi/api_helper_macros.h> -/* List of message types that this plugin understands */ - -#define foreach_abf_plugin_api_msg \ -_(ABF_PLUGIN_GET_VERSION, abf_plugin_get_version) \ -_(ABF_POLICY_ADD_DEL, abf_policy_add_del) \ -_(ABF_POLICY_DUMP, abf_policy_dump) \ -_(ABF_ITF_ATTACH_ADD_DEL, abf_itf_attach_add_del) \ -_(ABF_ITF_ATTACH_DUMP, abf_itf_attach_dump) - static void vl_api_abf_plugin_get_version_t_handler (vl_api_abf_plugin_get_version_t * mp) { @@ -260,56 +232,15 @@ vl_api_abf_itf_attach_dump_t_handler (vl_api_abf_itf_attach_dump_t * mp) abf_itf_attach_walk (abf_itf_attach_send_details, &ctx); } -#define vl_msg_name_crc_list -#include <abf/abf_all_api_h.h> -#undef vl_msg_name_crc_list - -/* Set up the API message handling tables */ -static clib_error_t * -abf_plugin_api_hookup (vlib_main_t * vm) -{ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + abf_base_msg_id), \ - #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_abf_plugin_api_msg; -#undef _ - - return 0; -} - -static void -setup_message_id_table (api_main_t * apim) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (apim, #n "_" #crc, id + abf_base_msg_id); - foreach_vl_msg_name_crc_abf; -#undef _ -} +#include <abf/abf.api.c> static clib_error_t * abf_api_init (vlib_main_t * vm) { - clib_error_t *error = 0; - - u8 *name = format (0, "abf_%08x%c", api_version, 0); - /* Ask for a correctly-sized block of API message decode slots */ - abf_base_msg_id = vl_msg_api_get_msg_ids ((char *) name, - VL_MSG_FIRST_AVAILABLE); - - error = abf_plugin_api_hookup (vm); - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (&api_main); + abf_base_msg_id = setup_message_id_table (); - vec_free (name); - - return error; + return 0; } VLIB_INIT_FUNCTION (abf_api_init); diff --git a/src/plugins/abf/abf_msg_enum.h b/src/plugins/abf/abf_msg_enum.h deleted file mode 100644 index 5c06eb5ad0c..00000000000 --- a/src/plugins/abf/abf_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_abf_msg_enum_h -#define included_abf_msg_enum_h - -#include <vppinfra/byte_order.h> - -#define vl_msg_id(n,h) n, -typedef enum { -#include <abf/abf_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 |