session: refactor local connects

[vpp.git] / src / vcl / vcl_bapi.c

diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c
index debfb8f..95efe00 100644 (file)
--- a/src/vcl/vcl_bapi.c
+++ b/src/vcl/vcl_bapi.c
@@ -333,19 +333,18 @@ vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp)
 {
   /* Expecting a similar message on mq. So ignore this */
   VDBG (0, "bapi msg vpp handle 0x%llx, sid %u: bind retval: %u!",
-       getpid (), mp->handle, mp->context, mp->retval);
+       mp->handle, mp->context, mp->retval);
 }
 
 static void
 vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp)
 {
   if (mp->retval)
-    clib_warning ("VCL<%d>: ERROR: sid %u: unbind failed: %U",
-                 getpid (), mp->context, format_api_error,
-                 ntohl (mp->retval));
+    VDBG (0, "ERROR: sid %u: unbind failed: %U", mp->context,
+         format_api_error, ntohl (mp->retval));
+
+  VDBG (1, "sid %u: unbind succeeded!", mp->context);
 
-  else
-    VDBG (1, "VCL<%d>: sid %u: unbind succeeded!", getpid (), mp->context);
 }
 
 static void
@@ -605,6 +604,7 @@ vppcom_send_unbind_sock (vcl_worker_t * wrk, u64 vpp_handle)
   ump->client_index = wrk->my_client_index;
   ump->wrk_index = wrk->vpp_wrk_index;
   ump->handle = vpp_handle;
+  ump->context = wrk->wrk_index;
   vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & ump);
 }
 
@@ -679,7 +679,7 @@ vppcom_connect_to_vpp (char *app_name)
          return VPPCOM_ECONNREFUSED;
        }
 
-      if (vl_socket_client_init_shm (0))
+      if (vl_socket_client_init_shm (0, 1 /* want_pthread */ ))
        {
          VERR ("app (%s) init shm failed!", app_name);
          return VPPCOM_ECONNREFUSED;