diff options
| author |   Florin Coras <fcoras@cisco.com> | 2023-11-20 14:46:10 -0800 |
|---|---|---|
| committer |   Dave Barach <vpp@barachs.net> | 2023-11-22 00:58:53 +0000 |
| commit | 9375266bd373ea3c86160d3262445607445a90d7 (patch) | |
| tree | b7c83451b9b489887c2c9949c1c5a931b7c1692b /src/vnet/session/session_api.c | |
| parent | 23b6a9ebeb244ed13d55ba3ae0ba011dd956f14e (diff) | |
session: per app wrk client ct segment handle
Make sure ct client segment handles do not collide if multi worker
application establishes cut-through sessions to only one server segment
manager.
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I905379f9ed73c64d57a826a3e97d53dab3a87517
Diffstat (limited to 'src/vnet/session/session_api.c')
| -rw-r--r-- | src/vnet/session/session_api.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c index 55fc72ee4c2..ff49d2ac032 100644 --- a/src/vnet/session/session_api.c +++ b/src/vnet/session/session_api.c @@ -212,7 +212,6 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, session_t * s, session_error_t err) { session_connected_msg_t m = { 0 }; - transport_connection_t *tc; fifo_segment_t *eq_seg; app_worker_t *app_wrk; application_t *app; @@ -230,14 +229,6 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, if (session_has_transport (s)) { - tc = session_get_transport (s); - if (!tc) - { - clib_warning ("failed to retrieve transport!"); - m.retval = SESSION_E_REFUSED; - goto snd_msg; - } - m.handle = session_handle (s); m.vpp_event_queue_address = fifo_segment_msg_q_offset (eq_seg, s->thread_index); @@ -252,7 +243,6 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, else { ct_connection_t *cct; - session_t *ss; cct = (ct_connection_t *) session_get_transport (s); m.handle = session_handle (s); @@ -263,11 +253,10 @@ 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); - ss = ct_session_get_peer (s); - m.ct_rx_fifo = fifo_segment_fifo_offset (ss->tx_fifo); - m.ct_tx_fifo = fifo_segment_fifo_offset (ss->rx_fifo); - m.ct_segment_handle = session_segment_handle (ss); m.mq_index = s->thread_index; + m.ct_rx_fifo = fifo_segment_fifo_offset (cct->client_rx_fifo); + m.ct_tx_fifo = fifo_segment_fifo_offset (cct->client_tx_fifo); + m.ct_segment_handle = cct->segment_handle; } /* Setup client session index in advance, in case data arrives |