Merged revisions 46474 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 30 Oct 2006 18:17:02 +0000 (18:17 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 30 Oct 2006 18:17:02 +0000 (18:17 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46474 | file | 2006-10-30 13:13:07 -0500 (Mon, 30 Oct 2006) | 2 lines

We need to lock the pvt structure during retransmission as another worker thread may be doing something as well.

........

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

channels/chan_iax2.c

index 6f46fa7..e675b3e 100644 (file)
@@ -8084,11 +8084,12 @@ static void *network_thread(void *ignore)
                                continue;
                        
                        f->sentyet++;
-                       /* Send a copy immediately -- errors here are ok, so don't bother locking */
+                       ast_mutex_lock(&iaxsl[f->callno]);
                        if (iaxs[f->callno]) {
                                send_packet(f);
                                count++;
                        } 
+                       ast_mutex_unlock(&iaxsl[f->callno]);
                        if (f->retries < 0) {
                                /* This is not supposed to be retransmitted */
                                AST_LIST_REMOVE(&iaxq.queue, f, list);