neels has uploaded this change for review.

View Change

msc: f_expect_paging(): better detect failure

When a received Paging mismatches, instead of waiting for timeout, fail
immediately.

Change-Id: I30273e3882e348a2ded88b7b96a5ec1473a56913
---
M msc/BSC_ConnectionHandler.ttcn
1 file changed, 26 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/36456/1

diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index ed4bed5..ac973d7 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1364,9 +1364,21 @@
 		tmsi := omit;
 	}
 	if (g_pars.ran_is_geran) {
-		BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi, tmsi));
+		alt {
+		[] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi, tmsi));
+		[] BSSAP.receive(tr_BSSMAP_Paging(?, *)) {
+				setverdict(fail, "Paging message doesn't match expectations");
+				mtc.stop;
+			}
+		}
 	} else {
-		BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi)));
+		alt {
+		[] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi)));
+		[] BSSAP.receive(tr_RANAP_Paging(?, ?)) {
+				setverdict(fail, "Paging message doesn't match expectations");
+				mtc.stop;
+			}
+		}
 	}
 }
 

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