diff options
| author | martinp <martinp@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-05-07 16:02:33 +0000 |
|---|---|---|
| committer | martinp <martinp@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-05-07 16:02:33 +0000 |
| commit | 8e6c0a25bf787cd3ff2c411ee0004e9a6072b35a (patch) | |
| tree | 140e03f7d6bdd6707dfd4eb4d0e692c4cbba7577 /channels | |
| parent | b4a201fd2052a9e05bef6ad4b53aafe0931d51e6 (diff) | |
Be avare of hidecallerid with PRI
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@970 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 82157b852..9036afa27 100755 --- 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; |