diff options
Diffstat (limited to 'src/host/virt_phy')
| -rw-r--r-- | src/host/virt_phy/src/l1ctl_sock.c | 9 | ||||
| -rw-r--r-- | src/host/virt_phy/src/shared/osmo_mcast_sock.c | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/host/virt_phy/src/l1ctl_sock.c b/src/host/virt_phy/src/l1ctl_sock.c index d247bef0..7951f46e 100644 --- a/src/host/virt_phy/src/l1ctl_sock.c +++ b/src/host/virt_phy/src/l1ctl_sock.c @@ -125,10 +125,7 @@ static int l1ctl_sock_accept_cb(struct osmo_fd *ofd, unsigned int what) } lsc->l1ctl_sock = lsi; - lsc->ofd.fd = fd; - lsc->ofd.when = OSMO_FD_READ; - lsc->ofd.cb = l1ctl_sock_data_cb; - lsc->ofd.data = lsc; + osmo_fd_setup(&lsc->ofd, fd, OSMO_FD_READ, l1ctl_sock_data_cb, lsc, 0); if (lsi->accept_cb) { rc = lsi->accept_cb(lsc); if (rc < 0) { @@ -163,9 +160,7 @@ struct l1ctl_sock_inst *l1ctl_sock_init( lsi = talloc_zero(ctx, struct l1ctl_sock_inst); lsi->priv = NULL; - lsi->ofd.data = lsi; - lsi->ofd.when = OSMO_FD_READ; - lsi->ofd.cb = l1ctl_sock_accept_cb; + osmo_fd_setup(&lsi->ofd, -1, OSMO_FD_READ, l1ctl_sock_accept_cb, lsi, 0); rc = osmo_sock_unix_init_ofd(&lsi->ofd, SOCK_STREAM, 0, path, OSMO_SOCK_F_BIND); if (rc < 0) { diff --git a/src/host/virt_phy/src/shared/osmo_mcast_sock.c b/src/host/virt_phy/src/shared/osmo_mcast_sock.c index b111a654..d0c5b6df 100644 --- a/src/host/virt_phy/src/shared/osmo_mcast_sock.c +++ b/src/host/virt_phy/src/shared/osmo_mcast_sock.c @@ -43,9 +43,7 @@ int mcast_client_sock_setup(struct osmo_fd *ofd, const char *mcast_group, uint16 int rc; unsigned int flags = OSMO_SOCK_F_BIND | OSMO_SOCK_F_NO_MCAST_ALL | OSMO_SOCK_F_UDP_REUSEADDR; - ofd->cb = fd_rx_cb; - ofd->when = OSMO_FD_READ; - ofd->data = osmo_fd_data; + osmo_fd_setup(ofd, -1, OSMO_FD_READ, fd_rx_cb, osmo_fd_data, 0); /* Create mcast client socket */ rc = osmo_sock_init_ofd(ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, |