Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init()

[Harald Welte]

Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9338


Change subject: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init()
......................................................................

BSSAP_Adapter: Split f_bssap_start() from f_bssap_init()

In non-handler mode, the SCCP emulation is currently started before
there's a user registered to SCCP_SP_PORT.  If the first BSSMAP
package arrives from the network, then the SCCP_Emulation will crash
as it cannot deliver the resulting SCCP user primitive to the user.

Let's split start from initialization, so user code can still register
something to SCCP_SP_PORT before starting SCCP_Emulation.

Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774
---
M bsc/BSC_Tests.ttcn
M library/BSSAP_Adapter.ttcn
M msc/MSC_Tests.ttcn
3 files changed, 7 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/9338/1

diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 936544b..906e214 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -312,6 +312,8 @@
 		connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT);
 		f_legacy_bssap_reset();
 	}
+	f_bssap_start(g_bssap);
+
 	f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port);
 
 	f_init_mgcp("VirtMSC");
diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn
index 7f03f33..e50487d 100644
--- a/library/BSSAP_Adapter.ttcn
+++ b/library/BSSAP_Adapter.ttcn
@@ -164,9 +164,12 @@
 		ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), ""));
 	}
 
-	ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));
 
 }
 
+function f_bssap_start(inout BSSAP_Adapter ba) {
+	ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));
+}
+
 
 }
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 56ac3d3..f843839 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -228,6 +228,7 @@
 	for (var integer i := 0; i < num_bsc; i := i + 1) {
 		if (isbound(mp_bssap_cfg[i])) {
 			f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps);
+			f_bssap_start(g_bssap[i]);
 		} else {
 			setverdict(fail, "missing BSSAP configuration");
 		}

-- 
To view, visit https://gerrit.osmocom.org/9338
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774
Gerrit-Change-Number: 9338
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180527/81289844/attachment.htm>