summaryrefslogtreecommitdiff
path: root/channels/chan_agent.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-03-04 01:11:25 +0000
committerMark Spencer <markster@digium.com>2004-03-04 01:11:25 +0000
commit806bb3c63f5c3cf8c06692051463120a8321767e (patch)
tree654f352211e2d0a687b2a6fe94df5f54c3b33d14 /channels/chan_agent.c
parent534e78b37206b8b61ac8a0af4bc1cd7cc75fcd2b (diff)
Add support for parking with IAX2
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_agent.c')
-rwxr-xr-xchannels/chan_agent.c8
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;
}