From 0c0479602e577f449e97019554a3e708f30b93c1 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 2 Mar 2009 23:00:30 +0000 Subject: 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/trunk@179462 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'main') diff --git a/main/channel.c b/main/channel.c index b3aec0e36..303c42317 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2243,7 +2243,10 @@ int ast_settimeout(struct ast_channel *c, unsigned int rate, int (*func)(const v int res; unsigned int real_rate = rate, max_rate; + ast_channel_lock(c); + if (c->timingfd == -1) { + ast_channel_unlock(c); return -1; } @@ -2263,6 +2266,8 @@ int ast_settimeout(struct ast_channel *c, unsigned int rate, int (*func)(const v c->timingfunc = func; c->timingdata = data; + ast_channel_unlock(c); + return res; } -- cgit v1.2.3