diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-12 20:46:32 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-12 20:46:32 +0000 |
| commit | c09a8dbf7d9e1a12879116afa09c6f32695424f4 (patch) | |
| tree | 4a56b5d8c373d72ca272c30c637344fedb862225 | |
| parent | 03d4ac0edba388fc7a9185ad0ab2f668329c4fe9 (diff) | |
Merged revisions 74955 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r74955 | murf | 2007-07-12 14:42:08 -0600 (Thu, 12 Jul 2007) | 1 line
This patch resolves 10143; thanks to irroot for the patch; looked acceptable. Let the community decide if it messes things up
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@74956 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9cebd9dab..18cb4aa65 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13992,7 +13992,8 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in sip_pvt_unlock(p->refer->refer_call); /* Make sure that the masq does not free our PVT for the old call */ - ast_set_flag(&p->refer->refer_call->flags[0], SIP_DEFER_BYE_ON_TRANSFER); /* Delay hangup */ + if (! earlyreplace && ! oneleggedreplace ) + ast_set_flag(&p->refer->refer_call->flags[0], SIP_DEFER_BYE_ON_TRANSFER); /* Delay hangup */ /* Prepare the masquerade - if this does not happen, we will be gone */ if(ast_channel_masquerade(replacecall, c)) @@ -14202,7 +14203,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int error = 1; } - if (!error && p->refer->refer_call->owner->_state != AST_STATE_RING && p->refer->refer_call->owner->_state != AST_STATE_UP ) { + if (!error && p->refer->refer_call->owner->_state != AST_STATE_RINGING && p->refer->refer_call->owner->_state != AST_STATE_RING && p->refer->refer_call->owner->_state != AST_STATE_UP ) { ast_log(LOG_NOTICE, "Supervised transfer attempted to replace non-ringing or active call id (%s)!\n", replace_id); transmit_response(p, "603 Declined (Replaces)", req); error = 1; |