sgsn: Ensure ATTACH is always only for GPRS, not combined

OsmoSGSN doesn't do combined GPRS+IMSI Attach.

Change-Id: Ib11f5d720a0e4e1d574982d1f33ba9aaa6b3a3cf
This commit is contained in:
Harald Welte 2018-02-16 21:54:21 +01:00
parent 3823e2ea77
commit 1967d47ea1
1 changed files with 8 additions and 8 deletions

View File

@ -282,7 +282,7 @@ private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr {
GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi));
GSUP.send(ts_GSUP_UL_RES(g_pars.imsi));
BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT(?, ?, ?)));
BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)));
BSSGP.send(ts_GMM_ATTACH_COMPL);
setverdict(pass);
}
@ -308,14 +308,14 @@ private function f_TC_attach_auth_id_timeout(charstring id) runs on BSSGP_ConnHd
BSSGP.send(ts_GMM_ATTACH_REQ(mi, old_ra, false, false, omit, omit));
alt {
[] BSSGP.receive(tr_BD_L3(tr_GMM_ID_REQ(?))) {
[] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ID_REQ(?))) {
/* don't send ID Response */
repeat;
}
[] BSSGP.receive(tr_BD_L3(tr_GMM_ATTACH_REJECT('09'O))) {
[] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT('09'O))) {
setverdict(pass);
}
[] BSSGP.receive(tr_BD_L3(tr_GMM_ATTACH_REJECT(?))) {
[] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) {
setverdict(fail, "Wrong Attach Reject Cause");
}
}
@ -344,7 +344,7 @@ private function f_TC_attach_auth_sai_timeout(charstring id) runs on BSSGP_ConnH
[] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { }
}
/* don't send SAI-response from HLR */
BSSGP.receive(tr_BD_L3(tr_GMM_ATTACH_REJECT(?)));
BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?)));
setverdict(pass);
}
testcase TC_attach_auth_sai_timeout() runs on test_CT {
@ -371,10 +371,10 @@ private function f_TC_attach_gsup_lu_timeout(charstring id) runs on BSSGP_ConnHd
GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi));
/* Never follow-up with ISD_REQ or UL_RES */
alt {
[] BSSGP.receive(tr_BD_L3(tr_GMM_ATTACH_REJECT(?))) {
[] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_REJECT(?))) {
setverdict(pass);
}
[] BSSGP.receive(tr_BD_L3(tr_GMM_ATTACH_ACCEPT(?, ?, ?))) {
[] BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) {
setverdict(fail);
}
}
@ -406,7 +406,7 @@ private function f_TC_attach_combined(charstring id) runs on BSSGP_ConnHdlr {
GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi));
GSUP.send(ts_GSUP_UL_RES(g_pars.imsi));
BSSGP.receive(tr_BD_L3(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)));
BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)));
BSSGP.send(ts_GMM_ATTACH_COMPL);
setverdict(pass);
}