From: Olle Johansson <oej@edvina.net>
Date: Wed, 23 Jan 2008 21:11:55 +0000 (+0000)
Subject: Merged revisions 99978 via svnmerge from
X-Git-Tag: 1.6.0-beta2~2^2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fb72505113482f7b624b726cccf70b3133541e8;p=thirdparty%2Fasterisk.git

Merged revisions 99978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99978 | oej | 2008-01-23 22:07:16 +0100 (Ons, 23 Jan 2008) | 7 lines

Second attempt. Don't change invitestate when receiving 18x messages in CANCEL state.

(issue #11736)
Reported by: MVF

Patch by oej.

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 598ccaa545..ed79134c83 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14290,7 +14290,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
 			}
 		}
 		if (find_sdp(req)) {
-			p->invitestate = INV_EARLY_MEDIA;
+			if (p->invitestate != INV_CANCELLED)
+				p->invitestate = INV_EARLY_MEDIA;
 			res = process_sdp(p, req);
 			if (!req->ignore && p->owner) {
 				/* Queue a progress frame only if we have SDP in 180 or 182 */
@@ -14305,7 +14306,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
 			sip_cancel_destroy(p);
 		/* Ignore 183 Session progress without SDP */
 		if (find_sdp(req)) {
-			p->invitestate = INV_EARLY_MEDIA;
+			if (p->invitestate != INV_CANCELLED)
+				p->invitestate = INV_EARLY_MEDIA;
 			res = process_sdp(p, req);
 			if (!req->ignore && p->owner) {
 				/* Queue a progress frame */