]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Backport the change to chan_iax2 to return NULL instead of a "null frame"
authorRussell Bryant <russell@russellbryant.com>
Thu, 29 Mar 2007 17:10:28 +0000 (17:10 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 29 Mar 2007 17:10:28 +0000 (17:10 +0000)
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

channels/chan_iax2.c

index c8c4221df544e6ef487b4ede0b719f4221269c4d..bce9d3e132afaaac32dde82301f26f95aa606579 100644 (file)
@@ -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)