[Asterisk-cvs] asterisk/channels chan_sip.c,1.510.2.8,1.510.2.9

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv459/channels

Modified Files:
      Tag: v1-0
	chan_sip.c 
Log Message:
Don't "ignore" on CANCEL (bug #2670)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.510.2.8
retrieving revision 1.510.2.9
diff -u -d -r1.510.2.8 -r1.510.2.9
--- chan_sip.c	14 Oct 2004 23:08:03 -0000	1.510.2.8
+++ chan_sip.c	23 Oct 2004 12:23:25 -0000	1.510.2.9
@@ -7106,7 +7106,7 @@
 		if (p->icseq && (p->icseq > seqno)) {
 			ast_log(LOG_DEBUG, "Ignoring too old packet packet %d (expecting >= %d)\n", seqno, p->icseq);
 			return -1;
-		} else if (p->icseq && (p->icseq == seqno)) {
+		} else if (p->icseq && (p->icseq == seqno) && (strcasecmp(cmd, "CANCEL") || p->alreadygone)) {
 			/* ignore means "don't do anything with it" but still have to 
 			   respond appropriately.  We do this if we receive a repeat of
 			   the last sequence number  */