api: fix sock reg passing on read event

[vpp.git] / src / vlibmemory / socket_api.h

diff --git a/src/vlibmemory/socket_api.h b/src/vlibmemory/socket_api.h
index 1e99550..41835e3 100644 (file)
--- a/src/vlibmemory/socket_api.h
+++ b/src/vlibmemory/socket_api.h
@@ -22,12 +22,14 @@
 #include <svm/ssvm.h>
 #include <vppinfra/file.h>
 
-#define API_SOCKET_FILE "/run/vpp-api.sock"
+/* Deprecated */
+#define API_SOCKET_FILE "/run/vpp/api.sock"
+
+#define API_SOCKET_FILENAME "api.sock"
 
 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 +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;
 
@@ -63,18 +64,28 @@ 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);
 clib_error_t *vl_sock_api_recv_fd_msg (int socket_fd, int fds[], int n_fds,
                                       u32 wait);
 
+vl_api_registration_t *vl_socket_api_client_handle_to_registration (u32 idx);
+u8 vl_socket_api_registration_handle_is_valid (u32 reg_index);
+
 #endif /* SRC_VLIBMEMORY_SOCKET_API_H_ */
 
 /*