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/svs | |
| 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/svs')
| -rw-r--r-- | src/plugins/svs/svs_api.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/plugins/svs/svs_api.c b/src/plugins/svs/svs_api.c index 03941fea08e..068d2fa4e76 100644 --- a/src/plugins/svs/svs_api.c +++ b/src/plugins/svs/svs_api.c @@ -54,7 +54,6 @@ * Base message ID fot the plugin */ static u32 svs_base_msg_id; - #include <vlibapi/api_helper_macros.h> /* List of message types that this plugin understands */ @@ -71,13 +70,11 @@ vl_api_svs_plugin_get_version_t_handler (vl_api_svs_plugin_get_version_t * mp) { vl_api_svs_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); @@ -87,7 +84,7 @@ vl_api_svs_plugin_get_version_t_handler (vl_api_svs_plugin_get_version_t * mp) rmp->major = htonl (SVS_PLUGIN_VERSION_MAJOR); rmp->minor = htonl (SVS_PLUGIN_VERSION_MINOR); - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (rp, (u8 *) rmp); } static void @@ -160,7 +157,7 @@ vl_api_svs_enable_disable_t_handler (vl_api_svs_enable_disable_t * mp) typedef struct svs_dump_walk_ctx_t_ { - unix_shared_memory_queue_t *q; + vl_api_registration_t *rp; u32 context; } svs_dump_walk_ctx_t; @@ -182,7 +179,7 @@ svs_send_details (fib_protocol_t fproto, mp->table_id = htonl (table_id); mp->af = fib_proto_to_api_address_family (fproto); - vl_msg_api_send_shmem (ctx->q, (u8 *) & mp); + vl_api_send_msg (ctx->rp, (u8 *) mp); return (WALK_CONTINUE); } @@ -190,16 +187,14 @@ svs_send_details (fib_protocol_t fproto, static void vl_api_svs_dump_t_handler (vl_api_svs_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; svs_dump_walk_ctx_t ctx = { - .q = q, + .rp = rp, .context = mp->context, }; |