lynxis lazus has uploaded this change for review.

View Change

SGSN: f_service_request: fix required authentication when doing Service Request

The authentication was broken before, because f_gmm_auth was consuming the
SecurityModeCommand and it never ended in as_service_request().

Change-Id: I1a4248c93514293ffdcdf9b42857bffab1fb92d9
---
M sgsn/BSSGP_ConnHdlr.ttcn
1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn
index 8c12ea6..b19ce86 100644
--- a/sgsn/BSSGP_ConnHdlr.ttcn
+++ b/sgsn/BSSGP_ConnHdlr.ttcn
@@ -814,12 +814,14 @@
 		}
 	}
 
+	/* f_gmm_auth can't be used because it consume the Security Command */
 	if (expect_auth) {
-		f_gmm_auth(umts_aka_challenge := true, ran_index := ran_index);
+		g_pars.vec := f_gen_auth_vec_3g();
 	}
 
 	alt {
 	[] as_service_request(exp_service_acc := expect_service_acc, ran_index := ran_index) { setverdict(pass); }
+	[expect_auth] as_gmm_auth(umts_aka_challenge := true, ran_index := ran_index, expect_sai := true) { repeat; };
 	[not expect_auth] RAN_CONN.receive(tr_PDU_DTAP_PS_MT(tr_GMM_AUTH_REQ)) {
 		Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
 			"Service Request: Unexpected GMM Auth Req");

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