[Asterisk-cvs] asterisk/channels chan_sip.c,1.504,1.505

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Update mp3 copyright header, fix pedantic + register in SIP (bug #2422)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -d -r1.504 -r1.505
--- chan_sip.c	15 Sep 2004 13:16:56 -0000	1.504
+++ chan_sip.c	15 Sep 2004 19:27:23 -0000	1.505
@@ -2393,11 +2393,9 @@
 	struct sip_pvt *p;
 	char *callid;
 	char tmp[256] = "";
-	char tmp2[256] = "";
 	char iabuf[INET_ADDRSTRLEN];
 	char *cmd;
 	char *tag = "", *c;
-	char *tag2 = "";
 
 	callid = get_header(req, "Call-ID");
 
@@ -2415,7 +2413,10 @@
 		c = strchr(tmp, ' ');
 		if (c)
 			*c = '\0';
-		strncpy(tmp, get_header(req, "From"), sizeof(tmp) - 1);
+		if (!strcasecmp(cmd, "SIP/2.0"))
+			strncpy(tmp, get_header(req, "To"), sizeof(tmp) - 1);
+		else
+			strncpy(tmp, get_header(req, "From"), sizeof(tmp) - 1);
 		tag = strstr(tmp, "tag=");
 		if (tag) {
 			tag += 4;
@@ -2423,14 +2424,6 @@
 			if (c)
 				*c = '\0';
 		}
-		strncpy(tmp2, get_header(req, "To"), sizeof(tmp2) - 1);
-		tag2 = strstr(tmp2, "tag=");
-		if (tag2) {
-			tag2 += 4;
-			c = strchr(tag2, ';');
-			if (c)
-				*c = '\0';
-		}
 			
 	}
 		
@@ -2442,7 +2435,7 @@
 	p = iflist;
 	while(p) {
 		if (!strcmp(p->callid, callid) && 
-			(!pedanticsipchecking || !tag || !tag2 || ast_strlen_zero(p->theirtag) || !strcmp(p->theirtag, tag) || !strcmp(p->theirtag, tag2))) {
+			(!pedanticsipchecking || !tag || ast_strlen_zero(p->theirtag) || !strcmp(p->theirtag, tag))) {
 			/* Found the call */
 			ast_mutex_lock(&p->lock);
 			ast_mutex_unlock(&iflock);
@@ -4116,10 +4109,16 @@
 
 	if (strchr(r->username, '@')) {
 		snprintf(from, sizeof(from), "<sip:%s>;tag=as%08x", r->username, p->tag);
-		snprintf(to, sizeof(to),     "<sip:%s>", r->username);
+		if (!ast_strlen_zero(p->theirtag))
+			snprintf(to, sizeof(to), "<sip:%s>;tag=%s", r->username, p->theirtag);
+		else
+			snprintf(to, sizeof(to), "<sip:%s>", r->username);
 	} else {
 		snprintf(from, sizeof(from), "<sip:%s@%s>;tag=as%08x", r->username, p->tohost, p->tag);
-		snprintf(to, sizeof(to),     "<sip:%s@%s>", r->username, p->tohost);
+		if (!ast_strlen_zero(p->theirtag))
+			snprintf(to, sizeof(to), "<sip:%s@%s>;tag=%s", r->username, p->tohost, p->theirtag);
+		else
+			snprintf(to, sizeof(to), "<sip:%s@%s>", r->username, p->tohost);
 	}
 	
 	snprintf(addr, sizeof(addr), "sip:%s", r->hostname);