diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/main/channel.c b/main/channel.c index 17a489fe6..f40099045 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2578,15 +2578,20 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) goto done; } - if (chan->fdno == -1) { #ifdef AST_DEVMODE + /* + * The ast_waitfor() code records which of the channel's file descriptors reported that + * data is available. In theory, ast_read() should only be called after ast_waitfor() + * reports that a channel has data available for reading. However, there still may be + * some edge cases throughout the code where ast_read() is called improperly. This can + * potentially cause problems, so if this is a developer build, make a lot of noise if + * this happens so that it can be addressed. + */ + if (chan->fdno == -1) { ast_log(LOG_ERROR, "ast_read() called with no recorded file descriptor.\n"); -#else - ast_debug(2, "ast_read() called with no recorded file descriptor.\n"); -#endif - f = &ast_null_frame; - goto done; } +#endif + prestate = chan->_state; /* Read and ignore anything on the alertpipe, but read only |