From 40ddd20beddbee76b85df3fbf207cd271c07a616 Mon Sep 17 00:00:00 2001 From: Mathieu Rene Date: Fri, 17 Jul 2009 14:07:55 +0000 Subject: [PATCH] Make callerid privacy work, thx Moc git-svn-id: http://svn.openzap.org/svn/openzap/trunk@775 a93c3328-9c30-0410-af19-c9cd2b2d52af --- libs/openzap/mod_openzap/mod_openzap.c | 2 +- libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c index 5caa9e1a5b..6b5688d2cd 100644 --- a/libs/openzap/mod_openzap/mod_openzap.c +++ b/libs/openzap/mod_openzap/mod_openzap.c @@ -2346,7 +2346,7 @@ SWITCH_STANDARD_API(oz_function) stream->write_function(stream, "+OK\n"); } } else { - stream->write_function(stream, "-ERR Usage: oz q931_pcap on|off [pcapfilename without suffix]\n"); + stream->write_function(stream, "-ERR Usage: oz q931_pcap on|off [pcapfilename without suffix]\n"); goto end; } diff --git a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c index 5b07494ef6..3af38e389a 100644 --- a/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c +++ b/libs/openzap/src/ozmod/ozmod_libpri/ozmod_libpri.c @@ -548,7 +548,7 @@ static __inline__ void state_advance(zap_channel_t *zchan) pri_sr_set_bearer(sr, 0, isdn_data->l1); pri_sr_set_called(sr, zchan->caller_data.ani.digits, dp, 1); pri_sr_set_caller(sr, zchan->caller_data.cid_num.digits, (isdn_data->opts & OZMOD_LIBPRI_OPT_OMIT_DISPLAY_IE ? NULL : zchan->caller_data.cid_name), - dp, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN); + dp, (zchan->caller_data.pres != 1 ? PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN : PRES_PROHIB_USER_NUMBER_NOT_SCREENED)); if (!(isdn_data->opts & OZMOD_LIBPRI_OPT_OMIT_REDIRECTING_NUMBER_IE)) { pri_sr_set_redirecting(sr, zchan->caller_data.cid_num.digits, dp, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, PRI_REDIR_UNCONDITIONAL);