diff options
| author | Jason Parker <jparker@digium.com> | 2007-10-24 20:59:00 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2007-10-24 20:59:00 +0000 |
| commit | 6c757caecad2d328b0bd1b4b044add1efc583216 (patch) | |
| tree | 86ba214026c671d5ed2e3c8f12425287840f6b6e /channels/chan_zap.c | |
| parent | b7ef49c93197f99d21b5e7fa3e3a6f3661048372 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@86983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 21ea7edc2..f38d86247 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -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); |