<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MSC_Tests.ttcn: fix: verify the contents of SM-RP-DA/OA for MO/MT SMS<br><br>Change-Id: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9<br>Related: OS#4324<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 19 insertions(+), 9 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 0f48ed6..ccebba1 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -1777,7 +1777,7 @@</span><br><span> </span><br><span> /* Expect CP-DATA(RP-DATA(SMS-DELIVER)) */</span><br><span> tp_mt := tr_SMS_DELIVER(?, spars.tp.ud, spars.tp.pid, spars.tp.dcs, ?);</span><br><span style="color: hsl(0, 100%, 40%);">- rp_mt := tr_RP_DATA_MT(?, ?, omit, tp_mt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rp_mt := tr_RP_DATA_MT(?, spars.rp.smsc_addr, omit, tp_mt);</span><br><span> l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt));</span><br><span> BSSAP.receive(tr_PDU_DTAP_MT(l3_mt, spars.dlci)) -> value dtap_mt;</span><br><span> </span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index f430335..e0d9c7f 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -2166,10 +2166,17 @@</span><br><span> var template GSUP_PDU mo_forwardSM := tr_GSUP_MO_FORWARD_SM_REQ(</span><br><span> imsi := g_pars.imsi,</span><br><span> sm_rp_mr := spars.rp.msg_ref,</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: extract SM-RP-DA from spars.rp.dest */</span><br><span style="color: hsl(0, 100%, 40%);">- sm_rp_da := tr_GSUP_SM_RP_DA_SMSC_ADDR(?),</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: MSISDN coding troubles */</span><br><span style="color: hsl(0, 100%, 40%);">- sm_rp_oa := tr_GSUP_SM_RP_OA_MSISDN(?),</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SM-RP-DA: SMSC address */</span><br><span style="color: hsl(120, 100%, 40%);">+ sm_rp_da := tr_GSUP_SM_RP_DA_SMSC_ADDR(t_GSUP_SM_RP_Addr(</span><br><span style="color: hsl(120, 100%, 40%);">+ number := spars.rp.smsc_addr.rP_NumberDigits,</span><br><span style="color: hsl(120, 100%, 40%);">+ npi := spars.rp.smsc_addr.rP_NumberingPlanIdentification,</span><br><span style="color: hsl(120, 100%, 40%);">+ ton := spars.rp.smsc_addr.rP_TypeOfNumber,</span><br><span style="color: hsl(120, 100%, 40%);">+ ext := spars.rp.smsc_addr.rP_Ext)),</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SM-RP-OA: subscriber's MSISDN (filled in by MSC) */</span><br><span style="color: hsl(120, 100%, 40%);">+ sm_rp_oa := tr_GSUP_SM_RP_OA_MSISDN(t_GSUP_SM_RP_Addr(</span><br><span style="color: hsl(120, 100%, 40%);">+ number := g_pars.msisdn,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOTE: MSISDN in g_pars lacks this info, assuming defaults */</span><br><span style="color: hsl(120, 100%, 40%);">+ npi := '0001'B, ton := '001'B, ext := '1'B)),</span><br><span> /* TODO: can we use decmatch here? */</span><br><span> sm_rp_ui := sm_tpdu</span><br><span> );</span><br><span>@@ -2269,15 +2276,18 @@</span><br><span> private function f_gsup_forwardSM_req(SmsParameters spars, OCT1 mms := '00'O)</span><br><span> runs on BSC_ConnHdlr {</span><br><span> var GSUP_SM_RP_Addr msisdn := valueof(t_GSUP_SM_RP_Addr(g_pars.msisdn));</span><br><span style="color: hsl(120, 100%, 40%);">+ var GSUP_SM_RP_Addr smsc := valueof(t_GSUP_SM_RP_Addr(</span><br><span style="color: hsl(120, 100%, 40%);">+ number := spars.rp.smsc_addr.rP_NumberDigits,</span><br><span style="color: hsl(120, 100%, 40%);">+ npi := spars.rp.smsc_addr.rP_NumberingPlanIdentification,</span><br><span style="color: hsl(120, 100%, 40%);">+ ton := spars.rp.smsc_addr.rP_TypeOfNumber,</span><br><span style="color: hsl(120, 100%, 40%);">+ ext := spars.rp.smsc_addr.rP_Ext));</span><br><span> </span><br><span> GSUP.send(ts_GSUP_MT_FORWARD_SM_REQ(</span><br><span> imsi := g_pars.imsi,</span><br><span> /* NOTE: MSC should assign RP-MR itself */</span><br><span> sm_rp_mr := 'FF'O,</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: extract SM-RP-DA from spars.rp.dest */</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: fix encoding of ts_GSUP_SM_RP_DA_IMSI */</span><br><span> sm_rp_da := valueof(ts_GSUP_SM_RP_DA_MSISDN(msisdn)),</span><br><span style="color: hsl(0, 100%, 40%);">- sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(msisdn)),</span><br><span style="color: hsl(120, 100%, 40%);">+ sm_rp_oa := valueof(ts_GSUP_SM_RP_OA_SMSC_ADDR(smsc)),</span><br><span> /* Encoded SMS TPDU (taken from Wireshark)</span><br><span> * FIXME: we should encode spars somehow */</span><br><span> sm_rp_ui := '00068021436500008111328130858200'O,</span><br><span>@@ -4656,7 +4666,7 @@</span><br><span> </span><br><span> /* Expect CP-DATA(RP-DATA(SMS-DELIVER)) */</span><br><span> tp_mt := tr_SMS_DELIVER(?, spars.tp.ud, spars.tp.pid, spars.tp.dcs, ?);</span><br><span style="color: hsl(0, 100%, 40%);">- rp_mt := tr_RP_DATA_MT(?, ?, omit, tp_mt);</span><br><span style="color: hsl(120, 100%, 40%);">+ rp_mt := tr_RP_DATA_MT(?, spars.rp.smsc_addr, omit, tp_mt);</span><br><span> l3_mt := tr_ML3_MT_SMS(?, c_TIF_ORIG, tr_CP_DATA_MT(rp_mt));</span><br><span> </span><br><span> SGsAP.receive(l3_mt) -> value sgsap_l3_mt;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16566">change 16566</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/+/16566"/><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: Ib467eeca6439bc6cce72293fbb5bb48f6d233db9 </div>
<div style="display:none"> Gerrit-Change-Number: 16566 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>