X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_api.c;h=6bee3e27bdb0c222d669eec960a86de1dcfc8f80;hb=6534b7aa13bc5bed15ed87f47bb766405963e9e8;hp=98d6946af8554b35307ad1d31daa2607a96cd45c;hpb=10d8cc6bf92851fcaec4a6b4c6d3554dc1eb2386;p=vpp.git

diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index 98d6946af85..6bee3e27bdb 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -184,13 +184,6 @@ send_session_connected_callback (u32 app_index, u32 api_context,
     }
 
   vl_msg_api_send_shmem (q, (u8 *) & mp);
-
-  /* Remove client if connect failed */
-  if (!is_fail)
-    {
-      s->session_state = SESSION_STATE_READY;
-    }
-
   return 0;
 }
 
@@ -419,7 +412,7 @@ done:
   REPLY_MACRO (VL_API_UNBIND_URI_REPLY);
 }
 
-void
+static void
 vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp)
 {
   vl_api_connect_uri_reply_t *rmp;
@@ -658,11 +651,20 @@ vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
   app = application_lookup (mp->client_index);
   if (app)
     {
-      clib_memcpy (&a->tep.ip, mp->ip,
+      unix_shared_memory_queue_t *client_q;
+      u8 *ip = mp->is_ip4 ? (u8 *) & a->tep.ip.ip4 : (u8 *) & a->tep.ip;
+
+      client_q = vl_api_client_index_to_input_queue (mp->client_index);
+      mp->client_queue_address = pointer_to_uword (client_q);
+      a->tep.is_ip4 = mp->is_ip4;
+      a->tep.port = mp->port;
+
+      clib_memcpy (ip, mp->ip,
 		   (mp->is_ip4 ? sizeof (ip4_address_t) :
 		    sizeof (ip6_address_t)));
       a->api_context = mp->context;
       a->app_index = app->index;
+      a->proto = mp->proto;
       a->mp = mp;
       rv = vnet_connect (a);
     }
@@ -677,7 +679,7 @@ vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
   /* Got some error, relay it */
 
 done:
-  REPLY_MACRO (VL_API_CONNECT_URI_REPLY);
+  REPLY_MACRO (VL_API_CONNECT_SOCK_REPLY);
 }
 
 static clib_error_t *