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
........

Merged revisions 358163 from http://svn.asterisk.org/svn/asterisk/branches/10

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 861350bd4c3cdc6b3a971020aa8961b9f6c8beaa..f6ce9e92340a5ab393bbafb94a5ddbe96d719c96 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13434,7 +13434,7 @@ static void update_connectedline(struct sip_pvt *p, const void *data, size_t dat
        if (ast_channel_state(p->owner) == 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);