X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fapi.h;h=6cd645bb1d53d755d0b026fa67762283f6b48247;hb=f872e9e99cb0e251bc8ea855be17ffe4d5bc3c27;hp=8d2b191fb8114a8377757bb4d7f8cc1a253da98f;hpb=b384b543313b6b47a277c903e9d4fcd4343054fa;p=vpp.git

diff --git a/src/vlibmemory/api.h b/src/vlibmemory/api.h
index 8d2b191fb81..6cd645bb1d5 100644
--- a/src/vlibmemory/api.h
+++ b/src/vlibmemory/api.h
@@ -26,6 +26,7 @@
 #include <vlibmemory/socket_client.h>
 
 void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
+void vl_api_force_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
 u16 vl_client_get_first_plugin_msg_id (const char *plugin_name);
 void vl_api_send_pending_rpc_requests (vlib_main_t * vm);
 u8 *vl_api_serialize_message_table (api_main_t * am, u8 * vector);
@@ -55,10 +56,9 @@ vl_api_can_send_msg (vl_api_registration_t * rp)
 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;
-
-  return (vl_mem_api_client_index_to_registration (index));
+  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
@@ -82,20 +82,21 @@ vl_api_registration_del_file (vl_api_registration_t * reg)
 }
 
 always_inline clib_error_t *
-vl_api_send_fd_msg (vl_api_registration_t * reg, int fd_to_send)
+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, fd_to_send);
+    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 *fd_to_recv, u32 wait)
+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, fd_to_recv, wait);
+    return vl_sock_api_recv_fd_msg (cf->file_descriptor, fds, n_fds, wait);
   return 0;
 }