[Asterisk-cvs] asterisk/channels chan_sip.c,1.891,1.892

[kpfleming]

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

Modified Files:
	chan_sip.c 
Log Message:
don't force CLID to be a phone-number-looking-thingie (issue #5325)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -d -r1.891 -r1.892
--- chan_sip.c	13 Oct 2005 22:56:53 -0000	1.891
+++ chan_sip.c	13 Oct 2005 23:48:12 -0000	1.892
@@ -4685,7 +4685,7 @@
 	char tmp[BUFSIZ/2];
 	char tmp2[BUFSIZ/2];
 	char iabuf[INET_ADDRSTRLEN];
-	char *l = default_callerid, *n = NULL;
+	char *l = NULL, *n = NULL;
 	int x;
 	char urioptions[256]="";
 
@@ -4720,13 +4720,13 @@
 		l = p->owner->cid.cid_num;
 		n = p->owner->cid.cid_name;
 	}
-	if (!l || (!ast_isphonenumber(l) && default_callerid[0]))
-			l = default_callerid;
 	/* if we are not sending RPID and user wants his callerid restricted */
 	if (!ast_test_flag(p, SIP_SENDRPID) && ((p->callingpres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED)) {
 		l = CALLERID_UNKNOWN;
 		n = l;
 	}
+	if (!l)
+		l = default_callerid;
 	if (!n || ast_strlen_zero(n))
 		n = l;
 	/* Allow user to be overridden */