<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20752">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_*_{disable,enable}<br><br>Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>Change-Id: I4e228399d21098cc9a99b9cc1aa42b24ec609159<br>---<br>M src/ipaccess/abisip-find.c<br>M src/ipaccess/ipaccess-proxy.c<br>M src/osmo-bsc/meas_feed.c<br>M src/osmo-bsc/pcu_sock.c<br>4 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/20752/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c</span><br><span>index a414d16..4bba8a3 100644</span><br><span>--- a/src/ipaccess/abisip-find.c</span><br><span>+++ b/src/ipaccess/abisip-find.c</span><br><span>@@ -406,7 +406,7 @@</span><br><span> if (flags & OSMO_FD_READ)</span><br><span> return read_response(bfd->fd);</span><br><span> if (flags & OSMO_FD_WRITE) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> return bcast_find(bfd->fd);</span><br><span> }</span><br><span> return 0;</span><br><span>@@ -418,7 +418,7 @@</span><br><span> {</span><br><span> struct osmo_fd *bfd = _data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd);</span><br><span> </span><br><span> base_stations_bump(false);</span><br><span> </span><br><span>diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c</span><br><span>index 1ed215d..47465b4 100644</span><br><span>--- a/src/ipaccess/ipaccess-proxy.c</span><br><span>+++ b/src/ipaccess/ipaccess-proxy.c</span><br><span>@@ -283,7 +283,7 @@</span><br><span> if (other_conn) {</span><br><span> /* enqueue the message for TX on the respective FD */</span><br><span> msgb_enqueue(&other_conn->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- other_conn->fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&other_conn->fd);</span><br><span> } else</span><br><span> msgb_free(msg);</span><br><span> </span><br><span>@@ -293,7 +293,7 @@</span><br><span> static int handle_udp_write(struct osmo_fd *bfd)</span><br><span> {</span><br><span> /* not implemented yet */</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> return -EIO;</span><br><span> }</span><br><span>@@ -840,7 +840,7 @@</span><br><span> /* enqueue packet towards BSC */</span><br><span> msgb_enqueue(&bsc_conn->tx_queue, msg);</span><br><span> /* mark respective filedescriptor as 'we want to write' */</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_conn->fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&bsc_conn->fd);</span><br><span> } else {</span><br><span> logp_ipbc_uid(DLINP, LOGL_INFO, ipbc, bfd->priv_nr >> 8);</span><br><span> LOGPC(DLINP, LOGL_INFO, "Dropping packet from %s, "</span><br><span>@@ -869,7 +869,7 @@</span><br><span> </span><br><span> /* get the next msg for this timeslot */</span><br><span> if (llist_empty(&ipc->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> return 0;</span><br><span> }</span><br><span> lh = ipc->tx_queue.next;</span><br><span>diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c</span><br><span>index 889f6ef..881f409 100644</span><br><span>--- a/src/osmo-bsc/meas_feed.c</span><br><span>+++ b/src/osmo-bsc/meas_feed.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> char buf[256];</span><br><span> </span><br><span> rc = read(ofd->fd, buf, sizeof(buf));</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->fd &= ~OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_disable(ofd);</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>@@ -159,7 +159,7 @@</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_mfs.wqueue.bfd.when &= ~OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_disable(&g_mfs.wqueue.bfd);</span><br><span> </span><br><span> if (g_mfs.dst_host)</span><br><span> talloc_free(g_mfs.dst_host);</span><br><span>diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c</span><br><span>index d59df33..541fc84 100644</span><br><span>--- a/src/osmo-bsc/pcu_sock.c</span><br><span>+++ b/src/osmo-bsc/pcu_sock.c</span><br><span>@@ -495,7 +495,7 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(conn_bfd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -518,7 +518,7 @@</span><br><span> osmo_fd_unregister(bfd);</span><br><span> </span><br><span> /* re-enable the generation of ACCEPT for new connections */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when |= OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_enable(&state->listen_bfd);</span><br><span> </span><br><span> #if 0</span><br><span> /* remove si13, ... */</span><br><span>@@ -597,7 +597,7 @@</span><br><span> msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span> pcu_prim = (struct gsm_pcu_if *)msg->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -612,7 +612,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd);</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -667,7 +667,7 @@</span><br><span> LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one PCU connected, this is all we support */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_disable(&state->listen_bfd);</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20752">change 20752</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-bsc/+/20752"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4e228399d21098cc9a99b9cc1aa42b24ec609159 </div>
<div style="display:none"> Gerrit-Change-Number: 20752 </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>