This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/20786 ) Change subject: use osmo_fd_setup() whenever applicable ...................................................................... use osmo_fd_setup() whenever applicable Change-Id: I1586e855d37670af2602fc26b5d1fc72a32d1929 --- M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp/mgcp_network.c 2 files changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/20786/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 5972803..6f4c1f3 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -832,6 +832,11 @@ } wq = &mgcp->wq; + osmo_wqueue_init(wq, 1024); + wq->read_cb = mgcp_do_read; + wq->write_cb = mgcp_do_write; + + osmo_fd_setup(&wq->bfd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, mgcp, 0); rc = init_socket(mgcp); if (rc < 0) { @@ -842,11 +847,6 @@ goto error_close_fd; } - osmo_wqueue_init(wq, 1024); - wq->bfd.when = OSMO_FD_READ; - wq->bfd.data = mgcp; - wq->read_cb = mgcp_do_read; - wq->write_cb = mgcp_do_write; LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd)); diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index b452201..6b31f2b 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1577,7 +1577,6 @@ mgcp_set_ip_tos(rtp_end->rtp.fd, cfg->endp_dscp); mgcp_set_ip_tos(rtp_end->rtcp.fd, cfg->endp_dscp); - rtp_end->rtp.when = OSMO_FD_READ; if (osmo_fd_register(&rtp_end->rtp) != 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to register RTP port %d\n", @@ -1585,7 +1584,6 @@ goto cleanup2; } - rtp_end->rtcp.when = OSMO_FD_READ; if (osmo_fd_register(&rtp_end->rtcp) != 0) { LOGPENDP(endp, DRTP, LOGL_ERROR, "failed to register RTCP port %d\n", @@ -1634,10 +1632,8 @@ } end->local_port = rtp_port; - end->rtp.cb = rtp_data_net; - end->rtp.data = conn; - end->rtcp.data = conn; - end->rtcp.cb = rtp_data_net; + osmo_fd_setup(&end->rtp, -1, OSMO_FD_READ, rtp_data_net, conn, 0); + osmo_fd_setup(&end->rtcp, -1, OSMO_FD_READ, rtp_data_net, conn, 0); return bind_rtp(endp->cfg, conn->end.local_addr, end, endp); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/20786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1586e855d37670af2602fc26b5d1fc72a32d1929 Gerrit-Change-Number: 20786 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge at osmocom.org> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201019/927a8072/attachment.htm>