From e098e78964c382a81756de0d2ae12deb95685400 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Thu, 7 Mar 2019 13:03:26 +0100 Subject: Remove local REPLY_MACRO so that socket transport works. memif, lacp, nsh and cdp used local REPLY_MACROs. Remove and use those in api_helper.h Change-Id: Ib01d6ae5cff0b6f1cef90996a54b3177f0c53463 Signed-off-by: Ole Troan --- src/plugins/cdp/cdp.c | 25 ++----------------------- src/plugins/lacp/lacp_api.c | 38 ++------------------------------------ src/plugins/memif/memif_api.c | 38 ++------------------------------------ src/plugins/nsh/nsh_api.c | 40 ++-------------------------------------- 4 files changed, 8 insertions(+), 133 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/cdp/cdp.c b/src/plugins/cdp/cdp.c index 3356437a9ea..08456ac2faf 100644 --- a/src/plugins/cdp/cdp.c +++ b/src/plugins/cdp/cdp.c @@ -47,29 +47,8 @@ #include #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); - +#define REPLY_MSG_ID_BASE cm->msg_id_base +#include /* List of message types that this plugin understands */ diff --git a/src/plugins/lacp/lacp_api.c b/src/plugins/lacp/lacp_api.c index 8bb6fa90eb0..d23bf217bac 100644 --- a/src/plugins/lacp/lacp_api.c +++ b/src/plugins/lacp/lacp_api.c @@ -50,42 +50,8 @@ #include #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 { \ - 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 REPLY_MSG_ID_BASE lm->msg_id_base +#include #define foreach_lacp_plugin_api_msg \ _(SW_INTERFACE_LACP_DUMP, sw_interface_lacp_dump) diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c index 77a87cc709d..bbc9e5c7c4a 100644 --- a/src/plugins/memif/memif_api.c +++ b/src/plugins/memif/memif_api.c @@ -51,42 +51,8 @@ #include #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 { \ - 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)+mm->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)+mm->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 REPLY_MSG_ID_BASE mm->msg_id_base +#include #define foreach_memif_plugin_api_msg \ _(MEMIF_SOCKET_FILENAME_ADD_DEL, memif_socket_filename_add_del) \ diff --git a/src/plugins/nsh/nsh_api.c b/src/plugins/nsh/nsh_api.c index ccae5544c85..cf9fd574b34 100644 --- a/src/plugins/nsh/nsh_api.c +++ b/src/plugins/nsh/nsh_api.c @@ -57,44 +57,8 @@ typedef enum #include #undef vl_msg_name_crc_list -/* - * 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)+nm->msg_id_base); \ - rmp->context = mp->context; \ - rmp->retval = ntohl(rv); \ - \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ - } while(0); - -#define REPLY_MACRO2(t, body) \ - do { \ - unix_shared_memory_queue_t * q; \ - rv = vl_msg_api_pd_handler (mp, rv); \ - 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)+nm->msg_id_base); \ - rmp->context = mp->context; \ - rmp->retval = ntohl(rv); \ - do {body;} while (0); \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ - } while(0); +#define REPLY_MSG_ID_BASE nm->msg_id_base +#include /* List of message types that this plugin understands */ -- cgit 1.2.3-korg