dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix a potential race condition when creating a software based mixing bridge. 

It was possible for no timer to become available between creating the bridge
and starting it. We now open a timer when creating it and keep it open until the
bridge is destroyed.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@184628 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2009-03-27 13:57:29 +00:00
parent c59cbe4bef
commit 7a12871f67
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridges/bridge_softmix.c
View File

@ -91,7 +91,7 @@ static int softmix_bridge_create(struct ast_bridge *bridge)
return -1;
}
ast_timer_close(timingfd);
bridge->bridge_pvt = (void*)(unsigned long)timingfd;
return 0;
}
@ -199,11 +199,7 @@ static int softmix_bridge_poke(struct ast_bridge *bridge, struct ast_bridge_chan
/*! \brief Function which acts as the mixing thread */
static int softmix_bridge_thread(struct ast_bridge *bridge)
{
int timingfd;
if ((timingfd = ast_timer_open()) < 0) {
return -1;
}
int timingfd = (unsigned short)(unsigned long)bridge->bridge_pvt;
ast_timer_set_rate(timingfd, (1000 / SOFTMIX_INTERVAL));
@ -267,7 +263,6 @@ static int softmix_bridge_thread(struct ast_bridge *bridge)
ao2_lock(bridge);
}
ast_timer_set_rate(timingfd, 0);
ast_timer_close(timingfd);
return 0;