api: refactor to use REPLY_MSG_ID_BASE #define

[vpp.git] / src / plugins / l3xc / l3xc_api.c

diff --git a/src/plugins/l3xc/l3xc_api.c b/src/plugins/l3xc/l3xc_api.c
index 0427cca..d4a837d 100644 (file)
--- a/src/plugins/l3xc/l3xc_api.c
+++ b/src/plugins/l3xc/l3xc_api.c
@@ -28,44 +28,18 @@
 #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
  */
 static u32 l3xc_base_msg_id;
 
+#define REPLY_MSG_ID_BASE (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)
@@ -123,12 +97,7 @@ done:
 
   BAD_SW_IF_INDEX_LABEL;
 
-  /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_L3XC_UPDATE_REPLY + l3xc_base_msg_id,
-  ({
-    rmp->stats_index = 0;
-  }))
-  /* *INDENT-ON* */
+  REPLY_MACRO2 (VL_API_L3XC_UPDATE_REPLY, ({ rmp->stats_index = 0; }))
 }
 
 static void
@@ -143,7 +112,7 @@ vl_api_l3xc_del_t_handler (vl_api_l3xc_del_t * mp)
 
   BAD_SW_IF_INDEX_LABEL;
 
-  REPLY_MACRO (VL_API_L3XC_DEL_REPLY + l3xc_base_msg_id);
+  REPLY_MACRO (VL_API_L3XC_DEL_REPLY);
 }
 
 typedef struct l3xc_dump_walk_ctx_t_
@@ -228,56 +197,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);