aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/export
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-10-08 11:35:23 +0200
committerNeale Ranns <nranns@cisco.com>2019-10-09 07:53:10 +0000
commitab96454e3aba8e60094e773a39e9d28f50d7192e (patch)
treec78289d57c16992ec340b1c64da61ddf51abc726 /src/plugins/ioam/export
parentb126ebcf421830e739e74a532e35351f1a5fe2c1 (diff)
ioam: remove api boilerplate
Note: The VAT _test.c plugins need some more adjustments. Type: refactor Change-Id: Ifa150683d7d68db7950f66ef85eea73c8281ba14 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/ioam/export')
-rw-r--r--src/plugins/ioam/export/ioam_export.c78
-rw-r--r--src/plugins/ioam/export/ioam_export_all_api_h.h16
-rw-r--r--src/plugins/ioam/export/ioam_export_msg_enum.h28
-rw-r--r--src/plugins/ioam/export/ioam_export_test.c27
4 files changed, 13 insertions, 136 deletions
diff --git a/src/plugins/ioam/export/ioam_export.c b/src/plugins/ioam/export/ioam_export.c
index 98e5f116c8a..f4c39a03c5c 100644
--- a/src/plugins/ioam/export/ioam_export.c
+++ b/src/plugins/ioam/export/ioam_export.c
@@ -28,36 +28,12 @@
/* define message IDs */
-#include <ioam/export/ioam_export_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/export/ioam_export_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/export/ioam_export_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/export/ioam_export_all_api_h.h>
-#undef vl_api_version
+#include <ioam/export/ioam_export.api_enum.h>
+#include <ioam/export/ioam_export.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_ioam_export_plugin_api_msg \
-_(IOAM_EXPORT_IP6_ENABLE_DISABLE, ioam_export_ip6_enable_disable)
-
ioam_export_main_t ioam_export_main;
extern vlib_node_registration_t export_node;
@@ -116,38 +92,6 @@ static void vl_api_ioam_export_ip6_enable_disable_t_handler
REPLY_MACRO (VL_API_IOAM_EXPORT_IP6_ENABLE_DISABLE_REPLY);
}
-/* Set up the API message handling tables */
-static clib_error_t *
-ioam_export_plugin_api_hookup (vlib_main_t * vm)
-{
- ioam_export_main_t *sm = &ioam_export_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_ioam_export_plugin_api_msg;
-#undef _
-
- return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (ioam_export_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_ioam_export;
-#undef _
-}
-
static clib_error_t *
set_ioam_export_ipfix_command_fn (vlib_main_t * vm,
unformat_input_t * input,
@@ -201,13 +145,11 @@ VLIB_CLI_COMMAND (set_ipfix_command, static) =
function = set_ioam_export_ipfix_command_fn,};
/* *INDENT-ON* */
-
+#include <ioam/export/ioam_export.api.c>
static clib_error_t *
ioam_export_init (vlib_main_t * vm)
{
ioam_export_main_t *em = &ioam_export_main;
- clib_error_t *error = 0;
- u8 *name;
u32 node_index = export_node.index;
vlib_node_t *ip6_hbyh_node = NULL;
@@ -216,25 +158,17 @@ ioam_export_init (vlib_main_t * vm)
em->set_id = IPFIX_IOAM_EXPORT_ID;
ioam_export_reset_next_node (em);
- name = format (0, "ioam_export_%08x%c", api_version, 0);
-
/* Ask for a correctly-sized block of API message decode slots */
- em->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
+ em->msg_id_base = setup_message_id_table ();
+
em->unix_time_0 = (u32) time (0); /* Store starting time */
em->vlib_time_0 = vlib_time_now (vm);
- error = ioam_export_plugin_api_hookup (vm);
-
- /* Add our API messages to the global name_crc hash table */
- setup_message_id_table (em, &api_main);
-
/* Hook this export node to ip6-hop-by-hop */
ip6_hbyh_node = vlib_get_node_by_name (vm, (u8 *) "ip6-hop-by-hop");
em->my_hbh_slot = vlib_node_add_next (vm, ip6_hbyh_node->index, node_index);
- vec_free (name);
- return error;
+ return 0;
}
VLIB_INIT_FUNCTION (ioam_export_init);
diff --git a/src/plugins/ioam/export/ioam_export_all_api_h.h b/src/plugins/ioam/export/ioam_export_all_api_h.h
deleted file mode 100644
index bc4368f2acb..00000000000
--- a/src/plugins/ioam/export/ioam_export_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/export/ioam_export.api.h>
diff --git a/src/plugins/ioam/export/ioam_export_msg_enum.h b/src/plugins/ioam/export/ioam_export_msg_enum.h
deleted file mode 100644
index c2de798893c..00000000000
--- a/src/plugins/ioam/export/ioam_export_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_ioam_export_msg_enum_h
-#define included_ioam_export_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <ioam/export/ioam_export_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_ioam_export_msg_enum_h */
diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c
index cd98877ac22..b7d53c2b0f3 100644
--- a/src/plugins/ioam/export/ioam_export_test.c
+++ b/src/plugins/ioam/export/ioam_export_test.c
@@ -28,31 +28,18 @@
/* Declare message IDs */
-#include <ioam/export/ioam_export_msg_enum.h>
+#include <ioam/export/ioam_export.api_enum.h>
+#include <ioam/export/ioam_export.api_types.h>
-/* define message structures */
-#define vl_typedefs
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun /* define message structures */
-#include <ioam/export/ioam_export_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/export/ioam_export_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/export/ioam_export_all_api_h.h>
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#include <ioam/export/ioam_export.api.h>
+#undef vl_endianfun
+#undef vl_printfun
#undef vl_api_version
-
typedef struct
{
/* API message ID base */