From: Joshua Colp <jcolp@digium.com>
Date: Thu, 26 Apr 2007 16:35:14 +0000 (+0000)
Subject: Merged revisions 62038 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2803
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14d8979b2f5b5b6a65e0743f9cd9d885692f2b10;p=thirdparty%2Fasterisk.git

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
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index e8d71ff90b..b6953bcff4 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)