From: Joshua Colp <jcolp@digium.com>
Date: Mon, 5 Mar 2012 16:41:01 +0000 (+0000)
Subject: Defer sending the connected line reinvite if a reinvite is already in progress.
X-Git-Tag: 1.8.10.1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffa247ce6ccae56b745fd1f0c53a7b5305e364b2;p=thirdparty%2Fasterisk.git

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

(issue ASTERISK-19355)
Reported by: tomaso

(closes issue AST-825)


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b7982b703a..e3e133bd5f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12970,7 +12970,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);