From 7705b4916b6588de0caa594e2bfb684a8736d572 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Wed, 16 Feb 2022 17:12:01 -0800 Subject: tls http srtp: fix session index for listeners Type: fix Signed-off-by: Florin Coras Change-Id: If5e6d0e8c686ea93674d6201c38b3a4d1c4786a5 --- src/plugins/http/http.c | 7 ++++--- src/plugins/srtp/srtp.c | 1 + src/vnet/tls/tls.c | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/http/http.c b/src/plugins/http/http.c index d407d9dfdb0..868d0ddf42d 100644 --- a/src/plugins/http/http.c +++ b/src/plugins/http/http.c @@ -733,7 +733,7 @@ static u32 http_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) { vnet_listen_args_t _args = {}, *args = &_args; - session_t *tc_listener, *app_listener; + session_t *ts_listener, *app_listener; http_main_t *hm = &http_main; session_endpoint_cfg_t *sep; app_worker_t *app_wrk; @@ -763,13 +763,14 @@ http_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) /* Grab transport connection listener and link to http listener */ lhc->h_tc_session_handle = args->handle; al = app_listener_get_w_handle (lhc->h_tc_session_handle); - tc_listener = app_listener_get_session (al); - tc_listener->opaque = lhc_index; + ts_listener = app_listener_get_session (al); + ts_listener->opaque = lhc_index; /* Grab application listener and link to http listener */ app_listener = listen_session_get (app_listener_index); lhc->h_pa_wrk_index = sep->app_wrk_index; lhc->h_pa_session_handle = listen_session_get_handle (app_listener); + lhc->c_s_index = app_listener_index; lhc->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; return lhc_index; diff --git a/src/plugins/srtp/srtp.c b/src/plugins/srtp/srtp.c index 82d9b3d8f04..c9987e8a47f 100644 --- a/src/plugins/srtp/srtp.c +++ b/src/plugins/srtp/srtp.c @@ -750,6 +750,7 @@ srtp_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) lctx->srtp_session_handle = udp_al_handle; lctx->app_session_handle = listen_session_get_handle (app_listener); lctx->udp_is_ip4 = sep->is_ip4; + lctx->c_s_index = app_listener_index; lctx->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; srtp_init_policy (lctx, (transport_endpt_cfg_srtp_t *) sep->ext_cfg->data); diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c index e201d478361..ec5f67081ee 100644 --- a/src/vnet/tls/tls.c +++ b/src/vnet/tls/tls.c @@ -834,6 +834,7 @@ tls_start_listen (u32 app_listener_index, transport_endpoint_cfg_t *tep) lctx->tls_ctx_engine = engine_type; lctx->tls_type = sep->transport_proto; lctx->ckpair_index = ccfg->ckpair_index; + lctx->c_s_index = app_listener_index; lctx->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; if (tls_vfts[engine_type].ctx_start_listen (lctx)) -- cgit 1.2.3-korg