<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10659">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;">ipa: Allow signalling fd destroyed in ipa_server_conn_read<br><br>Similar to what we do in other osmo_fd cb, check for read_cb returning<br>-EBADF and in that case don't attempt using the osmo_fd anymore, either<br>because the fd was already closed (no need to then signal WRITE) or<br>because osmo_fd struct itself has been freed.<br><br>Change-Id: I4b968b72285f23a9552519cea67398a43d5003d2<br>---<br>M include/osmocom/abis/ipa.h<br>M src/input/ipa.c<br>2 files changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h</span><br><span>index 4359268..a738156 100644</span><br><span>--- a/include/osmocom/abis/ipa.h</span><br><span>+++ b/include/osmocom/abis/ipa.h</span><br><span>@@ -37,6 +37,7 @@</span><br><span>      int (*closed_cb)(struct ipa_server_conn *peer);</span><br><span>      int (*ccm_cb)(struct ipa_server_conn *peer, struct msgb *msg,</span><br><span>                        struct tlv_parsed *tlvp, struct ipaccess_unit *ud);</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Callback when ofd has something to be read. -EBADF must be returned if the osmo_fd is destroyed. */</span><br><span>       int (*cb)(struct ipa_server_conn *peer, struct msgb *msg);</span><br><span>   void                            *data;</span><br><span>       struct msgb                     *pending_msg;</span><br><span>diff --git a/src/input/ipa.c b/src/input/ipa.c</span><br><span>index d0363e2..09e3426 100644</span><br><span>--- a/src/input/ipa.c</span><br><span>+++ b/src/input/ipa.c</span><br><span>@@ -328,7 +328,7 @@</span><br><span>         close(link->ofd.fd);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ipa_server_conn_read(struct ipa_server_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ipa_server_conn_read(struct ipa_server_conn *conn)</span><br><span> {</span><br><span>   struct osmo_fd *ofd = &conn->ofd;</span><br><span>     struct msgb *msg;</span><br><span>@@ -339,18 +339,18 @@</span><br><span>    ret = ipa_msg_recv_buffered(ofd->fd, &msg, &conn->pending_msg);</span><br><span>        if (ret <= 0) {</span><br><span>           if (ret == -EAGAIN)</span><br><span style="color: hsl(0, 100%, 40%);">-                     return;</span><br><span style="color: hsl(120, 100%, 40%);">+                       return 0;</span><br><span>            else if (ret == -EPIPE || ret == -ECONNRESET)</span><br><span>                        LOGIPA(conn, LOGL_ERROR, "lost connection with server\n");</span><br><span>                 else if (ret == 0)</span><br><span>                   LOGIPA(conn, LOGL_ERROR, "connection closed with server\n");</span><br><span>               ipa_server_conn_destroy(conn);</span><br><span style="color: hsl(0, 100%, 40%);">-          return;</span><br><span style="color: hsl(120, 100%, 40%);">+               return -EBADF;</span><br><span>       }</span><br><span>    if (conn->cb)</span><br><span style="color: hsl(0, 100%, 40%);">-                conn->cb(conn, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return conn->cb(conn, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      return;</span><br><span style="color: hsl(120, 100%, 40%);">+       return 0;</span><br><span> }</span><br><span> </span><br><span> static void ipa_server_conn_write(struct ipa_server_conn *conn)</span><br><span>@@ -376,11 +376,12 @@</span><br><span> static int ipa_server_conn_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span>  struct ipa_server_conn *conn = ofd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+  int rc = 0;</span><br><span> </span><br><span>      LOGP(DLINP, LOGL_DEBUG, "connected read/write\n");</span><br><span>         if (what & BSC_FD_READ)</span><br><span style="color: hsl(0, 100%, 40%);">-             ipa_server_conn_read(conn);</span><br><span style="color: hsl(0, 100%, 40%);">-     if (what & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+          rc = ipa_server_conn_read(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rc != -EBADF && (what & BSC_FD_WRITE))</span><br><span>               ipa_server_conn_write(conn);</span><br><span> </span><br><span>     return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10659">change 10659</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/10659"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I4b968b72285f23a9552519cea67398a43d5003d2 </div>
<div style="display:none"> Gerrit-Change-Number: 10659 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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>