Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/13728 )
Change subject: Add f_expect_paging() rather than using tr_BSSMAP_Paging
directly
......................................................................
Add f_expect_paging() rather than using tr_BSSMAP_Paging directly
this will ease the introduction of RANAP support
Change-Id: I213303337373c349676be4f8ac4175acdc701e47
---
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.ttcn
2 files changed, 14 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 0eace36..b3345ff 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -553,6 +553,11 @@
MNCC.receive(tr_MNCC_SETUP_cnf(cpars.mncc_callref));
}
+function f_expect_paging(boolean by_tmsi := true)
+runs on BSC_ConnHdlr {
+ BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+}
+
function f_mt_call_establish(inout CallParameters cpars)
runs on BSC_ConnHdlr {
@@ -561,7 +566,7 @@
/* BSC <- MSC: Expect paging. FIXME: By TMSI or not? */
f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);
- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+ f_expect_paging()
/* Complete the call via BSSAP */
f_mt_call_complete(cpars);
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index a9eb316..6ad8860 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -1443,7 +1443,8 @@
hex2str(cpars.called_party),
hex2str(g_pars.imsi)));
/* MSC->BSC: expect PAGING from MSC */
- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+ f_expect_paging();
+
/* MS -> MSC: PAGING RESPONSE */
f_establish_fully(EST_TYPE_PAG_RESP);
@@ -2022,7 +2023,8 @@
f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");
/* MSC->BSC: expect PAGING from MSC */
- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+ f_expect_paging();
+
/* Establish DTAP / BSSAP / SCCP connection */
f_establish_fully(EST_TYPE_PAG_RESP);
@@ -2326,7 +2328,7 @@
f_gsup_forwardSM_req(spars);
/* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */
- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+ f_expect_paging();
f_establish_fully(EST_TYPE_PAG_RESP);
/* Wait for MT SMS on DTAP */
@@ -2391,7 +2393,7 @@
f_gsup_forwardSM_req(spars);
/* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */
- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+ f_expect_paging();
f_establish_fully(EST_TYPE_PAG_RESP);
/* Wait for MT SMS on DTAP */
@@ -2451,7 +2453,7 @@
f_gsup_forwardSM_req(spars1);
/* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */
- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+ f_expect_paging();
f_establish_fully(EST_TYPE_PAG_RESP);
/* Wait for 1st MT SMS on DTAP */
@@ -2785,7 +2787,7 @@
}
/* MSC->BSC: expect PAGING from MSC */
- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
+ f_expect_paging();
/* Establish DTAP / BSSAP / SCCP connection */
f_establish_fully(EST_TYPE_PAG_RESP);
SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK));
--
To view, visit https://gerrit.osmocom.org/13728
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: I213303337373c349676be4f8ac4175acdc701e47
Gerrit-Change-Number: 13728
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
