From 7fe2a3d2930bc1fde01fb11ac2b645a5b8586b02 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 6 Aug 2010 07:18:22 +0800 Subject: mgcp: Add instrumentation code to find a possible port leak/bsc-fd corruption --- openbsc/src/mgcp/mgcp_network.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'openbsc') diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index 2123db77c..c864723a6 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -409,6 +409,12 @@ cleanup0: int mgcp_bind_bts_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { + if (endp->bts_end.rtp.fd != -1 || endp->bts_end.rtcp.fd != -1) { + LOGP(DMGCP, LOGL_ERROR, "Previous bts-port was still bound on %d\n", + ENDPOINT_NUMBER(endp)); + mgcp_free_rtp_port(&endp->bts_end); + } + endp->bts_end.local_port = rtp_port; endp->bts_end.rtp.cb = rtp_data_bts; endp->bts_end.rtp.data = endp; @@ -419,6 +425,12 @@ int mgcp_bind_bts_rtp_port(struct mgcp_endpoint *endp, int rtp_port) int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) { + if (endp->net_end.rtp.fd != -1 || endp->net_end.rtcp.fd != -1) { + LOGP(DMGCP, LOGL_ERROR, "Previous net-port was still bound on %d\n", + ENDPOINT_NUMBER(endp)); + mgcp_free_rtp_port(&endp->net_end); + } + endp->net_end.local_port = rtp_port; endp->net_end.rtp.cb = rtp_data_net; endp->net_end.rtp.data = endp; @@ -429,11 +441,6 @@ int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port) int mgcp_free_rtp_port(struct mgcp_rtp_end *end) { - if (end->local_alloc != PORT_ALLOC_DYNAMIC) { - LOGP(DMGCP, LOGL_ERROR, "Should only be called for dynamic ports.\n"); - return -1; - } - if (end->rtp.fd != -1) { close(end->rtp.fd); end->rtp.fd = -1; -- cgit v1.2.3