laforge submitted this change.

View Change


Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified
fixup for re-est: do not succeed on acceptance fail

Fix a bug introduced in commit
implement CM Re-Establish for voice calls
ae98b97382285420ba81549bc874b9fea5e7daa9
Neels Hofmeyr <neels@hofmeyr.de>
Thu Jul 29 22:40:59 2021 +0200
I6fa37d6ca9fcb1637742b40e37b68d67664c9b60

We should only succeed when conn_accepted == true!

Related: SYS#5130
Change-Id: I3679162143e8d7d8c0878de2102faa11eadfccfc
---
M src/libmsc/msc_a.c
1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index 70d9bf7..db1d998 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -182,7 +182,7 @@
if (msc_a->complete_layer3_type == COMPLETE_LAYER3_LU)
msc_a_put(msc_a, MSC_A_USE_LOCATION_UPDATING);

- if (msc_a->complete_layer3_type == COMPLETE_LAYER3_CM_RE_ESTABLISH_REQ) {
+ if (conn_accepted && msc_a->complete_layer3_type == COMPLETE_LAYER3_CM_RE_ESTABLISH_REQ) {
/* Trigger new Assignment to recommence the voice call. A little dance here because normally we verify
* that no CC trans is already active. */
struct gsm_trans *cc_trans = msc_a->cc.active_trans;

To view, visit change 36520. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3679162143e8d7d8c0878de2102faa11eadfccfc
Gerrit-Change-Number: 36520
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged