From 8392602302cd86abd081f23324e1d788e62c7a88 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 11 Aug 2017 16:48:51 +0200 Subject: mgcp_osmux: Remove unused parameter Change-Id: Icb1e7cb15fe04642578f5292124ebc1eac9c9aa3 --- include/openbsc/osmux.h | 3 +-- src/libmgcp/mgcp_osmux.c | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/openbsc/osmux.h b/include/openbsc/osmux.h index 0b64a7f1e..f3ea72a85 100644 --- a/include/openbsc/osmux.h +++ b/include/openbsc/osmux.h @@ -11,8 +11,7 @@ enum { }; int osmux_init(int role, struct mgcp_config *cfg); -int osmux_enable_endpoint(struct mgcp_endpoint *endp, int role, - struct in_addr *addr, uint16_t port); +int osmux_enable_endpoint(struct mgcp_endpoint *endp, struct in_addr *addr, uint16_t port); void osmux_disable_endpoint(struct mgcp_endpoint *endp); void osmux_allocate_cid(struct mgcp_endpoint *endp); void osmux_release_cid(struct mgcp_endpoint *endp); diff --git a/src/libmgcp/mgcp_osmux.c b/src/libmgcp/mgcp_osmux.c index b46a80e7f..c52984b32 100644 --- a/src/libmgcp/mgcp_osmux.c +++ b/src/libmgcp/mgcp_osmux.c @@ -340,8 +340,7 @@ static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr, if (endp->osmux.state == OSMUX_STATE_ENABLED) goto out; - if (osmux_enable_endpoint(endp, OSMUX_ROLE_BSC_NAT, - &addr->sin_addr, addr->sin_port) < 0 ){ + if (osmux_enable_endpoint(endp, &addr->sin_addr, addr->sin_port) < 0 ) { LOGP(DMGCP, LOGL_ERROR, "Could not enable osmux in endpoint %d\n", ENDPOINT_NUMBER(endp)); @@ -433,8 +432,7 @@ int osmux_init(int role, struct mgcp_config *cfg) return 0; } -int osmux_enable_endpoint(struct mgcp_endpoint *endp, int role, - struct in_addr *addr, uint16_t port) +int osmux_enable_endpoint(struct mgcp_endpoint *endp, struct in_addr *addr, uint16_t port) { /* If osmux is enabled, initialize the output handler. This handler is * used to reconstruct the RTP flow from osmux. The RTP SSRC is @@ -522,8 +520,7 @@ int osmux_send_dummy(struct mgcp_endpoint *endp) return 0; if (endp->osmux.state == OSMUX_STATE_ACTIVATING) { - if (osmux_enable_endpoint(endp, OSMUX_ROLE_BSC, - &endp->net_end.addr, + if (osmux_enable_endpoint(endp, &endp->net_end.addr, htons(endp->cfg->osmux_port)) < 0) { LOGP(DMGCP, LOGL_ERROR, "Could not activate osmux in endpoint %d\n", -- cgit v1.2.3