diff options
author | Ole Troan <ot@cisco.com> | 2019-04-10 09:44:23 +0200 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2019-04-10 13:06:45 +0000 |
commit | 2e1c8967faf4e9f7b45471df02e4e5b07fbb520a (patch) | |
tree | 172579d8d04927851d1781262bd2483fa9bf8643 /src/plugins/abf | |
parent | 13464f323a8bbd530bd85256de1c033781e098a7 (diff) |
API: Fix shared memory only action handlers.
Some API action handlers called vl_msg_ai_send_shmem()
directly. That breaks Unix domain socket API transport.
A couple (bond / vhost) also tried to send a sw_interface_event
directly, but did not send the message to all that had
registred interest. That scheme never worked correctly.
Refactored and improved the interface event code.
Change-Id: Idb90edfd8703c6ae593b36b4eeb4d3ed7da5c808
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/abf')
-rw-r--r-- | src/plugins/abf/abf_api.c | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/src/plugins/abf/abf_api.c b/src/plugins/abf/abf_api.c index bf2566901c4..9da08394fe6 100644 --- a/src/plugins/abf/abf_api.c +++ b/src/plugins/abf/abf_api.c @@ -72,24 +72,20 @@ static void vl_api_abf_plugin_get_version_t_handler (vl_api_abf_plugin_get_version_t * mp) { vl_api_abf_plugin_get_version_reply_t *rmp; - int msg_size = sizeof (*rmp); - unix_shared_memory_queue_t *q; + vl_api_registration_t *rp; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) - { - return; - } + rp = vl_api_client_index_to_registration (mp->client_index); + if (rp == 0) + return; - rmp = vl_msg_api_alloc (msg_size); - clib_memset (rmp, 0, msg_size); + rmp = vl_msg_api_alloc (sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_ABF_PLUGIN_GET_VERSION_REPLY + abf_base_msg_id); rmp->context = mp->context; rmp->major = htonl (ABF_PLUGIN_VERSION_MAJOR); rmp->minor = htonl (ABF_PLUGIN_VERSION_MINOR); - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (rp, (u8 *) rmp); } static void @@ -155,7 +151,7 @@ vl_api_abf_itf_attach_add_del_t_handler (vl_api_abf_itf_attach_add_del_t * mp) typedef struct abf_dump_walk_ctx_t_ { - unix_shared_memory_queue_t *q; + vl_api_registration_t *rp; u32 context; } abf_dump_walk_ctx_t; @@ -194,7 +190,7 @@ abf_policy_send_details (u32 api, void *args) fp++; } - vl_msg_api_send_shmem (ctx->q, (u8 *) & mp); + vl_api_send_msg (ctx->rp, (u8 *) mp); return (1); } @@ -202,16 +198,14 @@ abf_policy_send_details (u32 api, void *args) static void vl_api_abf_policy_dump_t_handler (vl_api_abf_policy_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *rp; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) - { - return; - } + rp = vl_api_client_index_to_registration (mp->client_index); + if (rp == 0) + return; abf_dump_walk_ctx_t ctx = { - .q = q, + .rp = rp, .context = mp->context, }; @@ -239,7 +233,7 @@ abf_itf_attach_send_details (u32 aiai, void *args) mp->attach.priority = htonl (aia->aia_prio); mp->attach.is_ipv6 = (aia->aia_proto == FIB_PROTOCOL_IP6); - vl_msg_api_send_shmem (ctx->q, (u8 *) & mp); + vl_api_send_msg (ctx->rp, (u8 *) mp); return (1); } @@ -247,16 +241,14 @@ abf_itf_attach_send_details (u32 aiai, void *args) static void vl_api_abf_itf_attach_dump_t_handler (vl_api_abf_itf_attach_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *rp; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) - { - return; - } + rp = vl_api_client_index_to_registration (mp->client_index); + if (rp == 0) + return; abf_dump_walk_ctx_t ctx = { - .q = q, + .rp = rp, .context = mp->context, }; |