diff options
author | Harald Welte <laforge@osmocom.org> | 2020-10-18 22:19:28 +0200 |
---|---|---|
committer | Harald Welte <laforge@osmocom.org> | 2020-10-19 12:05:17 +0200 |
commit | 806e7a37ddabd87b637b9151415f3f7375504e64 (patch) | |
tree | a725985a9436afc34fb9dca436cf92d6390f4a41 /src/osmo-bsc/pcu_sock.c | |
parent | 218b3753f1cf65fb89b85da8aa0fa57b1661f3c1 (diff) |
use osmo_fd_setup() whenever applicable
Change-Id: Iee26d14e997cc77c49b8fc1a9f388e4e2f783105
Diffstat (limited to 'src/osmo-bsc/pcu_sock.c')
-rw-r--r-- | src/osmo-bsc/pcu_sock.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index a1a1cfc18..d59df33bb 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -672,10 +672,7 @@ static int pcu_sock_accept(struct osmo_fd *bfd, unsigned int flags) return 0; } - conn_bfd->fd = rc; - conn_bfd->when = OSMO_FD_READ; - conn_bfd->cb = pcu_sock_cb; - conn_bfd->data = state; + osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, pcu_sock_cb, state, 0); if (osmo_fd_register(conn_bfd) != 0) { LOGP(DPCU, LOGL_ERROR, "Failed to register new connection " @@ -707,18 +704,15 @@ int pcu_sock_init(const char *path, struct gsm_bts *bts) bfd = &state->listen_bfd; - bfd->fd = osmo_sock_unix_init(SOCK_SEQPACKET, 0, path, - OSMO_SOCK_F_BIND); - if (bfd->fd < 0) { + rc = osmo_sock_unix_init(SOCK_SEQPACKET, 0, path, OSMO_SOCK_F_BIND); + if (rc < 0) { LOGP(DPCU, LOGL_ERROR, "Could not create unix socket: %s\n", strerror(errno)); talloc_free(state); return -1; } - bfd->when = OSMO_FD_READ; - bfd->cb = pcu_sock_accept; - bfd->data = state; + osmo_fd_setup(bfd, rc, OSMO_FD_READ, pcu_sock_accept, state, 0); rc = osmo_fd_register(bfd); if (rc < 0) { |