diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 13:56:06 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 13:56:06 +0000 |
commit | fb622f3196b28c5486502d811ccdb82e33865e10 (patch) | |
tree | ebd0d1fa673ad0ccda8b290a7fbfe481f946563e /main/channel.c | |
parent | c0eca9beee008ec5d092ac397d8a7b6d029412f4 (diff) |
Merged revisions 179609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r179609 | russell | 2009-03-03 07:54:41 -0600 (Tue, 03 Mar 2009) | 17 lines
Merged revisions 179608 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r179608 | russell | 2009-03-03 07:53:52 -0600 (Tue, 03 Mar 2009) | 9 lines
Make it easier to detect an improper call to ast_read().
When you call ast_waitfor() on a channel, the index into the channel fds array
that holds the file descriptor that poll() determines has input available is
stored in fdno. This patch clears out this value after a call to ast_read()
and also reports errors if ast_read() is called without an fdno set.
From a discussion on the asterisk-dev list.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@179611 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
-rw-r--r-- | main/channel.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index fa75a043f..d4a58469f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2442,6 +2442,12 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) usleep(1); } + if (chan->fdno == -1) { + ast_log(LOG_ERROR, "ast_read() called with no recorded file descriptor.\n"); + f = &ast_null_frame; + goto done; + } + if (chan->masq) { if (ast_do_masquerade(chan)) ast_log(LOG_WARNING, "Failed to perform masquerade\n"); @@ -2458,6 +2464,12 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) } prestate = chan->_state; + /* + * 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(). + */ + chan->fdno = -1; + /* Read and ignore anything on the alertpipe, but read only one sizeof(blah) per frame that we send from it */ if (chan->alertpipe[0] > -1) { |