Document parkinglot in chan_dahdi.conf.sample.

* Document existing feature in chan_dahdi.conf.sample.

* Remove some dead code related to the parkinglot option.

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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b94fc7faa28cae0216eb422a13d127e543e45448..cb4b193e44cb7bb8d5799eb3c88be61b21218f4f 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -397,8 +397,6 @@ static struct dahdi_ring_cadence AS_RP_cadence = {{250, 10000}};
 static char defaultcic[64] = "";
 static char defaultozz[64] = "";
 
-static char parkinglot[AST_MAX_EXTENSION] = "";                /*!< Default parking lot for this channel */
-
 /*! Run this script when the MWI state changes on an FXO line, if mwimonitor is enabled */
 static char mwimonitornotify[PATH_MAX] = "";
 #ifndef HAVE_DAHDI_LINEREVERSE_VMWI
@@ -16636,11 +16634,6 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
                if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
                        continue;
 
-               /* must have parkinglot in confp before build_channels is called */
-               if (!strcasecmp(v->name, "parkinglot")) {
-                       ast_copy_string(confp->chan.parkinglot, v->value, sizeof(confp->chan.parkinglot));
-               }
-
                /* Create the interface list */
                if (!strcasecmp(v->name, "channel") || !strcasecmp(v->name, "channels")) {
                        if (options & PROC_DAHDI_OPT_NOCHAN) {
@@ -16804,7 +16797,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
                } else if (!strcasecmp(v->name, "mohsuggest")) {
                        ast_copy_string(confp->chan.mohsuggest, v->value, sizeof(confp->chan.mohsuggest));
                } else if (!strcasecmp(v->name, "parkinglot")) {
-                       ast_copy_string(parkinglot, v->value, sizeof(parkinglot));
+                       ast_copy_string(confp->chan.parkinglot, v->value, sizeof(confp->chan.parkinglot));
                } else if (!strcasecmp(v->name, "stripmsd")) {
                        ast_log(LOG_NOTICE, "Configuration option \"%s\" has been deprecated. Please use dialplan instead\n", v->name);
                        confp->chan.stripmsd = atoi(v->value);

diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 32366e3f9709050908688d70160f7540e9752735..bb4600693edc2a3b0b94c296bc3f4187c6fd4a31 100644 (file)
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -579,6 +579,13 @@ transfer=yes
 ; ('canpark=no' is overridden by 'transfer=yes')
 ;
 canpark=yes
+
+; Sets the default parking lot for call parking.
+; This is setable per channel.
+; Parkinglots are configured in features.conf
+;
+;parkinglot=plaza
+
 ;
 ; Support call forward variable
 ;