<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/20784">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_setup() whenever applicable<br><br>Change-Id: Ib570e2ada619b72001d76d2cae159d78f09d6fb6<br>---<br>M src/libmsc/mncc_sock.c<br>M src/libmsc/smpp_smsc.c<br>2 files changed, 3 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/84/20784/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c</span><br><span>index a3527ef..4c1362d 100644</span><br><span>--- a/src/libmsc/mncc_sock.c</span><br><span>+++ b/src/libmsc/mncc_sock.c</span><br><span>@@ -250,11 +250,7 @@</span><br><span>           return 0;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">-   conn_bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-       conn_bfd->cb = mncc_sock_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->data = state;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, mncc_sock_cb, state, 0);</span><br><span>   if (osmo_fd_register(conn_bfd) != 0) {</span><br><span>               LOGP(DMNCC, LOGL_ERROR, "Failed to register new connection fd\n");</span><br><span>                 close(conn_bfd->fd);</span><br><span>@@ -294,10 +290,7 @@</span><br><span>               return -1;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bfd->when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">-    bfd->cb = mncc_sock_accept;</span><br><span style="color: hsl(0, 100%, 40%);">-  bfd->data = state;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, mncc_sock_accept, state, 0);</span><br><span>    rc = osmo_fd_register(bfd);</span><br><span>  if (rc < 0) {</span><br><span>             LOGP(DMNCC, LOGL_ERROR, "Could not register listen fd: %d\n", rc);</span><br><span>diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c</span><br><span>index 2d82d98..a5c6165 100644</span><br><span>--- a/src/libmsc/smpp_smsc.c</span><br><span>+++ b/src/libmsc/smpp_smsc.c</span><br><span>@@ -929,9 +929,7 @@</span><br><span>      esme_inc_seq_nr(esme);</span><br><span>       esme->smsc = smsc;</span><br><span>        osmo_wqueue_init(&esme->wqueue, 10);</span><br><span style="color: hsl(0, 100%, 40%);">-     esme->wqueue.bfd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">-    esme->wqueue.bfd.data = esme;</span><br><span style="color: hsl(0, 100%, 40%);">-        esme->wqueue.bfd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_fd_setup(&esme->wqueue.bfd, fd, OSMO_FD_READ, osmo_wqueue_bfd_cb, esme, 0);</span><br><span> </span><br><span>  if (osmo_fd_register(&esme->wqueue.bfd) != 0) {</span><br><span>               close(fd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/20784">change 20784</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-msc/+/20784"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib570e2ada619b72001d76d2cae159d78f09d6fb6 </div>
<div style="display:none"> Gerrit-Change-Number: 20784 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>