<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14551">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP<br><br>Some of our SMS related test cases are failing. The problem is<br>that SMS related RAN messages shall be sent on SAPI 3, as per<br>GSM TS 04.11, section 2.3, while they actually being sent on<br>SAPI 0.<br><br>For the messages coming from the TCs towards OsmoMSC over RANAP,<br>we need to convert from DLCI to SAPI in f_xmit_raw_l3(). OsmoMSC<br>also needs to be patched, because it seems to ignore SAPI IE.<br><br>Change-Id: I6199fd5f26774fb1ec419bc1ef9e1caeca3a0d35<br>---<br>M library/RAN_Emulation.ttcnpp<br>1 file changed, 8 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp</span><br><span>index b41d7eb..207adcd 100644</span><br><span>--- a/library/RAN_Emulation.ttcnpp</span><br><span>+++ b/library/RAN_Emulation.ttcnpp</span><br><span>@@ -1096,9 +1096,15 @@</span><br><span> #endif</span><br><span> #ifdef RAN_EMULATION_RANAP</span><br><span>   case (RAN_PROTOCOL_RANAP) {</span><br><span style="color: hsl(120, 100%, 40%);">+           var template (omit) RANAP_IEs.SAPI sapi := omit;</span><br><span>             var RANAP_PDU ranap;</span><br><span style="color: hsl(0, 100%, 40%);">-            /* FIXME: convert DLCI into SAPI */</span><br><span style="color: hsl(0, 100%, 40%);">-             ranap := valueof(ts_RANAP_DirectTransfer(l3_enc));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+          /* Perform DLCI -> SAPI transformation (x & 0x07) */</span><br><span style="color: hsl(120, 100%, 40%);">+           if (dlci and4b '07'O == '03'O) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      sapi := sapi_3;</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%);">+           ranap := valueof(ts_RANAP_DirectTransfer(l3_enc, sapi := sapi));</span><br><span>             RANAP.send(ts_RANAP_DATA_req(sccp_conn_id, ranap));</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/+/14551">change 14551</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/+/14551"/><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: I6199fd5f26774fb1ec419bc1ef9e1caeca3a0d35 </div>
<div style="display:none"> Gerrit-Change-Number: 14551 </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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>