diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | channels/chan_dahdi.c | 18 | ||||
| -rw-r--r-- | configs/chan_dahdi.conf.sample (renamed from configs/zapata.conf.sample) | 30 | ||||
| -rw-r--r-- | configs/extensions.ael.sample | 2 | ||||
| -rw-r--r-- | configs/extensions.conf.sample | 2 | ||||
| -rw-r--r-- | configs/sla.conf.sample | 2 | ||||
| -rw-r--r-- | configs/smdi.conf.sample | 2 | ||||
| -rw-r--r-- | contrib/scripts/autosupport | 7 | ||||
| -rw-r--r-- | doc/ael.txt | 2 | ||||
| -rw-r--r-- | doc/configuration.txt | 2 | ||||
| -rw-r--r-- | doc/sla.tex | 10 | ||||
| -rw-r--r-- | include/asterisk/doxyref.h | 4 |
12 files changed, 44 insertions, 39 deletions
@@ -159,7 +159,7 @@ they're used only to help make the configuration file easier to understand, and do not affect how it is actually parsed. Entries of the form 'variable=value' set the value of some parameter in -asterisk. For example, in zapata.conf, one might specify: +asterisk. For example, in chan_dahdi.conf, one might specify: switchtype=national diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index e9c99c4eb..f74cd3169 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -163,8 +163,6 @@ static const char tdesc[] = "DAHDI Telephony Driver" #endif ; -static const char config[] = "chan_dahdi.conf"; - #define SIG_EM DAHDI_SIG_EM #define SIG_EMWINK (0x0100000 | DAHDI_SIG_EM) #define SIG_FEATD (0x0200000 | DAHDI_SIG_EM) @@ -11371,16 +11369,16 @@ static int setup_dahdi(int reload) #endif #ifdef HAVE_ZAPTEL - cfg = ast_config_load("zapata.conf"); + if (!(cfg = ast_config_load("zapata.conf"))) { + ast_log(LOG_ERROR, "Unable to load zapata.conf\n"); + return 0; + } #else - cfg = ast_config_load(config); -#endif - /* Error if we have no config file... */ - if (!cfg) { - ast_log(LOG_ERROR, "Unable to load either config %s or zapata.conf\n", config); - return 0; + if (!(cfg = ast_config_load("chan_dahdi.conf"))) { + ast_log(LOG_ERROR, "Unable to load chan_dahdi.conf\n"); + return 0; } - +#endif /* It's a little silly to lock it, but we mind as well just to be sure */ ast_mutex_lock(&iflock); #ifdef HAVE_PRI diff --git a/configs/zapata.conf.sample b/configs/chan_dahdi.conf.sample index 21a2d6000..70bc8a208 100644 --- a/configs/zapata.conf.sample +++ b/configs/chan_dahdi.conf.sample @@ -1,10 +1,10 @@ ; -; Zapata telephony interface +; DAHDI telephony interface ; ; Configuration file ; -; You need to restart Asterisk to re-configure the Zap channel -; CLI> reload chan_zap.so +; You need to restart Asterisk to re-configure the DAHDI channels +; CLI> reload chan_dahdi.so ; will reload the configuration file, ; but not all configuration options are ; re-configured during a reload. @@ -19,7 +19,7 @@ ; trunkgroup => <trunkgroup>,<dchannel>[,<backup1>...] ; ; trunkgroup is the numerical trunk group to create -; dchannel is the zap channel which will have the +; dchannel is the DAHDI channel which will have the ; d-channel for the trunk. ; backup1 is an optional list of backup d-channels. ; @@ -27,9 +27,9 @@ ;trunkgroup => 1,24 ; ; Spanmap: Associates a span with a trunk group -; spanmap => <zapspan>,<trunkgroup>[,<logicalspan>] +; spanmap => <dahdispan>,<trunkgroup>[,<logicalspan>] ; -; zapspan is the zap span number to associate +; dahdispan is the DAHDI span number to associate ; trunkgroup is the trunkgroup (specified above) for the mapping ; logicalspan is the logical span number within the trunk group to use. ; if unspecified, no logical span number is used. @@ -348,12 +348,12 @@ callreturn=yes ; Note that when setting the number of taps, the number 256 does not translate ; to 256 ms of echo cancellation. echocancel=256 means 256 / 8 = 32 ms. ; -; Note that if any of your Zaptel cards have hardware echo cancellers, +; Note that if any of your DAHDI cards have hardware echo cancellers, ; then this setting only turns them on and off; numeric settings will ; be treated as "yes". There are no special settings required for ; hardware echo cancellers; when present and enabled in their kernel ; modules, they take precedence over the software echo canceller compiled -; into Zaptel automatically. +; into DAHDI automatically. ; echocancel=yes ; @@ -502,7 +502,7 @@ immediate=no ; ; FXO (FXS signalled) devices must have a timeout to determine if there was a ; hangup before the line was answered. This value can be tweaked to shorten -; how long it takes before Zap considers a non-ringing line to have hungup. +; how long it takes before DAHDI considers a non-ringing line to have hungup. ; ;ringtimeout=8000 ; @@ -537,7 +537,7 @@ immediate=no ;mohsuggest=default ; ; PRI channels can have an idle extension and a minunused number. So long as -; at least "minunused" channels are idle, chan_zap will try to call "idledial" +; at least "minunused" channels are idle, chan_dahdi will try to call "idledial" ; on them, and then dump them into the PBX in the "idleext" extension (which ; is of the form exten@context). When channels are needed the "idle" calls ; are disconnected (so long as there are at least "minidle" calls still @@ -551,16 +551,16 @@ immediate=no ;minunused=2 ;minidle=1 ; -; Configure jitter buffers in zapata (each one is 20ms, default is 4) +; Configure jitter buffers in DAHDI (each one is 20ms, default is 4) ; ;jitterbuffers=4 ; ;------------------------------ JITTER BUFFER CONFIGURATION -------------------------- ; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of a - ; ZAP channel. Defaults to "no". An enabled jitterbuffer will + ; DAHDI channel. Defaults to "no". An enabled jitterbuffer will ; be used only if the sending side can create and the receiving - ; side can not accept jitter. The ZAP channel can't accept jitter, - ; thus an enabled jitterbuffer on the receive ZAP side will always + ; side can not accept jitter. The DAHDI channel can't accept jitter, + ; thus an enabled jitterbuffer on the receive DAHDI side will always ; be used if the sending side can create jitter. ; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds. @@ -570,7 +570,7 @@ immediate=no ; big jumps in/broken timestamps, usually sent from exotic devices ; and programs. Defaults to 1000. -; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a ZAP +; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a DAHDI ; channel. Two implementations are currently available - "fixed" ; (with size always equals to jbmax-size) and "adaptive" (with ; variable size, actually the new jb of IAX2). Defaults to fixed. diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample index 89436dc21..ab8cdd854 100644 --- a/configs/extensions.ael.sample +++ b/configs/extensions.ael.sample @@ -27,7 +27,7 @@ globals { TRUNK="Zap/g2"; // Trunk interface // // Note the 'g2' in the TRUNK variable above. It specifies which group (defined - // in zapata.conf) to dial, i.e. group 2, and how to choose a channel to use in + // in chan_dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in // the specified group. The four possible options are: // // g: select the lowest-numbered non-busy Zap channel diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index d1e7a8310..b7151f4c4 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -90,7 +90,7 @@ IAXINFO=guest ; IAXtel username/password TRUNK=Zap/G2 ; Trunk interface ; ; Note the 'G2' in the TRUNK variable above. It specifies which group (defined -; in zapata.conf) to dial, i.e. group 2, and how to choose a channel to use in +; in chan_dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in ; the specified group. The four possible options are: ; ; g: select the lowest-numbered non-busy Zap channel diff --git a/configs/sla.conf.sample b/configs/sla.conf.sample index 2e5c88b00..fa768c513 100644 --- a/configs/sla.conf.sample +++ b/configs/sla.conf.sample @@ -29,7 +29,7 @@ ;autocontext=line1 ; This supports automatic generation of the dialplan entries ; if the autocontext option is used. Each trunk should have - ; a unique context name. Then, in zapata.conf, this device + ; a unique context name. Then, in chan_dahdi.conf, this device ; should be configured to have incoming calls go to this context. ;ringtimeout=30 ; Set how long to allow this trunk to ring on an inbound call before hanging diff --git a/configs/smdi.conf.sample b/configs/smdi.conf.sample index 669530e81..62464c47b 100644 --- a/configs/smdi.conf.sample +++ b/configs/smdi.conf.sample @@ -2,7 +2,7 @@ [interfaces] ; Specify serial ports to listen for SMDI messages on below. These will be -; referenced later in zapata.conf. If you do not specify any interfaces then +; referenced later in chan_dahdi.conf. If you do not specify any interfaces then ; SMDI will be disabled. Interfaces can have several different attributes ; associated with them. diff --git a/contrib/scripts/autosupport b/contrib/scripts/autosupport index 83efef42a..df746805e 100644 --- a/contrib/scripts/autosupport +++ b/contrib/scripts/autosupport @@ -164,6 +164,13 @@ if [ "$ans" = "y" ]; then echo >> $OUTPUT; echo "------------------" >> $OUTPUT; + echo "DAHDI CONFIG" >> $OUTPUT; + echo "------------------" >> $OUTPUT; + grep -v '^;' /etc/asterisk/chan_dahdi.conf >> $OUTPUT; + echo >> $OUTPUT; + echo >> $OUTPUT; + + echo "------------------" >> $OUTPUT; echo "EXTENSIONS CONFIG" >> $OUTPUT; echo "------------------" >> $OUTPUT; grep -v '^;' /etc/asterisk/extensions.conf >> $OUTPUT; diff --git a/doc/ael.txt b/doc/ael.txt index f72f2805b..7c7829ae9 100644 --- a/doc/ael.txt +++ b/doc/ael.txt @@ -48,7 +48,7 @@ as well as the Expression syntax, and the Variable syntax. Asterisk acts as a server. Devices involved in telephony, like Zapata cards, or Voip phones, all indicate some context that should be activated in their behalf. See the config file formats for IAX, SIP, -zapata.conf, etc. They all help describe a device, and they all +chan_dahdi.conf, etc. They all help describe a device, and they all specify a context to activate when somebody picks up a phone, or a call comes in from the phone company, or a voip phone, etc. diff --git a/doc/configuration.txt b/doc/configuration.txt index 43173b1b4..39e906101 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -18,7 +18,7 @@ Asterisk configuration files are defined as follows: label = value label2 = value -In some files, (e.g. mgcp.conf, zapata.conf and agents.conf), the syntax +In some files, (e.g. mgcp.conf, chan_dahdi.conf and agents.conf), the syntax is a bit different. In these files the syntax is as follows: [section] diff --git a/doc/sla.tex b/doc/sla.tex index c1159ce43..5aefdd61e 100644 --- a/doc/sla.tex +++ b/doc/sla.tex @@ -23,7 +23,7 @@ IP channels. An SLA system is built up of virtual trunks and stations mapped to real Asterisk devices. The configuration for all of this is done in three different files: extensions.conf, sla.conf, and the channel specific -configuration file such as sip.conf or zapata.conf. +configuration file such as sip.conf or chan_dahdi.conf. \subsection{Dialplan} @@ -55,7 +55,7 @@ Please refer to the examples section for full dialplan samples for SLA. An SLA trunk is a mapping between a virtual trunk and a real Asterisk device. This device may be an analog FXO line, or something like a SIP trunk. A trunk must be configured in two places. First, configure the device itself in the -channel specific configuration file such as zapata.conf or sip.conf. Once the +channel specific configuration file such as chan_dahdi.conf or sip.conf. Once the trunk is configured, then map it to an SLA trunk in sla.conf. \begin{verbatim} @@ -66,7 +66,7 @@ device=Zap/1 Be sure to configure the trunk's context to be the same one that is set for the "autocontext" option in sla.conf if automatic dialplan configuration is used. -This would be done in the regular device entry in zapata.conf, sip.conf, etc. +This would be done in the regular device entry in chan_dahdi.conf, sip.conf, etc. Note that the automatic dialplan generation creates the SLATrunk() extension at extension 's'. This is perfect for Zap channels that are FXO trunks, for example. However, it may not be good enough for an IP trunk, since the call @@ -195,7 +195,7 @@ device=SIP/station3 With this configuration, the dialplan is generated automatically. The first zap channel should have its context set to "line1" and the second should be -set to "line2" in zapata.conf. In sip.conf, station1, station2, and station3 +set to "line2" in chan_dahdi.conf. In sip.conf, station1, station2, and station3 should all have their context set to "sla\_stations". For reference, here is the automatically generated dialplan for this situation: @@ -238,7 +238,7 @@ For this example, assume that there are 2 trunks and 3 stations. The trunks are Zap/1 and Zap/2. The stations are SIP/station1, SIP/station2, and SIP/station3. -In zapata.conf, channel 1 has context=line1 and channel 2 has context=line2. +In chan_dahdi.conf, channel 1 has context=line1 and channel 2 has context=line2. In sip.conf, all three stations are configured with context=sla\_stations. diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h index 49e282816..74b7a5347 100644 --- a/include/asterisk/doxyref.h +++ b/include/asterisk/doxyref.h @@ -274,9 +274,9 @@ DUNDi is not itself a Voice-over IP signaling or media protocol. Instead, it pub */ /*! \page Config_zap Zaptel configuration - * \section zapconf zapata.conf + * \section zapconf chan_dahdi.conf * \arg Implemented in \ref chan_zap.c - * \verbinclude zapata.conf.sample + * \verbinclude chan_dahdi.conf.sample */ /*! \page Config_h323 H.323 channel driver information |