Change in osmo-msc[master]: fix incoming call while Paging

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/16298 )

Change subject: fix incoming call while Paging
......................................................................

fix incoming call while Paging

Do not free the CC transaction when an MT subscriber is already being Paged.
Instead, invoke another paging request, which paging.c will correctly add to
the list of pending paging response callbacks to run.

A ttcn3 test is linked in the related patch (s.b.).

Related: OS#4240
Related: Ieeae6322d4e80893ea3408c6b74bf8e32bea8e46
Change-Id: Idd4537b5f4817d17e5c87d9a93775a32aee0e7be
---
M src/libmsc/gsm_04_08_cc.c
1 file changed, 2 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 4e604e5..8cfb611 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -1935,19 +1935,11 @@
 			 * log it now. */
 			LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s\n", get_mncc_name(msg->msg_type));
 
-			if (vsub->cs.is_paging) {
-				LOG_TRANS(trans, LOGL_DEBUG,
-					  "rx %s, subscriber not yet connected, paging already started\n",
-					  get_mncc_name(msg->msg_type));
-				vlr_subscr_put(vsub, __func__);
-				trans_free(trans);
-				return 0;
-			}
-
 			/* store setup information until paging succeeds */
 			memcpy(&trans->cc.msg, data, sizeof(struct gsm_mncc));
 
-			/* Request a channel */
+			/* Request a channel. If Paging already started, paging_request_start() will append the new
+			 * trans to the already ongoing Paging. */
 			trans->paging_request = paging_request_start(vsub, PAGING_CAUSE_CALL_CONVERSATIONAL,
 								     cc_paging_cb, trans, "MNCC: establish call");
 			if (!trans->paging_request) {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/16298
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Idd4537b5f4817d17e5c87d9a93775a32aee0e7be
Gerrit-Change-Number: 16298
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191128/f0655e65/attachment.htm>