diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2013-12-23 16:38:43 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2013-12-23 16:38:43 +0000 |
| commit | 82eb03b915ccfc26ae453695f3de1296de7c7390 (patch) | |
| tree | a9895a292166aca26248cca81587421a17a4e1f1 | |
| parent | 5a15803a1bee11efc2326cc0c61798d313d8de0b (diff) | |
chan_dahdi: enable ignore_failed_channels by default
If ignore_failed_channels is set to "true" for a channel, the channel
will continue to be configured even if configuring it has failed.
This allows Asterisk to start before all the DAHDI initialization is
done and thus not force the starting order dahdi -> asterisk.
Review: https://reviewboard.asterisk.org/r/3063/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | UPGRADE-12.txt | 5 | ||||
| -rw-r--r-- | channels/chan_dahdi.c | 1 | ||||
| -rw-r--r-- | configs/chan_dahdi.conf.sample | 11 |
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. |