<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11922">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSC_ConnectionHandler.ttcn: split up f_mt_sms() into two functions<br><br>This would allow to expect a MT SMS message using f_mt_sms_expect()<br>and send an RP-ACK using f_mt_sms_send_rp_ack() separately in the<br>follow-up changes for SMS over GSUP.<br><br>Change-Id: I4730634a9f3352b6f8553ee2fd1d43044f41241e<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>1 file changed, 23 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/11922/1</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 96f522c..d5fde89 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -873,17 +873,13 @@</span><br><span> f_mo_sms_wait_rp_ack(spars);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* receive MT-SMS delivered from the MSC/SMSC over an already existing DTAP connection */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_mt_sms(inout SmsParameters spars)</span><br><span style="color: hsl(120, 100%, 40%);">+/* Wait for MT SMS on an already existing DTAP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_mt_sms_expect(inout SmsParameters spars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- var template (value) TPDU_RP_DATA_MS_SGSN tp_mo;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (value) RPDU_MS_SGSN rp_mo;</span><br><span> var template (value) PDU_ML3_MS_NW l3_mo;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> var template TPDU_RP_DATA_SGSN_MS tp_mt;</span><br><span> var template RPDU_SGSN_MS rp_mt;</span><br><span> var template PDU_ML3_NW_MS l3_mt;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> var PDU_DTAP_MT dtap_mt;</span><br><span> </span><br><span> var default d := activate(as_other_sms());</span><br><span>@@ -893,6 +889,7 @@</span><br><span> rp_mt := tr_RP_DATA_MT(?, ?, 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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Extract relevant identifiers */</span><br><span> spars.tid := bit2int(dtap_mt.dtap.tiOrSkip.transactionId.tio);</span><br><span> spars.rp.msg_ref := dtap_mt.dtap.msgs.sms.cP_DATA.cP_User_Data.cP_RPDU.rP_DATA_SGSN_MS.rP_MessageReference;</span><br><span>@@ -901,6 +898,19 @@</span><br><span> l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_ACK_MO);</span><br><span> BSSAP.send(ts_PDU_DTAP_MO(l3_mo, spars.dlci, true));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ deactivate(d);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</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%);">+/* Send RP-ACK for MT-SMS over an already existing DTAP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_mt_sms_send_rp_ack(inout SmsParameters spars)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) RPDU_MS_SGSN rp_mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) PDU_ML3_MS_NW l3_mo;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PDU_ML3_NW_MS l3_mt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var default d := activate(as_other_sms());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* send RP-ACK for RP-DATA */</span><br><span> rp_mo := ts_RP_ACK_MO(spars.rp.msg_ref);</span><br><span> l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_REPL, ts_CP_DATA_MO(rp_mo));</span><br><span>@@ -914,6 +924,13 @@</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Wait for a MT-SMS and send RP-ACK over an already existing</span><br><span style="color: hsl(120, 100%, 40%);">+ * (and authenticated, ...) DTAP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_mt_sms(inout SmsParameters spars)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mt_sms_expect(spars);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mt_sms_send_rp_ack(spars);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11922">change 11922</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/11922"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4730634a9f3352b6f8553ee2fd1d43044f41241e </div>
<div style="display:none"> Gerrit-Change-Number: 11922 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>