<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11717">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSC_ConnectionHandler.ttcn: split up f_mo_sms() into two functions<br><br>This would allow to submit an SMS message using f_mo_sms_submit()<br>and wait for RP-ACK using f_mo_sms_wait_rp_ack() separately in the<br>follow-up changes for SMS over GSUP.<br><br>Change-Id: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>1 file changed, 28 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/17/11717/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 bf7a6d2..96f522c 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -806,17 +806,13 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Submit a MO-SMS over an already existing (and authenticated, ...) DTAP connection */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_mo_sms(inout SmsParameters spars)</span><br><span style="color: hsl(120, 100%, 40%);">+/* Submit a MO-SMS over an already existing DTAP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_mo_sms_submit(inout SmsParameters spars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span> var template (value) TPDU_RP_DATA_MS_SGSN tp_mo;</span><br><span> var template (value) RPDU_MS_SGSN rp_mo;</span><br><span> var template (value) PDU_ML3_MS_NW l3_mo;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var template TPDU_RP_DATA_SGSN_MS tp_mt;</span><br><span style="color: hsl(0, 100%, 40%);">- var template RPDU_SGSN_MS rp_mt;</span><br><span style="color: hsl(0, 100%, 40%);">- var template PDU_ML3_NW_MS l3_mt;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> var default d := activate(as_other_sms());</span><br><span> </span><br><span> /* just in case this is routed to SMPP.. */</span><br><span>@@ -830,6 +826,24 @@</span><br><span> /* receive CP-ACK for CP-DATA above */</span><br><span> BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_SMS(spars.tid, c_TIF_REPL, tr_CP_ACK_MT), spars.dlci));</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%);">+/* Wait RP-ACK for MO-SMS on an already existing DTAP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_mo_sms_wait_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) PDU_ML3_MS_NW l3_mo;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var template TPDU_RP_DATA_SGSN_MS tp_mt;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RPDU_SGSN_MS rp_mt;</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 style="color: hsl(120, 100%, 40%);">+ /* just in case this is routed to SMPP.. */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (ispresent(spars.exp_rp_err)) {</span><br><span> /* expect an RP-ERROR message from MSC with given cause */</span><br><span> rp_mt := tr_RP_ERROR_MT(spars.rp.msg_ref, spars.exp_rp_err);</span><br><span>@@ -847,10 +861,18 @@</span><br><span> l3_mo := ts_ML3_MO_SMS(spars.tid, c_TIF_ORIG, 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%);">+</span><br><span> deactivate(d);</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Submit and wait a MO-SMS over an already existing (and authenticated, ...) DTAP connection */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_mo_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_mo_sms_submit(spars);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_mo_sms_wait_rp_ack(spars);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* receive MT-SMS delivered from the MSC/SMSC over an already existing DTAP connection */</span><br><span> function f_mt_sms(inout SmsParameters spars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11717">change 11717</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/11717"/><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: I5b35206286ae8add8b5bd34b0ab41ba7862c28e4 </div>
<div style="display:none"> Gerrit-Change-Number: 11717 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>