<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18462">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/IPA_Emulation: handle optional conn_id in ASP_RSL_Unitdata<br><br>This would allow the RSL Emulation component to maintain several<br>transceiver connections in server mode. In order to send an RSL<br>message to a specific transceiver, its TCP/IP connection ID needs<br>to be included in the ASP_RSL_Unitdata message.<br><br>Change-Id: I5c48d043cd746aad03e4329d9ffd2a627b640f64<br>Related: OS#4546<br>---<br>M library/IPA_Emulation.ttcnpp<br>1 file changed, 19 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp</span><br><span>index 1833a89..2148392 100644</span><br><span>--- a/library/IPA_Emulation.ttcnpp</span><br><span>+++ b/library/IPA_Emulation.ttcnpp</span><br><span>@@ -110,18 +110,23 @@</span><br><span> #ifdef IPA_EMULATION_RSL</span><br><span> /* like ASP_IPA_Unitdata, but with RSL_Message abstract type instead of octetstring */</span><br><span> type record ASP_RSL_Unitdata {</span><br><span style="color: hsl(120, 100%, 40%);">+ integer conn_id optional,</span><br><span> IpaStreamId streamId,</span><br><span> RSL_Message rsl</span><br><span> };</span><br><span> </span><br><span> template (value) ASP_RSL_Unitdata ts_ASP_RSL_UD(template (value) RSL_Message rsl,</span><br><span style="color: hsl(0, 100%, 40%);">- IpaStreamId sid := IPAC_PROTO_RSL_TRX0) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ IpaStreamId sid := IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (omit) integer conn_id := omit) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id := conn_id,</span><br><span> streamId := sid,</span><br><span> rsl := rsl</span><br><span> }</span><br><span> </span><br><span> template ASP_RSL_Unitdata tr_ASP_RSL_UD(template (present) RSL_Message rsl,</span><br><span style="color: hsl(0, 100%, 40%);">- template IpaStreamId sid := IPAC_PROTO_RSL_TRX0) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template IpaStreamId sid := IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(120, 100%, 40%);">+ template integer conn_id := *) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id := conn_id,</span><br><span> streamId := sid,</span><br><span> rsl := rsl</span><br><span> }</span><br><span>@@ -479,8 +484,13 @@</span><br><span> #ifdef IPA_EMULATION_RSL</span><br><span> private function f_from_rsl(IPL4asp_Types.ConnectionId connId, ASP_RSL_Unitdata rsl_tx) return IPA_Send {</span><br><span> var octetstring payload := enc_RSL_Message(rsl_tx.rsl);</span><br><span style="color: hsl(0, 100%, 40%);">- var IPA_Send ret := valueof(t_IPA_Send(connId, rsl_tx.streamId, payload));</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ASP_RSL_Unitdata may (optionally) contain TCP/IP connection ID */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsl_tx.conn_id != omit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ connId := rsl_tx.conn_id;</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%);">+ return valueof(t_IPA_Send(connId, rsl_tx.streamId, payload));</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span>@@ -654,10 +664,11 @@</span><br><span> #endif</span><br><span> #ifdef IPA_EMULATION_RSL</span><br><span> case (t_IpaSidRSL) {</span><br><span style="color: hsl(0, 100%, 40%);">- rsl := {</span><br><span style="color: hsl(0, 100%, 40%);">- streamId := ipa_rx.streamId,</span><br><span style="color: hsl(0, 100%, 40%);">- rsl := dec_RSL_Message(ipa_rx.msg)</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl := valueof(ts_ASP_RSL_UD(</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl := dec_RSL_Message(ipa_rx.msg),</span><br><span style="color: hsl(120, 100%, 40%);">+ sid := ipa_rx.streamId,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id := ipa_rx.connId</span><br><span style="color: hsl(120, 100%, 40%);">+ ));</span><br><span> IPA_RSL_PORT.send(rsl);</span><br><span> }</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18462">change 18462</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/+/18462"/><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: I5c48d043cd746aad03e4329d9ffd2a627b640f64 </div>
<div style="display:none"> Gerrit-Change-Number: 18462 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>