diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-05-21 20:31:53 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-05-21 20:31:53 +0000 |
| commit | 8b1193087e1459fe11398c8a2a28927779ffb29b (patch) | |
| tree | fa4ffc7e39409604ca5801f511dd3cee715643c1 /channels/chan_sip.c | |
| parent | e5f1f0496a0abdf472e81f1f818a2a942635b64a (diff) | |
Revert revision 367163.
This should have been committed to my team trunk-digiumphones branch
instead of trunk.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@367183 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d34d2718e..a84adeb75 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -671,8 +671,7 @@ static const struct sip_reasons { { AST_REDIRECTING_REASON_FOLLOW_ME, "follow-me" }, { AST_REDIRECTING_REASON_OUT_OF_ORDER, "out-of-service" }, { AST_REDIRECTING_REASON_AWAY, "away" }, - { AST_REDIRECTING_REASON_CALL_FWD_DTE, "unknown"}, - { AST_REDIRECTING_REASON_SEND_TO_VM, "send_to_vm"}, + { AST_REDIRECTING_REASON_CALL_FWD_DTE, "unknown"} }; @@ -24258,8 +24257,6 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int int localtransfer = 0; int attendedtransfer = 0; int res = 0; - struct ast_party_redirecting redirecting; - struct ast_set_party_redirecting update_redirecting; if (req->debug) { ast_verbose("Call %s got a SIP call transfer from %s: (REFER)!\n", @@ -24564,16 +24561,6 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int } ast_set_flag(&p->flags[0], SIP_DEFER_BYE_ON_TRANSFER); /* Delay hangup */ - /* When a call is transferred to voicemail from a Digium phone, there may be - * a Diversion header present in the REFER with an appropriate reason parameter - * set. We need to update the redirecting information appropriately. - */ - ast_party_redirecting_init(&redirecting); - memset(&update_redirecting, 0, sizeof(update_redirecting)); - change_redirecting_information(p, req, &redirecting, &update_redirecting, FALSE); - ast_channel_update_redirecting(current.chan2, &redirecting, &update_redirecting); - ast_party_redirecting_free(&redirecting); - /* Do not hold the pvt lock during the indicate and async_goto. Those functions * lock channels which will invalidate locking order if the pvt lock is held.*/ /* For blind transfers, move the call to the new extensions. For attended transfers on multiple |