stn: remove api boilerplate

Type: refactor
Change-Id: I212c87c03324137c79a674d0842ca4537b28e4b4
Signed-off-by: Ole Troan <ot@cisco.com>

1 files changed, 6 insertions, 91 deletions

diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c
index 40d4103b1ec..d9f3096b778 100644
--- a/src/plugins/stn/stn_api.c
+++ b/src/plugins/stn/stn_api.c
@@ -22,32 +22,13 @@
 #include <vppinfra/byte_order.h>
 
 /* define message IDs */
-#include <stn/stn_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <stn/stn_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <stn/stn_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 <stn/stn_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <stn/stn_all_api_h.h>
-#undef vl_api_version
+#include <stn/stn.api_enum.h>
+#include <stn/stn.api_types.h>
 
 #define REPLY_MSG_ID_BASE stn_main.msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
 /* Macro to finish up custom dump fns */
 #define FINISH                                  \
     vec_add1 (s, 0);                            \
@@ -145,80 +126,14 @@ vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t * mp)
   /* *INDENT-ON* */
 }
 
-
-/* List of message types that this plugin understands */
-#define foreach_stn_plugin_api_msg			\
-_(STN_ADD_DEL_RULE, stn_add_del_rule)	\
-_(STN_RULES_DUMP, stn_rules_dump)
-
-/**
- * @brief Set up the API message handling tables
- * @param vm vlib_main_t * vlib main data structure pointer
- * @returns 0 to indicate all is well
- */
-static clib_error_t *
-stn_plugin_api_hookup (vlib_main_t * vm)
-{
-  stn_main_t *stn = &stn_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + stn->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_stn_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <stn/stn.api.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (stn_main_t * stn, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + stn->msg_id_base);
-  foreach_vl_msg_name_crc_stn;
-#undef _
-}
-
-static void
-plugin_custom_dump_configure (stn_main_t * stn)
-{
-#define _(n,f) api_main.msg_print_handlers \
-  [VL_API_##n + stn->msg_id_base]                \
-    = (void *) vl_api_##f##_t_print;
-  foreach_stn_plugin_api_msg;
-#undef _
-}
-
+#include <stn/stn.api.c>
 clib_error_t *
 stn_api_init (vlib_main_t * vm, stn_main_t * sm)
 {
-  u8 *name;
-  clib_error_t *error = 0;
-
-  name = format (0, "stn_%08x%c", api_version, 0);
-
   /* Ask for a correctly-sized block of API message decode slots */
-  sm->msg_id_base = vl_msg_api_get_msg_ids ((char *) name,
-					    VL_MSG_FIRST_AVAILABLE);
-
-  error = stn_plugin_api_hookup (vm);
+  sm->msg_id_base = setup_message_id_table ();
 
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (sm, &api_main);
-
-  plugin_custom_dump_configure (sm);
-
-  vec_free (name);
-
-  return error;
+  return 0;
 }
 
 /*