summaryrefslogtreecommitdiffstats
path: root/src/vlibmemory/socket_api.h
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-12-06 17:05:08 -0800
committerDave Barach <openvpp@barachs.net>2019-12-09 15:50:02 +0000
commit5224b5cbd51ed48d1d2ce2a412998d8a944c480b (patch)
tree470bd8dda83ecb91f251f563e721acee306a6dec /src/vlibmemory/socket_api.h
parent4505f0154eaba59c432c869b65e2dc493837032a (diff)
api: fix sock reg passing on read event
Type: fix Change-Id: I383242e04a114b69fe247d912842be3560e96c10 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vlibmemory/socket_api.h')
-rw-r--r--src/vlibmemory/socket_api.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/vlibmemory/socket_api.h b/src/vlibmemory/socket_api.h
index 7192e0fcacc..41835e3050b 100644
--- a/src/vlibmemory/socket_api.h
+++ b/src/vlibmemory/socket_api.h
@@ -29,8 +29,7 @@
typedef struct
{
- clib_file_t *clib_file;
- vl_api_registration_t *regp;
+ u32 reg_index;
u8 *data;
} vl_socket_args_for_process_t;
@@ -53,7 +52,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;
@@ -66,12 +64,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);