Defer sending the connected line reinvite if a reinvite is already in progress.

(issue ASTERISK-19355)
Reported by: tomaso

(closes issue AST-825)
........

Merged revisions 358162 from http://svn.asterisk.org/svn/asterisk/branches/1.8

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0d0f9992bbc442d30fd148eaa21d3e9f9bc8d20c..1ec9ffba03250970a91f5a8b09688e0c1f93c129 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13340,7 +13340,7 @@ static void update_connectedline(struct sip_pvt *p, const void *data, size_t dat
        if (p->owner->_state == AST_STATE_UP || ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
                struct sip_request req;
 
-               if (p->invitestate == INV_CONFIRMED || p->invitestate == INV_TERMINATED) {
+               if (!p->pendinginvite && (p->invitestate == INV_CONFIRMED || p->invitestate == INV_TERMINATED)) {
                        reqprep(&req, p, ast_test_flag(&p->flags[0], SIP_REINVITE_UPDATE) ? SIP_UPDATE : SIP_INVITE, 0, 1);
 
                        add_header(&req, "Allow", ALLOWED_METHODS);