Merge branch 'master' of 192.168.0.100:/repos/git/asteriskHEADmaster

1 files changed, 8 insertions, 14 deletions

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 321be6625..b80b1b1e8 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -44,6 +44,7 @@
 	<use type="external">pri</use>
 	<use type="external">ss7</use>
 	<use type="external">openr2</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
@@ -409,8 +410,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
@@ -3072,9 +3071,9 @@ static int sig_pri_tone_to_dahditone(enum sig_pri_tone tone)
 #if defined(HAVE_PRI)
 static void my_handle_dchan_exception(struct sig_pri_span *pri, int index)
 {
-	int x, res;
+	int x;
 
-	res = ioctl(pri->fds[index], DAHDI_GETEVENT, &x);
+	ioctl(pri->fds[index], DAHDI_GETEVENT, &x);
 	if (x) {
 		ast_log(LOG_NOTICE, "PRI got event: %s (%d) on D-channel of span %d\n", event2str(x), x, pri->span);
 	}
@@ -11075,7 +11074,7 @@ quit_no_clean:
 */
 static int mwi_send_init(struct dahdi_pvt * pvt)
 {
-	int x, res;
+	int x;
 	struct ast_format tmpfmt;
 
 #ifdef HAVE_DAHDI_LINEREVERSE_VMWI
@@ -11112,7 +11111,7 @@ static int mwi_send_init(struct dahdi_pvt * pvt)
 		return -1;
 	}
 	x = DAHDI_FLUSH_BOTH;
-	res = ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_FLUSH, &x);
+	ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_FLUSH, &x);
 	x = 3000;
 	ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_ONHOOKTRANSFER, &x);
 #ifdef HAVE_DAHDI_LINEREVERSE_VMWI
@@ -16799,7 +16798,7 @@ static void process_echocancel(struct dahdi_chan_conf *confp, const char *data,
 /*!
  * \internal
  * \brief Determine the configured display text options.
- * \since 1.10
+ * \since 10.0
  *
  * \param value Configuration value string.
  *
@@ -16846,7 +16845,7 @@ static unsigned long dahdi_display_text_option(const char *value)
 /*!
  * \internal
  * \brief Determine the configured date/time send policy option.
- * \since 1.10
+ * \since 10.0
  *
  * \param value Configuration value string.
  *
@@ -16926,11 +16925,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) {
@@ -17094,7 +17088,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);