From 3e04d6fe8e437f54daddd610fe643f5a1ccf8024 Mon Sep 17 00:00:00 2001 From: Richard Mudgett <rmudgett@digium.com> Date: Tue, 27 Apr 2010 18:29:33 +0000 Subject: [PATCH] Merged revisions 259270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue #7321 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue #17143) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@259307 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 1 + configs/chan_dahdi.conf.sample | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 2ae8cf92d8..1877796114 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -11844,6 +11844,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, tmp->adsi = conf->chan.adsi; tmp->use_smdi = conf->chan.use_smdi; tmp->permhidecallerid = conf->chan.hidecallerid; + tmp->hidecalleridname = conf->chan.hidecalleridname; tmp->callreturn = conf->chan.callreturn; tmp->echocancel = conf->chan.echocancel; tmp->echotraining = conf->chan.echotraining; diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample index 30229b5fc9..cfb82104e0 100644 --- a/configs/chan_dahdi.conf.sample +++ b/configs/chan_dahdi.conf.sample @@ -408,10 +408,6 @@ ; usecallerid=yes ; -; Hide the name part and leave just the number part of the caller ID -; string. Only applies to PRI channels. -;hidecalleridname=yes -; ; Type of caller ID signalling in use ; bell = bell202 as used in US (default) ; v23 = v23 as used in the UK @@ -446,6 +442,10 @@ usecallerid=yes ; ;hidecallerid=yes ; +; Enable if you need to hide just the name and not the number for legacy PBX use. +; Only applies to PRI channels. +;hidecalleridname=yes +; ; On UK analog lines, the caller hanging up determines the end of calls. So ; Asterisk hanging up the line may or may not end a call (DAHDI could just as ; easily be re-attaching to a prior incoming call that was not yet hung up). -- GitLab