<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10658">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipa: Allow signalling fd destroyed in ipa_client_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: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1<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;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/58/10658/1</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 a157889..4359268 100644</span><br><span>--- a/include/osmocom/abis/ipa.h</span><br><span>+++ b/include/osmocom/abis/ipa.h</span><br><span>@@ -71,6 +71,7 @@</span><br><span>         const char                      *addr;</span><br><span>       uint16_t                        port;</span><br><span>        void (*updown_cb)(struct ipa_client_conn *link, int up);</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 (*read_cb)(struct ipa_client_conn *link, struct msgb *msg);</span><br><span>      int (*write_cb)(struct ipa_client_conn *link);</span><br><span>       void                            *data;</span><br><span>diff --git a/src/input/ipa.c b/src/input/ipa.c</span><br><span>index 554644c..d0363e2 100644</span><br><span>--- a/src/input/ipa.c</span><br><span>+++ b/src/input/ipa.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span>  link->pending_msg = NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ipa_client_read(struct ipa_client_conn *link)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ipa_client_read(struct ipa_client_conn *link)</span><br><span> {</span><br><span>        struct osmo_fd *ofd = link->ofd;</span><br><span>  struct msgb *msg;</span><br><span>@@ -58,7 +58,7 @@</span><br><span>        ret = ipa_msg_recv_buffered(ofd->fd, &msg, &link->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(link, LOGL_ERROR, "lost connection with server\n");</span><br><span>                 else if (ret == 0)</span><br><span>@@ -66,10 +66,11 @@</span><br><span>             ipa_client_conn_close(link);</span><br><span>                 if (link->updown_cb)</span><br><span>                      link->updown_cb(link, 0);</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 (link->read_cb)</span><br><span style="color: hsl(0, 100%, 40%);">-           link->read_cb(link, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+          return link->read_cb(link, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+   return 0;</span><br><span> }</span><br><span> </span><br><span> static void ipa_client_write(struct ipa_client_conn *link)</span><br><span>@@ -111,7 +112,7 @@</span><br><span> static int ipa_client_fd_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span>   struct ipa_client_conn *link = ofd->data;</span><br><span style="color: hsl(0, 100%, 40%);">-    int error, ret;</span><br><span style="color: hsl(120, 100%, 40%);">+       int error, ret = 0;</span><br><span>  socklen_t len = sizeof(error);</span><br><span> </span><br><span>   switch(link->state) {</span><br><span>@@ -132,9 +133,9 @@</span><br><span>       case IPA_CLIENT_LINK_STATE_CONNECTED:</span><br><span>                if (what & BSC_FD_READ) {</span><br><span>                        LOGIPA(link, LOGL_DEBUG, "connected read\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                 ipa_client_read(link);</span><br><span style="color: hsl(120, 100%, 40%);">+                        ret = ipa_client_read(link);</span><br><span>                 }</span><br><span style="color: hsl(0, 100%, 40%);">-               if (what & BSC_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+                if (ret != -EBADF && (what & BSC_FD_WRITE)) {</span><br><span>                    LOGIPA(link, LOGL_DEBUG, "connected write\n");</span><br><span>                     ipa_client_write(link);</span><br><span>              }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10658">change 10658</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/10658"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0e449a2bdf7f0411feeccd262cd731ca6fba3fc1 </div>
<div style="display:none"> Gerrit-Change-Number: 10658 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>