diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2018-10-24 18:33:10 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-03-29 11:12:14 +0000 |
| commit | aa17059b329d592d1f2eaa8b1adf2ffdadfd3c78 (patch) | |
| tree | 59a47536719be3346f3223d3eef32932422ccb06 | |
| parent | 0c6f34cf8f53e6b1ed4b04846f871bc18ccf33db (diff) | |
bsc-nat: Fix errors due to bit rot
Change-Id: I79f3b1b74c9f6f8769a5d71fde04847435f3f345
| -rw-r--r-- | bsc-nat/BSC_MS_ConnectionHandler.ttcn | 7 | ||||
| -rw-r--r-- | bsc-nat/BSC_MS_Simulation.ttcn | 2 | ||||
| -rw-r--r-- | bsc-nat/MSC_ConnectionHandler.ttcn | 4 | ||||
| -rwxr-xr-x | bsc-nat/MSC_Simulation.ttcn | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn index 1f414348..27e1b581 100644 --- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn +++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn @@ -52,7 +52,9 @@ const BssmapOps BSC_MS_BssmapOps := { 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 @@ runs on BSC_MS_ConnHdlr { 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 b9414a3b..7b0093d0 100644 --- a/bsc-nat/BSC_MS_Simulation.ttcn +++ b/bsc-nat/BSC_MS_Simulation.ttcn @@ -62,7 +62,7 @@ function main(charstring remote_ip, PortNumber remote_port, /* 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 102869cb..27fbba73 100644 --- a/bsc-nat/MSC_ConnectionHandler.ttcn +++ b/bsc-nat/MSC_ConnectionHandler.ttcn @@ -58,7 +58,9 @@ const BssmapOps MSC_BssmapOps := { 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 7e39ca13..0a135091 100755 --- a/bsc-nat/MSC_Simulation.ttcn +++ b/bsc-nat/MSC_Simulation.ttcn @@ -64,7 +64,7 @@ function main(charstring local_ip, PortNumber local_port, 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; |