<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11562">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: f_est_dchan: verify Chan Rqd originated by RACH arrives on RSL<br><br>We cannot notify RSL Emulation layer about expecting a specific FN<br>(during ts_RSLDC_ChanRqd) because we only know the FN after sending the<br>RACH request, and since notification to RSL Emulation happens async, it<br>can happen (verified) that ChanRqd message from BTS arrives and is<br>handled before we register the RACH req into the ConnectionTable.<br><br>Change-Id: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64<br>---<br>M bts/BTS_Tests.ttcn<br>M library/RSL_Emulation.ttcn<br>2 files changed, 70 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 5b073ef..64c2510 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1344,6 +1344,28 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Send RACH request through l1CTL and wait for ChanReq on RSL BST->BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_rach_req_wait_chan_rqd(integer ra) runs on ConnHdlr return GsmFrameNumber {</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmFrameNumber fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 8.0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* advertise to RSL Emulation that we expect to receive confirmation from RACH */</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL.send(ts_RSLDC_ChanRqd_anyFN(int2oct(ra,1)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send the actual RACH */</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := f_L1CTL_RACH(L1CTL, ra);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL.receive(tr_RSL_CHAN_RQD(int2oct(ra,1), fn)) { setverdict(pass, "Received CHAN-RQD from RACH REQ") }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for CHAN-RQD from RACH REQ <", ra, ", ", fn, ">"));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ T.stop</span><br><span style="color: hsl(120, 100%, 40%);">+ return fn;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /* Establish dedicated channel: L1CTL + RSL side */</span><br><span> private function f_est_dchan(boolean encr_enable := false) runs on ConnHdlr {</span><br><span>@@ -1351,10 +1373,8 @@</span><br><span> var ImmediateAssignment imm_ass;</span><br><span> var integer ra := 23;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_PARAM(L1CTL, g_pars.l1_pars.ms_actual_ta, g_pars.l1_pars.ms_power_level);</span><br><span style="color: hsl(0, 100%, 40%);">- fn := f_L1CTL_RACH(L1CTL, ra);</span><br><span style="color: hsl(0, 100%, 40%);">- /* This arrives on CCHAN, so we cannot test for receiving CHAN RQDhere */</span><br><span style="color: hsl(0, 100%, 40%);">- //RSL.receive(tr_RSL_CHAN_RQD(int2oct(23,1)));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send RACH request and wait for ChanReq */</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := f_rach_req_wait_chan_rqd(ra);</span><br><span> </span><br><span> /* Activate channel on BTS side */</span><br><span> f_rsl_chan_act(g_pars.chan_mode, encr_enable);</span><br><span>diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn</span><br><span>index cf02d00..cdeca74 100644</span><br><span>--- a/library/RSL_Emulation.ttcn</span><br><span>+++ b/library/RSL_Emulation.ttcn</span><br><span>@@ -47,14 +47,19 @@</span><br><span> </span><br><span> type record RSLDC_ChanRqd {</span><br><span> OCT1 ra,</span><br><span style="color: hsl(0, 100%, 40%);">- GsmFrameNumber fn</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmFrameNumber fn optional</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template RSLDC_ChanRqd ts_RSLDC_ChanRqd(OCT1 ra, GsmFrameNumber fn) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) RSLDC_ChanRqd ts_RSLDC_ChanRqd(OCT1 ra, GsmFrameNumber fn) := {</span><br><span> ra := ra,</span><br><span> fn := fn</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template (value) RSLDC_ChanRqd ts_RSLDC_ChanRqd_anyFN(OCT1 ra) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ra := ra,</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := omit</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type port RSL_DCHAN_PT message {</span><br><span> inout RSLDC_ChanRqd, RSL_Message;</span><br><span> } with { extension "internal" };</span><br><span>@@ -183,15 +188,36 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Matches by only RA if FN is ommited in one of the connections allocated */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_cid_by_ra_fn2(OCT1 ra, RSL_IE_FrameNumber fn)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RSL_Emulation_CT return integer {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < sizeof(ConnectionTable); i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ispresent(ConnectionTable[i].ra) and</span><br><span style="color: hsl(120, 100%, 40%);">+ ConnectionTable[i].ra == ra) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ispresent(ConnectionTable[i].ra_fn) or</span><br><span style="color: hsl(120, 100%, 40%);">+ fn == valueof(ts_RSL_IE_FrameNumber(ConnectionTable[i].ra_fn))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return i;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ log("No Dchan handler for ", ra, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* create an ew client with given RA and FN */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_cid_create(OCT1 ra, GsmFrameNumber fn, RSL_DchanHdlr comp_ref)</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_cid_create(OCT1 ra, template (omit) GsmFrameNumber fn, RSL_DchanHdlr comp_ref)</span><br><span> runs on RSL_Emulation_CT {</span><br><span> var integer i;</span><br><span> for (i := 0; i < sizeof(ConnectionTable); i := i+1) {</span><br><span> if (not ispresent(ConnectionTable[i].ra) and</span><br><span> not ispresent(ConnectionTable[i].trx_nr)) {</span><br><span> ConnectionTable[i].ra := ra;</span><br><span style="color: hsl(0, 100%, 40%);">- ConnectionTable[i].ra_fn := fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ispresent(fn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ConnectionTable[i].ra_fn := valueof(fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ConnectionTable[i].ra_fn := omit;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> ConnectionTable[i].comp_ref := comp_ref;</span><br><span> return;</span><br><span> }</span><br><span>@@ -394,6 +420,17 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ [not bts_role] IPA_PT.receive(tr_RSL(tr_RSL_CHAN_RQD(?))) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ var RSL_IE_RequestRef req_ref;</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref := rx_rsl.rsl.ies[1].body.req_ref;</span><br><span style="color: hsl(120, 100%, 40%);">+ cid := f_cid_by_ra_fn2(req_ref.ra, req_ref.frame_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cid != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ CLIENT_PT.send(rx_rsl.rsl) to ConnectionTable[cid].comp_ref;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_cid_clear(cid);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ CCHAN_PT.send(rx_rsl);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> [bts_role] IPA_PT.receive(tr_RSL(tr_RSL_PAGING_CMD(?, ?))) -> value rx_rsl {</span><br><span> /* broadcast to all clients? */</span><br><span>@@ -446,6 +483,11 @@</span><br><span> ts_RSL_CHAN_RQD(chan_rqd.ra, chan_rqd.fn)));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ [not bts_role] CLIENT_PT.receive(RSLDC_ChanRqd:?) -> value chan_rqd sender vc_conn {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Store the knowledge that this sender has requested a certain RQ+time */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_cid_create(chan_rqd.ra, chan_rqd.fn, vc_conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> [] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value rx_rsl_msg sender vc_conn {</span><br><span> /* forward to BSC */</span><br><span> cid := f_cid_by_comp_ref(vc_conn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11562">change 11562</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/11562"/><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: I438fd3ee82d88498d928dbcc89ce9bd80d37ab64 </div>
<div style="display:none"> Gerrit-Change-Number: 11562 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </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: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>