Change in ...osmo-ttcn3-hacks[master]: add support for expect_sai on f_gmm_auth

[lynxis lazus]

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15556


Change subject: add support for expect_sai on f_gmm_auth
......................................................................

add support for expect_sai on f_gmm_auth

Change-Id: I424918e792ff73eeafd99ac2a272cf4f2f62cb43
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 7 insertions(+), 5 deletions(-)



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

diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 281dcc9..b5861a9 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -593,7 +593,7 @@
 /* perform GMM authentication (if expected).
  * Note, for umts_aka_challenge to work, the revisionLevelIndicatior needs to
  * be 1 to mark R99 capability, in the GMM Attach Request, see f_gmm_attach(). */
-function f_gmm_auth (boolean umts_aka_challenge := false, boolean force_gsm_sres := false, integer ran_index := 0) runs on BSSGP_ConnHdlr {
+function f_gmm_auth (boolean umts_aka_challenge := false, boolean force_gsm_sres := false, integer ran_index := 0, boolean expect_sai := true) runs on BSSGP_ConnHdlr {
 	var PDU_L3_MS_SGSN l3_mo;
 	var PDU_L3_SGSN_MS l3_mt;
 	var default di := activate(as_mm_identity(ran_index));
@@ -626,8 +626,10 @@
 			log("GSUP sends only 2G auth tuple", auth_tuple);
 		}
 
-		GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi));
-		GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple));
+		if (expect_sai) {
+			GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi));
+			GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple));
+		}
 
 		var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand);
 		auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn;
@@ -757,7 +759,7 @@
 	GSUP.send(ts_GSUP_UL_RES(g_pars.imsi));
 }
 
-friend function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, integer ran_index := 0) runs on BSSGP_ConnHdlr {
+friend function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, integer ran_index := 0, boolean expect_sai := true) runs on BSSGP_ConnHdlr {
 	var RoutingAreaIdentificationV old_ra := f_random_RAI();
 	var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit);
 	var PDU_L3_SGSN_MS l3_mt;
@@ -770,7 +772,7 @@
 	attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B;
 
 	f_send_l3(attach_req, ran_index);
-	f_gmm_auth(umts_aka_challenge, force_gsm_sres, ran_index);
+	f_gmm_auth(umts_aka_challenge, force_gsm_sres, ran_index, expect_sai);
 	/* Expect SGSN to perform LU with HLR */
 	f_gmm_gsup_lu_isd();
 

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

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I424918e792ff73eeafd99ac2a272cf4f2f62cb43
Gerrit-Change-Number: 15556
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190917/7c892226/attachment.htm>