kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 09:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 179462 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r179462 | russell | 2009-03-02 17:00:30 -0600 (Mon, 02 Mar 2009) | 16 lines

Merged revisions 179461 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r179461 | russell | 2009-03-02 16:58:18 -0600 (Mon, 02 Mar 2009) | 8 lines

Ensure that only one thread is calling ast_settimeout() on a channel at a time.

For example, with an IAX2 channel, you can have both the channel thread and the
chan_iax2 processing threads calling this function, and doing so twice at the
same time is a bad thing.

(Found in a debugging session with dvossel and mmichelson)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@179463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-03-02 23:02:49 +00:00
parent 98d73b0f65
commit 9a6e93c561
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/channel.c
View File

@@ -2233,6 +2233,7 @@ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *d
{ {
int res = -1; int res = -1;
#ifdef HAVE_DAHDI #ifdef HAVE_DAHDI
ast_channel_lock(c);
if (c->timingfd > -1) { if (c->timingfd > -1) {
if (!func) { if (!func) {
samples = 0; samples = 0;
@@ -2243,7 +2244,8 @@ int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *d
c->timingfunc = func; c->timingfunc = func;
c->timingdata = data; c->timingdata = data;
} }
#endif ast_channel_unlock(c);
#endif
return res; return res;
} }