From: Dave Wallace <dwallacelf@gmail.com>
Date: Wed, 14 Jun 2017 16:38:28 +0000 (-0400)
Subject: Fix session api connect sock handler.
X-Git-Tag: v17.07-rc1~43
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=b2d5ff349d2c6cb2b733375dca4952cdeab2e7d3;p=vpp.git

Fix session api connect sock handler.

Change-Id: I034efb9fc3ebb846c0aef07b18c1f110b8cbf3e3
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---

diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index 095cc118fc8..f772cb9fdb4 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -658,11 +658,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);
     }