kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-17 17:07:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 86982 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11079)
........
r86982 | qwell | 2007-10-24 15:56:47 -0500 (Wed, 24 Oct 2007) | 5 lines

Correctly respect hidecalleridname configuration option.
Simplify code slightly in the process.

Issue 11079, reported by ddv2005

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-10-24 20:59:00 +00:00
parent b7ef49c931
commit 6c757caeca
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_zap.c
+9 -8
View File
@@ -2336,17 +2336,18 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
c++;
else
c = dest;
if (!p->hidecalleridname)
n = ast->cid.cid_name;
else
n = NULL;
l = NULL;
n = NULL;
if (!p->hidecallerid) {
l = ast->cid.cid_num;
n = ast->cid.cid_name;
} else {
l = NULL;
n = NULL;
if (!p->hidecalleridname) {
n = ast->cid.cid_name;
}
}
if (strlen(c) < p->stripmsd) {
ast_log(LOG_WARNING, "Number '%s' is shorter than stripmsd (%d)\n", c, p->stripmsd);
ast_mutex_unlock(&p->lock);