diff options
-rw-r--r-- | src/ipaccess/abisip-find.c | 10 | ||||
-rw-r--r-- | src/ipaccess/ipaccess-config.c | 2 | ||||
-rw-r--r-- | src/ipaccess/ipaccess-proxy.c | 22 | ||||
-rw-r--r-- | src/osmo-bsc/bsc_rf_ctrl.c | 4 | ||||
-rw-r--r-- | src/osmo-bsc/meas_feed.c | 4 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_mgcp.c | 2 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_msc.c | 2 | ||||
-rw-r--r-- | src/osmo-bsc/pcu_sock.c | 18 | ||||
-rw-r--r-- | src/utils/meas_json.c | 2 | ||||
-rw-r--r-- | src/utils/meas_udp2db.c | 2 | ||||
-rw-r--r-- | src/utils/meas_vis.c | 2 |
11 files changed, 35 insertions, 35 deletions
diff --git a/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c index 21ed50e5a..11b2851ae 100644 --- a/src/ipaccess/abisip-find.c +++ b/src/ipaccess/abisip-find.c @@ -403,10 +403,10 @@ static int read_response(int fd) static int bfd_cb(struct osmo_fd *bfd, unsigned int flags) { - if (flags & BSC_FD_READ) + if (flags & OSMO_FD_READ) return read_response(bfd->fd); - if (flags & BSC_FD_WRITE) { - bfd->when &= ~BSC_FD_WRITE; + if (flags & OSMO_FD_WRITE) { + bfd->when &= ~OSMO_FD_WRITE; return bcast_find(bfd->fd); } return 0; @@ -418,7 +418,7 @@ static void timer_cb(void *_data) { struct osmo_fd *bfd = _data; - bfd->when |= BSC_FD_WRITE; + bfd->when |= OSMO_FD_WRITE; base_stations_bump(false); @@ -447,7 +447,7 @@ int main(int argc, char **argv) fprintf(stdout, "\nWARNING: the --timeout should be larger than --interval.\n\n"); bfd.cb = bfd_cb; - bfd.when = BSC_FD_READ | BSC_FD_WRITE; + bfd.when = OSMO_FD_READ | OSMO_FD_WRITE; bfd.fd = udp_sock(cmdline_opts.ifname, cmdline_opts.bind_ip); if (bfd.fd < 0) { perror("Cannot create local socket for broadcast udp"); diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 306cc8786..f7d733231 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -92,7 +92,7 @@ static int ipaccess_connect(struct e1inp_line *line, struct sockaddr_in *sa) bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; + bfd->when = OSMO_FD_READ | OSMO_FD_WRITE; bfd->data = line; bfd->priv_nr = E1INP_SIGN_OML; diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index f4d620b34..05a6f6358 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -283,7 +283,7 @@ static int handle_udp_read(struct osmo_fd *bfd) if (other_conn) { /* enqueue the message for TX on the respective FD */ msgb_enqueue(&other_conn->tx_queue, msg); - other_conn->fd.when |= BSC_FD_WRITE; + other_conn->fd.when |= OSMO_FD_WRITE; } else msgb_free(msg); @@ -293,7 +293,7 @@ static int handle_udp_read(struct osmo_fd *bfd) static int handle_udp_write(struct osmo_fd *bfd) { /* not implemented yet */ - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; return -EIO; } @@ -303,9 +303,9 @@ static int udp_fd_cb(struct osmo_fd *bfd, unsigned int what) { int rc = 0; - if (what & BSC_FD_READ) + if (what & OSMO_FD_READ) rc = handle_udp_read(bfd); - if (what & BSC_FD_WRITE) + if (what & OSMO_FD_WRITE) rc = handle_udp_write(bfd); return rc; @@ -840,7 +840,7 @@ static int handle_tcp_read(struct osmo_fd *bfd) /* enqueue packet towards BSC */ msgb_enqueue(&bsc_conn->tx_queue, msg); /* mark respective filedescriptor as 'we want to write' */ - bsc_conn->fd.when |= BSC_FD_WRITE; + bsc_conn->fd.when |= OSMO_FD_WRITE; } else { logp_ipbc_uid(DLINP, LOGL_INFO, ipbc, bfd->priv_nr >> 8); LOGPC(DLINP, LOGL_INFO, "Dropping packet from %s, " @@ -869,7 +869,7 @@ static int handle_tcp_write(struct osmo_fd *bfd) /* get the next msg for this timeslot */ if (llist_empty(&ipc->tx_queue)) { - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; return 0; } lh = ipc->tx_queue.next; @@ -897,12 +897,12 @@ static int proxy_ipaccess_fd_cb(struct osmo_fd *bfd, unsigned int what) { int rc = 0; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { rc = handle_tcp_read(bfd); if (rc < 0) return rc; } - if (what & BSC_FD_WRITE) + if (what & OSMO_FD_WRITE) rc = handle_tcp_write(bfd); return rc; @@ -917,7 +917,7 @@ static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what) struct sockaddr_in sa; socklen_t sa_len = sizeof(sa); - if (!(what & BSC_FD_READ)) + if (!(what & OSMO_FD_READ)) return 0; ret = accept(listen_bfd->fd, (struct sockaddr *) &sa, &sa_len); @@ -940,7 +940,7 @@ static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what) bfd->data = ipc; bfd->priv_nr = listen_bfd->priv_nr; bfd->cb = proxy_ipaccess_fd_cb; - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; ret = osmo_fd_register(bfd); if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "could not register FD\n"); @@ -1019,7 +1019,7 @@ static struct ipa_proxy_conn *connect_bsc(struct sockaddr_in *sa, int priv_nr, v bfd = &ipc->fd; bfd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); bfd->cb = ipaccess_fd_cb; - bfd->when = BSC_FD_READ | BSC_FD_WRITE; + bfd->when = OSMO_FD_READ | OSMO_FD_WRITE; bfd->data = ipc; bfd->priv_nr = priv_nr; diff --git a/src/osmo-bsc/bsc_rf_ctrl.c b/src/osmo-bsc/bsc_rf_ctrl.c index 11cd22404..c72154a02 100644 --- a/src/osmo-bsc/bsc_rf_ctrl.c +++ b/src/osmo-bsc/bsc_rf_ctrl.c @@ -373,7 +373,7 @@ static int rf_ctrl_accept(struct osmo_fd *bfd, unsigned int what) osmo_wqueue_init(&conn->queue, 10); conn->queue.bfd.data = conn; conn->queue.bfd.fd = fd; - conn->queue.bfd.when = BSC_FD_READ | BSC_FD_WRITE; + conn->queue.bfd.when = OSMO_FD_READ | OSMO_FD_WRITE; conn->queue.read_cb = rf_read_cmd; conn->queue.write_cb = rf_write_cmd; conn->rf = rf; @@ -483,7 +483,7 @@ static int rf_create_socket(struct osmo_bsc_rf *rf, const char *path) return -1; } - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; bfd->cb = rf_ctrl_accept; bfd->data = rf; diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index 8450f69ca..f9a362600 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -118,7 +118,7 @@ static int feed_read_cb(struct osmo_fd *ofd) char buf[256]; rc = read(ofd->fd, buf, sizeof(buf)); - ofd->fd &= ~BSC_FD_READ; + ofd->fd &= ~OSMO_FD_READ; return rc; } @@ -158,7 +158,7 @@ int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port) if (rc < 0) return rc; - g_mfs.wqueue.bfd.when &= ~BSC_FD_READ; + g_mfs.wqueue.bfd.when &= ~OSMO_FD_READ; if (g_mfs.dst_host) talloc_free(g_mfs.dst_host); diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index bec793032..90a73e509 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -71,7 +71,7 @@ int bsc_sccplite_mgcp_proxy_cb(struct osmo_fd *ofd, unsigned int what) struct msgb *msg; int rc; - if (!(what & BSC_FD_READ)) + if (!(what & OSMO_FD_READ)) return 0; msg = msgb_alloc_headroom(1024, 16, "MGCP->IPA"); diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index f9691462c..f2a1e5b0f 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -253,7 +253,7 @@ struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr) msc_data->audio_support[4]->ver = 3; msc_data->audio_support[4]->hr = 1; - osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, BSC_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); + osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, OSMO_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0"); msc_data->mgcp_ipa.local_port = 0; /* dynamic */ diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index bb1874637..e75c2d498 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -458,7 +458,7 @@ static int pcu_sock_send(struct gsm_bts *bts, struct msgb *msg) return -EIO; } msgb_enqueue(&state->upqueue, msg); - conn_bfd->when |= BSC_FD_WRITE; + conn_bfd->when |= OSMO_FD_WRITE; return 0; } @@ -481,7 +481,7 @@ static void pcu_sock_close(struct pcu_sock_state *state) osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ - state->listen_bfd.when |= BSC_FD_READ; + state->listen_bfd.when |= OSMO_FD_READ; #if 0 /* remove si13, ... */ @@ -560,7 +560,7 @@ static int pcu_sock_write(struct osmo_fd *bfd) msg = llist_entry(state->upqueue.next, struct msgb, list); pcu_prim = (struct gsm_pcu_if *)msg->data; - bfd->when &= ~BSC_FD_WRITE; + bfd->when &= ~OSMO_FD_WRITE; /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ if (!msgb_length(msg)) { @@ -575,7 +575,7 @@ static int pcu_sock_write(struct osmo_fd *bfd) goto close; if (rc < 0) { if (errno == EAGAIN) { - bfd->when |= BSC_FD_WRITE; + bfd->when |= OSMO_FD_WRITE; break; } goto close; @@ -599,12 +599,12 @@ static int pcu_sock_cb(struct osmo_fd *bfd, unsigned int flags) { int rc = 0; - if (flags & BSC_FD_READ) + if (flags & OSMO_FD_READ) rc = pcu_sock_read(bfd); if (rc < 0) return rc; - if (flags & BSC_FD_WRITE) + if (flags & OSMO_FD_WRITE) rc = pcu_sock_write(bfd); return rc; @@ -630,13 +630,13 @@ static int pcu_sock_accept(struct osmo_fd *bfd, unsigned int flags) LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have " "another active connection ?!?\n"); /* We already have one PCU connected, this is all we support */ - state->listen_bfd.when &= ~BSC_FD_READ; + state->listen_bfd.when &= ~OSMO_FD_READ; close(rc); return 0; } conn_bfd->fd = rc; - conn_bfd->when = BSC_FD_READ; + conn_bfd->when = OSMO_FD_READ; conn_bfd->cb = pcu_sock_cb; conn_bfd->data = state; @@ -679,7 +679,7 @@ int pcu_sock_init(const char *path, struct gsm_bts *bts) return -1; } - bfd->when = BSC_FD_READ; + bfd->when = OSMO_FD_READ; bfd->cb = pcu_sock_accept; bfd->data = state; diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 6aa531a7f..0fd99c0d0 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -158,7 +158,7 @@ static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); diff --git a/src/utils/meas_udp2db.c b/src/utils/meas_udp2db.c index 34f8385e8..07023c323 100644 --- a/src/utils/meas_udp2db.c +++ b/src/utils/meas_udp2db.c @@ -71,7 +71,7 @@ static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c index 01be98611..73ccfc4aa 100644 --- a/src/utils/meas_vis.c +++ b/src/utils/meas_vis.c @@ -125,7 +125,7 @@ static int udp_fd_cb(struct osmo_fd *ofd, unsigned int what) { int rc; - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { struct msgb *msg = msgb_alloc(1024, "UDP Rx"); rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg)); |