ioam: remove api boilerplate

[vpp.git] / src / plugins / ioam / export-vxlan-gpe / vxlan_gpe_ioam_export.c

diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
index cef6090..cc3713c 100644 (file)
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
@@ -25,41 +25,16 @@
 
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
 
 #include <ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h>
 
 /* define message IDs */
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <ioam/export-vxlan-gpe/vxlan_gpe_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-vxlan-gpe/vxlan_gpe_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-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h>
-#undef vl_api_version
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api_enum.h>
+#include <ioam/export-vxlan-gpe/vxlan_gpe_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_vxlan_gpe_ioam_export_plugin_api_msg                        \
-_(VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE, vxlan_gpe_ioam_export_enable_disable)
-
 ioam_export_main_t vxlan_gpe_ioam_export_main;
 extern vlib_node_registration_t vxlan_export_node;
 
@@ -134,28 +109,6 @@ static void vl_api_vxlan_gpe_ioam_export_enable_disable_t_handler
   REPLY_MACRO (VL_API_VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE_REPLY);
 }                              /* API message handler */
 
-
-
-/* Set up the API message handling tables */
-static clib_error_t *
-vxlan_gpe_ioam_export_plugin_api_hookup (vlib_main_t * vm)
-{
-  ioam_export_main_t *sm = &vxlan_gpe_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_vxlan_gpe_ioam_export_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-
 static clib_error_t *
 set_vxlan_gpe_ioam_export_ipfix_command_fn (vlib_main_t * vm,
                                            unformat_input_t * input,
@@ -214,32 +167,25 @@ VLIB_CLI_COMMAND (set_vxlan_gpe_ioam_ipfix_command, static) =
 };
 /* *INDENT-ON* */
 
-
+#include <ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.c>
 static clib_error_t *
 vxlan_gpe_ioam_export_init (vlib_main_t * vm)
 {
   ioam_export_main_t *em = &vxlan_gpe_ioam_export_main;
-  clib_error_t *error = 0;
-  u8 *name;
 
   em->set_id = IPFIX_VXLAN_IOAM_EXPORT_ID;
 
-  name = format (0, "vxlan_gpe_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 = vxlan_gpe_ioam_export_plugin_api_hookup (vm);
   em->my_hbh_slot = ~0;
   em->vlib_main = vm;
   em->vnet_main = vnet_get_main ();
   ioam_export_reset_next_node (em);
-  vec_free (name);
 
-  return error;
+  return 0;
 }
 
 VLIB_INIT_FUNCTION (vxlan_gpe_ioam_export_init);