diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 16:48:15 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 16:48:15 +0000 |
| commit | e5dfce26b1c966c4c4acf8553e08a203dd0798ec (patch) | |
| tree | 85ab1aa707bb3c7c142d85338c16815ed658941b | |
| parent | 861f2ad22be83563340a69a014e1534f940e0e26 (diff) | |
Merged revisions 179742 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r179742 | russell | 2009-03-03 10:47:28 -0600 (Tue, 03 Mar 2009) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@179743 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 b13e79dd6..d788e79a2 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2515,12 +2515,14 @@ 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 { blah = 0; ioctl(chan->timingfd, DAHDI_TIMERCONFIG, &blah); chan->timingdata = NULL; + chan->fdno = -1; ast_channel_unlock(chan); } /* cannot 'goto done' because the channel is already unlocked */ @@ -2538,6 +2540,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; } @@ -2595,7 +2598,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(). */ |