From: Florin Coras <fcoras@cisco.com>
Date: Fri, 23 Apr 2021 15:58:57 +0000 (-0700)
Subject: session: set connected session index for ct
X-Git-Tag: v21.10-rc0~201
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=893bc97ed6eb426dd8c0dc9489a810e206b3fcf6;p=vpp.git

session: set connected session index for ct

Set connected session index for ct as well.

Type: fix

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

diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index f54a46b39ba..cf5a66d9e7a 100644
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -303,8 +303,6 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context,
       m.server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo);
       m.server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo);
       m.segment_handle = session_segment_handle (s);
-      s->rx_fifo->shr->client_session_index = api_context;
-      s->tx_fifo->shr->client_session_index = api_context;
     }
   else
     {
@@ -326,6 +324,11 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context,
       m.ct_segment_handle = session_segment_handle (ss);
     }
 
+  /* Setup client session index in advance, in case data arrives
+   * before the app processes message and updates it */
+  s->rx_fifo->shr->client_session_index = api_context;
+  s->tx_fifo->shr->client_session_index = api_context;
+
 snd_msg:
 
   app_mq = app_wrk->event_queue;