[asterisk-commits] tilghman: trunk r282609 - in /trunk: ./ channels/sig_pri.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Aug 18 02:50:07 2010
New Revision: 282609

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282609
Log:
Merged revisions 282608 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282608 | tilghman | 2010-08-18 02:49:04 -0500 (Wed, 18 Aug 2010) | 16 lines
  
  Merged revisions 282607 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r282607 | tilghman | 2010-08-18 02:43:14 -0500 (Wed, 18 Aug 2010) | 9 lines
    
    Don't warn on callerid when completely text, instead of numeric with localdialplan prefixes.
    
    (closes issue #16770)
     Reported by: jamicque
     Patches: 
           20100413__issue16770.diff.txt uploaded by tilghman (license 14)
           20100811__issue16770.diff.txt uploaded by tilghman (license 14)
     Tested by: jamicque
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/sig_pri.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=282609&r1=282608&r2=282609
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Wed Aug 18 02:50:07 2010
@@ -5917,7 +5917,20 @@
 	l = NULL;
 	n = NULL;
 	if (!p->hidecallerid) {
-		l = ast->connected.id.number.valid ? ast->connected.id.number.str : NULL;
+		if (ast->connected.id.number.valid) {
+			/* If we get to the end of this loop without breaking, there's no
+			 * calleridnum.  This is done instead of testing for "unknown" or
+			 * the thousands of other ways that the calleridnum could be
+			 * invalid. */
+			for (l = ast->connected.id.number.str; l && *l; l++) {
+				if (strchr("0123456789", *l)) {
+					l = ast->connected.id.number.str;
+					break;
+				}
+			}
+		} else {
+			l = NULL;
+		}
 		if (!p->hidecalleridname) {
 			n = ast->connected.id.name.valid ? ast->connected.id.name.str : NULL;
 		}