diff options
author | Russell Bryant <russell@russellbryant.com> | 2009-03-03 16:47:28 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2009-03-03 16:47:28 +0000 |
commit | cfa0d9c0ce771795e3238c24065958963304110d (patch) | |
tree | 24d2009ff91022ac850f558f99eea3e7ed680742 /main | |
parent | f000d5bb0f576a0ca464af7f0442639ec6929585 (diff) |
Merged revisions 179741 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r179741 | russell | 2009-03-03 10:45:46 -0600 (Tue, 03 Mar 2009) | 6 lines
Ensure chan->fdno always gets reset to -1 after handling a channel fd event.
Since setting fdno to -1 had to be moved, a couple of other code paths that
do process an fd event return early and do not pass through the code path
where it was moved to. So, set it to -1 in a few other places, too.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@179742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/channel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 5197a7e21..a39dfb906 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2524,10 +2524,12 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) /* save a copy of func/data before unlocking the channel */ int (*func)(const void *) = chan->timingfunc; void *data = chan->timingdata; + chan->fdno = -1; ast_channel_unlock(chan); func(data); } else { ast_timer_set_rate(chan->timingfd, 0); + chan->fdno = -1; ast_channel_unlock(chan); } @@ -2551,6 +2553,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) chan->generator->generate(chan, tmp, -1, -1); chan->generatordata = tmp; f = &ast_null_frame; + chan->fdno = -1; goto done; } @@ -2609,7 +2612,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) ast_log(LOG_WARNING, "No read routine on channel %s\n", chan->name); } - /* + /* * Reset the recorded file descriptor that triggered this read so that we can * easily detect when ast_read() is called without properly using ast_waitfor(). */ |