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, 5 insertions, 3 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 04a4e68c1..e329f5fcb 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -380,17 +380,19 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f)
 	return res;
 }
 
-static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
+static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock)
 {
 	struct agent_pvt *p = newchan->pvt->pvt;
-	ast_mutex_lock(&p->lock);
+	if (needlock)
+		ast_mutex_lock(&p->lock);
 	if (p->owner != oldchan) {
 		ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
 		ast_mutex_unlock(&p->lock);
 		return -1;
 	}
 	p->owner = newchan;
-	ast_mutex_unlock(&p->lock);
+	if (needlock)
+		ast_mutex_unlock(&p->lock);
 	return 0;
 }