diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-27 19:03:04 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-27 19:03:04 +0000 |
| commit | c0d6ba8fdc843002148a3ff988c0543b35e719dd (patch) | |
| tree | 9463383460d63cbf2e028013d21430b402eb7bf4 | |
| parent | 6e968627fa51d50556cc8bcda1cd09ab516c4320 (diff) | |
Merged revisions 259307 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@259310 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 1 | ||||
| -rw-r--r-- | 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 d20fc07bf..84edbf27d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -10444,6 +10444,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 f40af59a2..c03797f83 100644 --- a/configs/chan_dahdi.conf.sample +++ b/configs/chan_dahdi.conf.sample @@ -340,10 +340,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 @@ -367,6 +363,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). |