<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/18164">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>New define is available since libosmocore 1.1.0, and we already require<br>1.3.0, so no need to update dependenices.<br>Let's change it to avoid people re-using old BSC_FD_* symbols when<br>copy-pasting somewhere else.<br><br>Change-Id: I269690c1c9e4d19b5b69eef206b95e71f7931188<br>---<br>M examples/rs232-write.c<br>M examples/stream-client.c<br>M examples/stream-server.c<br>M src/datagram.c<br>M src/rs232.c<br>M src/stream.c<br>6 files changed, 29 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/64/18164/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/rs232-write.c b/examples/rs232-write.c</span><br><span>index dfe1bd5..508c64a 100644</span><br><span>--- a/examples/rs232-write.c</span><br><span>+++ b/examples/rs232-write.c</span><br><span>@@ -377,7 +377,7 @@</span><br><span> exit(EXIT_FAILURE);</span><br><span> }</span><br><span> kbd_ofd->fd = STDIN_FILENO;</span><br><span style="color: hsl(0, 100%, 40%);">- kbd_ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ kbd_ofd->when = OSMO_FD_READ;</span><br><span> kbd_ofd->data = NULL;</span><br><span> kbd_ofd->cb = kbd_cb;</span><br><span> rc = osmo_fd_register(kbd_ofd);</span><br><span>diff --git a/examples/stream-client.c b/examples/stream-client.c</span><br><span>index f590f25..fd1a517 100644</span><br><span>--- a/examples/stream-client.c</span><br><span>+++ b/examples/stream-client.c</span><br><span>@@ -142,7 +142,7 @@</span><br><span> exit(EXIT_FAILURE);</span><br><span> }</span><br><span> kbd_ofd->fd = STDIN_FILENO;</span><br><span style="color: hsl(0, 100%, 40%);">- kbd_ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ kbd_ofd->when = OSMO_FD_READ;</span><br><span> kbd_ofd->data = conn;</span><br><span> kbd_ofd->cb = kbd_cb;</span><br><span> rc = osmo_fd_register(kbd_ofd);</span><br><span>diff --git a/examples/stream-server.c b/examples/stream-server.c</span><br><span>index f3ee315..4946e13 100644</span><br><span>--- a/examples/stream-server.c</span><br><span>+++ b/examples/stream-server.c</span><br><span>@@ -166,7 +166,7 @@</span><br><span> exit(EXIT_FAILURE);</span><br><span> }</span><br><span> kbd_ofd->fd = STDIN_FILENO;</span><br><span style="color: hsl(0, 100%, 40%);">- kbd_ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ kbd_ofd->when = OSMO_FD_READ;</span><br><span> kbd_ofd->data = srv;</span><br><span> kbd_ofd->cb = kbd_cb;</span><br><span> osmo_fd_register(kbd_ofd);</span><br><span>diff --git a/src/datagram.c b/src/datagram.c</span><br><span>index 634e702..d2233d5 100644</span><br><span>--- a/src/datagram.c</span><br><span>+++ b/src/datagram.c</span><br><span>@@ -95,7 +95,7 @@</span><br><span> LOGP(DLINP, LOGL_DEBUG, "sending data\n");</span><br><span> </span><br><span> if (llist_empty(&conn->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when &= ~OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> lh = conn->tx_queue.next;</span><br><span>@@ -115,7 +115,7 @@</span><br><span> {</span><br><span> struct osmo_dgram_tx *conn = ofd->data;</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 (what & OSMO_FD_WRITE) {</span><br><span> LOGP(DLINP, LOGL_DEBUG, "write\n");</span><br><span> osmo_dgram_tx_write(conn);</span><br><span> }</span><br><span>@@ -136,7 +136,7 @@</span><br><span> return NULL;</span><br><span> </span><br><span> conn->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when |= OSMO_FD_READ;</span><br><span> conn->ofd.priv_nr = 0; /* XXX */</span><br><span> conn->ofd.cb = osmo_dgram_tx_fd_cb;</span><br><span> conn->ofd.data = conn;</span><br><span>@@ -240,7 +240,7 @@</span><br><span> struct msgb *msg)</span><br><span> {</span><br><span> msgb_enqueue(&conn->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span>@@ -290,7 +290,7 @@</span><br><span> struct osmo_dgram_rx *conn = ofd->data;</span><br><span> </span><br><span> LOGP(DLINP, LOGL_DEBUG, "read\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ)</span><br><span> osmo_dgram_rx_read(conn);</span><br><span> </span><br><span> return 0;</span><br><span>@@ -310,7 +310,7 @@</span><br><span> return NULL;</span><br><span> </span><br><span> conn->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when |= OSMO_FD_READ;</span><br><span> conn->ofd.cb = osmo_dgram_rx_cb;</span><br><span> conn->ofd.data = conn;</span><br><span> </span><br><span>diff --git a/src/rs232.c b/src/rs232.c</span><br><span>index 28f1ba0..4ebc7b9 100644</span><br><span>--- a/src/rs232.c</span><br><span>+++ b/src/rs232.c</span><br><span>@@ -62,7 +62,7 @@</span><br><span> struct osmo_rs232 *r = ptr;</span><br><span> </span><br><span> /* we're again ready to transmit. */</span><br><span style="color: hsl(0, 100%, 40%);">- r->ofd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ r->ofd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> static int handle_ser_write(struct osmo_fd *bfd)</span><br><span>@@ -75,7 +75,7 @@</span><br><span> LOGP(DLINP, LOGL_DEBUG, "writing data to rs232\n");</span><br><span> </span><br><span> if (llist_empty(&r->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- r->ofd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ r->ofd.when &= ~OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> lh = r->tx_queue.next;</span><br><span>@@ -92,7 +92,7 @@</span><br><span> </span><br><span> /* We've got more data to write, but we have to wait to make it. */</span><br><span> if (!llist_empty(&r->tx_queue) && r->cfg.delay_us) {</span><br><span style="color: hsl(0, 100%, 40%);">- r->ofd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ r->ofd.when &= ~OSMO_FD_WRITE;</span><br><span> osmo_timer_schedule(&r->tx_timer, 0, r->cfg.delay_us);</span><br><span> }</span><br><span> return 0;</span><br><span>@@ -114,13 +114,13 @@</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ)</span><br><span> rc = handle_ser_read(bfd);</span><br><span> </span><br><span> if (rc < 0)</span><br><span> return rc;</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 (what & OSMO_FD_WRITE)</span><br><span> rc = handle_ser_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -223,7 +223,7 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ;</span><br><span> bfd->cb = serial_fd_cb;</span><br><span> bfd->data = r;</span><br><span> </span><br><span>@@ -257,7 +257,7 @@</span><br><span> void osmo_rs232_write(struct osmo_rs232 *r, struct msgb *msg)</span><br><span> {</span><br><span> msgb_enqueue(&r->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- r->ofd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ r->ofd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> void osmo_rs232_close(struct osmo_rs232 *r)</span><br><span>diff --git a/src/stream.c b/src/stream.c</span><br><span>index 5887bf9..6e4c461 100644</span><br><span>--- a/src/stream.c</span><br><span>+++ b/src/stream.c</span><br><span>@@ -258,7 +258,7 @@</span><br><span> int ret;</span><br><span> </span><br><span> if (llist_empty(&cli->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- cli->ofd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->ofd.when &= ~OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> lh = cli->tx_queue.next;</span><br><span>@@ -314,7 +314,7 @@</span><br><span> /* If messages got enqueued while 'connecting', keep WRITE flag</span><br><span> up to dispatch them upon next main loop step */</span><br><span> if (llist_empty(&cli->tx_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- cli->ofd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->ofd.when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> LOGSCLI(cli, LOGL_DEBUG, "connection done.\n");</span><br><span> cli->state = STREAM_CLI_STATE_CONNECTED;</span><br><span>@@ -332,11 +332,11 @@</span><br><span> cli->connect_cb(cli);</span><br><span> break;</span><br><span> case STREAM_CLI_STATE_CONNECTED:</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ) {</span><br><span> LOGSCLI(cli, LOGL_DEBUG, "connected read\n");</span><br><span> osmo_stream_cli_read(cli);</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 (what & OSMO_FD_WRITE) {</span><br><span> LOGSCLI(cli, LOGL_DEBUG, "connected write\n");</span><br><span> osmo_stream_cli_write(cli);</span><br><span> }</span><br><span>@@ -601,7 +601,7 @@</span><br><span> return ret;</span><br><span> }</span><br><span> cli->ofd.fd = ret;</span><br><span style="color: hsl(0, 100%, 40%);">- cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->ofd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> </span><br><span> if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) {</span><br><span> ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1);</span><br><span>@@ -673,7 +673,7 @@</span><br><span> return ret;</span><br><span> }</span><br><span> cli->ofd.fd = ret;</span><br><span style="color: hsl(0, 100%, 40%);">- cli->ofd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->ofd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> </span><br><span> if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) {</span><br><span> ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1);</span><br><span>@@ -708,7 +708,7 @@</span><br><span> void osmo_stream_cli_send(struct osmo_stream_cli *cli, struct msgb *msg)</span><br><span> {</span><br><span> msgb_enqueue(&cli->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- cli->ofd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ cli->ofd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Receive data via an Osmocom stream client</span><br><span>@@ -815,7 +815,7 @@</span><br><span> </span><br><span> link->proto = IPPROTO_TCP;</span><br><span> link->ofd.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- link->ofd.when |= BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ link->ofd.when |= OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> link->ofd.cb = osmo_stream_srv_fd_cb;</span><br><span> link->ofd.data = link;</span><br><span> </span><br><span>@@ -1053,7 +1053,7 @@</span><br><span> LOGP(DLINP, LOGL_DEBUG, "sending data\n");</span><br><span> </span><br><span> if (llist_empty(&conn->tx_queue)) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when &= ~OSMO_FD_WRITE;</span><br><span> return;</span><br><span> }</span><br><span> lh = conn->tx_queue.next;</span><br><span>@@ -1090,9 +1090,9 @@</span><br><span> int rc = 0;</span><br><span> </span><br><span> LOGP(DLINP, LOGL_DEBUG, "connected read/write\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ)</span><br><span> rc = osmo_stream_srv_read(conn);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != -EBADF && (what & BSC_FD_WRITE))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc != -EBADF && (what & OSMO_FD_WRITE))</span><br><span> osmo_stream_srv_write(conn);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -1120,7 +1120,7 @@</span><br><span> conn->ofd.fd = fd;</span><br><span> conn->ofd.data = conn;</span><br><span> conn->ofd.cb = osmo_stream_srv_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when = OSMO_FD_READ;</span><br><span> conn->cb = cb;</span><br><span> conn->closed_cb = closed_cb;</span><br><span> conn->data = data;</span><br><span>@@ -1206,7 +1206,7 @@</span><br><span> }</span><br><span> </span><br><span> msgb_enqueue(&conn->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- conn->ofd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ofd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Receive data via Osmocom stream server</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/18164">change 18164</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/libosmo-netif/+/18164"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I269690c1c9e4d19b5b69eef206b95e71f7931188 </div>
<div style="display:none"> Gerrit-Change-Number: 18164 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>