Merged revisions 268495 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r268495 | tilghman | 2010-06-05 19:37:30 -0500 (Sat, 05 Jun 2010) | 2 lines

  Finally track down and eliminate the "FRACK! warnings from chan_iax2".
........

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index ff86aa5a2329c69c0560011b1274873690204362..3cf2596fbf4609c55551749faaec646d98e2a83e 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3227,7 +3227,16 @@ static void iax2_destroy(int callno)
 
 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;