[asterisk-commits] dvossel: trunk r219721 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Sep 21 11:59:05 2009
New Revision: 219721

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=219721
Log:
Merged revisions 219720 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r219720 | dvossel | 2009-09-21 11:55:53 -0500 (Mon, 21 Sep 2009) | 3 lines
  
  Reverting merge 219520. This change was not necessary.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=219721&r1=219720&r2=219721
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Sep 21 11:59:05 2009
@@ -1685,7 +1685,6 @@
 static void iax2_frame_free(struct iax_frame *fr)
 {
 	ast_sched_thread_del(sched, fr->retrans);
-	fr->retrans = -1;
 	iax_frame_free(fr);
 }
 
@@ -3353,6 +3352,7 @@
 		/* Don't attempt delivery, just remove it from the queue */
 		AST_LIST_REMOVE(&frame_queue[callno], f, list);
 		ast_mutex_unlock(&iaxsl[callno]);
+		f->retrans = -1; /* this is safe because this is the scheduled function */
 		/* Free the IAX frame */
 		iax2_frame_free(f);
 	} else if (callno) {