[asterisk-commits] oej: branch 1.4 r99978 - /branches/1.4/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Jan 23 15:07:16 2008
New Revision: 99978

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99978
Log:
Second attempt. Don't change invitestate when receiving 18x messages in CANCEL state.

(issue #11736)
Reported by: MVF

Patch by oej.

Modified:
    branches/1.4/channels/chan_sip.c

Change Statistics:
 0 files changed

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=99978&r1=99977&r2=99978
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Wed Jan 23 15:07:16 2008
@@ -12042,7 +12042,8 @@
 			}
 		}
 		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 (!ast_test_flag(req, SIP_PKT_IGNORE) && p->owner) {
 				/* Queue a progress frame only if we have SDP in 180 or 182 */
@@ -12057,7 +12058,8 @@
 			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 (!ast_test_flag(req, SIP_PKT_IGNORE) && p->owner) {
 				/* Queue a progress frame */