X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fcdp%2Fcdp.c;h=1fe557fe82e8a14cd81a1b5842840f01d8d9b37f;hb=e5d34919b;hp=a88a06bc9c53d0450e8d9f695c5cdc362727278c;hpb=aaacfbc5b15b0653489ad2e80db48151a4375ece;p=vpp.git

diff --git a/src/plugins/cdp/cdp.c b/src/plugins/cdp/cdp.c
index a88a06bc9c5..1fe557fe82e 100644
--- a/src/plugins/cdp/cdp.c
+++ b/src/plugins/cdp/cdp.c
@@ -24,57 +24,11 @@
 #include <vpp/app/version.h>
 
 /* define message IDs */
-#include <cdp/cdp_msg_enum.h>
+#include <cdp/cdp.api_enum.h>
+#include <cdp/cdp.api_types.h>
 
-/* define message structures */
-#define vl_typedefs
-#include <cdp/cdp_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <cdp/cdp_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 <cdp/cdp_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <cdp/cdp_all_api_h.h>
-#undef vl_api_version
-
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
- */
-
-#define REPLY_MACRO(t)                                          \
-do {                                                            \
-    unix_shared_memory_queue_t * q =                            \
-    vl_api_client_index_to_input_queue (mp->client_index);      \
-    if (!q)                                                     \
-        return;                                                 \
-                                                                \
-    rmp = vl_msg_api_alloc (sizeof (*rmp));                     \
-    rmp->_vl_msg_id = ntohs((t)+cm->msg_id_base);               \
-    rmp->context = mp->context;                                 \
-    rmp->retval = ntohl(rv);                                    \
-                                                                \
-    vl_msg_api_send_shmem (q, (u8 *)&rmp);                      \
-} while(0);
-
-
-/* List of message types that this plugin understands */
-
-#define foreach_cdp_plugin_api_msg                           \
-_(CDP_ENABLE_DISABLE, cdp_enable_disable)
+#define REPLY_MSG_ID_BASE cm->msg_id_base
+#include <vlibapi/api_helper_macros.h>
 
 /* Action function shared between message handler and debug CLI */
 
@@ -84,11 +38,17 @@ cdp_enable_disable (cdp_main_t * cm, int enable_disable)
   int rv = 0;
 
   if (enable_disable)
-    vlib_process_signal_event (cm->vlib_main, cdp_process_node.index,
-			       CDP_EVENT_ENABLE, 0);
+    {
+      vnet_cdp_create_periodic_process (cm);
+      vlib_process_signal_event (cm->vlib_main, cm->cdp_process_node_index,
+				 CDP_EVENT_ENABLE, 0);
+    }
   else
-    vlib_process_signal_event (cm->vlib_main, cdp_process_node.index,
-			       CDP_EVENT_DISABLE, 0);
+    {
+      vnet_cdp_create_periodic_process (cm);
+      vlib_process_signal_event (cm->vlib_main, cm->cdp_process_node_index,
+				 CDP_EVENT_DISABLE, 0);
+    }
   cm->enabled = enable_disable;
 
   return rv;
@@ -148,60 +108,18 @@ static void vl_api_cdp_enable_disable_t_handler
   REPLY_MACRO (VL_API_CDP_ENABLE_DISABLE_REPLY);
 }
 
-/* Set up the API message handling tables */
-static clib_error_t *
-cdp_plugin_api_hookup (vlib_main_t * vm)
-{
-  cdp_main_t *cm = &cdp_main;
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + cm->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_cdp_plugin_api_msg;
-#undef _
-
-  return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <cdp/cdp_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (cdp_main_t * cm, api_main_t * am)
-{
-#define _(id,n,crc)   vl_msg_api_add_msg_name_crc (am, #n  #crc, id + cm->msg_id_base);
-  foreach_vl_msg_name_crc_cdp;
-#undef _
-}
-
+#include <cdp/cdp.api.c>
 static clib_error_t *
 cdp_init (vlib_main_t * vm)
 {
   cdp_main_t *cm = &cdp_main;
-  clib_error_t *error = 0;
-  u8 *name;
 
   cm->vlib_main = vm;
 
-  name = format (0, "cdp_%08x%c", api_version, 0);
-
   /* Ask for a correctly-sized block of API message decode slots */
-  cm->msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-  error = cdp_plugin_api_hookup (vm);
+  cm->msg_id_base = setup_message_id_table ();
 
-  /* Add our API messages to the global name_crc hash table */
-  setup_message_id_table (cm, &api_main);
-
-  vec_free (name);
-
-  return error;
+  return 0;
 }
 
 VLIB_INIT_FUNCTION (cdp_init);
@@ -210,6 +128,7 @@ VLIB_INIT_FUNCTION (cdp_init);
 VLIB_PLUGIN_REGISTER () =
 {
   .version = VPP_BUILD_VER,
+  .description = "Cisco Discovery Protocol (CDP)",
 };
 /* *INDENT-ON* */