sock api: fix registrations and client reads

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

diff --git a/src/vlibmemory/api.h b/src/vlibmemory/api.h
index 4f869a6..dc1e75e 100644 (file)
--- a/src/vlibmemory/api.h
+++ b/src/vlibmemory/api.h
@@ -43,13 +43,60 @@ vl_api_send_msg (vl_api_registration_t * rp, u8 * elem)
     }
 }
 
+always_inline int
+vl_api_can_send_msg (vl_api_registration_t * rp)
+{
+  if (PREDICT_FALSE (rp->registration_type > REGISTRATION_TYPE_SHMEM))
+    return 1;
+  else
+    return vl_mem_api_can_send (rp->vl_input_queue);
+}
+
 always_inline vl_api_registration_t *
 vl_api_client_index_to_registration (u32 index)
 {
-  if (PREDICT_FALSE (socket_main.current_rp != 0))
-    return socket_main.current_rp;
+  if (vl_socket_api_registration_handle_is_valid (ntohl (index)))
+    return vl_socket_api_client_handle_to_registration (ntohl (index));
+  return vl_mem_api_client_index_to_registration (index);
+}
+
+always_inline u32
+vl_api_registration_file_index (vl_api_registration_t * reg)
+{
+  return reg->clib_file_index;
+}
+
+always_inline clib_file_t *
+vl_api_registration_file (vl_api_registration_t * reg)
+{
+  return clib_file_get (&file_main, vl_api_registration_file_index (reg));
+}
+
+always_inline void
+vl_api_registration_del_file (vl_api_registration_t * reg)
+{
+  clib_file_t *cf = vl_api_registration_file (reg);
+  if (cf)
+    clib_file_del (&file_main, cf);
+}
 
-  return (vl_mem_api_client_index_to_registration (index));
+always_inline clib_error_t *
+vl_api_send_fd_msg (vl_api_registration_t * reg, int fds[], int n_fds)
+{
+  clib_file_t *cf = vl_api_registration_file (reg);
+  if (cf)
+    return vl_sock_api_send_fd_msg (cf->file_descriptor, fds, n_fds);
+  return 0;
+}
+
+always_inline clib_error_t *
+vl_api_recv_fd_msg (vl_api_registration_t * reg, int fds[], int n_fds,
+                   u32 wait)
+{
+  clib_file_t *cf = vl_api_registration_file (reg);
+  if (cf)
+    return vl_sock_api_recv_fd_msg (cf->file_descriptor, fds, n_fds, wait);
+  return 0;
 }
 
 /*