<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mncc: check fd before closing a connection<br><br>The function close_connection() closes the fd without marking it as<br>closed. Lets set the fd to -1 and check at the beginning if it is<br>greater than zero. This prevents us from closing an already closed fd<br>again.<br><br>Related: OS#4159<br>Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e<br>---<br>M src/mncc.c<br>1 file changed, 6 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mncc.c b/src/mncc.c</span><br><span>index e23bd6f..f2e2579 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -324,8 +324,12 @@</span><br><span> /* Close the MNCC connection/socket */</span><br><span> static void close_connection(struct mncc_connection *conn)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+   if (conn->fd.fd < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+            return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    osmo_fd_unregister(&conn->fd);</span><br><span>        close(conn->fd.fd);</span><br><span style="color: hsl(120, 100%, 40%);">+        conn->fd.fd = -1;</span><br><span>         osmo_timer_schedule(&conn->reconnect, 5, 0);</span><br><span>  conn->state = MNCC_DISCONNECTED;</span><br><span>  if (conn->on_disconnect)</span><br><span>@@ -924,6 +928,7 @@</span><br><span>            LOGP(DMNCC, LOGL_ERROR, "Failed to connect(%s). Retrying\n",</span><br><span>                       conn->app->mncc.path);</span><br><span>                 conn->state = MNCC_DISCONNECTED;</span><br><span style="color: hsl(120, 100%, 40%);">+           conn->fd.fd = -1;</span><br><span>                 osmo_timer_schedule(&conn->reconnect, 5, 0);</span><br><span>          return;</span><br><span>      }</span><br><span>@@ -1022,6 +1027,7 @@</span><br><span>    conn->reconnect.data = conn;</span><br><span>      conn->fd.cb = mncc_data;</span><br><span>  conn->fd.data = conn;</span><br><span style="color: hsl(120, 100%, 40%);">+      conn->fd.fd = -1;</span><br><span>         conn->app = cfg;</span><br><span>  conn->state = MNCC_DISCONNECTED;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/15303">change 15303</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/c/osmo-sip-connector/+/15303"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sip-connector </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9742f31a37296fed15d54cf44c1f65b93abb8c8e </div>
<div style="display:none"> Gerrit-Change-Number: 15303 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>