From: David Vossel <dvossel@digium.com>
Date: Wed, 22 Sep 2010 16:49:56 +0000 (+0000)
Subject: During check_pendings, if the dialog is terminated with a CANCEL, change the invitest... 
X-Git-Tag: 1.4.38-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abf7e809c684dedc8144ec7893eb335bc703b5c9;p=thirdparty%2Fasterisk.git

During check_pendings, if the dialog is terminated with a CANCEL, change the invitestate to INV_CANCEL like in sip_hangup.


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index aac35178e9..b9996c1a52 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13104,11 +13104,12 @@ static void check_pendings(struct sip_pvt *p)
 {
 	if (ast_test_flag(&p->flags[0], SIP_PENDINGBYE)) {
 		/* if we can't BYE, then this is really a pending CANCEL */
-		if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA)
+		if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA) {
+			p->invitestate = INV_CANCELLED;
 			transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE);
 			/* Actually don't destroy us yet, wait for the 487 on our original 
 			   INVITE, but do set an autodestruct just in case we never get it. */
-		else {
+		} else {
 			/* We have a pending outbound invite, don't send someting
 				new in-transaction */
 			if (p->pendinginvite)