Change in osmo-ttcn3-hacks[master]: bsc-nat: Fix errors due to bit rot

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Mar 29 11:12:15 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13456 )

Change subject: bsc-nat: Fix errors due to bit rot
......................................................................

bsc-nat: Fix errors due to bit rot

Change-Id: I79f3b1b74c9f6f8769a5d71fde04847435f3f345
---
M bsc-nat/BSC_MS_ConnectionHandler.ttcn
M bsc-nat/BSC_MS_Simulation.ttcn
M bsc-nat/MSC_ConnectionHandler.ttcn
M bsc-nat/MSC_Simulation.ttcn
4 files changed, 11 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
index 1f41434..27e1b58 100644
--- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn
+++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
@@ -52,7 +52,9 @@
 	create_cb := refers(CreateCallback),
 	unitdata_cb := refers(UnitdataCallback),
 	decode_dtap := false,
-	role_ms := true
+	role_ms := true,
+	sccp_addr_local := omit,
+	sccp_addr_peer := omit
 }
 
 
@@ -157,6 +159,9 @@
 			self.stop;
 			}
 
+		[] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {
+			}
+
 		/* disconnect in invalid state */
 		[] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {
 			setverdict(fail);
diff --git a/bsc-nat/BSC_MS_Simulation.ttcn b/bsc-nat/BSC_MS_Simulation.ttcn
index b9414a3..7b0093d 100644
--- a/bsc-nat/BSC_MS_Simulation.ttcn
+++ b/bsc-nat/BSC_MS_Simulation.ttcn
@@ -62,7 +62,7 @@
 	/* start components */
 	vc_IPA.start(IPA_Emulation.main_client(remote_ip, remote_port, local_ip, local_port));
 	vc_SCCP.start(SCCPStart(sccp_pars));
-	vc_BSSMAP.start(BSSMAP_Emulation.main(BSC_MS_BssmapOps, id));
+	vc_BSSMAP.start(BSSMAP_Emulation.main(BSC_MS_ConnectionHandler.BSC_MS_BssmapOps, id));
 
 	/* Initial delay to wait for IPA connection establishment */
 	T.start(2.0);
diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn
index 102869c..27fbba7 100644
--- a/bsc-nat/MSC_ConnectionHandler.ttcn
+++ b/bsc-nat/MSC_ConnectionHandler.ttcn
@@ -58,7 +58,9 @@
 	create_cb := refers(CreateCallback),
 	unitdata_cb := refers(UnitdataCallback),
 	decode_dtap := false,
-	role_ms := false
+	role_ms := false,
+	sccp_addr_local := omit,
+	sccp_addr_peer := omit
 }
 
 type enumerated MSC_State {
diff --git a/bsc-nat/MSC_Simulation.ttcn b/bsc-nat/MSC_Simulation.ttcn
index 7e39ca1..0a13509 100755
--- a/bsc-nat/MSC_Simulation.ttcn
+++ b/bsc-nat/MSC_Simulation.ttcn
@@ -64,7 +64,7 @@
 
 	vc_IPA.start(IPA_Emulation.main_server(local_ip, local_port));
 	vc_SCCP.start(SCCPStart(sccp_pars));
-	vc_BSSMAP.start(BSSMAP_Emulation.main(MSC_BssmapOps, id & "-BSSMAP"));
+	vc_BSSMAP.start(BSSMAP_Emulation.main(MSC_ConnectionHandler.MSC_BssmapOps, id & "-BSSMAP"));
 
 	/* wait until termination of respective components */
 	vc_IPA.done;

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

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I79f3b1b74c9f6f8769a5d71fde04847435f3f345
Gerrit-Change-Number: 13456
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Willmann <dwillmann at sysmocom.de>
Gerrit-Reviewer: Daniel Willmann <dwillmann at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190329/70461bec/attachment.html>


More information about the gerrit-log mailing list