<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC/BSC_ConnectionHandler: only keep SMSC address in SmsParametersRp<br><br>When sending MO or MT SMS, we never include both SM-RP-DA/OA IEs<br>at the same time. In case of MO SMS, SM-RP-OA is omitted, and in<br>case of MT SMS - SM-RP-DA is omitted.<br><br>Change-Id: Ia60bdd2498034b6b849f874cf1eee272abef2b47<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 16 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index 1ce0b69..0f48ed6 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -1618,8 +1618,7 @@</span><br><span> }</span><br><span> type record SmsParametersRp {</span><br><span> OCT1 msg_ref,</span><br><span style="color: hsl(0, 100%, 40%);">- RP_NumberingPlan_and_NumberDigits orig optional,</span><br><span style="color: hsl(0, 100%, 40%);">- RP_NumberingPlan_and_NumberDigits dest optional</span><br><span style="color: hsl(120, 100%, 40%);">+ RP_NumberingPlan_and_NumberDigits smsc_addr optional</span><br><span> }</span><br><span> type record SmsParameters {</span><br><span> SmsParametersTp tp,</span><br><span>@@ -1639,6 +1638,16 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template RP_NumberingPlan_and_NumberDigits t_RP_Addr(template hexstring addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BIT4 npi := '0001'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BIT3 ton := '001'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BIT1 ext := '1'B) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rP_NumberingPlanIdentification := npi,</span><br><span style="color: hsl(120, 100%, 40%);">+ rP_TypeOfNumber := ton,</span><br><span style="color: hsl(120, 100%, 40%);">+ rP_Ext := ext,</span><br><span style="color: hsl(120, 100%, 40%);">+ rP_NumberDigits := addr</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template (value) SmsParameters t_SmsPars(hexstring tp_daddr := '12345'H) := {</span><br><span> tp := {</span><br><span> msg_ref := '23'O,</span><br><span>@@ -1650,8 +1659,9 @@</span><br><span> },</span><br><span> rp := {</span><br><span> msg_ref := '42'O,</span><br><span style="color: hsl(0, 100%, 40%);">- orig := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- dest := { '0000'B, '000'B, '0'B, '98765'H }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We don't really need to have both SM-RP-DA/OA here, because only one IE</span><br><span style="color: hsl(120, 100%, 40%);">+ * is included in MO/MT SMS, and in the most cases it's the SMSC address. */</span><br><span style="color: hsl(120, 100%, 40%);">+ smsc_addr := t_RP_Addr('76722337'H)</span><br><span> },</span><br><span> tid := 0,</span><br><span> dlci := '03'O,</span><br><span>@@ -1700,7 +1710,7 @@</span><br><span> </span><br><span> tp_mo := ts_SMS_SUBMIT(spars.tp.msg_ref, spars.tp.da, spars.tp.pid, spars.tp.dcs,</span><br><span> spars.tp.udl, spars.tp.ud);</span><br><span style="color: hsl(0, 100%, 40%);">- rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, spars.rp.orig, spars.rp.dest, tp_mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, omit, spars.rp.smsc_addr, tp_mo);</span><br><span> l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo));</span><br><span> BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true));</span><br><span> /* receive CP-ACK for CP-DATA above */</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 05d0ef6..439d7f1 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -4702,7 +4702,7 @@</span><br><span> </span><br><span> tp_mo := ts_SMS_SUBMIT(spars.tp.msg_ref, spars.tp.da, spars.tp.pid, spars.tp.dcs,</span><br><span> spars.tp.udl, spars.tp.ud);</span><br><span style="color: hsl(0, 100%, 40%);">- rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, spars.rp.orig, spars.rp.dest, tp_mo);</span><br><span style="color: hsl(120, 100%, 40%);">+ rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, omit, spars.rp.smsc_addr, tp_mo);</span><br><span> l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, ts_CP_DATA_MO(rp_mo));</span><br><span> </span><br><span> SGsAP.send(l3_mo);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16597">change 16597</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/+/16597"/><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: Ia60bdd2498034b6b849f874cf1eee272abef2b47 </div>
<div style="display:none"> Gerrit-Change-Number: 16597 </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@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>