<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19284">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: Ia5a656567d212fa265aef1375d714d0c5fee5dd6<br>---<br>M src/ipaccess/abisip-find.c<br>M src/ipaccess/ipaccess-config.c<br>M src/ipaccess/ipaccess-proxy.c<br>M src/osmo-bsc/bsc_rf_ctrl.c<br>M src/osmo-bsc/meas_feed.c<br>M src/osmo-bsc/osmo_bsc_mgcp.c<br>M src/osmo-bsc/osmo_bsc_msc.c<br>M src/osmo-bsc/pcu_sock.c<br>M src/utils/meas_json.c<br>M src/utils/meas_udp2db.c<br>M src/utils/meas_vis.c<br>11 files changed, 35 insertions(+), 35 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/84/19284/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 21ed50e..11b2851 100644</span><br><span>--- a/src/ipaccess/abisip-find.c</span><br><span>+++ b/src/ipaccess/abisip-find.c</span><br><span>@@ -403,10 +403,10 @@</span><br><span> </span><br><span> static int bfd_cb(struct osmo_fd *bfd, unsigned int flags)</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 read_response(bfd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when |= OSMO_FD_WRITE;</span><br><span> </span><br><span> base_stations_bump(false);</span><br><span> </span><br><span>@@ -447,7 +447,7 @@</span><br><span> fprintf(stdout, "\nWARNING: the --timeout should be larger than --interval.\n\n");</span><br><span> </span><br><span> bfd.cb = bfd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> bfd.fd = udp_sock(cmdline_opts.ifname, cmdline_opts.bind_ip);</span><br><span> if (bfd.fd < 0) {</span><br><span> perror("Cannot create local socket for broadcast udp");</span><br><span>diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c</span><br><span>index 306cc87..f7d7332 100644</span><br><span>--- a/src/ipaccess/ipaccess-config.c</span><br><span>+++ b/src/ipaccess/ipaccess-config.c</span><br><span>@@ -92,7 +92,7 @@</span><br><span> </span><br><span> bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);</span><br><span> bfd->cb = ipaccess_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> bfd->data = line;</span><br><span> bfd->priv_nr = E1INP_SIGN_OML;</span><br><span> </span><br><span>diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c</span><br><span>index f4d620b..05a6f63 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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ other_conn->fd.when |= OSMO_FD_WRITE;</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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> return -EIO;</span><br><span> }</span><br><span>@@ -303,9 +303,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_udp_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_udp_write(bfd);</span><br><span> </span><br><span> return rc;</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 |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_conn->fd.when |= OSMO_FD_WRITE;</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 &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> lh = ipc->tx_queue.next;</span><br><span>@@ -897,12 +897,12 @@</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_tcp_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 (what & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_WRITE)</span><br><span> rc = handle_tcp_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -917,7 +917,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> ret = accept(listen_bfd->fd, (struct sockaddr *) &sa, &sa_len);</span><br><span>@@ -940,7 +940,7 @@</span><br><span> bfd->data = ipc;</span><br><span> bfd->priv_nr = listen_bfd->priv_nr;</span><br><span> bfd->cb = proxy_ipaccess_fd_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> ret = osmo_fd_register(bfd);</span><br><span> if (ret < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "could not register FD\n");</span><br><span>@@ -1019,7 +1019,7 @@</span><br><span> bfd = &ipc->fd;</span><br><span> bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);</span><br><span> bfd->cb = ipaccess_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> bfd->data = ipc;</span><br><span> bfd->priv_nr = priv_nr;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>index 11cd224..c72154a 100644</span><br><span>--- a/src/osmo-bsc/bsc_rf_ctrl.c</span><br><span>+++ b/src/osmo-bsc/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>@@ -483,7 +483,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/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c</span><br><span>index 8450f69..f9a3626 100644</span><br><span>--- a/src/osmo-bsc/meas_feed.c</span><br><span>+++ b/src/osmo-bsc/meas_feed.c</span><br><span>@@ -118,7 +118,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>@@ -158,7 +158,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/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c</span><br><span>index bec7930..90a73e5 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_mgcp.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_mgcp.c</span><br><span>@@ -71,7 +71,7 @@</span><br><span> struct msgb *msg;</span><br><span> int rc;</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> msg = msgb_alloc_headroom(1024, 16, "MGCP->IPA");</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index f969146..f2a1e5b 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -253,7 +253,7 @@</span><br><span> msc_data->audio_support[4]->ver = 3;</span><br><span> msc_data->audio_support[4]->hr = 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, BSC_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, OSMO_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0);</span><br><span> msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0");</span><br><span> msc_data->mgcp_ipa.local_port = 0; /* dynamic */</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c</span><br><span>index bb18746..e75c2d4 100644</span><br><span>--- a/src/osmo-bsc/pcu_sock.c</span><br><span>+++ b/src/osmo-bsc/pcu_sock.c</span><br><span>@@ -458,7 +458,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>@@ -481,7 +481,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>@@ -560,7 +560,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>@@ -575,7 +575,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>@@ -599,12 +599,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>@@ -630,13 +630,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>@@ -679,7 +679,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/src/utils/meas_json.c b/src/utils/meas_json.c</span><br><span>index 6aa531a..0fd99c0 100644</span><br><span>--- a/src/utils/meas_json.c</span><br><span>+++ b/src/utils/meas_json.c</span><br><span>@@ -158,7 +158,7 @@</span><br><span> {</span><br><span> int rc;</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> struct msgb *msg = msgb_alloc(1024, "UDP Rx");</span><br><span> </span><br><span> rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg));</span><br><span>diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c</span><br><span>index 34f8385..07023c3 100644</span><br><span>--- a/src/utils/meas_udp2db.c</span><br><span>+++ b/src/utils/meas_udp2db.c</span><br><span>@@ -71,7 +71,7 @@</span><br><span> {</span><br><span> int rc;</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> struct msgb *msg = msgb_alloc(1024, "UDP Rx");</span><br><span> </span><br><span> rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg));</span><br><span>diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c</span><br><span>index 01be986..73ccfc4 100644</span><br><span>--- a/src/utils/meas_vis.c</span><br><span>+++ b/src/utils/meas_vis.c</span><br><span>@@ -125,7 +125,7 @@</span><br><span> {</span><br><span> int rc;</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> struct msgb *msg = msgb_alloc(1024, "UDP Rx");</span><br><span> </span><br><span> rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19284">change 19284</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/+/19284"/><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: Ia5a656567d212fa265aef1375d714d0c5fee5dd6 </div>
<div style="display:none"> Gerrit-Change-Number: 19284 </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>