From: Kevin P. Fleming Date: Wed, 24 May 2006 16:17:26 +0000 (+0000) Subject: respect 'usecallingpres' in zapata.conf even if CLID has not been set for the channel... X-Git-Tag: 1.2.9.1~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84790a577bd47d3c4e768db1386ec256c0e8d6e6;p=thirdparty%2Fasterisk.git 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/branches/1.2@29969 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 847063a5ba..c167db2ba9 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2119,9 +2119,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