cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

Use osmo_fd_setup() whenever applicable 

Change-Id: Ib570e2ada619b72001d76d2cae159d78f09d6fb6
This commit is contained in:
Harald Welte 2020-10-19 13:10:50 +02:00 committed by laforge
parent 5a58cefab7
commit aa29e33cb5
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libmsc/mncc_sock.c
View File

@ -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);

4
src/libmsc/smpp_smsc.c
View File

@ -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);