<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20770">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_*_{disable,enable}<br><br>Change-Id: If4c7f946852d153bd472e5c704f8d517d26ca22e<br>Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>---<br>M src/host/layer23/src/mobile/mncc_sock.c<br>1 file changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/20770/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c</span><br><span>index 14adf07..5ea6feb 100644</span><br><span>--- a/src/host/layer23/src/mobile/mncc_sock.c</span><br><span>+++ b/src/host/layer23/src/mobile/mncc_sock.c</span><br><span>@@ -72,13 +72,13 @@</span><br><span> </span><br><span> /* Actually enqueue the message and mark socket write need */</span><br><span> msgb_enqueue(&state->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- state->conn_bfd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&state->conn_bfd);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> void mncc_sock_write_pending(struct mncc_sock_state *state)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- state->conn_bfd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&state->conn_bfd);</span><br><span> }</span><br><span> </span><br><span> static void mncc_sock_close(struct mncc_sock_state *state)</span><br><span>@@ -92,7 +92,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> /* FIXME: make sure we don't enqueue anymore */</span><br><span> </span><br><span>@@ -156,7 +156,7 @@</span><br><span> msg = llist_entry(state->upqueue.next, struct msgb, list);</span><br><span> mncc_prim = (struct gsm_mncc *)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>@@ -171,7 +171,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>@@ -226,7 +226,7 @@</span><br><span> LOGP(DMNCC, LOGL_NOTICE, "MNCC app connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one MNCC app 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/osmocom-bb/+/20770">change 20770</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/osmocom-bb/+/20770"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If4c7f946852d153bd472e5c704f8d517d26ca22e </div>
<div style="display:none"> Gerrit-Change-Number: 20770 </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>