From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 29 Mar 2007 17:10:28 +0000 (+0000)
Subject: Backport the change to chan_iax2 to return NULL instead of a "null frame"
X-Git-Tag: 1.2.18~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87695d824e86e8b506bc2ca3549606a8ef83dc6;p=thirdparty%2Fasterisk.git

Backport the change to chan_iax2 to return NULL instead of a "null frame"
from its read callback.  See revision 59341 to the 1.4 branch for more info.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@59355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c8c4221df5..bce9d3e132 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3164,9 +3164,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) 
 {
-	static struct ast_frame f = { AST_FRAME_NULL, };
-	ast_log(LOG_NOTICE, "I should never be called!\n");
-	return &f;
+	ast_log(LOG_NOTICE, "I should never be called! Hanging up.\n");
+	return NULL;
 }
 
 static int iax2_start_transfer(unsigned short callno0, unsigned short callno1)