diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-04-26 16:35:14 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-04-26 16:35:14 +0000 |
| commit | 14d8979b2f5b5b6a65e0743f9cd9d885692f2b10 (patch) | |
| tree | 18561d8878a2308037351cce07ba551fb3de5818 | |
| parent | 007fa5e0bea84fde39511f273c790622e0316d7d (diff) | |
Merged revisions 62038 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r62038 | file | 2007-04-26 12:33:52 -0400 (Thu, 26 Apr 2007) | 10 lines
Merged revisions 62037 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r62037 | file | 2007-04-26 12:30:57 -0400 (Thu, 26 Apr 2007) | 2 lines
Revert previous fix for when the IAX2 channel goes funky (that's the technical term). This is causing legit calls to be prematurely hung up. (issue #9600 reported by justdave)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index e8d71ff90..b6953bcff 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3124,8 +3124,8 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat static struct ast_frame *iax2_read(struct ast_channel *c) { - ast_log(LOG_NOTICE, "I should never be called! Hanging up.\n"); - return NULL; + ast_log(LOG_NOTICE, "I should never be called!\n"); + return &ast_null_frame; } static int iax2_start_transfer(unsigned short callno0, unsigned short callno1, int mediaonly) |