/* define message IDs */
-#include <lacp/lacp_msg_enum.h>
+#include <vnet/format_fns.h>
+#include <lacp/lacp.api_enum.h>
+#include <lacp/lacp.api_types.h>
-/* define message structures */
-#define vl_typedefs
-#include <lacp/lacp_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <lacp/lacp_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 <lacp/lacp_all_api_h.h>
-#undef vl_printfun
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <lacp/lacp_all_api_h.h>
-#undef vl_api_version
+/* Macro to finish up custom dump fns */
+#define FINISH \
+ vec_add1 (s, 0); \
+ vl_print (handle, (char *)s); \
+ vec_free (s); \
+ return handle;
-/*
- * 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 { \
- svm_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 = htons ((t)+lm->msg_id_base); \
- rmp->context = mp->context; \
- rmp->retval = htonl (rv); \
- \
- vl_msg_api_send_shmem (q, (u8 *)&rmp); \
-} while(0);
-
-#define REPLY_MACRO2(t, body) \
-do { \
- svm_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 = htons ((t)+lm->msg_id_base); \
- rmp->context = mp->context; \
- rmp->retval = htonl (rv); \
- do {body;} while (0); \
- vl_msg_api_send_shmem (q, (u8 *)&rmp); \
-} while(0);
-
-#define foreach_lacp_plugin_api_msg \
-_(SW_INTERFACE_LACP_DUMP, sw_interface_lacp_dump)
+#define REPLY_MSG_ID_BASE lm->msg_id_base
+#include <vlibapi/api_helper_macros.h>
static void
lacp_send_sw_interface_details (vl_api_registration_t * reg,
vl_api_sw_interface_lacp_details_t *mp;
mp = vl_msg_api_alloc (sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
+ clib_memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = htons (VL_API_SW_INTERFACE_LACP_DETAILS + lm->msg_id_base);
mp->sw_if_index = htonl (lacp_if->sw_if_index);
vec_free (lacpifs);
}
-#define vl_msg_name_crc_list
-#include <lacp/lacp_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (lacp_main_t * lm, api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + lm->msg_id_base);
- foreach_vl_msg_name_crc_lacp;
-#undef _
-}
-
/* Set up the API message handling tables */
+#include <lacp/lacp.api.c>
clib_error_t *
lacp_plugin_api_hookup (vlib_main_t * vm)
{
lacp_main_t *lm = &lacp_main;
- api_main_t *am = &api_main;
- u8 *name;
-
- /* Construct the API name */
- name = format (0, "lacp_%08x%c", api_version, 0);
+ api_main_t *am = vlibapi_get_main ();
/* Ask for a correctly-sized block of API message decode slots */
- lm->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + lm->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_lacp_plugin_api_msg;
-#undef _
-
- /*
- * Set up the (msg_name, crc, message-id) table
- */
- setup_message_id_table (lm, am);
-
- vec_free (name);
+ lm->msg_id_base = setup_message_id_table ();
+
+ /* Mark these APIs as mp safe */
+ am->is_mp_safe[VL_API_SW_INTERFACE_LACP_DUMP] = 1;
+ am->is_mp_safe[VL_API_SW_INTERFACE_LACP_DETAILS] = 1;
+
return 0;
}