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.4@179461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-03-02 22:58:18 +00:00
parent 5062dff9dd
commit 6706e0be24

View File

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