Change the default for the pridialplan parameter to the far more common case of

'unknown', and better document the use of each parameter.
(closes issue #12633)
 Reported by: tzafrir
 Patches:
       pridialplan_unknown_2.diff uploaded by tzafrir (license 46)

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

diff --git a/CHANGES b/CHANGES
index 728f8bc..18236d6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ Zaptel channel driver (chan_zap) Changes
 ----------------------------------------
  * Channels can now be configured using named sections in zapata.conf, just
    like other channel drivers, including the use of templates.
+ * The default for pridialplan has changed from 'national' to 'unknown'.
 
 PBX Changes
 -----------

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index fcc8e15..89059c6 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -750,7 +750,7 @@ static struct zt_chan_conf zt_chan_conf_default(void) {
                .pri = {
                        .nsf = PRI_NSF_NONE,
                        .switchtype = PRI_SWITCH_NI2,
-                       .dialplan = PRI_NATIONAL_ISDN + 1,
+                       .dialplan = PRI_UNKNOWN + 1,
                        .localdialplan = PRI_NATIONAL_ISDN + 1,
                        .nodetype = PRI_CPE,
 

diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample
index 20bcdb8..8ddb7a5 100644 (file)
--- a/configs/zapata.conf.sample
+++ b/configs/zapata.conf.sample
@@ -79,10 +79,20 @@
 ;
 ;nsf=none
 ;
-; PRI Dialplan:  Only RARELY used for PRI.
+; PRI Dialplan: The ISDN-level Type Of Number (TON) or numbering plan, used for
+; the dialed number.  For most installations, leaving this as 'unknown' (the
+; default) works in the most cases.  In some very unusual circumstances, you
+; may need to set this to 'dynamic' or 'redundant'.  Note that if you set one
+; of the others, you will be unable to dial another class of numbers.  For
+; example, if you set 'national', you will be unable to dial local or
+; international numbers.
+;
 ; PRI Local Dialplan:  Only RARELY used for PRI (sets the calling number's 
-; numbering plan)
-; pridialplan and prilocaldialplan cannot be changed on a reload.
+; numbering plan).  In North America, the typical use is sending the 10 digit
+; callerID number and setting the prilocaldialplan to 'national' (the default).
+; Only VERY rarely will you need to change this.
+;
+; Neither pridialplan nor prilocaldialplan can be changed on reload.
 ;
 ; unknown:        Unknown
 ; private:        Private ISDN
@@ -93,7 +103,7 @@
 ; redundant:      Same as dynamic, except that the underlying number is not 
 ;                 changed (not common)
 ;
-;pridialplan=national
+;pridialplan=unknown
 ;prilocaldialplan=national
 ; 
 ; pridialplan may be also set at dialtime, by prefixing the dialled number with