<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13456">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc-nat: Fix errors due to bit rot<br><br>Change-Id: I79f3b1b74c9f6f8769a5d71fde04847435f3f345<br>---<br>M bsc-nat/BSC_MS_ConnectionHandler.ttcn<br>M bsc-nat/BSC_MS_Simulation.ttcn<br>M bsc-nat/MSC_ConnectionHandler.ttcn<br>M bsc-nat/MSC_Simulation.ttcn<br>4 files changed, 11 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn</span><br><span>index 1f41434..27e1b58 100644</span><br><span>--- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn</span><br><span>+++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn</span><br><span>@@ -52,7 +52,9 @@</span><br><span>     create_cb := refers(CreateCallback),</span><br><span>         unitdata_cb := refers(UnitdataCallback),</span><br><span>     decode_dtap := false,</span><br><span style="color: hsl(0, 100%, 40%);">-   role_ms := true</span><br><span style="color: hsl(120, 100%, 40%);">+       role_ms := true,</span><br><span style="color: hsl(120, 100%, 40%);">+      sccp_addr_local := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+      sccp_addr_peer := omit</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -157,6 +159,9 @@</span><br><span>                    self.stop;</span><br><span>                   }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+         [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>          /* disconnect in invalid state */</span><br><span>            [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {</span><br><span>                   setverdict(fail);</span><br><span>diff --git a/bsc-nat/BSC_MS_Simulation.ttcn b/bsc-nat/BSC_MS_Simulation.ttcn</span><br><span>index b9414a3..7b0093d 100644</span><br><span>--- a/bsc-nat/BSC_MS_Simulation.ttcn</span><br><span>+++ b/bsc-nat/BSC_MS_Simulation.ttcn</span><br><span>@@ -62,7 +62,7 @@</span><br><span>   /* start components */</span><br><span>       vc_IPA.start(IPA_Emulation.main_client(remote_ip, remote_port, local_ip, local_port));</span><br><span>       vc_SCCP.start(SCCPStart(sccp_pars));</span><br><span style="color: hsl(0, 100%, 40%);">-    vc_BSSMAP.start(BSSMAP_Emulation.main(BSC_MS_BssmapOps, id));</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_BSSMAP.start(BSSMAP_Emulation.main(BSC_MS_ConnectionHandler.BSC_MS_BssmapOps, id));</span><br><span> </span><br><span>   /* Initial delay to wait for IPA connection establishment */</span><br><span>         T.start(2.0);</span><br><span>diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn</span><br><span>index 102869c..27fbba7 100644</span><br><span>--- a/bsc-nat/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc-nat/MSC_ConnectionHandler.ttcn</span><br><span>@@ -58,7 +58,9 @@</span><br><span>       create_cb := refers(CreateCallback),</span><br><span>         unitdata_cb := refers(UnitdataCallback),</span><br><span>     decode_dtap := false,</span><br><span style="color: hsl(0, 100%, 40%);">-   role_ms := false</span><br><span style="color: hsl(120, 100%, 40%);">+      role_ms := false,</span><br><span style="color: hsl(120, 100%, 40%);">+     sccp_addr_local := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+      sccp_addr_peer := omit</span><br><span> }</span><br><span> </span><br><span> type enumerated MSC_State {</span><br><span>diff --git a/bsc-nat/MSC_Simulation.ttcn b/bsc-nat/MSC_Simulation.ttcn</span><br><span>index 7e39ca1..0a13509 100755</span><br><span>--- a/bsc-nat/MSC_Simulation.ttcn</span><br><span>+++ b/bsc-nat/MSC_Simulation.ttcn</span><br><span>@@ -64,7 +64,7 @@</span><br><span> </span><br><span>      vc_IPA.start(IPA_Emulation.main_server(local_ip, local_port));</span><br><span>       vc_SCCP.start(SCCPStart(sccp_pars));</span><br><span style="color: hsl(0, 100%, 40%);">-    vc_BSSMAP.start(BSSMAP_Emulation.main(MSC_BssmapOps, id & "-BSSMAP"));</span><br><span style="color: hsl(120, 100%, 40%);">+  vc_BSSMAP.start(BSSMAP_Emulation.main(MSC_ConnectionHandler.MSC_BssmapOps, id & "-BSSMAP"));</span><br><span> </span><br><span>       /* wait until termination of respective components */</span><br><span>        vc_IPA.done;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13456">change 13456</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/13456"/><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: I79f3b1b74c9f6f8769a5d71fde04847435f3f345 </div>
<div style="display:none"> Gerrit-Change-Number: 13456 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Daniel Willmann <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Daniel Willmann <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>