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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@179611 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index fa75a043ffb893933affb3d1ee3b5af2bd5d6023..d4a58469f87bfd2b53a8ecab02d9fe3d8a54a24f 100644 (file)
--- 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) {