1 files changed, 5 insertions, 67 deletions
diff --git a/src/plugins/tlsopenssl/tls_openssl_api.c b/src/plugins/tlsopenssl/tls_openssl_api.c
index 99ef3fe27c3..b305bf2677f 100644
--- a/src/plugins/tlsopenssl/tls_openssl_api.c
+++ b/src/plugins/tlsopenssl/tls_openssl_api.c
@@ -20,37 +20,14 @@
 #include <tlsopenssl/tls_openssl.h>
 
 /* define message IDs */
-#include <tlsopenssl/tls_openssl_msg_enum.h>
+#include <tlsopenssl/tls_openssl.api_enum.h>
+#include <tlsopenssl/tls_openssl.api_types.h>
 
-/* define message structures */
-#define vl_typedefs
-#include <tlsopenssl/tls_openssl_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <tlsopenssl/tls_openssl_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 <tlsopenssl/tls_openssl_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n, v) static u32 api_version = (v);
-#include <tlsopenssl/tls_openssl_all_api_h.h>
-#undef vl_api_version
 
 #define REPLY_MSG_ID_BASE om->msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-/* List of message types that this plugin understands */
-
-#define foreach_tls_openssl_plugin_api_msg \
-  _ (TLS_OPENSSL_SET_ENGINE, tls_openssl_set_engine)
-
 extern openssl_main_t openssl_main;
 
 /* API message handler */
@@ -83,55 +60,16 @@ vl_api_tls_openssl_set_engine_t_handler (vl_api_tls_openssl_set_engine_t * mp)
   REPLY_MACRO (VL_API_TLS_OPENSSL_SET_ENGINE_REPLY);
 }
 
-/* Set up the API message handling tables */
-static clib_error_t *
-tls_openssl_plugin_api_hookup (vlib_main_t * vm)
-{
-  openssl_main_t *om = &openssl_main;
-#define _(N, n)                                                         \
-  vl_msg_api_set_handlers ((VL_API_##N + om->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_tls_openssl_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <tlsopenssl/tls_openssl_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (openssl_main_t * om, api_main_t * am)
-{
-#define _(id, n, crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + om->msg_id_base);
-  foreach_vl_msg_name_crc_tls_openssl;
-#undef _
-}
-
+#include <tlsopenssl/tls_openssl.api.c>
 clib_error_t *
 tls_openssl_api_init (vlib_main_t * vm)
 {
   openssl_main_t *om = &openssl_main;
-  clib_error_t *error = 0;
-  u8 *name;
-
-  name = format (0, "tls_openssl_%08x%c", api_version, 0);
 
   /* Ask for a correctly-sized block of API message decode slots */
-  om->msg_id_base =
-    vl_msg_api_get_msg_ids ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = tls_openssl_plugin_api_hookup (vm);
+  om->msg_id_base = setup_message_id_table ();
 
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (om, &api_main);
-  vec_free (name);
-
-  return error;
+  return 0;
 }
 
 /*