diff options
| author |   Ole Troan <ot@cisco.com> | 2019-03-07 13:03:26 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-07 14:29:13 +0000 |
| commit | e098e78964c382a81756de0d2ae12deb95685400 (patch) | |
| tree | 5277122e0d1e9498df41d033e5218d03205e7eee /src/plugins/nsh | |
| parent | d3d1205087783eb36c9e44d98a33a0f01adb47c9 (diff) | |
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 <ot@cisco.com>
Diffstat (limited to 'src/plugins/nsh')
| -rw-r--r-- | src/plugins/nsh/nsh_api.c | 40 |
1 files changed, 2 insertions, 38 deletions
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 <nsh/nsh.api.h> #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 <vlibapi/api_helper_macros.h> /* List of message types that this plugin understands */ |