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

Merged revisions 29969 via svnmerge from

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

........
r29969 | kpfleming | 2006-05-24 11:17:26 -0500 (Wed, 24 May 2006) | 2 lines

respect 'usecallingpres' in zapata.conf even if CLID has not been set for the channel (issue #7123)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-05-24 16:19:57 +00:00
parent 8122c35675
commit 11d13e1d4b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_zap.c
View File

@@ -2097,9 +2097,8 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
prilocaldialplan = PRI_LOCAL_ISDN;
}
}
pri_sr_set_caller(sr, l ? (l + ldp_strip) : NULL, n, prilocaldialplan,
l ? (p->use_callingpres ? ast->cid.cid_pres : PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN) :
PRES_NUMBER_NOT_AVAILABLE);
pri_sr_set_caller(sr, l ? (l + ldp_strip) : NULL, n, prilocaldialplan,
p->use_callingpres ? ast->cid.cid_pres : (l ? PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN : PRES_NUMBER_NOT_AVAILABLE));
pri_sr_set_redirecting(sr, ast->cid.cid_rdnis, p->pri->localdialplan - 1, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, PRI_REDIR_UNCONDITIONAL);
#ifdef SUPPORT_USERUSER