diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
| commit | 8e8b329e14ad2e4d747c4c4eb33c118305401aee (patch) | |
| tree | 200a9b111d9cf75ab980aedf53ee714b7cc398f2 /funcs/func_timeout.c | |
| parent | 8b24b0d20647697c9ee899dea85871465c3032cb (diff) | |
Add channel locking for channel snapshot creation.
This adds channel locks around calls to create channel snapshots as well
as other functions which operate on a channel and then end up
creating a channel snapshot. Functions that expect the channel to be
locked prior to being called have had their documentation updated to
indicate such.
........
Merged revisions 403311 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_timeout.c')
| -rw-r--r-- | funcs/func_timeout.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index 3c2810fd5..e93ce3f62 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -155,7 +155,9 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, switch (*data) { case 'a': case 'A': + ast_channel_lock(chan); ast_channel_setwhentohangup_tv(chan, when); + ast_channel_unlock(chan); if (!ast_tvzero(*ast_channel_whentohangup(chan))) { when = ast_tvadd(when, ast_tvnow()); ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z", |