<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12852">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;">Don't use deprecated osmo_stream_cli_open2()<br><br>Using osmo_stream_cli_open() with explicit timeout set via<br>osmo_stream_cli_set_reconnect_timeout() will have the same<br>effect. Update comment explaining this as well as the code.<br><br>Change-Id: Iffe6ea48a170880faef071c7c4a1bc0605aa9855<br>---<br>M src/osmo_ss7.c<br>1 file changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index 39d92fa..05668b0 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -1261,12 +1261,13 @@</span><br><span>              else</span><br><span>                         osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb);</span><br><span>                osmo_stream_cli_set_data(asp->client, asp);</span><br><span style="color: hsl(0, 100%, 40%);">-          rc = osmo_stream_cli_open2(asp->client, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+                rc = osmo_stream_cli_open(asp->client);</span><br><span>           if (rc < 0) {</span><br><span>                     LOGSS7(asp->inst, LOGL_ERROR, "Unable to open stream"</span><br><span>                           " client for ASP %s\n", asp->cfg.name);</span><br><span style="color: hsl(0, 100%, 40%);">-                    /* we don't return error in here because osmo_stream_cli_open2()</span><br><span style="color: hsl(0, 100%, 40%);">-                       will continue to retry to connect so the error is transient  */</span><br><span style="color: hsl(120, 100%, 40%);">+                    /* we don't return error in here because osmo_stream_cli_open()</span><br><span style="color: hsl(120, 100%, 40%);">+                      will continue to retry (due to timeout being explicitly set with</span><br><span style="color: hsl(120, 100%, 40%);">+                      osmo_stream_cli_set_reconnect_timeout() above) to connect so the error is transient */</span><br><span>            }</span><br><span>            /* TODO: make this configurable and not implicit */</span><br><span>          role = XUA_ASPFSM_ROLE_ASP;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12852">change 12852</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/12852"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iffe6ea48a170880faef071c7c4a1bc0605aa9855 </div>
<div style="display:none"> Gerrit-Change-Number: 12852 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@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: Max <msuraev@sysmocom.de> </div>