[asterisk-commits] tzafrir: branch group/zapata_conf r84127 - in /team/group/zapata_conf: channe...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sat Sep 29 12:11:51 CDT 2007
Author: tzafrir
Date: Sat Sep 29 12:11:51 2007
New Revision: 84127
URL: http://svn.digium.com/view/asterisk?view=rev&rev=84127
Log:
Update sample zapata.conf:
* All configuration settings are documented.
* Documented which cannot be updated on reload.
* Documented which settings are global, rather than per-channel.
* More stantardized form.
* Don't provide default values as values to set
* Include example for the new separate contexts syntax.
Also remove a doplicate setting from chan_zap.c
Modified:
team/group/zapata_conf/channels/chan_zap.c
team/group/zapata_conf/configs/zapata.conf.sample
Modified: team/group/zapata_conf/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/channels/chan_zap.c?view=diff&rev=84127&r1=84126&r2=84127
==============================================================================
--- team/group/zapata_conf/channels/chan_zap.c (original)
+++ team/group/zapata_conf/channels/chan_zap.c Sat Sep 29 12:11:51 2007
@@ -12410,8 +12410,6 @@
confp->chan.outsigmod = SIG_FEATDMF;
} else if (!strcasecmp(v->value, "sf_featb")) {
confp->chan.outsigmod = SIG_SF_FEATB;
- } else if (!strcasecmp(v->value, "sf")) {
- confp->chan.outsigmod = SIG_SF;
} else if (!strcasecmp(v->value, "featd")) {
confp->chan.outsigmod = SIG_FEATD;
} else if (!strcasecmp(v->value, "featdmf")) {
Modified: team/group/zapata_conf/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/configs/zapata.conf.sample?view=diff&rev=84127&r1=84126&r2=84127
==============================================================================
--- team/group/zapata_conf/configs/zapata.conf.sample (original)
+++ team/group/zapata_conf/configs/zapata.conf.sample Sat Sep 29 12:11:51 2007
@@ -7,7 +7,9 @@
; CLI> reload chan_zap.so
; will reload the configuration file,
; but not all configuration options are
-; re-configured during a reload.
+; re-configured during a reload (signalling, as well as
+; PRI and SS7-related settings cannot be changed on a
+; reload.
@@ -45,9 +47,9 @@
;
;language=en
;
-; Default context
-;
-context=default
+; Context for calls. Defaults to 'default'
+;
+;context=incoming
;
; Switchtype: Only used for PRI.
;
@@ -55,18 +57,23 @@
; dms100: Nortel DMS100
; 4ess: AT&T 4ESS
; 5ess: Lucent 5ESS
-; euroisdn: EuroISDN
+; euroisdn: EuroISDN (common in europe)
; ni1: Old National ISDN 1
; qsig: Q.SIG
;
-switchtype=national
+;switchtype=euroisdn
;
; Some switches (AT&T especially) require network specific facility IE
; supported values are currently 'none', 'sdn', 'megacom', 'tollfreemegacom', 'accunet'
;
+; nsf cannot be changed on a reload.
+;
;nsf=none
;
; PRI Dialplan: Only RARELY used for PRI.
+; PRI Local Dialplan: Only RARELY used for PRI (sets the calling number's
+; numbering plan)
+; pridialplan and prilocaldialplan cannot be changed on a reload.
;
; unknown: Unknown
; private: Private ISDN
@@ -74,25 +81,17 @@
; national: National ISDN
; international: International ISDN
; dynamic: Dynamically selects the appropriate dialplan
-; redundant: Same as dynamic, except that the underlying number is not changed (not common)
+; redundant: Same as dynamic, except that the underlying number is not
+; changed (not common)
;
;pridialplan=national
-;
-; PRI Local Dialplan: Only RARELY used for PRI (sets the calling number's numbering plan)
-;
-; unknown: Unknown
-; private: Private ISDN
-; local: Local ISDN
-; national: National ISDN
-; international: International ISDN
-; dynamic: Dynamically selects the appropriate dialplan
-; redundant: Same as dynamic, except that the underlying number is not changed (not common)
-;
;prilocaldialplan=national
;
; PRI callerid prefixes based on the given TON/NPI (dialplan)
; This is especially needed for euroisdn E1-PRIs
;
+; None of the prefix settings can be changed on reload.
+;
; sample 1 for Germany
;internationalprefix = 00
;nationalprefix = 0
@@ -115,6 +114,7 @@
;resetinterval = 3600
;
; Overlap dialing mode (sending overlap digits)
+; Cannot be changed on a reload.
;
;overlapdial=yes
;
@@ -124,13 +124,18 @@
; with all telcos.
;
; outofband: Signal Busy/Congestion out of band with RELEASE/DISCONNECT
-; inband: Signal Busy/Congestion using in-band tones
-;
-; priindication = outofband
+; inband: Signal Busy/Congestion using in-band tones (default)
+;
+; priindication cannot be changed on a reload.
+;
+;priindication = outofband
;
; If you need to override the existing channels selection routine and force all
; PRI channels to be marked as exclusively selected, set this to yes.
-; priexclusive = yes
+;
+; priexclusive cannot be changed on a reload.
+;
+;priexclusive = yes
;
; ISDN Timers
; All of the ISDN timers and counters that are used are configurable. Specify
@@ -146,18 +151,22 @@
; May vary in other ISDN standards (Q.931 1993 : 90000 ms)
; T313: Wait for CONNECT acknowledge, CPE side only (default 3000 ms)
;
-; pritimer => t200,1000
-; pritimer => t313,4000
+;pritimer => t200,1000
+;pritimer => t313,4000
;
; To enable transmission of facility-based ISDN supplementary services (such
; as caller name from CPE over facility), enable this option.
-; facilityenable = yes
-;
+; Cannot be changed on a reload.
+;
+;facilityenable = yes
+;
+; pritimer cannot be changed on a reload.
;
; Signalling method (default is fxs). Valid values:
; auto: Just use whatever is configured in Zaptel.
; Should work well for FXS and FXO.
; em: E & M
+; em_e1: E & M E1
; em_w: E & M Wink
; featd: Feature Group D (The fake, Adtran style, DTMF)
; featdmf: Feature Group D (The real thing, MF (domestic, US))
@@ -182,6 +191,7 @@
; sf_featdmf: SF Feature Group D (The real thing, MF (domestic, US))
; sf_featb: SF Feature Group B (MF (domestic, US))
; e911: E911 (MF) style signalling
+; ss7: Signalling System 7
;
; The following are used for Radio interfaces:
; fxs_rx: Receive audio/COR on an FXS kewlstart interface (FXO at the
@@ -202,7 +212,8 @@
; sf_txrx: Receive audio/COR AND Transmit audio/PTT on an SF interface
; (2-way)
; sf_rxtx: Same as sf_txrx (for our dyslexic friends)
-; ss7: Signalling System 7
+;
+; signalling of a channel can not be changed on a reload.
;
signalling=auto
;
@@ -212,11 +223,19 @@
; format. If you only specify 'signalling', then it will be the format for
; both inbound and outbound.
;
-; signalling=featdmf
-; outsignalling=featb
+; outsignalling can only be one of:
+; em, em_e1, em_w, sf, sf_w, sf_featd, sf_featdmf, sf_featb, featd,
+; featdmf, featdmf_ta, e911, fgccama, fgccamamf
+;
+; outsignalling cannot be changed on a reload.
+;
+;signalling=featdmf
+;
+;outsignalling=featb
;
; For Feature Group D Tandem access, to set the default CIC and OZZ use these
-; parameters:
+; parameters (Will not be updated on reload):
+;
;defaultozz=0000
;defaultcic=303
;
@@ -231,43 +250,57 @@
; rxflash: Receiver flashtime (default 1250ms)
; debounce: Debounce timing (default 600ms)
;
+; None of them will update on a reload.
+;
rxwink=300 ; Atlas seems to use long (250ms) winks
;
; How long generated tones (DTMF and MF) will be played on the channel
-; (in milliseconds)
+; (in milliseconds).
+;
+; This is a global, rather than a per-channel setting. It will not be
+; updated on a reload.
+;
;toneduration=100
;
-; Whether or not to do distinctive ring detection on FXO lines
+; Whether or not to do distinctive ring detection on FXO lines:
;
;usedistinctiveringdetection=yes
-;distinctiveringaftercid=yes ; enable dring detection after callerid for those countries like Australia
- ; where the ring cadence is changed *after* the callerid spill.
-;
-; Whether or not to use caller ID
+;
+; enable dring detection after callerid for those countries like Australia
+; where the ring cadence is changed *after* the callerid spill:
+;
+;distinctiveringaftercid=yes
+;
+; Whether or not to use caller ID:
;
usecallerid=yes
;
+; Hide the name part and leave just the number part of the callerid
+; string. Only applies to PRI channels.
+;hidecalleridname=yes
+;
; Type of caller ID signalling in use
-; bell = bell202 as used in US
+; bell = bell202 as used in US (default)
; v23 = v23 as used in the UK
; v23_jp = v23 as used in Japan
; dtmf = DTMF as used in Denmark, Sweden and Netherlands
; smdi = Use SMDI for callerid. Requires SMDI to be enabled (usesmdi).
;
-;cidsignalling=bell
+;cidsignalling=v23
;
; What signals the start of caller ID
-; ring = a ring signals the start
-; polarity = polarity reversal signals the start
+; ring = a ring signals the start (default)
+; polarity = polarity reversal signals the start
; polarity_IN = polarity reversal signals the start, for India,
-; for dtmf dialtone detection; using DTMF.
-; (see doc/India-CID.txt)
-;
-;cidstart=ring
+; for dtmf dialtone detection; using DTMF.
+; (see doc/India-CID.txt)
+;
+;cidstart=polarity
;
; Whether or not to hide outgoing caller ID (Override with *67 or *82)
-;
-hidecallerid=no
+; (If your dialplan doesn't catch it)
+;
+;hidecallerid=yes
;
; Whether or not to enable call waiting on internal extensions
; With this set to 'yes', busy extensions will hear the call-waiting
@@ -284,15 +317,15 @@
;
; Whether or not use the caller ID presentation for the outgoing call that the
; calling switch is sending.
-; See README.callingpres
+; See README.callingpres. FIXME: file no longer exists.
;
usecallingpres=yes
;
; Some countries (UK) have ring tones with different ring tones (ring-ring),
; which means the callerid needs to be set later on, and not just after
-; the first ring, as per the default.
-;
-;sendcalleridafter=1
+; the first ring, as per the default (1).
+;
+;sendcalleridafter = 2
;
;
; Support Caller*ID on Call Waiting
@@ -317,7 +350,8 @@
;
cancallforward=yes
;
-; Whether or not to support Call Return (*69)
+; Whether or not to support Call Return (*69, if your dialplan doesn't
+; catch this first)
;
callreturn=yes
;
@@ -384,29 +418,47 @@
;
; You may also set the default receive and transmit gains (in dB)
;
-rxgain=0.0
-txgain=0.0
+; Gain Settings: increasing / decreasing the volume level on a channel.
+; The values are in db (decibells). A positive number
+; increases the volume level on a channel, and a
+; negavive value decreases volume level.
+;
+; There are several independent gain settings:
+; rxgain: gain for the rx (receive - into Asterisk) channel. Default: 0.0
+; txgain: gain for the tx (transmit - out of Asterisk Asterisk) channel.
+; Default: 0.0
+; cid_rxgain: set the gain just for the caller ID sounds Asterisk
+; emits. Default: 5.0 .
+
+;rxgain=2.0
+;txgain=3.0
;
; Logical groups can be assigned to allow outgoing rollover. Groups range
-; from 0 to 63, and multiple groups can be specified.
+; from 0 to 63, and multiple groups can be specified. By default the
+; channel is not a member of any group.
+;
+; Note tha an explicit empty value for 'group' is invalid, and will ont
+; override a previous non-empty one. The same applies to callgroup and
+; pickupgroup as well.
;
group=1
;
; Ring groups (a.k.a. call groups) and pickup groups. If a phone is ringing
; and it is a member of a group which is one of your pickup groups, then
-; you can answer it by picking up and dialling *8#. For simple offices, just
+; you can answer it by picking up and dialing *8#. For simple offices, just
; make these both the same. Groups range from 0 to 63.
;
callgroup=1
pickupgroup=1
-;setvar=CHANNEL=42 ; Channel variable to be set for all calls from this channel
+; Channel variable to be set for all calls from this channel
+;setvar=CHANNEL=42
;
; Specify whether the channel should be answered immediately or if the simple
; switch should provide dialtone, read digits, etc.
;
-immediate=no
+;immediate=yes
;
; Specify whether flash-hook transfers to 'busy' channels should complete or
; return to the caller performing the transfer (default is yes).
@@ -415,8 +467,23 @@
;
; CallerID can be set to "asreceived" or a specific number if you want to
; override it. Note that "asreceived" only applies to trunk interfaces.
-;
-;callerid=2564286000
+; fullname sets just the
+;
+; fullname: sets just the name part.
+; cid_number: sets just the number part:
+;
+;callerid = 123456
+;
+;callerid = My Name <2564286000>
+; Which can also be written as:
+;cid_number = 2564286000
+;fullname = My Name
+;
+;callerid = asreceived
+;
+; should we use the callerid from incoming call on zap transfer?
+;
+;useincomingcalleridonzaptransfer = yes
;
; AMA flags affects the recording of Call Detail Records. If specified
; it may be 'default', 'omit', 'billing', or 'documentation'.
@@ -449,12 +516,12 @@
;busydetect=yes
;
; If busydetect is enabled, it is also possible to specify how many busy tones
-; to wait for before hanging up. The default is 4, but better results can be
-; achieved if set to 6 or even 8. Mind that the higher the number, the more
+; to wait for before hanging up. The default is 3, but it might be
+; safer to set to 6 or even 8. Mind that the higher the number, the more
; time that will be needed to hangup a channel, but lowers the probability
; that you will get random hangups.
;
-;busycount=4
+;busycount=6
;
; If busydetect is enabled, it is also possible to specify the cadence of your
; busy signal. In many countries, it is 500msec on, 500msec off. Without
@@ -481,6 +548,10 @@
;
;hanguponpolarityswitch=yes
;
+; polarityonanswerdelay: minimal time period (ms) between the answer
+; polarity switch and hangup polarity switch.
+; (default: 600ms)
+;
; On trunk interfaces (FXS) it can be useful to attempt to follow the progress
; of a call through RINGING, BUSY, and ANSWERING. If turned on, call
; progress attempts to determine answer, busy, and ringing on phone lines.
@@ -488,21 +559,34 @@
; so don't count on it being very accurate.
;
; Few zones are supported at the time of this writing, but may be selected
-; with "progzone"
+; with "progzone".
+;
+; progzone also affects the pattern used for buzydetect (unless
+busypattern is set explicitly). The possible
+; values are:
+; us (default)
+; ca (alias for 'us')
+; cr (Costa Rica)
+; br (Brazil, alias for 'cr')
+; uk
;
; This feature can also easily detect false hangups. The symptoms of this is
; being disconnected in the middle of a call for no reason.
;
;callprogress=yes
-;progzone=us
+;progzone=uk
;
; 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.
;
+; ringtimeout will not update on a reload.
+;
;ringtimeout=8000
;
; For FXO (FXS signalled) devices, whether to use pulse dial instead of DTMF
+; Pulse digits from phones (FXS devices, FXO signalling) are always
+; detected.
;
;pulsedial=yes
;
@@ -522,13 +606,10 @@
; passed through as signalling instead of generating hold music locally. This
; setting is only valid when used on a channel that uses digital signalling.
;
-; This option may be specified globally, or on a per-user or per-peer basis.
-;
;mohinterpret=default
;
; This option specifies which music on hold class to suggest to the peer channel
-; when this channel places the peer on hold. It may be specified globally or on
-; a per-user or per-peer basis.
+; when this channel places the peer on hold.
;
;mohsuggest=default
;
@@ -542,12 +623,15 @@
; multilink PPP, thus more efficiently utilizing combined voice/data services
; than conventional fixed mappings/muxings.
;
+; Those settings cannot be changed on reload.
+;
;idledial=6999
;idleext=6999 at dialout
;minunused=2
;minidle=1
;
; Configure jitter buffers in zapata (each one is 20ms, default is 4)
+; This is set globally, rather than per-channel.
;
;jitterbuffers=4
;
@@ -579,6 +663,9 @@
; to be placed. Also, if you define any custom cadences, the default cadences
; will be turned off.
;
+; This setting is global, rather than per-channel. It will not update on
+; a reload.
+;
; Syntax is: cadence=ring,silence[,ring,silence[...]]
;
; These are the default cadences:
@@ -602,9 +689,7 @@
;channel => 1
;callerid="Black Phone"<(256) 428-6122>
;channel => 2
-;callerid="CallerID Phone" <(256) 428-6123>
;callerid="CallerID Phone" <(630) 372-1564>
-;callerid="CallerID Phone" <(256) 704-4666>
;channel => 3
;callerid="Pac Tel Phone" <(256) 428-6124>
;channel => 4
@@ -650,6 +735,8 @@
; pri_cpe or pri_net for CPE or Network termination, and generally you will
; want to create a single "group" for all channels of the PRI.
;
+; switchtype cannot be changed on a reload.
+;
; switchtype = national
; signalling = pri_cpe
; group = 2
@@ -677,6 +764,8 @@
;channel => 1
; ---------------- Options for use with signalling=ss7 -----------------
+; None of then can be changed by a reload.
+;
; Variant of SS7 signaling:
; Options are itu and ansi
;ss7type = itu
@@ -736,6 +825,60 @@
; First signaling channel
;sigchan = 48
+; Set the tonezone. Equivalent of the defaultzone settings in ztcfg ,
+; this sets the tone zone by number.
+; The defualt is -1: not to set anything.
+;tonezone = 0 ; 0 is US
+
; Channels to associate with CICs on this linkset
;channel = 25-47
; ----------------- SS7 Options ----------------------------------------
+
+; chan_zap reads first the contents of the section [channels in
+; zapata.conf and [general] in users.conf . Those are used as global
+; configurations.
+;
+; After that the other sections in zapata.conf and in users.conf are
+; read and processed. A channel will be generated / updated if the
+; keyword 'zapchan' is used in a section. Using 'channel =>' there may
+; have unexpected results.
+;
+; The section names [general] and [globals] are reserved and will not be
+; read for channel configurations.
+;
+; The following are examples of using separate contexts in zapata.conf:
+; The name of the section is currently not used anywhere in the
+; configuration itself:
+;[phone1]
+; 'zapchan' has generally the same meaning as 'channel' But it is only
+; applied in the end of the section. Thus it can appear anywhere in the
+; section:
+;zapchan = 1-3
+;signalling = auto
+;group=1
+;callerid = asreceived
+; echocancel = yes
+;
+;
+; Here we use templates to share common configuration between sections:
+;[phones](!)
+;signalling = auto
+;group = 5
+;faxdetect = incoming
+;echocancel = 64
+;
+;[phone1](phones)
+;zapchan = 1
+;mailbox = 100
+;callerid = "Joe Schmoe" <(256) 428-6131>;
+;
+;[phone2](phones)
+;zapchan = 5,6
+;faxdetect=none ; overriding the template
+;mailbox = 101
+;callerid = "Megan May" <(256) 428-6132>
+;
+;[phone3](phones)
+;zapchan = 3
+;mailbox = 103
+;callerid = 103
More information about the asterisk-commits
mailing list