kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 282607 via svnmerge from

Browse Source 
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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@282608 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-08-18 07:49:04 +00:00
parent 647a8f6edd
commit 4aed988d66
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
channels/sig_pri.c
View File

@@ -5917,7 +5917,20 @@ int sig_pri_call(struct sig_pri_chan *p, struct ast_channel *ast, char *rdest, i
l = NULL; l = NULL;
n = NULL; n = NULL;
if (!p->hidecallerid) { 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) { if (!p->hidecalleridname) {
n = ast->connected.id.name.valid ? ast->connected.id.name.str : NULL; n = ast->connected.id.name.valid ? ast->connected.id.name.str : NULL;
} }