<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/openbsc/+/20737">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Migrate from BSC_FD_* to OSMO_FD_*<br><br>Change-Id: If45434eb0d7da69feb4001e0ac35f0e297bdeef5<br>---<br>M openbsc/src/libbsc/bsc_msc.c<br>M openbsc/src/libbsc/bsc_rf_ctrl.c<br>M openbsc/src/libbsc/pcu_sock.c<br>M openbsc/src/libcommon/socket.c<br>M openbsc/src/libmgcp/mgcp_network.c<br>M openbsc/src/libmgcp/mgcp_osmux.c<br>M openbsc/src/libmsc/meas_feed.c<br>M openbsc/src/libmsc/mncc_sock.c<br>M openbsc/src/libmsc/smpp_smsc.c<br>M openbsc/src/libtrau/rtp_proxy.c<br>M openbsc/src/osmo-bsc/osmo_bsc_msc.c<br>M openbsc/src/osmo-bsc_mgcp/mgcp_main.c<br>M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c<br>M openbsc/src/osmo-bsc_nat/bsc_nat.c<br>M openbsc/src/osmo-bsc_nat/bsc_ussd.c<br>15 files changed, 48 insertions(+), 48 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/libbsc/bsc_msc.c b/openbsc/src/libbsc/bsc_msc.c</span><br><span>index 82a572d..dac0e52 100644</span><br><span>--- a/openbsc/src/libbsc/bsc_msc.c</span><br><span>+++ b/openbsc/src/libbsc/bsc_msc.c</span><br><span>@@ -81,7 +81,7 @@</span><br><span> queue = container_of(fd, struct osmo_wqueue, bfd);</span><br><span> con = container_of(queue, struct bsc_msc_connection, write_queue);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((what & BSC_FD_WRITE) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((what & OSMO_FD_WRITE) == 0) {</span><br><span> LOGP(DMSC, LOGL_ERROR,</span><br><span> "MSC(%s) Callback but not writable.\n", con->name);</span><br><span> return -1;</span><br><span>@@ -107,7 +107,7 @@</span><br><span> </span><br><span> /* go to full operation */</span><br><span> fd->cb = osmo_wqueue_bfd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span> </span><br><span> con->is_connected = 1;</span><br><span> LOGP(DMSC, LOGL_NOTICE,</span><br><span>@@ -209,7 +209,7 @@</span><br><span> if (ret == -1 && errno == EINPROGRESS) {</span><br><span> LOGP(DMSC, LOGL_ERROR,</span><br><span> "MSC(%s) Connection in progress\n", con->name);</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> fd->cb = msc_connection_connect;</span><br><span> osmo_timer_setup(&con->timeout_timer, msc_con_timeout, con);</span><br><span> osmo_timer_schedule(&con->timeout_timer, 20, 0);</span><br><span>@@ -218,7 +218,7 @@</span><br><span> connection_loss(con);</span><br><span> return ret;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- fd->when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span style="color: hsl(120, 100%, 40%);">+ fd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;</span><br><span> fd->cb = osmo_wqueue_bfd_cb;</span><br><span> con->is_connected = 1;</span><br><span> if (con->connected)</span><br><span>diff --git a/openbsc/src/libbsc/bsc_rf_ctrl.c b/openbsc/src/libbsc/bsc_rf_ctrl.c</span><br><span>index 0e28600..9159a8f 100644</span><br><span>--- a/openbsc/src/libbsc/bsc_rf_ctrl.c</span><br><span>+++ b/openbsc/src/libbsc/bsc_rf_ctrl.c</span><br><span>@@ -373,7 +373,7 @@</span><br><span> osmo_wqueue_init(&conn->queue, 10);</span><br><span> conn->queue.bfd.data = conn;</span><br><span> conn->queue.bfd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->queue.bfd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->queue.bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> conn->queue.read_cb = rf_read_cmd;</span><br><span> conn->queue.write_cb = rf_write_cmd;</span><br><span> conn->rf = rf;</span><br><span>@@ -479,7 +479,7 @@</span><br><span> return -1;</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 = rf_ctrl_accept;</span><br><span> bfd->data = rf;</span><br><span> </span><br><span>diff --git a/openbsc/src/libbsc/pcu_sock.c b/openbsc/src/libbsc/pcu_sock.c</span><br><span>index e2066ba..4411df8 100644</span><br><span>--- a/openbsc/src/libbsc/pcu_sock.c</span><br><span>+++ b/openbsc/src/libbsc/pcu_sock.c</span><br><span>@@ -484,7 +484,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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -507,7 +507,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 |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when |= OSMO_FD_READ;</span><br><span> </span><br><span> #if 0</span><br><span> /* remove si13, ... */</span><br><span>@@ -586,7 +586,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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -601,7 +601,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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when |= OSMO_FD_WRITE;</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -625,12 +625,12 @@</span><br><span> {</span><br><span> int rc = 0;</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> rc = pcu_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = pcu_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -656,13 +656,13 @@</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 &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when = OSMO_FD_READ;</span><br><span> conn_bfd->cb = pcu_sock_cb;</span><br><span> conn_bfd->data = state;</span><br><span> </span><br><span>@@ -705,7 +705,7 @@</span><br><span> return -1;</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 = pcu_sock_accept;</span><br><span> bfd->data = state;</span><br><span> </span><br><span>diff --git a/openbsc/src/libcommon/socket.c b/openbsc/src/libcommon/socket.c</span><br><span>index 2a64767..5697c33 100644</span><br><span>--- a/openbsc/src/libcommon/socket.c</span><br><span>+++ b/openbsc/src/libcommon/socket.c</span><br><span>@@ -65,7 +65,7 @@</span><br><span> </span><br><span> bfd->fd = socket(AF_INET, type, proto);</span><br><span> bfd->cb = cb;</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->data = data;</span><br><span> bfd->priv_nr = priv_nr;</span><br><span> </span><br><span>diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c</span><br><span>index 49500d9..e268658 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_network.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_network.c</span><br><span>@@ -972,14 +972,14 @@</span><br><span> mgcp_set_ip_tos(rtp_end->rtp.fd, cfg->endp_dscp);</span><br><span> mgcp_set_ip_tos(rtp_end->rtcp.fd, cfg->endp_dscp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rtp_end->rtp.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_end->rtp.when = OSMO_FD_READ;</span><br><span> if (osmo_fd_register(&rtp_end->rtp) != 0) {</span><br><span> LOGP(DMGCP, LOGL_ERROR, "Failed to register RTP port %d on 0x%x\n",</span><br><span> rtp_end->local_port, endpno);</span><br><span> goto cleanup2;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rtp_end->rtcp.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_end->rtcp.when = OSMO_FD_READ;</span><br><span> if (osmo_fd_register(&rtp_end->rtcp) != 0) {</span><br><span> LOGP(DMGCP, LOGL_ERROR, "Failed to register RTCP port %d on 0x%x\n",</span><br><span> rtp_end->local_port + 1, endpno);</span><br><span>diff --git a/openbsc/src/libmgcp/mgcp_osmux.c b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>index ce344ca..232c23a 100644</span><br><span>--- a/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>+++ b/openbsc/src/libmgcp/mgcp_osmux.c</span><br><span>@@ -445,7 +445,7 @@</span><br><span> return ret;</span><br><span> }</span><br><span> mgcp_set_ip_tos(osmux_fd.fd, cfg->endp_dscp);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_fd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_fd.when |= OSMO_FD_READ;</span><br><span> </span><br><span> ret = osmo_fd_register(&osmux_fd);</span><br><span> if (ret < 0) {</span><br><span>diff --git a/openbsc/src/libmsc/meas_feed.c b/openbsc/src/libmsc/meas_feed.c</span><br><span>index 3ddcdc3..6413493 100644</span><br><span>--- a/openbsc/src/libmsc/meas_feed.c</span><br><span>+++ b/openbsc/src/libmsc/meas_feed.c</span><br><span>@@ -101,7 +101,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 &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->fd &= ~OSMO_FD_READ;</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>@@ -140,7 +140,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 &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_mfs.wqueue.bfd.when &= ~OSMO_FD_READ;</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/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c</span><br><span>index 0efe3a1..98cafa1 100644</span><br><span>--- a/openbsc/src/libmsc/mncc_sock.c</span><br><span>+++ b/openbsc/src/libmsc/mncc_sock.c</span><br><span>@@ -73,7 +73,7 @@</span><br><span> </span><br><span> /* Actually enqueue the message and mark socket write need */</span><br><span> msgb_enqueue(&net->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- net->mncc_state->conn_bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->mncc_state->conn_bfd.when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -88,7 +88,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 |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when |= OSMO_FD_READ;</span><br><span> </span><br><span> /* release all exisitng calls */</span><br><span> gsm0408_clear_all_trans(state->net, GSM48_PDISC_CC);</span><br><span>@@ -151,7 +151,7 @@</span><br><span> msg = llist_entry(net->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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -166,7 +166,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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when |= OSMO_FD_WRITE;</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -190,12 +190,12 @@</span><br><span> {</span><br><span> int rc = 0;</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> rc = mncc_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = mncc_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -227,7 +227,7 @@</span><br><span> hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type);</span><br><span> </span><br><span> msgb_enqueue(&mncc->net->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- mncc->conn_bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc->conn_bfd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> /* accept a new connection */</span><br><span>@@ -250,13 +250,13 @@</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 &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when = OSMO_FD_READ;</span><br><span> conn_bfd->cb = mncc_sock_cb;</span><br><span> conn_bfd->data = state;</span><br><span> </span><br><span>@@ -299,7 +299,7 @@</span><br><span> return -1;</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 = mncc_sock_accept;</span><br><span> bfd->data = state;</span><br><span> </span><br><span>diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c</span><br><span>index 1cee3fe..3b76d57 100644</span><br><span>--- a/openbsc/src/libmsc/smpp_smsc.c</span><br><span>+++ b/openbsc/src/libmsc/smpp_smsc.c</span><br><span>@@ -915,7 +915,7 @@</span><br><span> osmo_wqueue_init(&esme->wqueue, 10);</span><br><span> esme->wqueue.bfd.fd = fd;</span><br><span> esme->wqueue.bfd.data = esme;</span><br><span style="color: hsl(0, 100%, 40%);">- esme->wqueue.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ esme->wqueue.bfd.when = OSMO_FD_READ;</span><br><span> </span><br><span> if (osmo_fd_register(&esme->wqueue.bfd) != 0) {</span><br><span> close(fd);</span><br><span>diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c</span><br><span>index 6b38ee5..59fee12 100644</span><br><span>--- a/openbsc/src/libtrau/rtp_proxy.c</span><br><span>+++ b/openbsc/src/libtrau/rtp_proxy.c</span><br><span>@@ -286,7 +286,7 @@</span><br><span> else</span><br><span> memcpy(payload, frame->data, payload_len);</span><br><span> msgb_enqueue(&rss->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- rss->bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ rss->bfd.when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -396,7 +396,7 @@</span><br><span> </span><br><span> rc = read(rss->bfd.fd, msg->data, RTP_ALLOC_SIZE);</span><br><span> if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- rss->bfd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ rss->bfd.when &= ~OSMO_FD_READ;</span><br><span> goto out_free;</span><br><span> } else if (rc < 0) {</span><br><span> /* Ignore "connection refused". this happens, If we open the</span><br><span>@@ -405,7 +405,7 @@</span><br><span> goto out_free;</span><br><span> DEBUGPC(DLMUX, "Read of RTP socket (%p) failed (errno %d, "</span><br><span> "%s)\n", rs, errno, strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- rss->bfd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ rss->bfd.when &= ~OSMO_FD_READ;</span><br><span> goto out_free;</span><br><span> }</span><br><span> </span><br><span>@@ -430,7 +430,7 @@</span><br><span> goto out_free;</span><br><span> }</span><br><span> msgb_enqueue(&other_rss->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- other_rss->bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ other_rss->bfd.when |= OSMO_FD_WRITE;</span><br><span> break;</span><br><span> </span><br><span> case RTP_RECV_UPSTREAM:</span><br><span>@@ -448,7 +448,7 @@</span><br><span> if (rc < 0)</span><br><span> goto out_free;</span><br><span> msgb_enqueue(&rss->tx_queue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- rss->bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ rss->bfd.when |= OSMO_FD_WRITE;</span><br><span> break;</span><br><span> }</span><br><span> if (rss->bfd.priv_nr != RTP_PRIV_RTP) {</span><br><span>@@ -482,7 +482,7 @@</span><br><span> </span><br><span> msg = msgb_dequeue(&rss->tx_queue);</span><br><span> if (!msg) {</span><br><span style="color: hsl(0, 100%, 40%);">- rss->bfd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ rss->bfd.when &= ~OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -516,10 +516,10 @@</span><br><span> return -EINVAL;</span><br><span> }</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> rtp_socket_read(rs, rss);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rtp_socket_write(rs, rss);</span><br><span> </span><br><span> return 0;</span><br><span>@@ -600,7 +600,7 @@</span><br><span> rss->sin_local.sin_family = AF_INET;</span><br><span> rss->sin_local.sin_addr.s_addr = htonl(ip);</span><br><span> rss->sin_local.sin_port = htons(port);</span><br><span style="color: hsl(0, 100%, 40%);">- rss->bfd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ rss->bfd.when |= OSMO_FD_READ;</span><br><span> </span><br><span> rc = bind(rss->bfd.fd, (struct sockaddr *)&rss->sin_local,</span><br><span> sizeof(rss->sin_local));</span><br><span>diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index badecc6..a4b0d0f 100644</span><br><span>--- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -153,7 +153,7 @@</span><br><span> }</span><br><span> </span><br><span> osmo_wqueue_init(&data->mgcp_agent, 10);</span><br><span style="color: hsl(0, 100%, 40%);">- data->mgcp_agent.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ data->mgcp_agent.bfd.when = OSMO_FD_READ;</span><br><span> data->mgcp_agent.bfd.data = data;</span><br><span> data->mgcp_agent.read_cb = mgcp_do_read;</span><br><span> data->mgcp_agent.write_cb = mgcp_do_write;</span><br><span>diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c</span><br><span>index 220efa3..8a71f53 100644</span><br><span>--- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c</span><br><span>+++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c</span><br><span>@@ -246,7 +246,7 @@</span><br><span> </span><br><span> /* we need to bind a socket */</span><br><span> if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->gw_fd.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->gw_fd.bfd.when = OSMO_FD_READ;</span><br><span> cfg->gw_fd.bfd.cb = read_call_agent;</span><br><span> cfg->gw_fd.bfd.fd = socket(AF_INET, SOCK_DGRAM, 0);</span><br><span> if (cfg->gw_fd.bfd.fd < 0) {</span><br><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>index 1b0abf3..069c964 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>@@ -1127,7 +1127,7 @@</span><br><span> }</span><br><span> </span><br><span> osmo_wqueue_init(&cfg->gw_fd, 10);</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->gw_fd.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->gw_fd.bfd.when = OSMO_FD_READ;</span><br><span> cfg->gw_fd.bfd.data = nat;</span><br><span> cfg->gw_fd.read_cb = mgcp_do_read;</span><br><span> cfg->gw_fd.write_cb = mgcp_do_write;</span><br><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>index 9bb33ad..3376d39 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c</span><br><span>@@ -1381,7 +1381,7 @@</span><br><span> struct sockaddr_in sa;</span><br><span> socklen_t sa_len = sizeof(sa);</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(bfd->fd, (struct sockaddr *) &sa, &sa_len);</span><br><span>@@ -1431,7 +1431,7 @@</span><br><span> bsc->write_queue.bfd.fd = fd;</span><br><span> bsc->write_queue.read_cb = ipaccess_bsc_read_cb;</span><br><span> bsc->write_queue.write_cb = bsc_write_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- bsc->write_queue.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc->write_queue.bfd.when = OSMO_FD_READ;</span><br><span> if (osmo_fd_register(&bsc->write_queue.bfd) < 0) {</span><br><span> LOGP(DNAT, LOGL_ERROR, "Failed to register BSC fd.\n");</span><br><span> close(fd);</span><br><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c</span><br><span>index d44b1b2..471743a 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c</span><br><span>@@ -237,7 +237,7 @@</span><br><span> socklen_t sa_len = sizeof(sa);</span><br><span> int fd;</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(bfd->fd, (struct sockaddr *) &sa, &sa_len);</span><br><span>@@ -259,7 +259,7 @@</span><br><span> osmo_wqueue_init(&conn->queue, 10);</span><br><span> conn->queue.bfd.data = conn;</span><br><span> conn->queue.bfd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->queue.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->queue.bfd.when = OSMO_FD_READ;</span><br><span> conn->queue.read_cb = ussd_read_cb;</span><br><span> conn->queue.write_cb = bsc_write_cb;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/openbsc/+/20737">change 20737</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/openbsc/+/20737"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If45434eb0d7da69feb4001e0ac35f0e297bdeef5 </div>
<div style="display:none"> Gerrit-Change-Number: 20737 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>