dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31267 ) Change subject: mgcp_endp: cosmetic move mgcp_endp_release to the end ...................................................................... mgcp_endp: cosmetic move mgcp_endp_release to the end It is more logical to move the function mgcp_endp_release to the end since it is used to release the endpoint when it is no longer needed for any transmission. (Also the follow up patch requires the function to be moved) Change-Id: Id3166a6a817ddb9ce36ff1b375ff8ed3598a00c2 --- M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_endp.c 2 files changed, 32 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/67/31267/1 diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index b130050..08b966f 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -130,7 +130,6 @@ }; struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, unsigned int index); -void mgcp_endp_release(struct mgcp_endpoint *endp); int mgcp_endp_claim(struct mgcp_endpoint *endp, const char *callid); void mgcp_endp_update(struct mgcp_endpoint *endp); bool mgcp_endp_is_wildcarded(const char *epname); @@ -145,3 +144,4 @@ const struct mgcp_trunk *trunk); struct mgcp_endpoint *mgcp_endp_find_specific(const char *epname, const struct mgcp_trunk *trunk); +void mgcp_endp_release(struct mgcp_endpoint *endp); diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index a41e0d0..22dbeb7 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -110,36 +110,6 @@ return endp; } -/*! release endpoint, all open connections are closed. - * \param[in] endp endpoint to release */ -void mgcp_endp_release(struct mgcp_endpoint *endp) -{ - LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "Releasing endpoint\n"); - - /* Normally this function should only be called when - * all connections have been removed already. In case - * that there are still connections open (e.g. when - * RSIP is executed), free them all at once. */ - mgcp_conn_free_all(endp); - - /* We must only decrement the stat item when the endpoint as actually - * claimed. An endpoint is claimed when a call-id is set */ - if (endp->callid) - osmo_stat_item_dec(osmo_stat_item_group_get_item(endp->trunk->stats.common, - TRUNK_STAT_ENDPOINTS_USED), 1); - - /* Reset endpoint parameters and states */ - talloc_free(endp->callid); - endp->callid = NULL; - talloc_free(endp->local_options.string); - endp->local_options.string = NULL; - talloc_free(endp->local_options.codec); - endp->local_options.codec = NULL; - - if (endp->trunk->trunk_type == MGCP_TRUNK_E1) - mgcp_e1_endp_release(endp); -} - /* Check if the endpoint name contains the prefix (e.g. "rtpbridge/" or * "ds/e1-") and write the epname without the prefix back to the memory * pointed at by epname. (per trunk the prefix is the same for all endpoints, @@ -675,3 +645,34 @@ if (llist_empty(&endp->conns)) mgcp_endp_release(endp); } + +/*! release endpoint, all open connections are closed. + * \param[in] endp endpoint to release */ +void mgcp_endp_release(struct mgcp_endpoint *endp) +{ + LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "Releasing endpoint\n"); + + /* Normally this function should only be called when + * all connections have been removed already. In case + * that there are still connections open (e.g. when + * RSIP is executed), free them all at once. */ + mgcp_conn_free_all(endp); + + /* We must only decrement the stat item when the endpoint as actually + * claimed. An endpoint is claimed when a call-id is set */ + if (endp->callid) + osmo_stat_item_dec(osmo_stat_item_group_get_item(endp->trunk->stats.common, + TRUNK_STAT_ENDPOINTS_USED), 1); + + /* Reset endpoint parameters and states */ + talloc_free(endp->callid); + endp->callid = NULL; + talloc_free(endp->local_options.string); + endp->local_options.string = NULL; + talloc_free(endp->local_options.codec); + endp->local_options.codec = NULL; + + if (endp->trunk->trunk_type == MGCP_TRUNK_E1) + mgcp_e1_endp_release(endp); +} + -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id3166a6a817ddb9ce36ff1b375ff8ed3598a00c2 Gerrit-Change-Number: 31267 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange