aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-05-09 13:04:02 +0200
committerHarald Welte <laforge@gnumonks.org>2019-05-09 13:04:02 +0200
commit62113fce7a5eda31f87367975377f1027118130b (patch)
tree05ccc8b7c4158bdc8b0244bebc177f3c4c0574bb
parent0ac6315212a35522495ea216f14f94a6d4f9fbb3 (diff)
msc: Don't require protocolExtensions in RANAP Paging
We were using '?' for the protocolExtensions in RANAP messages, which required that such extensions existed. In reality, we want to use '*' which accepts paging messages whether or not there are any protocolExtensions present. As this is the default in all our RANAP receive template, callers don't even need to specify it. This should fix all Iu paging related test failures in MSC_Tests*.ttcn Change-Id: If22e16ecb301c86b9073ffde0af9e03bc85fbcc7
-rw-r--r--msc/BSC_ConnectionHandler.ttcn2
-rw-r--r--msc/MSC_Tests.ttcn6
2 files changed, 4 insertions, 4 deletions
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 1cec69c3..9fc06169 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -766,7 +766,7 @@ runs on BSC_ConnHdlr {
if (g_pars.ran_is_geran) {
BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
} else {
- BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi), ?));
+ BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi)));
}
}
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 3a6711b0..52aa6854 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2127,7 +2127,7 @@ friend function f_tc_lu_and_mt_sms_paging_and_nothing(charstring id, BSC_ConnHdl
setverdict(fail, "paging seems not to stop!");
mtc.stop;
}
- [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi), ?)) {
+ [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) {
setverdict(fail, "paging seems not to stop!");
mtc.stop;
}
@@ -3070,7 +3070,7 @@ runs on BSC_ConnHdlr {
[pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)) {
setverdict(pass);
}
- [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi), ?)) {
+ [not pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) {
setverdict(pass);
}
/* We don't expect anything else */
@@ -3677,7 +3677,7 @@ private function f_sgsap_bssmap_screening() runs on BSC_ConnHdlr {
[g_pars.ran_is_geran] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); {
setverdict(pass);
}
- [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi), ?)) {
+ [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))) {
setverdict(pass);
}
[] SGsAP.receive {