projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
50e9f66
)
Be avare of hidecallerid with PRI
author
Martin Pycko
<martinp@digium.com>
Wed, 7 May 2003 16:02:33 +0000
(16:02 +0000)
committer
Martin Pycko
<martinp@digium.com>
Wed, 7 May 2003 16:02:33 +0000
(16:02 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@970
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
channels/chan_zap.c
patch
|
blob
|
history
diff --git
a/channels/chan_zap.c
b/channels/chan_zap.c
index
82157b8
..
9036afa
100755
(executable)
--- a/
channels/chan_zap.c
+++ b/
channels/chan_zap.c
@@
-1356,7
+1356,7
@@
static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
c++;
else
c = dest;
- if (ast->callerid) {
+ if (ast->callerid && !p->hidecallerid) {
strncpy(callerid, ast->callerid, sizeof(callerid)-1);
ast_callerid_parse(callerid, &n, &l);
if (l) {
@@
-2013,7
+2013,7
@@
static int zt_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags,
p1 = c1->pvt->pvt;
/* cant do pseudo-channels here */
if ((!p0->sig) || (!p1->sig)) return -2;
-
+
ast_pthread_mutex_lock(&c0->lock);
ast_pthread_mutex_lock(&c1->lock);
op0 = p0 = c0->pvt->pvt;