[Asterisk-cvs] asterisk/channels chan_sip.c,1.460,1.461

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/tmp/cvs-serv8890/channels

Modified Files:
	chan_sip.c 
Log Message:
Make request URI in CANCEL match that of the original INVITE exactly (bug #2134)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -d -r1.460 -r1.461
--- chan_sip.c	22 Jul 2004 23:16:40 -0000	1.460
+++ chan_sip.c	27 Jul 2004 04:04:45 -0000	1.461
@@ -3105,8 +3105,10 @@
 		else /* Some implementations (e.g. Uniden UIP200) can't handle rport being in the message!! */
 			snprintf(p->via, sizeof(p->via), "SIP/2.0/UDP %s:%d;branch=z9hG4bK%08x", ast_inet_ntoa(iabuf, sizeof(iabuf), p->ourip), ourport, p->branch);
 	}
-
-	if (!ast_strlen_zero(p->uri)) {
+	if (!strcasecmp(msg, "CANCEL")) {
+		/* MUST use original URI */
+		c = p->initreq.rlPart2;
+	} else if (!ast_strlen_zero(p->uri)) {
 		c = p->uri;
 	} else {
 		if (p->outgoing)