Merged revisions 85093 via svnmerge from

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

........
r85093 | file | 2007-10-09 11:30:16 -0300 (Tue, 09 Oct 2007) | 4 lines

Don't perform a reinvite if a transfer is in progress.
(issue #10915)
Reported by: ramonpeek

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85094 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5a99df4..5f613ef 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18640,7 +18640,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc
                        changed = 1;
                }
        }
-       if (changed && !ast_test_flag(&p->flags[0], SIP_GOTREFER)) {
+       if (changed && !ast_test_flag(&p->flags[0], SIP_GOTREFER) && !ast_test_flag(&p->flags[0], SIP_DEFER_BYE_ON_TRANSFER)) {
                if (chan->_state != AST_STATE_UP) {     /* We are in early state */
                        if (p->do_history)
                                append_history(p, "ExtInv", "Initial invite sent with remote bridge proposal.");