<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10568">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipaccess: Use osmo_fd_setup to set up callbacks<br><br>We have a public API in libosmocore, so let's use it istead of manually<br>filling each struct field.<br><br>Change-Id: I09479c3d5b0b9bd69a56c080b8c533a32824cc66<br>---<br>M src/input/ipaccess.c<br>1 file changed, 5 insertions(+), 15 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/68/10568/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c</span><br><span>index 3d2fa44..6f41c97 100644</span><br><span>--- a/src/input/ipaccess.c</span><br><span>+++ b/src/input/ipaccess.c</span><br><span>@@ -189,11 +189,9 @@</span><br><span>                     newbfd = &ts->driver.ipaccess.fd;</span><br><span> </span><br><span>                         /* get rid of our old temporary bfd */</span><br><span style="color: hsl(0, 100%, 40%);">-                  newbfd->fd = bfd->fd;</span><br><span style="color: hsl(0, 100%, 40%);">-                     newbfd->when |= bfd->when; /* preserve 'newbfd->when' flags potentially set by sign_link_up() */</span><br><span style="color: hsl(0, 100%, 40%);">-                       newbfd->cb = bfd->cb;</span><br><span style="color: hsl(0, 100%, 40%);">-                     newbfd->data = bfd->data;</span><br><span style="color: hsl(0, 100%, 40%);">-                 newbfd->priv_nr = E1INP_SIGN_RSL + unit_data.trx_id;</span><br><span style="color: hsl(120, 100%, 40%);">+                       /* preserve 'newbfd->when' flags potentially set by sign_link_up() */</span><br><span style="color: hsl(120, 100%, 40%);">+                      osmo_fd_setup(newbfd, bfd->fd, bfd->when, bfd->cb,</span><br><span style="color: hsl(120, 100%, 40%);">+                                 bfd->data, E1INP_SIGN_RSL + unit_data.trx_id);</span><br><span>                      osmo_fd_unregister(bfd);</span><br><span>                     bfd->fd = -1;</span><br><span>                     ret = osmo_fd_register(newbfd);</span><br><span>@@ -479,11 +477,7 @@</span><br><span>       e1i_ts = &line->ts[idx];</span><br><span> </span><br><span>  bfd = &e1i_ts->driver.ipaccess.fd;</span><br><span style="color: hsl(0, 100%, 40%);">-       bfd->fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">-        bfd->data = line;</span><br><span style="color: hsl(0, 100%, 40%);">-    bfd->priv_nr = E1INP_SIGN_OML;</span><br><span style="color: hsl(0, 100%, 40%);">-       bfd->cb = ipaccess_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-    bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_OML);</span><br><span>   ret = osmo_fd_register(bfd);</span><br><span>         if (ret < 0) {</span><br><span>            LOGP(DLINP, LOGL_ERROR, "could not register FD\n");</span><br><span>@@ -535,11 +529,7 @@</span><br><span>         e1i_ts = &line->ts[E1INP_SIGN_RSL-1];</span><br><span> </span><br><span>     bfd = &e1i_ts->driver.ipaccess.fd;</span><br><span style="color: hsl(0, 100%, 40%);">-       bfd->fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">-        bfd->data = line;</span><br><span style="color: hsl(0, 100%, 40%);">-    bfd->priv_nr = E1INP_SIGN_RSL;</span><br><span style="color: hsl(0, 100%, 40%);">-       bfd->cb = ipaccess_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">-    bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fd_setup(bfd, fd, BSC_FD_READ, ipaccess_fd_cb, line, E1INP_SIGN_RSL);</span><br><span>   ret = osmo_fd_register(bfd);</span><br><span>         if (ret < 0) {</span><br><span>            LOGP(DLINP, LOGL_ERROR, "could not register FD\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10568">change 10568</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/10568"/><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: I09479c3d5b0b9bd69a56c080b8c533a32824cc66 </div>
<div style="display:none"> Gerrit-Change-Number: 10568 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>