chan_dahdi: Change inband_on_proceeding option default to no/disabled.

(issue ASTERISK-21151)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384711 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 3f6169ade6397ec66025f6f197ccaffbfa197acc..39f08049b9606e273ac2a05d1c494cf0241df00f 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -67,6 +67,7 @@ chan_dahdi:
  - Analog port dialing and deferred DTMF dialing for PRI now distinguishes
    between 'w' and 'W'.  The 'w' pauses dialing for half a second.  The 'W'
    pauses dialing for one second.
+ - The default for inband_on_proceeding has changed to no.
 
 Dialplan:
  - All channel and global variable names are evaluated in a case-sensitive manner.
@@ -191,7 +192,7 @@ SIP
    configuration option. Symptoms of this include one way media or no media flow.
 
 chan_unistim
- - Due to massive update in chan_unistim phone keys functions and on-screen 
+ - Due to massive update in chan_unistim phone keys functions and on-screen
    information changed.
 
 users.conf:
@@ -263,10 +264,10 @@ Manager:
    unchanged.
 
 Module Support Level
- - All modules in the addons, apps, bridge, cdr, cel, channels, codecs, 
+ - All modules in the addons, apps, bridge, cdr, cel, channels, codecs,
    formats, funcs, pbx, and res have been updated to include MODULEINFO data
    that includes <support_level> tags with a value of core, extended, or deprecated.
-   More information is available on the Asterisk wiki at 
+   More information is available on the Asterisk wiki at
    https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States
 
    Deprecated modules are now marked to not build by default and must be explicitly

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index bd58b6d87b444e587ed89fbbb097d3c8ed7d48f2..6259cec037fc8dc7252fecbf91a130522a70d72a 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -1413,7 +1413,6 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void)
                        .localdialplan = PRI_NATIONAL_ISDN + 1,
                        .nodetype = PRI_CPE,
                        .qsigchannelmapping = DAHDI_CHAN_MAPPING_PHYSICAL,
-                       .inband_on_proceeding = 1,
 
 #if defined(HAVE_PRI_CCSS)
                        .cc_ptmp_recall_mode = 1,/* specificRecall */

diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 7d64cf3831bdcbd7f5ab329bc954844866391989..26bd0cbd7c15e27c4b2219c2060835dae2c30b07 100644 (file)
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -204,7 +204,7 @@ context=public
 ; without the progress indicator ie indicating inband audio is available and
 ; assume that the CPE device has connected the media path for listening to
 ; ringback and other messages.
-; Default yes in current release branches for backward compatibility.
+; Default no.
 ;
 ;inband_on_proceeding=yes
 ;