<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10599">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix SCCPlite BSC tests: send IPA ID ACK, not GET<br><br>From libosmo-sccp.git Icffda98579e676ab6ca63c9c22cf5d151c4fe95f on, we expect<br>an IPA ID ACK upon first connecting, not an IPA ID GET. This might be specific<br>to the one MSC tested so far, but it's the status quo.<br><br>Make the IPA server in IPA_Emulation configurable, to conform and send the IPA<br>ID ACK upon connecting. This fixes the ttcn3-bsc-tests,SCCPlite suite, broken<br>by above libosmo-sccp commit.<br><br>For other IPA clients, it is so far required to send the IPA ID GET, so only<br>configure the SCCPlite server in BSSAP_Adapter.ttcn to send IPA ID ACK, and<br>leave the others unchanged.<br><br>Related: OS#3500 OS#3498<br>Related: Icffda98579e676ab6ca63c9c22cf5d151c4fe95f (libosmo-sccp)<br>Change-Id: I34b6296a1a408729802a9659c6524c0f67a2f4fe<br>---<br>M library/BSSAP_Adapter.ttcn<br>M library/IPA_Emulation.ttcnpp<br>2 files changed, 20 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn</span><br><span>index ada66d2..cebdffe 100644</span><br><span>--- a/library/BSSAP_Adapter.ttcn</span><br><span>+++ b/library/BSSAP_Adapter.ttcn</span><br><span>@@ -107,7 +107,8 @@</span><br><span> connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT);</span><br><span> ba.vc_WAIT.start(IPA_Emulation.waiter_main());</span><br><span> ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg.sctp_addr.local_sctp_port));</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg.sctp_addr.local_sctp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ true, IPA_INIT_SEND_IPA_ID_ACK));</span><br><span> /* wait until we received an IPA CCM ID_ACK */</span><br><span> ba.vc_WAIT.done;</span><br><span> disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT);</span><br><span>diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp</span><br><span>index b10a983..5c385e6 100644</span><br><span>--- a/library/IPA_Emulation.ttcnpp</span><br><span>+++ b/library/IPA_Emulation.ttcnpp</span><br><span>@@ -51,6 +51,11 @@</span><br><span> IPA_MODE_SERVER</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type enumerated IpaInitBehavior {</span><br><span style="color: hsl(120, 100%, 40%);">+ IPA_INIT_SEND_IPA_ID_GET,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPA_INIT_SEND_IPA_ID_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record ASP_IPA_Unitdata {</span><br><span> IpaStreamId streamId,</span><br><span> IpaExtStreamId streamIdExt optional,</span><br><span>@@ -165,6 +170,7 @@</span><br><span> </span><br><span> var IpaMode g_mode;</span><br><span> var boolean g_ccm_enabled;</span><br><span style="color: hsl(120, 100%, 40%);">+ var IpaInitBehavior g_init_behavior;</span><br><span> var IPA_CCM_Parameters g_ccm_pars := c_IPA_default_ccm_pars;</span><br><span> }</span><br><span> </span><br><span>@@ -425,9 +431,12 @@</span><br><span> </span><br><span> /* main function to use for a server-side IPA implementation */</span><br><span> function main_server(charstring local_host, IPL4asp_Types.PortNumber local_port,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean ccm_enabled := true) runs on IPA_Emulation_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean ccm_enabled := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ IpaInitBehavior init_behavior := IPA_INIT_SEND_IPA_ID_GET)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on IPA_Emulation_CT {</span><br><span> g_mode := IPA_MODE_SERVER;</span><br><span> g_ccm_enabled := ccm_enabled;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_init_behavior := init_behavior;</span><br><span> f_bind(local_host, local_port);</span><br><span> ScanEvents();</span><br><span> }</span><br><span>@@ -566,7 +575,14 @@</span><br><span> g_ipa_conn_id := asp_evt.connOpened.connId;</span><br><span> f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP));</span><br><span> if (g_mode == IPA_MODE_SERVER and g_ccm_enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(valueof(ts_IPA_ID_GET));</span><br><span style="color: hsl(120, 100%, 40%);">+ select (g_init_behavior) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case (IPA_INIT_SEND_IPA_ID_GET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_ID_GET));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ case (IPA_INIT_SEND_IPA_ID_ACK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_ACK));</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> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10599">change 10599</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/10599"/><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: I34b6296a1a408729802a9659c6524c0f67a2f4fe </div>
<div style="display:none"> Gerrit-Change-Number: 10599 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>