pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33824 )
(
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ASCI: Remove check for trans->msc_a to be set in _assign_complete() ......................................................................
ASCI: Remove check for trans->msc_a to be set in _assign_complete()
trans->msc_a is always set when ASSIGNMENT COMPLETE is received.
Fixes: CID#322144 Change-Id: I0fe16e59959b48d08d95aefa6d4415f78dcf1eb4 --- M src/libmsc/msc_vgcs.c 1 file changed, 15 insertions(+), 4 deletions(-)
Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index 1af9aae..52cc25d 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -967,13 +967,12 @@ { uint16_t cell_id;
+ OSMO_ASSERT(trans->msc_a); + /* Change state. */ osmo_fsm_inst_state_chg(trans->gcc.fi, VGCS_GCC_ST_N2_CALL_ACTIVE, 0, 0); /* Get cell ID. */ - if (trans->msc_a) - cell_id = trans->msc_a->via_cell.cell_identity; - else - LOG_GCC(trans, LOGL_ERROR, "Missing msc_a, please fix!\n"); + cell_id = trans->msc_a->via_cell.cell_identity; /* Releasing dedicated channel. */ release_msc_a(trans); /* Send CONNECT to the calling subscriber. */