From d81fec021ee11c3d818044b4494317e6ed81cfb7 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 25 Aug 2013 17:39:38 +0200 Subject: libmgcp: attach mgcp_ prefix to udp_send This patch is a cleanup. --- openbsc/src/libmgcp/mgcp_network.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index a70acfb9a..2b55527aa 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -115,7 +115,8 @@ uint32_t get_current_ts(void) return ret; } -static int udp_send(int fd, struct in_addr *addr, int port, char *buf, int len) +static int mgcp_udp_send(int fd, struct in_addr *addr, int port, char *buf, + int len) { struct sockaddr_in out; out.sin_family = AF_INET; @@ -129,8 +130,8 @@ int mgcp_send_dummy(struct mgcp_endpoint *endp) { static char buf[] = { MGCP_DUMMY_LOAD }; - return udp_send(endp->net_end.rtp.fd, &endp->net_end.addr, - endp->net_end.rtp_port, buf, 1); + return mgcp_udp_send(endp->net_end.rtp.fd, &endp->net_end.addr, + endp->net_end.rtp_port, buf, 1); } /** @@ -283,11 +284,13 @@ static int mgcp_send(struct mgcp_endpoint *endp, int dest, int is_rtp, addr, buf, rc); forward_data(endp->net_end.rtp.fd, &endp->taps[MGCP_TAP_NET_OUT], buf, rc); - return udp_send(endp->net_end.rtp.fd, &endp->net_end.addr, - endp->net_end.rtp_port, buf, rc); + return mgcp_udp_send(endp->net_end.rtp.fd, + &endp->net_end.addr, + endp->net_end.rtp_port, buf, rc); } else if (!tcfg->omit_rtcp) { - return udp_send(endp->net_end.rtcp.fd, &endp->net_end.addr, - endp->net_end.rtcp_port, buf, rc); + return mgcp_udp_send(endp->net_end.rtcp.fd, + &endp->net_end.addr, + endp->net_end.rtcp_port, buf, rc); } } else { if (is_rtp) { @@ -296,11 +299,13 @@ static int mgcp_send(struct mgcp_endpoint *endp, int dest, int is_rtp, addr, buf, rc); forward_data(endp->bts_end.rtp.fd, &endp->taps[MGCP_TAP_BTS_OUT], buf, rc); - return udp_send(endp->bts_end.rtp.fd, &endp->bts_end.addr, - endp->bts_end.rtp_port, buf, rc); + return mgcp_udp_send(endp->bts_end.rtp.fd, + &endp->bts_end.addr, + endp->bts_end.rtp_port, buf, rc); } else if (!tcfg->omit_rtcp) { - return udp_send(endp->bts_end.rtcp.fd, &endp->bts_end.addr, - endp->bts_end.rtcp_port, buf, rc); + return mgcp_udp_send(endp->bts_end.rtcp.fd, + &endp->bts_end.addr, + endp->bts_end.rtcp_port, buf, rc); } } -- cgit v1.2.3