From 74cac8839efae6a69baea031fb01602ef8907e8a Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 7 Sep 2018 09:13:15 -0700 Subject: session: fix reentrant listens Change-Id: I72d400401a308012b43513179870823f6f921e44 Signed-off-by: Florin Coras --- src/vnet/session/application.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/vnet/session/application.c') diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c index 8cf32896631..3811091f05c 100644 --- a/src/vnet/session/application.c +++ b/src/vnet/session/application.c @@ -762,10 +762,12 @@ application_start_listen (application_t * app, sep_ext->is_ip4); ls = listen_session_new (0, sst); ls->app_index = app->app_index; - + lh = listen_session_get_handle (ls); if (session_listen (ls, sep_ext)) goto err; + + ls = listen_session_get_from_handle (lh); app_listener = app_listener_alloc (app); ls->listener_db_index = app_listener->al_index; @@ -779,7 +781,7 @@ application_start_listen (application_t * app, app_listener->workers = clib_bitmap_set (app_listener->workers, app_wrk->wrk_map_index, 1); - *res = listen_session_get_handle (ls); + *res = lh; return 0; err: @@ -1924,9 +1926,10 @@ format_app_worker_listener (u8 * s, va_list * args) if (verbose) { - s = format (s, "%-40s%-25s%=10u%-15u%-15u%-10u", str, app_name, - app_wrk->wrk_map_index, app->api_client_index, handle, - sm_index); + char buf[32]; + sprintf (buf, "%u(%u)", app_wrk->wrk_map_index, app_wrk->wrk_index); + s = format (s, "%-40s%-25s%=10s%-15u%-15u%-10u", str, app_name, + buf, app->api_client_index, handle, sm_index); } else s = format (s, "%-40s%-25s%=10u", str, app_name, app_wrk->wrk_map_index); -- cgit 1.2.3-korg