Merged revisions 62038 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 26 Apr 2007 16:35:14 +0000 (16:35 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 26 Apr 2007 16:35:14 +0000 (16:35 +0000)
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

channels/chan_iax2.c

index e8d71ff..b6953bc 100644 (file)
@@ -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)