dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 86982 via svnmerge from 

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: http://svn.digium.com/svn/asterisk/trunk@86983 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
qwell 2007-10-24 20:59:00 +00:00
parent f7ffafc70a
commit 46cd8cbfc5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_zap.c
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);