From: Florin Coras <fcoras@cisco.com>
Date: Wed, 4 Nov 2020 21:08:35 +0000 (-0800)
Subject: session: fix ct server session thread index
X-Git-Tag: v21.06-rc0~230
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=ce252ca83f8c1621dae2112f59750c0e0f7f784a;p=vpp.git

session: fix ct server session thread index

Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I835b61f0b88a7324b09d82400debd78ad8b95401
---

diff --git a/src/plugins/hs_apps/vcl/vcl_test_server.c b/src/plugins/hs_apps/vcl/vcl_test_server.c
index 852c96863ce..798fd72b481 100644
--- a/src/plugins/hs_apps/vcl/vcl_test_server.c
+++ b/src/plugins/hs_apps/vcl/vcl_test_server.c
@@ -387,7 +387,7 @@ vcl_test_server_process_opts (vcl_test_server_main_t * vsm, int argc,
   vsm->cfg.proto = VPPCOM_PROTO_TCP;
 
   opterr = 0;
-  while ((c = getopt (argc, argv, "6DLsw:p:")) != -1)
+  while ((c = getopt (argc, argv, "6DLsw:hp:")) != -1)
     switch (c)
       {
       case '6':
diff --git a/src/vnet/session/application_local.c b/src/vnet/session/application_local.c
index dc777562d00..9b0136f95dc 100644
--- a/src/vnet/session/application_local.c
+++ b/src/vnet/session/application_local.c
@@ -120,7 +120,6 @@ ct_session_connect_notify (session_t * ss)
   cs = session_alloc (thread_index);
   ss = session_get (ss_index, thread_index);
   cs->session_type = ss->session_type;
-  cs->connection_index = sct->c_c_index;
   cs->listener_handle = SESSION_INVALID_HANDLE;
   cs->session_state = SESSION_STATE_CONNECTING;
   cs->app_wrk_index = client_wrk->wrk_index;
@@ -211,6 +210,8 @@ ct_init_accepted_session (app_worker_t * server_wrk,
   sm_index = segment_manager_index (sm);
   ls->rx_fifo->master_session_index = ls->session_index;
   ls->tx_fifo->master_session_index = ls->session_index;
+  ls->rx_fifo->master_thread_index = ls->thread_index;
+  ls->tx_fifo->master_thread_index = ls->thread_index;
   ls->rx_fifo->segment_manager = sm_index;
   ls->tx_fifo->segment_manager = sm_index;
   ls->rx_fifo->segment_index = seg_index;