<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13728">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add f_expect_paging() rather than using tr_BSSMAP_Paging directly<br><br>this will ease the introduction of RANAP support<br><br>Change-Id: I213303337373c349676be4f8ac4175acdc701e47<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>M msc/MSC_Tests.ttcn<br>2 files changed, 14 insertions(+), 7 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 0eace36..b3345ff 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -553,6 +553,11 @@</span><br><span> MNCC.receive(tr_MNCC_SETUP_cnf(cpars.mncc_callref));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_expect_paging(boolean by_tmsi := true)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_mt_call_establish(inout CallParameters cpars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span> </span><br><span>@@ -561,7 +566,7 @@</span><br><span> </span><br><span> /* BSC <- MSC: Expect paging. FIXME: By TMSI or not? */</span><br><span> f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging()</span><br><span> </span><br><span> /* Complete the call via BSSAP */</span><br><span> f_mt_call_complete(cpars);</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index a9eb316..6ad8860 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -1443,7 +1443,8 @@</span><br><span> hex2str(cpars.called_party), hex2str(g_pars.imsi)));</span><br><span> </span><br><span> /* MSC->BSC: expect PAGING from MSC */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* MS -> MSC: PAGING RESPONSE */</span><br><span> f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span> </span><br><span>@@ -2022,7 +2023,8 @@</span><br><span> f_vty_sms_send(hex2str(pars.imsi), "2342", "Hello SMS");</span><br><span> </span><br><span> /* MSC->BSC: expect PAGING from MSC */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Establish DTAP / BSSAP / SCCP connection */</span><br><span> f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span> </span><br><span>@@ -2326,7 +2328,7 @@</span><br><span> f_gsup_forwardSM_req(spars);</span><br><span> </span><br><span> /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span> f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span> </span><br><span> /* Wait for MT SMS on DTAP */</span><br><span>@@ -2391,7 +2393,7 @@</span><br><span> f_gsup_forwardSM_req(spars);</span><br><span> </span><br><span> /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span> f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span> </span><br><span> /* Wait for MT SMS on DTAP */</span><br><span>@@ -2451,7 +2453,7 @@</span><br><span> f_gsup_forwardSM_req(spars1);</span><br><span> </span><br><span> /* Expect Paging Request and Establish DTAP / BSSAP / SCCP connection */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span> f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span> </span><br><span> /* Wait for 1st MT SMS on DTAP */</span><br><span>@@ -2785,7 +2787,7 @@</span><br><span> }</span><br><span> </span><br><span> /* MSC->BSC: expect PAGING from MSC */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_expect_paging();</span><br><span> /* Establish DTAP / BSSAP / SCCP connection */</span><br><span> f_establish_fully(EST_TYPE_PAG_RESP);</span><br><span> SMPP.receive(tr_SMPP(c_SMPP_command_id_alert_notification, ESME_ROK));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13728">change 13728</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/13728"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I213303337373c349676be4f8ac4175acdc701e47 </div>
<div style="display:none"> Gerrit-Change-Number: 13728 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>