From: Olle Johansson <oej@edvina.net>
Date: Sun, 3 Feb 2008 16:46:39 +0000 (+0000)
Subject: Merged revisions 102142 via svnmerge from
X-Git-Tag: 1.6.0-beta3~2^2~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ca0fa1cae95b95118a983fed364d54494ba6384;p=thirdparty%2Fasterisk.git

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

........
r102142 | oej | 2008-02-03 17:38:12 +0100 (Sön, 03 Feb 2008) | 8 lines

Use the same CSEQ on CANCEL as on INVITE	(according to RFC 3261)

(closes issue #9492)
Reported by: kryptolus
Patches:
      bug9492.txt uploaded by oej (license 306)
Tested by: oej

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ff18ee88ef..0287e6f6bd 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4619,7 +4619,7 @@ static int sip_hangup(struct ast_channel *ast)
 					append_history(p, "DELAY", "Not sending cancel, waiting for timeout");
 				} else {
 					/* Send a new request: CANCEL */
-					transmit_request(p, SIP_CANCEL, p->ocseq, XMIT_RELIABLE, FALSE);
+					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. */
 					needdestroy = 0;
@@ -14202,7 +14202,7 @@ 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)
-			transmit_request(p, SIP_CANCEL, p->ocseq, XMIT_RELIABLE, FALSE);
+			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 {