Change in osmo-ttcn3-hacks[master]: MSC: Verify CSFB INDICATOR is present in CLEAR COMMAND

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Feb 22 21:24:12 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12935 )

Change subject: MSC: Verify CSFB INDICATOR is present in CLEAR COMMAND
......................................................................

MSC: Verify CSFB INDICATOR is present in CLEAR COMMAND

When a CSFB voice call is cleared by the MSC, it must include the
CSFB INDICATOR in order to trigger the BSC to perform actions
required for Fast Return to LTE.

This patch changes TC_sgsap_lu_and_mt_call() and
TC_bssap_lu_sgsap_lu_and_mt_call() to ensure the CSFB INDICATOR IE
is present as expected.

Change-Id: I6ce3a34f85aca7143cf7925cb9319bc679e8d395
---
M library/BSSMAP_Templates.ttcn
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.ttcn
3 files changed, 23 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index a30b8e7..b538095 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -638,6 +638,21 @@
 	}
 }
 
+template PDU_BSSAP tr_BSSMAP_ClearCommandCSFB modifies tr_BSSAP_BSSMAP := {
+	pdu := {
+		bssmap := {
+			clearCommand := {
+				messageType := '20'O,	/* overwritten */
+				layer3HeaderInfo := *,
+				cause := ?,
+				cSFB_Indication := {
+					elementIdentifier := '8F'O
+				}
+			}
+		}
+	}
+}
+
 template (value) PDU_BSSAP ts_BSSMAP_ClearComplete
 modifies ts_BSSAP_BSSMAP := {
 	pdu := {
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 7b88192..b041007 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -646,13 +646,18 @@
 	setverdict(pass);
 }
 
-function f_call_hangup(inout CallParameters cpars, boolean release_by_ms)
+function f_call_hangup(inout CallParameters cpars, boolean release_by_ms, boolean is_csfb := false)
 runs on BSC_ConnHdlr {
 
 	var MobileIdentityLV mi;
 	var MNCC_PDU mncc;
 	var MgcpCommand mgcp_cmd;
 	var boolean respond_to_dlcx;
+	var template PDU_BSSAP t_clear := tr_BSSMAP_ClearCommand;
+
+	if (is_csfb) {
+		t_clear := tr_BSSMAP_ClearCommandCSFB;
+	}
 
 	MNCC.send(ts_MNCC_DISC_req(cpars.mncc_callref, valueof(ts_MNCC_cause(23))));
 	BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_DISC(cpars.transaction_id)));
@@ -673,7 +678,7 @@
 
 	/* clearing of radio channel */
 	interleave {
-	[] BSSAP.receive(tr_BSSMAP_ClearCommand) {
+	[] BSSAP.receive(t_clear) {
 		BSSAP.send(ts_BSSMAP_ClearComplete);
 		BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
 		}
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 00f9bec..7129f81 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -4471,7 +4471,7 @@
 	/* Complete the call, hold it for some time and then tear it down */
 	f_mt_call_complete(cpars);
 	f_sleep(3.0);
-	f_call_hangup(cpars, true);
+	f_call_hangup(cpars, true, is_csfb := true);
 
 	/* Make sure that subscriber is still present and the SGs association is in tact (ref-counting) */
 	f_ctrl_get_exp(IPA_CTRL, "fsm.SGs-UE.id.imsi:" & hex2str(g_pars.imsi) & ".state", "SGs-ASSOCIATED");

-- 
To view, visit https://gerrit.osmocom.org/12935
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ce3a34f85aca7143cf7925cb9319bc679e8d395
Gerrit-Change-Number: 12935
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190222/3812cc36/attachment.htm>


More information about the gerrit-log mailing list