<p>lynxis lazus <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10386">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: add optional bssgp index for f_upd_ptmsi_and_tlli f_bssgp_client_llgmm_assign f_process_rau_accept<br><br>f_process_rau_accept can send the RAU Complete over the correct BSSGP<br><br>Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5<br>---<br>M sgsn/SGSN_Tests.ttcn<br>1 file changed, 10 insertions(+), 10 deletions(-)<br><br></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 82c37f2..497e45f 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -461,12 +461,12 @@</span><br><span> deactivate(di);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_upd_ptmsi_and_tlli(OCT4 p_tmsi) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_upd_ptmsi_and_tlli(OCT4 p_tmsi, integer bssgp_index := 0) runs on BSSGP_ConnHdlr {</span><br><span> g_pars.p_tmsi := p_tmsi;</span><br><span> /* update TLLI */</span><br><span> g_pars.tlli_old := g_pars.tlli;</span><br><span> g_pars.tlli := g_pars.p_tmsi or4b 'c0000000'O;</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_bssgp_client_llgmm_assign(g_pars.tlli_old, g_pars.tlli, BSSGP_PROC[bssgp_index]);</span><br><span> }</span><br><span> </span><br><span> function f_process_attach_accept(PDU_GMM_AttachAccept aa) runs on BSSGP_ConnHdlr {</span><br><span>@@ -498,7 +498,7 @@</span><br><span> /* T3302, T3319, T3323, T3312_ext, T3324 */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_process_rau_accept(PDU_GMM_RoutingAreaUpdateAccept ra, integer bssgp_index := 0) runs on BSSGP_ConnHdlr {</span><br><span> /* mandatory IE */</span><br><span> g_pars.ra := ra.routingAreaId;</span><br><span> if (ispresent(ra.allocatedPTMSI)) {</span><br><span>@@ -506,7 +506,7 @@</span><br><span> setverdict(fail, "unexpected P-TMSI allocation");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_upd_ptmsi_and_tlli(ra.allocatedPTMSI.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets, bssgp_index);</span><br><span> }</span><br><span> if (ispresent(ra.msIdentity)) {</span><br><span> setverdict(fail, "unexpected TMSI allocation in non-combined attach");</span><br><span>@@ -867,10 +867,10 @@</span><br><span> }</span><br><span> </span><br><span> /* general GPRS DETACH helper */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_detach_mo(BIT3 detach_type, boolean power_off, boolean expect_purge) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+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 BssgpDecoded bd;</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));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_l3_gmm_llc(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>@@ -881,7 +881,7 @@</span><br><span> setverdict(fail, "Unexpected GSUP PURGE MS for unregistered TLLI");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd {</span><br><span style="color: hsl(120, 100%, 40%);">+ [power_off] BSSGP[bssgp_index].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd {</span><br><span> g_pars.ra := omit;</span><br><span> setverdict(fail, "Unexpected ATTACH ACCEPT in no-power-off DETACH");</span><br><span> mtc.stop;</span><br><span>@@ -890,12 +890,12 @@</span><br><span> [power_off] T.timeout {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [not power_off] BSSGP[0].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not power_off] BSSGP[bssgp_index].receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd {</span><br><span> g_pars.ra := omit;</span><br><span> setverdict(pass);</span><br><span> /* TODO: check if any PDP contexts are deactivated on network side? */</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSGP[0].receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSGP[bssgp_index].receive { repeat; }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -1857,7 +1857,7 @@</span><br><span> 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> alt {</span><br><span> [] BSSGP[bssgp].receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd {</span><br><span style="color: hsl(0, 100%, 40%);">- f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, bssgp);</span><br><span> f_send_l3_gmm_llc(ts_GMM_RAU_COMPL, bssgp);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10386">change 10386</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/10386"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib9a65f0d09d3689911843a1b40e2a4114710e5b5 </div>
<div style="display:none"> Gerrit-Change-Number: 10386 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>