<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9338">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSAP_Adapter: Split f_bssap_start() from f_bssap_init()<br><br>In non-handler mode, the SCCP emulation is currently started before<br>there's a user registered to SCCP_SP_PORT.  If the first BSSMAP<br>package arrives from the network, then the SCCP_Emulation will crash<br>as it cannot deliver the resulting SCCP user primitive to the user.<br><br>Let's split start from initialization, so user code can still register<br>something to SCCP_SP_PORT before starting SCCP_Emulation.<br><br>Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/BSSAP_Adapter.ttcn<br>M msc/MSC_Tests.ttcn<br>3 files changed, 7 insertions(+), 1 deletion(-)<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/38/9338/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 936544b..906e214 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -312,6 +312,8 @@</span><br><span>                 connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT);</span><br><span>           f_legacy_bssap_reset();</span><br><span>      }</span><br><span style="color: hsl(120, 100%, 40%);">+     f_bssap_start(g_bssap);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port);</span><br><span> </span><br><span>   f_init_mgcp("VirtMSC");</span><br><span>diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn</span><br><span>index 7f03f33..e50487d 100644</span><br><span>--- a/library/BSSAP_Adapter.ttcn</span><br><span>+++ b/library/BSSAP_Adapter.ttcn</span><br><span>@@ -164,9 +164,12 @@</span><br><span>                ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), ""));</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_bssap_start(inout BSSAP_Adapter ba) {</span><br><span style="color: hsl(120, 100%, 40%);">+     ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> }</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 56ac3d3..f843839 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -228,6 +228,7 @@</span><br><span>  for (var integer i := 0; i < num_bsc; i := i + 1) {</span><br><span>               if (isbound(mp_bssap_cfg[i])) {</span><br><span>                      f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps);</span><br><span style="color: hsl(120, 100%, 40%);">+                     f_bssap_start(g_bssap[i]);</span><br><span>           } else {</span><br><span>                     setverdict(fail, "missing BSSAP configuration");</span><br><span>           }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9338">change 9338</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/9338"/><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: I55c94f18531bb7e5369500dc90f4b0ff3a420774 </div>
<div style="display:none"> Gerrit-Change-Number: 9338 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>