aboutsummaryrefslogtreecommitdiffstats
path: root/bridges
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-27 15:58:11 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-27 15:58:11 +0000
commit52519dcd93c7772335df9ef01db822c3e0189c06 (patch)
tree4278a00a6524dceddbc585ea3b1d5df904ca1cb8 /bridges
parent2e5e09cb1e549e90d3c69033915d2c0ce5aa4423 (diff)
Merged revisions 184677 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r184677 | file | 2009-03-27 12:57:28 -0300 (Fri, 27 Mar 2009) | 7 lines Fix a potential timer leak in bridge_softmix. It is possible for a bridge to be created without actually being used. In that scenario a timing file descriptor would be opened and not closed. To fix this the timing file descriptor is now closed in the destroy callback, not the thread function. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@184678 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_softmix.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 953dbb45a..8a8e94d83 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -96,6 +96,16 @@ static int softmix_bridge_create(struct ast_bridge *bridge)
return 0;
}
+/*! \brief Function called when a bridge is destroyed */
+static int softmix_bridge_destroy(struct ast_bridge *bridge)
+{
+ int timingfd = (unsigned long)bridge->bridge_pvt;
+
+ ast_timer_close(timingfd);
+
+ return 0;
+}
+
/*! \brief Function called when a channel is joined into the bridge */
static int softmix_bridge_join(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
{
@@ -263,8 +273,6 @@ static int softmix_bridge_thread(struct ast_bridge *bridge)
ao2_lock(bridge);
}
- ast_timer_close(timingfd);
-
return 0;
}
@@ -278,6 +286,7 @@ static struct ast_bridge_technology softmix_bridge = {
.formats = AST_FORMAT_SLINEAR,
#endif
.create = softmix_bridge_create,
+ .destroy = softmix_bridge_destroy,
.join = softmix_bridge_join,
.leave = softmix_bridge_leave,
.write = softmix_bridge_write,