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.
........

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 8125588..b58036c 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1685,7 +1685,6 @@ static void iax2_destroy_helper(struct chan_iax2_pvt *pvt)
 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 @@ static void __attempt_transmit(const void *data)
                /* 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) {