summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Skrzypczak <nathan.skrzypczak@gmail.com>2019-11-07 10:29:24 +0100
committerAndrew Yourtchenko <ayourtch@gmail.com>2020-08-07 21:45:43 +0000
commit215c55ad6d08b41c8ab4e9d45825456e930d7db0 (patch)
treeaa8e81808cd02609b90d63e29686ed2de8902f31
parent2c4ba41bea6d89ade80d67241eaf135e4b55de19 (diff)
session: fix app attach on error
Type: fix Change-Id: I57b3c76515544ba3655690b37e0dacb47734ba6d Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com> (cherry picked from commit 9d3e1b433f394781a55a4c7c39b695d08dd2563f)
-rwxr-xr-xsrc/vnet/session/session_api.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index c55aab33541..4e040a09fad 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -659,13 +659,12 @@ vl_api_app_attach_t_handler (vl_api_app_attach_t * mp)
}
done:
-
- ctrl_thread = vlib_num_workers ()? 1 : 0;
- ctrl_mq = session_main_get_vpp_event_queue (ctrl_thread);
/* *INDENT-OFF* */
REPLY_MACRO2 (VL_API_APP_ATTACH_REPLY, ({
if (!rv)
{
+ ctrl_thread = vlib_num_workers ()? 1 : 0;
+ ctrl_mq = session_main_get_vpp_event_queue (ctrl_thread);
segp = a->segment;
rmp->app_index = clib_host_to_net_u32 (a->app_index);
rmp->app_mq = pointer_to_uword (a->app_evt_q);