From 39a97e24fb7f5f67813bb4abd99038cd124b9583 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 6 Aug 2010 18:03:11 +0800 Subject: mgcp: Remember if the endpoint was allocated... Do not use the CI_UNUSED to decide if an endpoint is allocated but introduce a new flag. This way only the CRCX and free_endp play with the allocated field. --- openbsc/include/openbsc/mgcp_internal.h | 1 + openbsc/src/mgcp/mgcp_network.c | 2 +- openbsc/src/mgcp/mgcp_protocol.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openbsc/include/openbsc/mgcp_internal.h b/openbsc/include/openbsc/mgcp_internal.h index d7be0a244..12e3ad9b1 100644 --- a/openbsc/include/openbsc/mgcp_internal.h +++ b/openbsc/include/openbsc/mgcp_internal.h @@ -85,6 +85,7 @@ struct mgcp_rtp_tap { }; struct mgcp_endpoint { + int allocated; uint32_t ci; char *callid; char *local_options; diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index ce81f3c7a..96a186559 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -215,7 +215,7 @@ static int recevice_from(struct mgcp_endpoint *endp, int fd, struct sockaddr_in } /* do not forward aynthing... maybe there is a packet from the bts */ - if (endp->ci == CI_UNUSED) + if (!endp->allocated) return -1; #warning "Slight spec violation. With connection mode recvonly we should attempt to forward." diff --git a/openbsc/src/mgcp/mgcp_protocol.c b/openbsc/src/mgcp/mgcp_protocol.c index 828c33b98..2aa66a0af 100644 --- a/openbsc/src/mgcp/mgcp_protocol.c +++ b/openbsc/src/mgcp/mgcp_protocol.c @@ -430,7 +430,7 @@ static struct msgb *handle_create_con(struct mgcp_config *cfg, struct msgb *msg) if (found != 0) return create_response(500, "CRCX", trans_id); - if (endp->ci != CI_UNUSED) { + if (endp->allocated) { if (cfg->force_realloc) { LOGP(DMGCP, LOGL_NOTICE, "Endpoint 0x%x already allocated. Forcing realloc.\n", ENDPOINT_NUMBER(endp)); @@ -487,6 +487,7 @@ static struct msgb *handle_create_con(struct mgcp_config *cfg, struct msgb *msg) if (endp->ci == CI_UNUSED) goto error2; + endp->allocated = 1; endp->bts_end.payload_type = cfg->audio_payload; /* policy CB */ @@ -667,7 +668,7 @@ static struct msgb *handle_delete_con(struct mgcp_config *cfg, struct msgb *msg) if (found != 0) return create_response(error_code, "DLCX", trans_id); - if (endp->ci == CI_UNUSED) { + if (!endp->allocated) { LOGP(DMGCP, LOGL_ERROR, "Endpoint is not used. 0x%x\n", ENDPOINT_NUMBER(endp)); return create_response(error_code, "DLCX", trans_id); } @@ -811,6 +812,7 @@ void mgcp_free_endp(struct mgcp_endpoint *endp) { LOGP(DMGCP, LOGL_DEBUG, "Deleting endpoint on: 0x%x\n", ENDPOINT_NUMBER(endp)); endp->ci = CI_UNUSED; + endp->allocated = 0; if (endp->callid) { talloc_free(endp->callid); -- cgit v1.2.3