[Asterisk-cvs] asterisk/channels chan_sip.c,1.257,1.258

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Temporarily revert changes, prepare for proper fix (sorry for the cvs spam)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- chan_sip.c	27 Nov 2003 21:49:34 -0000	1.257
+++ chan_sip.c	27 Nov 2003 22:09:42 -0000	1.258
@@ -3707,10 +3707,10 @@
 	}
 	if (sipdebug)
 		ast_verbose("Looking for %s in %s\n", c, p->context);
-	if (!oreq || !strlen(p->exten))
-		strncpy(p->exten, c, sizeof(p->exten) - 1);
 	if (ast_exists_extension(NULL, p->context, c, 1, fr) ||
 		!strcmp(c, ast_pickup_ext())) {
+		if (!oreq)
+			strncpy(p->exten, c, sizeof(p->exten) - 1);
 		return 0;
 	}
 
@@ -5057,8 +5057,6 @@
 				ast_queue_frame(p->owner, &af, 0);
 		} else if (sipdebug)
 			ast_verbose("Ignoring this request\n");
-		if (!strlen(p->our_contact))
-			build_contact(p);
 		if (!p->lastinvite) {
 			/* Handle authentication if this is our first invite */
 			res = check_user(p, req, cmd, e, 1, sin);
@@ -5277,9 +5275,7 @@
 			check_via(p, req);
 		} else if (sipdebug)
 			ast_verbose("Ignoring this request\n");
-		
-		if (!strlen(p->our_contact))
-			build_contact(p);
+
 		if (!p->lastinvite) {
 			/* Handle authentication if this is our first subscribe */
 			res = check_user(p, req, cmd, e, 0, sin);