[asterisk-commits] russell: branch 1.2 r59355 - /branches/1.2/channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Mar 29 12:10:28 2007
New Revision: 59355

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59355
Log:
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.

Modified:
    branches/1.2/channels/chan_iax2.c

Modified: branches/1.2/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_iax2.c?view=diff&rev=59355&r1=59354&r2=59355
==============================================================================
--- branches/1.2/channels/chan_iax2.c (original)
+++ branches/1.2/channels/chan_iax2.c Thu Mar 29 12:10:28 2007
@@ -3164,9 +3164,8 @@
 
 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)