X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fapi.h;h=dc1e75e484d35cb226cbce892c061a2df3c7a224;hb=402377e80c19b103792a0f340d9376e0138abbfe;hp=2146b16c5b07e2e047f95a7cf2af918f67ae7090;hpb=466f289c27f290a2764a82f57f5c20d080227ead;p=vpp.git

diff --git a/src/vlibmemory/api.h b/src/vlibmemory/api.h
index 2146b16c5b0..dc1e75e484d 100644
--- a/src/vlibmemory/api.h
+++ b/src/vlibmemory/api.h
@@ -55,10 +55,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