From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 27 Apr 2010 18:41:38 +0000 (+0000)
Subject: Merged revisions 259307 via svnmerge from
X-Git-Tag: 1.6.0.28-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c84a01aa1ec018f2ea62744024c2b023fd237b;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@259308 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 916e42239d..98c8c8db64 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -8940,6 +8940,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 942e0da355..8ac74c2ab6 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -330,10 +330,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
@@ -357,6 +353,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
+;
 ; The following option enables receiving MWI on FXO lines.  The default
 ; value is no.  When this is enabled, and MWI notification indicates on or off,
 ; the script specified by the mwimonitornotify option is executed.  Also, an