diff options
author | Florin Coras <fcoras@cisco.com> | 2019-12-06 17:05:08 -0800 |
---|---|---|
committer | Andrew Yourtchenko <ayourtch@gmail.com> | 2020-08-12 07:43:14 +0000 |
commit | 339cad4aaf5c1aa7b0ab35af33e5e1cfe18c2a94 (patch) | |
tree | cfaf99cd61922c94f78ef755a65846f1d2f11ebe /src/vlibmemory/socket_api.h | |
parent | 299f9caae6975f1642462963e1df3deef343acfa (diff) |
api: fix sock reg passing on read event
Type: fix
Change-Id: I383242e04a114b69fe247d912842be3560e96c10
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit 5224b5cbd51ed48d1d2ce2a412998d8a944c480b)
Diffstat (limited to 'src/vlibmemory/socket_api.h')
-rw-r--r-- | src/vlibmemory/socket_api.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/vlibmemory/socket_api.h b/src/vlibmemory/socket_api.h index f3af300238c..5032d2048b6 100644 --- a/src/vlibmemory/socket_api.h +++ b/src/vlibmemory/socket_api.h @@ -26,8 +26,7 @@ typedef struct { - clib_file_t *clib_file; - vl_api_registration_t *regp; + u32 reg_index; u8 *data; } vl_socket_args_for_process_t; @@ -50,7 +49,6 @@ typedef struct * or to a shared-memory connection. */ vl_api_registration_t *current_rp; - clib_file_t *current_uf; /* One input buffer, shared across all sockets */ i8 *input_buffer; @@ -63,12 +61,19 @@ typedef struct extern socket_main_t socket_main; +always_inline vl_api_registration_t * +vl_socket_get_registration (u32 reg_index) +{ + if (pool_is_free_index (socket_main.registration_pool, reg_index)) + return 0; + return pool_elt_at_index (socket_main.registration_pool, reg_index); +} + void vl_socket_free_registration_index (u32 pool_index); clib_error_t *vl_socket_read_ready (struct clib_file *uf); clib_error_t *vl_socket_write_ready (struct clib_file *uf); void vl_socket_api_send (vl_api_registration_t * rp, u8 * elem); -void vl_socket_process_api_msg (clib_file_t * uf, vl_api_registration_t * rp, - i8 * input_v); +void vl_socket_process_api_msg (vl_api_registration_t * rp, i8 * input_v); void vl_sock_api_dump_clients (vlib_main_t * vm, api_main_t * am); clib_error_t *vl_sock_api_init (vlib_main_t * vm); clib_error_t *vl_sock_api_send_fd_msg (int socket_fd, int fds[], int n_fds); |