aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-09-27 14:09:31 +0200
committerNeale Ranns <nranns@cisco.com>2019-09-27 16:06:05 +0000
commit694ec926c79b27609ce9f452f8fd6f3f4aa9ff4e (patch)
tree34d0fb1073ff2f0cde02d866f318a30a44b5b44b
parent4540b2f8cd09b7a36a45c752d751d8da1b1ee6b0 (diff)
l3xc: remove api boilerplate
Type: refactor Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: Iea808fcdbf97cb78a2e2805002d3e2333279cb89
-rw-r--r--src/plugins/l3xc/CMakeLists.txt4
-rw-r--r--src/plugins/l3xc/l3xc_all_api_h.h21
-rw-r--r--src/plugins/l3xc/l3xc_api.c81
-rw-r--r--src/plugins/l3xc/l3xc_msg_enum.h28
4 files changed, 6 insertions, 128 deletions
diff --git a/src/plugins/l3xc/CMakeLists.txt b/src/plugins/l3xc/CMakeLists.txt
index 82ea08404d9..d00a83b86ea 100644
--- a/src/plugins/l3xc/CMakeLists.txt
+++ b/src/plugins/l3xc/CMakeLists.txt
@@ -19,8 +19,4 @@ add_vpp_plugin(l3xc
API_FILES
l3xc.api
-
- INSTALL_HEADERS
- l3xc_all_api_h.h
- l3xc_msg_enum.h
)
diff --git a/src/plugins/l3xc/l3xc_all_api_h.h b/src/plugins/l3xc/l3xc_all_api_h.h
deleted file mode 100644
index 5152e2de1c3..00000000000
--- a/src/plugins/l3xc/l3xc_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 <l3xc/l3xc.api.h>
diff --git a/src/plugins/l3xc/l3xc_api.c b/src/plugins/l3xc/l3xc_api.c
index 0427cca5f1c..847acaac331 100644
--- a/src/plugins/l3xc/l3xc_api.c
+++ b/src/plugins/l3xc/l3xc_api.c
@@ -28,28 +28,9 @@
#include <vlibmemory/api.h>
/* define message IDs */
-#include <l3xc/l3xc_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <l3xc/l3xc_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <l3xc/l3xc_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 <l3xc/l3xc_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <l3xc/l3xc_all_api_h.h>
-#undef vl_api_version
+#include <vnet/format_fns.h>
+#include <l3xc/l3xc.api_enum.h>
+#include <l3xc/l3xc.api_types.h>
/**
* Base message ID fot the plugin
@@ -58,14 +39,6 @@ static u32 l3xc_base_msg_id;
#include <vlibapi/api_helper_macros.h>
-/* List of message types that this plugin understands */
-
-#define foreach_l3xc_plugin_api_msg \
- _(L3XC_PLUGIN_GET_VERSION, l3xc_plugin_get_version) \
- _(L3XC_UPDATE, l3xc_update) \
- _(L3XC_DEL, l3xc_del) \
- _(L3XC_DUMP, l3xc_dump)
-
static void
vl_api_l3xc_plugin_get_version_t_handler (vl_api_l3xc_plugin_get_version_t *
mp)
@@ -228,56 +201,14 @@ vl_api_l3xc_dump_t_handler (vl_api_l3xc_dump_t * mp)
}
}
-#define vl_msg_name_crc_list
-#include <l3xc/l3xc_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-/* Set up the API message handling tables */
-static clib_error_t *
-l3xc_plugin_api_hookup (vlib_main_t * vm)
-{
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + l3xc_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_l3xc_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 + l3xc_base_msg_id);
- foreach_vl_msg_name_crc_l3xc;
-#undef _
-}
-
+#include <l3xc/l3xc.api.c>
static clib_error_t *
l3xc_api_init (vlib_main_t * vm)
{
- clib_error_t *error = 0;
-
- u8 *name = format (0, "l3xc_%08x%c", api_version, 0);
-
/* Ask for a correctly-sized block of API message decode slots */
- l3xc_base_msg_id = vl_msg_api_get_msg_ids ((char *) name,
- VL_MSG_FIRST_AVAILABLE);
-
- error = l3xc_plugin_api_hookup (vm);
-
- /* Add our API messages to the global name_crc hash table */
- setup_message_id_table (&api_main);
+ l3xc_base_msg_id = setup_message_id_table ();
- vec_free (name);
-
- return error;
+ return 0;
}
VLIB_INIT_FUNCTION (l3xc_api_init);
diff --git a/src/plugins/l3xc/l3xc_msg_enum.h b/src/plugins/l3xc/l3xc_msg_enum.h
deleted file mode 100644
index 51baddcad80..00000000000
--- a/src/plugins/l3xc/l3xc_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_l3xc_msg_enum_h
-#define included_l3xc_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <l3xc/l3xc_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