[svn-commits] tilghman: trunk r268495 - /trunk/channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Jun  5 19:37:30 2010
New Revision: 268495

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=268495
Log:
Finally track down and eliminate the "FRACK! warnings from chan_iax2".

Modified:
    trunk/channels/chan_iax2.c

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=268495&r1=268494&r2=268495
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Sat Jun  5 19:37:30 2010
@@ -3281,7 +3281,16 @@
 
 retry:
 	if ((pvt = iaxs[callno])) {
+#if 0
+		/* iax2_destroy_helper gets called from this function later on.  When
+		 * called twice, we get the (previously) familiar FRACK! errors in
+		 * devmode, from the scheduler.  An alternative to this approach is to
+		 * reset the scheduler entries to -1 when they're deleted in
+		 * iax2_destroy_helper().  That approach was previously decided to be
+		 * "wrong" because "the memory is going to be deallocated anyway.  Why
+		 * should we be resetting those values?" */
 		iax2_destroy_helper(pvt);
+#endif
 	}
 
 	owner = pvt ? pvt->owner : NULL;