[asterisk-commits] oej: trunk r102143 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Feb  3 10:46:39 2008
New Revision: 102143

URL: http://svn.digium.com/view/asterisk?view=rev&rev=102143
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=102143&r1=102142&r2=102143
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Feb  3 10:46:39 2008
@@ -4619,7 +4619,7 @@
 					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 @@
 	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 {