Add support for parking with IAX2

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2318 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 4 deletions

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 2cb73f475..524458979 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -185,20 +185,23 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f)
 	return res;
 }
 
-static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
+static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock)
 {
 	struct local_pvt *p = newchan->pvt->pvt;
-	ast_mutex_lock(&p->lock);
+	if (needlock)
+		ast_mutex_lock(&p->lock);
 	if ((p->owner != oldchan) && (p->chan != oldchan)) {
 		ast_log(LOG_WARNING, "old channel wasn't %p but was %p/%p\n", oldchan, p->owner, p->chan);
-		ast_mutex_unlock(&p->lock);
+		if (needlock)
+			ast_mutex_unlock(&p->lock);
 		return -1;
 	}
 	if (p->owner == oldchan)
 		p->owner = newchan;
 	else
 		p->chan = newchan;	
-	ast_mutex_unlock(&p->lock);
+	if (needlock)
+		ast_mutex_unlock(&p->lock);
 	return 0;
 }