diff options
Diffstat (limited to 'src/ipaccess/abisip-find.c')
| -rw-r--r-- | src/ipaccess/abisip-find.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c index 11b2851ae..a26bb55d7 100644 --- a/src/ipaccess/abisip-find.c +++ b/src/ipaccess/abisip-find.c @@ -53,7 +53,7 @@ static struct { .format_json = false, }; -static void print_help() +static void print_help(void) { printf("\n"); printf("Usage: abisip-find [-l] [<interface-name>]\n"); @@ -265,7 +265,7 @@ LLIST_HEAD(base_stations); void *ctx = NULL; -void print_timestamp() +void print_timestamp(void) { time_t now = time(NULL); printf("\n\n----- %s\n", ctime(&now)); @@ -304,7 +304,7 @@ bool base_stations_add(struct base_station *new_bs) return true; } -bool base_stations_timeout() +bool base_stations_timeout(void) { struct base_station *bs, *next_bs; time_t now = time(NULL); @@ -323,7 +323,7 @@ bool base_stations_timeout() return changed; } -void base_stations_print() +void base_stations_print(void) { struct base_station *bs; int count = 0; @@ -406,7 +406,7 @@ static int bfd_cb(struct osmo_fd *bfd, unsigned int flags) if (flags & OSMO_FD_READ) return read_response(bfd->fd); if (flags & OSMO_FD_WRITE) { - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); return bcast_find(bfd->fd); } return 0; @@ -418,7 +418,7 @@ static void timer_cb(void *_data) { struct osmo_fd *bfd = _data; - bfd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(bfd); base_stations_bump(false); @@ -446,13 +446,12 @@ int main(int argc, char **argv) else if (cmdline_opts.send_interval >= cmdline_opts.list_view_timeout) fprintf(stdout, "\nWARNING: the --timeout should be larger than --interval.\n\n"); - bfd.cb = bfd_cb; - bfd.when = OSMO_FD_READ | OSMO_FD_WRITE; - bfd.fd = udp_sock(cmdline_opts.ifname, cmdline_opts.bind_ip); - if (bfd.fd < 0) { + rc = udp_sock(cmdline_opts.ifname, cmdline_opts.bind_ip); + if (rc < 0) { perror("Cannot create local socket for broadcast udp"); exit(1); } + osmo_fd_setup(&bfd, rc, OSMO_FD_READ | OSMO_FD_WRITE, bfd_cb, NULL, 0); rc = osmo_fd_register(&bfd); if (rc < 0) { |