diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-10-19 13:10:50 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-10-19 11:38:05 +0000 |
| commit | aa29e33cb56ecdb21678ef50175f94ea8f6b4ed8 (patch) | |
| tree | 0b03cf42aad3b0d3101954e3c067d9051002251d | |
| parent | 5a58cefab7a5c59f752df2b478a840766f8e8074 (diff) | |
Use osmo_fd_setup() whenever applicable
Change-Id: Ib570e2ada619b72001d76d2cae159d78f09d6fb6
| -rw-r--r-- | src/libmsc/mncc_sock.c | 11 | ||||
| -rw-r--r-- | src/libmsc/smpp_smsc.c | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c index a3527ef59..4c1362d43 100644 --- a/src/libmsc/mncc_sock.c +++ b/src/libmsc/mncc_sock.c @@ -250,11 +250,7 @@ static int mncc_sock_accept(struct osmo_fd *bfd, unsigned int flags) return 0; } - conn_bfd->fd = rc; - conn_bfd->when = OSMO_FD_READ; - conn_bfd->cb = mncc_sock_cb; - conn_bfd->data = state; - + osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, mncc_sock_cb, state, 0); if (osmo_fd_register(conn_bfd) != 0) { LOGP(DMNCC, LOGL_ERROR, "Failed to register new connection fd\n"); close(conn_bfd->fd); @@ -294,10 +290,7 @@ int mncc_sock_init(struct gsm_network *net, const char *sock_path) return -1; } - bfd->when = OSMO_FD_READ; - bfd->cb = mncc_sock_accept; - bfd->data = state; - + osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, mncc_sock_accept, state, 0); rc = osmo_fd_register(bfd); if (rc < 0) { LOGP(DMNCC, LOGL_ERROR, "Could not register listen fd: %d\n", rc); diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 2d82d98d5..a5c6165f0 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -929,9 +929,7 @@ static int link_accept_cb(struct smsc *smsc, int fd, esme_inc_seq_nr(esme); esme->smsc = smsc; osmo_wqueue_init(&esme->wqueue, 10); - esme->wqueue.bfd.fd = fd; - esme->wqueue.bfd.data = esme; - esme->wqueue.bfd.when = OSMO_FD_READ; + osmo_fd_setup(&esme->wqueue.bfd, fd, OSMO_FD_READ, osmo_wqueue_bfd_cb, esme, 0); if (osmo_fd_register(&esme->wqueue.bfd) != 0) { close(fd); |