<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18486">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RSL_Emulation: fixup: handle RSL messages from any TRX<br><br>As a side effect of change [1], the RSL emulation component has<br>stopped to handle RSL messages from transceivers other than<br>TRX#0. Let's fix this by using template '?' for stream ID.<br><br>[1] I4c4a98458cfa33512db661b5435f484a38e2ef4f<br><br>Change-Id: I5ff05bbd985ddc5e39a390e4b775a16f066a53ea<br>---<br>M library/RSL_Emulation.ttcn<br>1 file changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn</span><br><span>index ffd60a7..bbe5332 100644</span><br><span>--- a/library/RSL_Emulation.ttcn</span><br><span>+++ b/library/RSL_Emulation.ttcn</span><br><span>@@ -382,7 +382,7 @@</span><br><span> IPA_PT.send(ts_ASP_RSL_UD(ts_RSL_PAGING_LOAD_IND(23)));</span><br><span> }</span><br><span> [not bts_role] IPA_PT.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) { }</span><br><span style="color: hsl(0, 100%, 40%);">- [bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_IMM_ASSIGN)) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_IMM_ASSIGN, sid := ?)) -> value rx_rsl {</span><br><span> var GsmRrMessage rr;</span><br><span> var OCT1 ra;</span><br><span> var GsmFrameNumber fn;</span><br><span>@@ -418,7 +418,7 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [not bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_CHAN_RQD(?))) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_CHAN_RQD(?), sid := ?)) -> value rx_rsl {</span><br><span> var RSL_IE_RequestRef req_ref;</span><br><span> req_ref := rx_rsl.rsl.ies[1].body.req_ref;</span><br><span> cid := f_cid_by_ra_fn2(req_ref.ra, req_ref.frame_nr);</span><br><span>@@ -430,7 +430,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_PAGING_CMD(?, ?))) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_PAGING_CMD(?, ?), sid := ?)) -> value rx_rsl {</span><br><span> /* broadcast to all clients? */</span><br><span> for (i := 0; i < sizeof(ConnectionTable); i := i + 1) {</span><br><span> if (ispresent(ConnectionTable[i].comp_ref)) {</span><br><span>@@ -440,24 +440,24 @@</span><br><span> }</span><br><span> </span><br><span> /* Forward common channel management to the special port for it */</span><br><span style="color: hsl(0, 100%, 40%);">- [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeT(?))) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeT(?), sid := ?)) -> value rx_rsl {</span><br><span> CCHAN_PT.send(rx_rsl);</span><br><span> }</span><br><span> </span><br><span> /* Forward common channel management to the special port for it */</span><br><span style="color: hsl(0, 100%, 40%);">- [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeC(?))) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeC(?), sid := ?)) -> value rx_rsl {</span><br><span> CCHAN_PT.send(rx_rsl);</span><br><span> }</span><br><span> </span><br><span> /* blindly acknowledge all channel activations */</span><br><span style="color: hsl(0, 100%, 40%);">- [bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV))) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [bts_role] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV), sid := ?)) -> value rx_rsl {</span><br><span> chan_nr := rx_rsl.rsl.ies[0].body.chan_nr;</span><br><span> trx_nr := f_trx_by_streamId(rx_rsl.streamId);</span><br><span> f_store_last_act_data(trx_nr, chan_nr, rx_rsl.rsl);</span><br><span> IPA_PT.send(ts_ASP_RSL_UD(ts_RSL_CHAN_ACT_ACK(chan_nr, 23), rx_rsl.streamId));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [not dchan_suspended] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeDR(?))) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [not dchan_suspended] IPA_PT.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeDR(?), sid := ?)) -> value rx_rsl {</span><br><span> /* dispatch to channel based on ChanId */</span><br><span> cid := f_cid_by_chan_nr(f_trx_by_streamId(rx_rsl.streamId),</span><br><span> rx_rsl.rsl.ies[0].body.chan_nr);</span><br><span>@@ -491,7 +491,7 @@</span><br><span> IPA_PT.send(ts_ASP_RSL_UD(rx_rsl_msg, ConnectionTable[cid].stream_id));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [] CCHAN_PT.receive(tr_ASP_RSL_UD(?)) -> value rx_rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] CCHAN_PT.receive(tr_ASP_RSL_UD(?, sid := ?)) -> value rx_rsl {</span><br><span> IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId));</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18486">change 18486</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/c/osmo-ttcn3-hacks/+/18486"/><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-Change-Id: I5ff05bbd985ddc5e39a390e4b775a16f066a53ea </div>
<div style="display:none"> Gerrit-Change-Number: 18486 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>