tcp: api cleanup

[vpp.git] / src / vnet / tcp / tcp_api.c

diff --git a/src/vnet/tcp/tcp_api.c b/src/vnet/tcp/tcp_api.c
index 8b169f8..dce0003 100644 (file)
--- a/src/vnet/tcp/tcp_api.c
+++ b/src/vnet/tcp/tcp_api.c
@@ -21,30 +21,16 @@
 #include <vlibmemory/api.h>
 
 #include <vnet/tcp/tcp.h>
-
 #include <vnet/ip/ip_types_api.h>
 
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs            /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun           /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
+#include <vnet/format_fns.h>
 
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
+#include <vnet/tcp/tcp.api_enum.h>
+#include <vnet/tcp/tcp.api_types.h>
 
+#define REPLY_MSG_ID_BASE tcp_main.msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-#define foreach_tcp_api_msg                                     \
-_(TCP_CONFIGURE_SRC_ADDRESSES, tcp_configure_src_addresses)
-
 static void
   vl_api_tcp_configure_src_addresses_t_handler
   (vl_api_tcp_configure_src_addresses_t * mp)
@@ -78,37 +64,14 @@ error:
   REPLY_MACRO (VL_API_TCP_CONFIGURE_SRC_ADDRESSES_REPLY);
 }
 
-#define vl_msg_name_crc_list
-#include <vnet/tcp/tcp.api.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_tcp;
-#undef _
-}
-
+#include <vnet/tcp/tcp.api.c>
 static clib_error_t *
 tcp_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = vlibapi_get_main ();
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #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_tcp_api_msg;
-#undef _
-
   /*
    * Set up the (msg_name, crc, message-id) table
    */
-  setup_message_id_table (am);
+  REPLY_MSG_ID_BASE = setup_message_id_table ();
 
   return 0;
 }