sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 90269 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90269 | file | 2007-11-30 10:43:15 -0400 (Fri, 30 Nov 2007) | 6 lines

Fix locking issues under one legged replaces scenarios.
(closes issue #11420)
Reported by: irroot
Patches:
      chan_sip_oneleg.patch uploaded by irroot (license 52)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp 2007-11-30 14:45:36 +00:00
parent 2fe8b945fa
commit 4a5b8ad6b3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_sip.c
View File

@ -14773,7 +14773,8 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
ast_quiet_chan(targetcall);
ast_debug(4, "Invite/Replaces: preparing to masquerade %s into %s\n", c->name, replacecall->name);
/* Unlock clone, but not original (replacecall) */
ast_channel_unlock(c);
if (!oneleggedreplace)
ast_channel_unlock(c);
/* Unlock PVT */
sip_pvt_unlock(p->refer->refer_call);
@ -14804,7 +14805,8 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
ast_log(LOG_WARNING, "Invite/Replace: Could not read frame from RING channel \n");
}
c->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
ast_channel_unlock(replacecall);
if (!oneleggedreplace)
ast_channel_unlock(replacecall);
} else { /* Bridged call, UP channel */
if ((f = ast_read(replacecall))) { /* Force the masq to happen */
/* Masq ok */
@ -14835,7 +14837,8 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
ast_debug(4, "End After transfer:----------------------------\n");
ast_channel_unlock(p->owner); /* Unlock new owner */
sip_pvt_unlock(p); /* Unlock SIP structure */
if (!oneleggedreplace)
sip_pvt_unlock(p); /* Unlock SIP structure */
/* The call should be down with no ast_channel, so hang it up */
c->tech_pvt = dialog_unref(c->tech_pvt);