From: Florin Coras <fcoras@cisco.com>
Date: Wed, 6 Nov 2019 23:41:37 +0000 (-0800)
Subject: vcl: fix epoll connected events sid
X-Git-Tag: v19.08.2~73
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=63eee2eb5527745b48a6bf570cc9654a2ab2366f;p=vpp.git

vcl: fix epoll connected events sid

Type: fix

Use sid returned by vcl_session_connected_handler instead of trying to
infer it from vpp session handle.

Change-Id: Ic0fbb90ec2bd851b435fc3f2a34265ac9a8ab29f
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit f1653e62fe41e3df429aadaaab22d0cc8aaa227a)
---

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 47ea7a479b1..349e27e5122 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -2627,9 +2627,8 @@ vcl_epoll_wait_handle_mq_event (vcl_worker_t * wrk, session_event_t * e,
       break;
     case SESSION_CTRL_EVT_CONNECTED:
       connected_msg = (session_connected_msg_t *) e->data;
-      vcl_session_connected_handler (wrk, connected_msg);
+      sid = vcl_session_connected_handler (wrk, connected_msg);
       /* Generate EPOLLOUT because there's no connected event */
-      sid = vcl_session_index_from_vpp_handle (wrk, connected_msg->handle);
       if (!(session = vcl_session_get (wrk, sid)))
 	break;
       session_events = session->vep.ev.events;