From 0fdb143516884b47738885f693ca4a744f14dd8b Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 29 Nov 2021 16:25:34 +0100 Subject: [PATCH] fix assignment success counters: count *before* cleanup of fsm state Counting the Assignment success after osmo_fsm_inst_term() meant that we were counting a cleared out channel mode, which always yielded signalling mode. Count the Assignment success *before* terminating, so that we correctly count the successful assignment as speech mode. Related: SYS#4878 Related: Icb1386ec2ccd70eb3c026301b9b08ad7177278f7 (osmo-ttcn3-hacks) Change-Id: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 --- src/osmo-bsc/assignment_fsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 656bd3e94..cb3d754ad 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -287,10 +287,10 @@ static void assignment_success(struct gsm_subscriber_connection *conn) conn->user_plane.msc_assigned_rtp_port = conn->assignment.req.msc_rtp_port; } + assignment_count_result(CTR_ASSIGNMENT_COMPLETED); + LOG_ASSIGNMENT(conn, LOGL_DEBUG, "Assignment successful\n"); osmo_fsm_inst_term(conn->assignment.fi, OSMO_FSM_TERM_REGULAR, 0); - - assignment_count_result(CTR_ASSIGNMENT_COMPLETED); } static void assignment_fsm_update_id(struct gsm_subscriber_connection *conn)