From: Joshua Colp <jcolp@digium.com>
Date: Mon, 30 Oct 2006 18:17:02 +0000 (+0000)
Subject: Merged revisions 46474 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3807ed8cc8f39fcd169334d2b44da0495edbe47;p=thirdparty%2Fasterisk.git

Merged revisions 46474 via svnmerge from
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
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 6f46fa75ac..e675b3e71c 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -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);