summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPGRADE-12.txt5
-rw-r--r--channels/chan_dahdi.c1
-rw-r--r--configs/chan_dahdi.conf.sample11
3 files changed, 11 insertions, 6 deletions
diff --git a/UPGRADE-12.txt b/UPGRADE-12.txt
index 360e28d93..354e1070e 100644
--- a/UPGRADE-12.txt
+++ b/UPGRADE-12.txt
@@ -220,6 +220,11 @@ chan_dahdi:
- Added mwi_vm_boxes that also must be configured for ISDN MWI to be enabled.
+ - ignore_failed_channels now defaults to True: the channel will continue to
+ be configured even if configuring it has failed. This is generally a
+ better setup for systems with not more than one DAHDI device or with DAHDI
+ >= 2.8.0 .
+
chan_local:
- The /b option has been removed.
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index d4e2a8238..a97f3c3a2 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -961,6 +961,7 @@ static struct dahdi_chan_conf dahdi_chan_conf_default(void)
.debouncetime = -1
},
.is_sig_auto = 1,
+ .ignore_failed_channels = 1,
.smdi_port = "/dev/ttyS0",
};
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 51dedcad8..83701ef00 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -1167,12 +1167,11 @@ pickupgroup=1
;
;
; ignore_failed_channels: Continue even if some channels failed to configure.
-; False by default, as if even a single channel failed to configure, it might
-; mean other channels are misplaced and having them work may not be a good
-; idea. If enabled (set to true), chan_dahdi will nevertheless attempt to
-; configure other channels rather than giving up. This normally makes sense
-; only if you use names (<subdir>!<number>) for DAHDI channels.
-;ignore_failed_channels = true
+; True by default. Disable this if you can guarantee that DAHDI starts before
+; Asterisk and want to be sure chan_dahdi will not start with broken
+; configuration.
+;
+;ignore_failed_channels = false
;
; Configure jitter buffers in DAHDI (each one is 20ms, default is 4)
; This is set globally, rather than per-channel.