<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13335">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Max: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">select: Rename BSC_FD_* constants to OSMO_FD_*<br><br>The naming of these constants dates back to when the code was private<br>within OpenBSC. Everything else was renamed (bsc_fd -> osmo_fd) at<br>the time, but somehow the BSC_FD_* defines have been missed at the<br>time.<br><br>Keep compatibility #defines around, but allow us to migrate the<br>applications to a less confusing naming meanwhile.<br><br>Change-Id: Ifae33ed61a7cf0ae54ad487399e7dd2489986436<br>---<br>M include/osmocom/core/select.h<br>M src/ctrl/control_if.c<br>M src/gb/gprs_ns.c<br>M src/gb/gprs_ns_frgre.c<br>M src/gsmtap_util.c<br>M src/select.c<br>M src/socket.c<br>M src/vty/telnet_interface.c<br>M src/write_queue.c<br>9 files changed, 42 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h</span><br><span>index 1ba6b83..e4787b0 100644</span><br><span>--- a/include/osmocom/core/select.h</span><br><span>+++ b/include/osmocom/core/select.h</span><br><span>@@ -13,11 +13,16 @@</span><br><span> * \file select.h */</span><br><span> </span><br><span> /*! Indicate interest in reading from the file descriptor */</span><br><span style="color: hsl(0, 100%, 40%);">-#define BSC_FD_READ 0x0001</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_FD_READ 0x0001</span><br><span> /*! Indicate interest in writing to the file descriptor */</span><br><span style="color: hsl(0, 100%, 40%);">-#define BSC_FD_WRITE 0x0002</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_FD_WRITE 0x0002</span><br><span> /*! Indicate interest in exceptions from the file descriptor */</span><br><span style="color: hsl(0, 100%, 40%);">-#define BSC_FD_EXCEPT 0x0004</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_FD_EXCEPT 0x0004</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* legacy naming dating back to early OpenBSC / bsc_hack of 2008 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define BSC_FD_READ OSMO_FD_READ</span><br><span style="color: hsl(120, 100%, 40%);">+#define BSC_FD_WRITE OSMO_FD_WRITE</span><br><span style="color: hsl(120, 100%, 40%);">+#define BSC_FD_EXCEPT OSMO_FD_EXCEPT</span><br><span> </span><br><span> /*! Structure representing a file dsecriptor */</span><br><span> struct osmo_fd {</span><br><span>@@ -25,8 +30,8 @@</span><br><span> struct llist_head list; </span><br><span> /*! actual operating-system level file decriptor */</span><br><span> int fd;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! bit-mask or of \ref BSC_FD_READ, \ref BSC_FD_WRITE and/or</span><br><span style="color: hsl(0, 100%, 40%);">- * \ref BSC_FD_EXCEPT */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! bit-mask or of \ref OSMO_FD_READ, \ref OSMO_FD_WRITE and/or</span><br><span style="color: hsl(120, 100%, 40%);">+ * \ref OSMO_FD_EXCEPT */</span><br><span> unsigned int when;</span><br><span> /*! call-back function to be called once file descriptor becomes</span><br><span> * available */</span><br><span>diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c</span><br><span>index 0209f3b..ce2e367 100644</span><br><span>--- a/src/ctrl/control_if.c</span><br><span>+++ b/src/ctrl/control_if.c</span><br><span>@@ -524,7 +524,7 @@</span><br><span> char *name;</span><br><span> </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> return 0;</span><br><span> </span><br><span> fd = accept(listen_bfd->fd, NULL, NULL);</span><br><span>@@ -554,7 +554,7 @@</span><br><span> LOGP(DLCTRL, LOGL_INFO, "accept()ed new CTRL connection from %s\n", name);</span><br><span> </span><br><span> ccon->write_queue.bfd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">- ccon->write_queue.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ccon->write_queue.bfd.when = OSMO_FD_READ;</span><br><span> </span><br><span> ret = osmo_fd_register(&ccon->write_queue.bfd);</span><br><span> if (ret < 0) {</span><br><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index 8c3b0fa..c7ff78e 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -2006,9 +2006,9 @@</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_nsip_read(bfd);</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_nsip_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>diff --git a/src/gb/gprs_ns_frgre.c b/src/gb/gprs_ns_frgre.c</span><br><span>index 483fdb6..dbbd8d2 100644</span><br><span>--- a/src/gb/gprs_ns_frgre.c</span><br><span>+++ b/src/gb/gprs_ns_frgre.c</span><br><span>@@ -315,9 +315,9 @@</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_nsfrgre_read(bfd);</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_nsfrgre_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c</span><br><span>index 385b467..996830f 100644</span><br><span>--- a/src/gsmtap_util.c</span><br><span>+++ b/src/gsmtap_util.c</span><br><span>@@ -355,7 +355,7 @@</span><br><span> int rc;</span><br><span> uint8_t buf[4096];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!(flags & BSC_FD_READ))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(flags & OSMO_FD_READ))</span><br><span> return 0;</span><br><span> </span><br><span> rc = read(fd->fd, buf, sizeof(buf));</span><br><span>@@ -395,7 +395,7 @@</span><br><span> </span><br><span> sink_ofd = >i->sink_ofd;</span><br><span> sink_ofd->fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">- sink_ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ sink_ofd->when = OSMO_FD_READ;</span><br><span> sink_ofd->cb = gsmtap_sink_fd_cb;</span><br><span> </span><br><span> rc = osmo_fd_register(sink_ofd);</span><br><span>diff --git a/src/select.c b/src/select.c</span><br><span>index 4e7be35..7ce135f 100644</span><br><span>--- a/src/select.c</span><br><span>+++ b/src/select.c</span><br><span>@@ -55,7 +55,7 @@</span><br><span> /*! Set up an osmo-fd. Will not register it.</span><br><span> * \param[inout] ofd Osmo FD to be set-up</span><br><span> * \param[in] fd OS-level file descriptor number</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] when bit-mask of BSC_FD_{READ,WRITE,EXECEPT}</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] when bit-mask of OSMO_FD_{READ,WRITE,EXECEPT}</span><br><span> * \param[in] cb Call-back function to be called</span><br><span> * \param[in] data Private context pointer</span><br><span> * \param[in] priv_nr Private number</span><br><span>@@ -171,13 +171,13 @@</span><br><span> int highfd = 0;</span><br><span> </span><br><span> llist_for_each_entry(ufd, &osmo_fds, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ufd->when & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ufd->when & OSMO_FD_READ)</span><br><span> FD_SET(ufd->fd, readset);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ufd->when & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ufd->when & OSMO_FD_WRITE)</span><br><span> FD_SET(ufd->fd, writeset);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ufd->when & BSC_FD_EXCEPT)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ufd->when & OSMO_FD_EXCEPT)</span><br><span> FD_SET(ufd->fd, exceptset);</span><br><span> </span><br><span> if (ufd->fd > highfd)</span><br><span>@@ -199,17 +199,17 @@</span><br><span> int flags = 0;</span><br><span> </span><br><span> if (FD_ISSET(ufd->fd, readset)) {</span><br><span style="color: hsl(0, 100%, 40%);">- flags |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ flags |= OSMO_FD_READ;</span><br><span> FD_CLR(ufd->fd, readset);</span><br><span> }</span><br><span> </span><br><span> if (FD_ISSET(ufd->fd, writeset)) {</span><br><span style="color: hsl(0, 100%, 40%);">- flags |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ flags |= OSMO_FD_WRITE;</span><br><span> FD_CLR(ufd->fd, writeset);</span><br><span> }</span><br><span> </span><br><span> if (FD_ISSET(ufd->fd, exceptset)) {</span><br><span style="color: hsl(0, 100%, 40%);">- flags |= BSC_FD_EXCEPT;</span><br><span style="color: hsl(120, 100%, 40%);">+ flags |= OSMO_FD_EXCEPT;</span><br><span> FD_CLR(ufd->fd, exceptset);</span><br><span> }</span><br><span> </span><br><span>@@ -327,7 +327,7 @@</span><br><span> {</span><br><span> ofd->cb = cb;</span><br><span> ofd->data = data;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when = OSMO_FD_READ;</span><br><span> </span><br><span> if (ofd->fd < 0) {</span><br><span> int rc;</span><br><span>diff --git a/src/socket.c b/src/socket.c</span><br><span>index 6a3f254..3a46ad0 100644</span><br><span>--- a/src/socket.c</span><br><span>+++ b/src/socket.c</span><br><span>@@ -414,7 +414,7 @@</span><br><span> return sfd;</span><br><span> </span><br><span> ofd->fd = sfd;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when = OSMO_FD_READ;</span><br><span> </span><br><span> rc = osmo_fd_register(ofd);</span><br><span> if (rc < 0) {</span><br><span>diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c</span><br><span>index e090e17..dc23b12 100644</span><br><span>--- a/src/vty/telnet_interface.c</span><br><span>+++ b/src/vty/telnet_interface.c</span><br><span>@@ -59,7 +59,7 @@</span><br><span> static int telnet_new_connection(struct osmo_fd *fd, unsigned int what);</span><br><span> </span><br><span> static struct osmo_fd server_socket = {</span><br><span style="color: hsl(0, 100%, 40%);">- .when = BSC_FD_READ,</span><br><span style="color: hsl(120, 100%, 40%);">+ .when = OSMO_FD_READ,</span><br><span> .cb = telnet_new_connection,</span><br><span> .priv_nr = 0,</span><br><span> };</span><br><span>@@ -142,8 +142,8 @@</span><br><span> struct telnet_connection *conn = fd->data;</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(0, 100%, 40%);">- conn->fd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fd.when &= ~OSMO_FD_READ;</span><br><span> rc = vty_read(conn->vty);</span><br><span> }</span><br><span> </span><br><span>@@ -151,10 +151,10 @@</span><br><span> if (rc == -EBADF)</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 = buffer_flush_all(conn->vty->obuf, fd->fd);</span><br><span> if (rc == BUFFER_EMPTY)</span><br><span style="color: hsl(0, 100%, 40%);">- conn->fd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fd.when &= ~OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> return rc;</span><br><span>@@ -177,7 +177,7 @@</span><br><span> connection->priv = fd->data;</span><br><span> connection->fd.data = connection;</span><br><span> connection->fd.fd = new_connection;</span><br><span style="color: hsl(0, 100%, 40%);">- connection->fd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ connection->fd.when = OSMO_FD_READ;</span><br><span> connection->fd.cb = client_data;</span><br><span> rc = osmo_fd_register(&connection->fd);</span><br><span> if (rc < 0) {</span><br><span>@@ -219,10 +219,10 @@</span><br><span> </span><br><span> switch (event) {</span><br><span> case VTY_READ:</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> break;</span><br><span> case VTY_WRITE:</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when |= OSMO_FD_WRITE;</span><br><span> break;</span><br><span> case VTY_CLOSED:</span><br><span> /* vty layer is about to free() vty */</span><br><span>diff --git a/src/write_queue.c b/src/write_queue.c</span><br><span>index fb6839a..3399b0f 100644</span><br><span>--- a/src/write_queue.c</span><br><span>+++ b/src/write_queue.c</span><br><span>@@ -47,22 +47,22 @@</span><br><span> </span><br><span> queue = container_of(fd, struct osmo_wqueue, bfd);</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 = queue->read_cb(fd);</span><br><span> if (rc == -EBADF)</span><br><span> goto err_badfd;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_EXCEPT) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_EXCEPT) {</span><br><span> rc = queue->except_cb(fd);</span><br><span> if (rc == -EBADF)</span><br><span> goto err_badfd;</span><br><span> }</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> struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> /* the queue might have been emptied */</span><br><span> if (!llist_empty(&queue->msg_queue)) {</span><br><span>@@ -76,7 +76,7 @@</span><br><span> goto err_badfd;</span><br><span> </span><br><span> if (!llist_empty(&queue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -115,7 +115,7 @@</span><br><span> </span><br><span> ++queue->current_length;</span><br><span> msgb_enqueue(&queue->msg_queue, data);</span><br><span style="color: hsl(0, 100%, 40%);">- queue->bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ queue->bfd.when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -133,7 +133,7 @@</span><br><span> }</span><br><span> </span><br><span> queue->current_length = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- queue->bfd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ queue->bfd.when &= ~OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> /*! @} */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13335">change 13335</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/13335"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifae33ed61a7cf0ae54ad487399e7dd2489986436 </div>
<div style="display:none"> Gerrit-Change-Number: 13335 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>