[Asterisk-cvs] asterisk/channels chan_sip.c,1.510.2.45,1.510.2.46

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	chan_sip.c 
Log Message:
only use default cid if specified (bug #3486)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.510.2.45
retrieving revision 1.510.2.46
diff -u -d -r1.510.2.45 -r1.510.2.46
--- chan_sip.c	29 Jan 2005 07:16:08 -0000	1.510.2.45
+++ chan_sip.c	7 Feb 2005 03:25:22 -0000	1.510.2.46
@@ -3669,7 +3669,7 @@
 		ast_callerid_parse(cid, &n, &l);
 		if (l) 
 			ast_shrink_phone_number(l);
-		if (!l || !ast_isphonenumber(l))
+		if ((!l || !ast_isphonenumber(l)) && default_callerid[0])
 				l = default_callerid;
 	}
 	/* if user want's his callerid restricted */