paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-02 13:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

use osmo_fd_setup() whenever applicable

Browse Source 
Change-Id: I1586e855d37670af2602fc26b5d1fc72a32d1929
This commit is contained in:
Harald Welte
2020-10-19 13:25:41 +02:00
committed by laforge
parent 38404969df
commit c2a8f59560
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libosmo-mgcp-client/mgcp_client.c
View File

@@ -832,6 +832,11 @@ int mgcp_client_connect(struct mgcp_client *mgcp)
} }
wq = &mgcp->wq; 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); rc = init_socket(mgcp);
if (rc < 0) { if (rc < 0) {
@@ -842,11 +847,6 @@ int mgcp_client_connect(struct mgcp_client *mgcp)
goto error_close_fd; 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)); LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd));

8
src/libosmo-mgcp/mgcp_network.c
View File

@@ -1577,7 +1577,6 @@ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr,
mgcp_set_ip_tos(rtp_end->rtp.fd, cfg->endp_dscp); mgcp_set_ip_tos(rtp_end->rtp.fd, cfg->endp_dscp);
mgcp_set_ip_tos(rtp_end->rtcp.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) { if (osmo_fd_register(&rtp_end->rtp) != 0) {
LOGPENDP(endp, DRTP, LOGL_ERROR, LOGPENDP(endp, DRTP, LOGL_ERROR,
"failed to register RTP port %d\n", "failed to register RTP port %d\n",
@@ -1585,7 +1584,6 @@ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr,
goto cleanup2; goto cleanup2;
} }
rtp_end->rtcp.when = OSMO_FD_READ;
if (osmo_fd_register(&rtp_end->rtcp) != 0) { if (osmo_fd_register(&rtp_end->rtcp) != 0) {
LOGPENDP(endp, DRTP, LOGL_ERROR, LOGPENDP(endp, DRTP, LOGL_ERROR,
"failed to register RTCP port %d\n", "failed to register RTCP port %d\n",
@@ -1634,10 +1632,8 @@ int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port,
} }
end->local_port = rtp_port; end->local_port = rtp_port;
end->rtp.cb = rtp_data_net; osmo_fd_setup(&end->rtp, -1, OSMO_FD_READ, rtp_data_net, conn, 0);
end->rtp.data = conn; osmo_fd_setup(&end->rtcp, -1, OSMO_FD_READ, rtp_data_net, conn, 0);
end->rtcp.data = conn;
end->rtcp.cb = rtp_data_net;
return bind_rtp(endp->cfg, conn->end.local_addr, end, endp); return bind_rtp(endp->cfg, conn->end.local_addr, end, endp);
} }

4
src/libosmo-mgcp/mgcp_osmux.c
View File

@@ -416,8 +416,7 @@ int osmux_init(int role, struct mgcp_config *cfg)
{ {
int ret; int ret;
osmux_fd.cb = osmux_read_fd_cb; osmo_fd_setup(&osmux_fd, -1, OSMO_FD_READ, osmux_read_fd_cb, cfg, 0);
osmux_fd.data = cfg;
ret = mgcp_create_bind(cfg->osmux_addr, &osmux_fd, cfg->osmux_port); ret = mgcp_create_bind(cfg->osmux_addr, &osmux_fd, cfg->osmux_port);
if (ret < 0) { if (ret < 0) {
@@ -426,7 +425,6 @@ int osmux_init(int role, struct mgcp_config *cfg)
return ret; return ret;
} }
mgcp_set_ip_tos(osmux_fd.fd, cfg->endp_dscp); mgcp_set_ip_tos(osmux_fd.fd, cfg->endp_dscp);
osmux_fd.when |= OSMO_FD_READ;
ret = osmo_fd_register(&osmux_fd); ret = osmo_fd_register(&osmux_fd);
if (ret < 0) { if (ret < 0) {