<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13905">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: Use f_send_l3() instead of 2G speicific f_send_l3_gmm_llc()<br><br>Change-Id: If80da5a94fd786b90f71121b51742c9f70a693eb<br>---<br>M sgsn/SGSN_Tests.ttcn<br>1 file changed, 39 insertions(+), 40 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/13905/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 8bd32b1..d76ae5e 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -450,7 +450,7 @@</span><br><span> BSSGP[gb_index].send(ts_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[gb_index], llc_enc));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_send_l3_gmm_llc(template PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_send_l3_gmm_llc(template PDU_L3_MS_SGSN l3_mo, integer gb_index := 0) runs on BSSGP_ConnHdlr {</span><br><span> var octetstring l3_enc := enc_PDU_L3_MS_SGSN(valueof(l3_mo));</span><br><span> var BIT4 sapi := f_llc_sapi_by_l3_mo(valueof(l3_mo));</span><br><span> var integer n_u := f_llc_get_n_u_tx(llc[bit2int(sapi)]);</span><br><span>@@ -786,7 +786,7 @@</span><br><span> private function f_TC_attach_auth_id_timeout(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ(?)) {</span><br><span> /* don't send ID Response */</span><br><span>@@ -812,7 +812,7 @@</span><br><span> private function f_TC_attach_auth_sai_timeout(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> alt {</span><br><span> [] as_mm_identity();</span><br><span> [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); { }</span><br><span>@@ -832,7 +832,7 @@</span><br><span> private function f_TC_attach_auth_sai_reject(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> alt {</span><br><span> [] as_mm_identity();</span><br><span> [] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); {</span><br><span>@@ -854,7 +854,7 @@</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> f_gmm_auth();</span><br><span> /* Expect MSC to perform LU with HLR */</span><br><span> GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi));</span><br><span>@@ -883,7 +883,7 @@</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> f_gmm_auth();</span><br><span> /* Expect MSC to perform LU with HLR */</span><br><span> GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) {</span><br><span>@@ -914,7 +914,7 @@</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, true, false, omit, omit));</span><br><span> f_gmm_auth();</span><br><span> /* Expect MSC to perform LU with HLR */</span><br><span> f_gmm_gsup_lu_isd();</span><br><span>@@ -922,7 +922,7 @@</span><br><span> BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt {</span><br><span> f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_COMPL);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> testcase TC_attach_combined() runs on test_CT {</span><br><span>@@ -940,12 +940,12 @@</span><br><span> </span><br><span> g_pars.net.expect_auth := false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> f_gmm_auth();</span><br><span> BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt {</span><br><span> f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_COMPL);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> testcase TC_attach_accept_all() runs on test_CT {</span><br><span>@@ -967,7 +967,7 @@</span><br><span> </span><br><span> g_pars.net.expect_auth := false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> alt {</span><br><span> [] as_mm_identity();</span><br><span> [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT('07'O)) {</span><br><span>@@ -999,7 +999,7 @@</span><br><span> private function f_TC_rau_unknown(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false, omit, omit));</span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_GMM_RAU_REJECT('0a'O)) {</span><br><span> setverdict(pass);</span><br><span>@@ -1035,7 +1035,7 @@</span><br><span> function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge, integer bssgp_index := 0) runs on BSSGP_ConnHdlr {</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> timer T := 5.0;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_DET_REQ_MO(detach_type, power_off), bssgp_index);</span><br><span> if (expect_purge) {</span><br><span> GSUP.receive(tr_GSUP_PURGE_MS_REQ(g_pars.imsi, OSMO_GSUP_CN_DOMAIN_PS));</span><br><span> GSUP.send(ts_GSUP_PURGE_MS_RES(g_pars.imsi));</span><br><span>@@ -1163,7 +1163,7 @@</span><br><span> recovery := ts_Recovery(apars.ggsn_restart_ctr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr,</span><br><span> apars.apn, apars.pco), gb_idx);</span><br><span> GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) -> value g_ud {</span><br><span> f_process_gtp_ctx_act_req(apars, g_ud.gtpc);</span><br><span>@@ -1203,7 +1203,7 @@</span><br><span> var boolean exp_rej := ispresent(apars.exp_rej_cause);</span><br><span> var Gtp1cUnitdata g_ud;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit), gb_idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_SM_DEACT_PDP_REQ_MO(apars.tid, cause, false, omit), gb_idx);</span><br><span> GTP.receive(tr_GTPC_MsgType(?, deletePDPContextRequest, apars.ggsn_tei_c)) -> value g_ud {</span><br><span> var integer seq_nr := oct2int(g_ud.gtpc.opt_part.sequenceNumber);</span><br><span> BSSGP[gb_idx].clear;</span><br><span>@@ -1235,7 +1235,7 @@</span><br><span> </span><br><span> alt {</span><br><span> [] BSSGP[gb_idx].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, ?, true)) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), gb_idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid), gb_idx);</span><br><span> }</span><br><span> [not error_ind] GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {</span><br><span> repeat;</span><br><span>@@ -1421,7 +1421,7 @@</span><br><span> /* PDP Context activation for not-attached subscriber; expect fail */</span><br><span> private function f_TC_pdp_act_unattached(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_SM_ACT_PDP_REQ(apars.tid, apars.nsapi, apars.sapi, apars.qos, apars.addr,</span><br><span> apars.apn, apars.pco));</span><br><span> alt {</span><br><span> /* We might want toalso actually expect a PDPC CTX ACT REJ? */</span><br><span>@@ -1569,7 +1569,7 @@</span><br><span> var OCT1 cause_network_failure := int2oct(38, 1)</span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_SM_DEACT_PDP_REQ_MT(apars.tid, cause_network_failure, true)) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid));</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> [] as_xid(apars);</span><br><span>@@ -1650,7 +1650,7 @@</span><br><span> </span><br><span> GTP.receive(tr_GTPC_MsgType(?, deletePDPContextResponse, apars.ggsn_tei_c)) {}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_SM_DEACT_PDP_ACCEPT_MO(apars.tid));</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> testcase TC_attach_pdp_act_deact_mt_t3395_expire() runs on test_CT {</span><br><span>@@ -1733,7 +1733,7 @@</span><br><span> </span><br><span> /* MS: receive a Detach Request */</span><br><span> BSSGP[0].receive(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_DET_ACCEPT_MO);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_DET_ACCEPT_MO);</span><br><span> </span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -1824,7 +1824,7 @@</span><br><span> var integer count_req := 0;</span><br><span> var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit));</span><br><span> </span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) {</span><br><span>@@ -1832,7 +1832,7 @@</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) {</span><br><span> mi := valueof(ts_MI_IMSI_LV(g_pars.imsi));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ID_RESP(mi));</span><br><span> repeat;</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) {</span><br><span>@@ -1872,7 +1872,7 @@</span><br><span> /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */</span><br><span> g_pars.p_tmsi := 'c0000035'O;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit));</span><br><span> </span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) {</span><br><span>@@ -1885,7 +1885,7 @@</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) {</span><br><span> mi := valueof(ts_MI_IMEI_LV(g_pars.imei));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ID_RESP(mi));</span><br><span> repeat;</span><br><span> }</span><br><span> }</span><br><span>@@ -1946,7 +1946,7 @@</span><br><span> /* there is no auth */</span><br><span> g_pars.net.expect_auth := false;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit));</span><br><span> f_gmm_auth();</span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) {</span><br><span>@@ -1955,7 +1955,7 @@</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT(*, *, *)) -> value l3_mt {</span><br><span> f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept);</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_COMPL);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> }</span><br><span>@@ -1999,7 +1999,7 @@</span><br><span> private function f_TC_attach_check_complete_resend(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var integer count_req := 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit));</span><br><span> f_gmm_auth();</span><br><span> </span><br><span> timer T := 10.0;</span><br><span>@@ -2039,11 +2039,11 @@</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> </span><br><span> /* then send RAU */</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra, false, omit, omit), bssgp);</span><br><span> alt {</span><br><span> [] BSSGP[bssgp].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt {</span><br><span> f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_RAU_COMPL, bssgp);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_RAU_COMPL, bssgp);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> [] BSSGP[bssgp].receive(tr_GMM_RAU_REJECT) {</span><br><span>@@ -2119,7 +2119,7 @@</span><br><span> var RoutingAreaIdentificationV rand_rai := f_random_RAI();</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit));</span><br><span> </span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_GMM_ATTACH_REJECT(?)) {</span><br><span>@@ -2128,16 +2128,16 @@</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) {</span><br><span> mi := valueof(ts_MI_IMSI_LV(g_pars.imsi));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ID_RESP(mi));</span><br><span> repeat;</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) {</span><br><span> /* send out a second GMM_Attach Request.</span><br><span> * If the SGSN follows the rules, this 2nd ATTACH REQ should be ignored, because</span><br><span> * of the same content */</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), rand_rai, true, false, omit, omit));</span><br><span> mi := valueof(ts_MI_IMEI_LV(g_pars.imei));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ID_RESP(mi));</span><br><span> }</span><br><span> }</span><br><span> f_sleep(1.0);</span><br><span>@@ -2146,7 +2146,7 @@</span><br><span> alt {</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ('001'B)) {</span><br><span> mi := valueof(ts_MI_IMSI_LV(g_pars.imsi));</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ID_RESP(mi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ID_RESP(mi));</span><br><span> repeat;</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ID_REQ('010'B)) {</span><br><span>@@ -2159,7 +2159,7 @@</span><br><span> }</span><br><span> [] BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt {</span><br><span> f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept);</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_COMPL);</span><br><span> setverdict(pass);</span><br><span> /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */</span><br><span> }</span><br><span>@@ -2197,7 +2197,7 @@</span><br><span> /* The thing is, if the solSACapability is 'omit', then the</span><br><span> * revisionLevelIndicatior is at the wrong place! */</span><br><span> attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(attach_req);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(attach_req);</span><br><span> </span><br><span> /* do the auth */</span><br><span> var PDU_L3_MS_SGSN l3_mo;</span><br><span>@@ -2229,7 +2229,7 @@</span><br><span> BSSGP[0].receive(auth_ciph_req) -> value l3_mt;</span><br><span> </span><br><span> /* send the gmm auth failure with resync IE */</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(g_pars.vec.auts));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_AUTH_FAIL_UMTS_AKA_RESYNC(g_pars.vec.auts));</span><br><span> </span><br><span> /* wait for the GSUP resync request */</span><br><span> GSUP.receive(tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC(</span><br><span>@@ -2276,7 +2276,7 @@</span><br><span> l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv :=</span><br><span> valueof(ts_MI_IMEISV_TLV(g_pars.imei & '0'H));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(l3_mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(l3_mo);</span><br><span> deactivate(di);</span><br><span> </span><br><span> /* Expect SGSN to perform LU with HLR */</span><br><span>@@ -2285,7 +2285,7 @@</span><br><span> BSSGP[0].receive(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?)) -> value l3_mt {</span><br><span> f_process_attach_accept(l3_mt.msgs.gprs_mm.attachAccept);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_l3_gmm_llc(ts_GMM_ATTACH_COMPL);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3(ts_GMM_ATTACH_COMPL);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span>@@ -2420,7 +2420,6 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> control {</span><br><span> execute( TC_attach() );</span><br><span> execute( TC_attach_mnc3() );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13905">change 13905</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13905"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If80da5a94fd786b90f71121b51742c9f70a693eb </div>
<div style="display:none"> Gerrit-Change-Number: 13905 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>