Merged revisions 310462 via svnmerge from
[asterisk/asterisk.git] / pbx / pbx_config.c
index e63ab74..0baa8e1 100644 (file)
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#include <errno.h>
 
+#include "asterisk/paths.h"    /* ast_config_AST_CONFIG_DIR */
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/logger.h"
 #include "asterisk/cli.h"
+#include "asterisk/channel.h"  /* AST_MAX_EXTENSION */
 #include "asterisk/callerid.h"
 
-static char *config = "extensions.conf";
-static char *registrar = "pbx_config";
+static const char config[] = "extensions.conf";
+static const char registrar[] = "pbx_config";
 static char userscontext[AST_MAX_EXTENSION] = "default";
 
 static int static_config = 0;
 static int write_protect_config = 1;
-static int autofallthrough_config = 0;
+static int autofallthrough_config = 1;
 static int clearglobalvars_config = 0;
+static int extenpatternmatchnew_config = 0;
+static char *overrideswitch_config = NULL;
 
 AST_MUTEX_DEFINE_STATIC(save_dialplan_lock);
 
 static struct ast_context *local_contexts = NULL;
-
+static struct ast_hashtab *local_table = NULL;
 /*
- * Help for commands provided by this module ...
+ * Prototypes for our completion functions
  */
-static char context_dont_include_help[] =
-"Usage: dont include <context> in <context>\n"
-"       Remove an included context from another context.\n";
-
-static char context_remove_extension_help[] =
-"Usage: remove extension exten@context [priority]\n"
-"       Remove an extension from a given context. If a priority\n"
-"       is given, only that specific priority from the given extension\n"
-"       will be removed.\n";
-
-static char context_add_include_help[] =
-"Usage: include <context> in <context>\n"
-"       Include a context in another context.\n";
-
-static char save_dialplan_help[] =
-"Usage: save dialplan [/path/to/extension/file]\n"
-"       Save dialplan created by pbx_config module.\n"
-"\n"
-"Example: save dialplan                 (/etc/asterisk/extensions.conf)\n"
-"         save dialplan /home/markster  (/home/markster/extensions.conf)\n";
-
-static char context_add_extension_help[] =
-"Usage: add extension <exten>,<priority>,<app>,<app-data> into <context>\n"
-"       [replace]\n\n"
-"       This command will add new extension into <context>. If there is an\n"
-"       existence of extension with the same priority and last 'replace'\n"
-"       arguments is given here we simply replace this extension.\n"
-"\n"
-"Example: add extension 6123,1,Dial,IAX/216.207.245.56/6123 into local\n"
-"         Now, you can dial 6123 and talk to Markster :)\n";
-
-static char context_add_ignorepat_help[] =
-"Usage: add ignorepat <pattern> into <context>\n"
-"       This command adds a new ignore pattern into context <context>\n"
-"\n"
-"Example: add ignorepat _3XX into local\n";
-
-static char context_remove_ignorepat_help[] =
-"Usage: remove ignorepat <pattern> from <context>\n"
-"       This command removes an ignore pattern from context <context>\n"
-"\n"
-"Example: remove ignorepat _3XX from local\n";
-
-static char reload_extensions_help[] =
-"Usage: reload extensions.conf without reloading any other modules\n"
-"       This command does not delete global variables unless\n"
-"       clearglobalvars is set to yes in extensions.conf\n"
-"\n"
-"Example: extensions reload\n";
+static char *complete_dialplan_remove_include(struct ast_cli_args *);
+static char *complete_dialplan_add_include(struct ast_cli_args *);
+static char *complete_dialplan_remove_ignorepat(struct ast_cli_args *);
+static char *complete_dialplan_add_ignorepat(struct ast_cli_args *);
+static char *complete_dialplan_remove_extension(struct ast_cli_args *);
+static char *complete_dialplan_add_extension(struct ast_cli_args *);
 
 /*
  * Implementation of functions provided by this module
@@ -115,23 +70,31 @@ static char reload_extensions_help[] =
 /*!
  * REMOVE INCLUDE command stuff
  */
-static int handle_context_dont_include(int fd, int argc, char *argv[])
+static char *handle_cli_dialplan_remove_include(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-       if (argc != 5)
-               return RESULT_SHOWUSAGE;
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan remove include";
+               e->usage =
+                       "Usage: dialplan remove include <context> from <context>\n"
+                       "       Remove an included context from another context.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return complete_dialplan_remove_include(a);
+       }
 
-       if (strcmp(argv[3], "in"))
-               return RESULT_SHOWUSAGE;
+       if (strcmp(a->argv[4], "from"))
+               return CLI_SHOWUSAGE;
 
-       if (!ast_context_remove_include(argv[4], argv[2], registrar)) {
-               ast_cli(fd, "We are not including '%s' in '%s' now\n",
-                       argv[2], argv[4]);
-               return RESULT_SUCCESS;
+       if (!ast_context_remove_include(a->argv[5], a->argv[3], registrar)) {
+               ast_cli(a->fd, "We are not including '%s' into '%s' now\n",
+                       a->argv[3], a->argv[5]);
+               return CLI_SUCCESS;
        }
 
-       ast_cli(fd, "Failed to remove '%s' include from '%s' context\n",
-               argv[2], argv[4]);
-       return RESULT_FAILURE;
+       ast_cli(a->fd, "Failed to remove '%s' include from '%s' context\n",
+               a->argv[3], a->argv[5]);
+       return CLI_FAILURE;
 }
 
 /*! \brief return true if 'name' is included by context c */
@@ -139,7 +102,7 @@ static int lookup_ci(struct ast_context *c, const char *name)
 {
        struct ast_include *i = NULL;
 
-       if (ast_lock_context(c))        /* error, skip */
+       if (ast_rdlock_context(c))      /* error, skip */
                return 0;
        while ( (i = ast_walk_context_includes(c, i)) )
                if (!strcmp(name, ast_get_include_name(i)))
@@ -153,7 +116,7 @@ static int lookup_c_ip(struct ast_context *c, const char *name)
 {
        struct ast_ignorepat *ip = NULL;
 
-       if (ast_lock_context(c))        /* error, skip */
+       if (ast_rdlock_context(c))      /* error, skip */
                return 0;
        while ( (ip = ast_walk_context_ignorepats(c, ip)) )
                if (!strcmp(name, ast_get_ignorepat_name(ip)))
@@ -186,9 +149,9 @@ static int partial_match(const char *s, const char *word, int len)
 /*! \brief split extension\@context in two parts, return -1 on error.
  * The return string is malloc'ed and pointed by *ext
  */
-static int split_ec(const char *src, char **ext, char ** const ctx)
+static int split_ec(const char *src, char **ext, char ** const ctx, char ** const cid)
 {
-       char *c, *e = ast_strdup(src); /* now src is not used anymore */
+       char *i, *c, *e = ast_strdup(src); /* now src is not used anymore */
 
        if (e == NULL)
                return -1;      /* malloc error */
@@ -204,21 +167,27 @@ static int split_ec(const char *src, char **ext, char ** const ctx)
                        free(e);
                        return -1;
                }
-       } 
+       }
+       if (cid && (i = strchr(e, '/'))) {
+               *i++ = '\0';
+               *cid = i;
+       } else if (cid) {
+               /* Signal none detected */
+               *cid = NULL;
+       }
        return 0;
 }
 
 /* _X_ is the string we need to complete */
-static char *complete_context_dont_include(const char *line, const char *word,
-       int pos, int state)
+static char *complete_dialplan_remove_include(struct ast_cli_args *a)
 {
        int which = 0;
        char *res = NULL;
-       int len = strlen(word); /* how many bytes to match */
+       int len = strlen(a->word); /* how many bytes to match */
        struct ast_context *c = NULL;
 
-       if (pos == 2) {         /* "dont include _X_" */
-               if (ast_lock_contexts()) {
+       if (a->pos == 3) {              /* "dialplan remove include _X_" */
+               if (ast_wrlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock context list\n");
                        return NULL;
                }
@@ -226,7 +195,7 @@ static char *complete_context_dont_include(const char *line, const char *word,
                while (!res && (c = ast_walk_contexts(c))) {
                        struct ast_include *i = NULL;
 
-                       if (ast_lock_context(c))        /* error ? skip this one */
+                       if (ast_rdlock_context(c))      /* error ? skip this one */
                                continue;
 
                        while ( !res && (i = ast_walk_context_includes(c, i)) ) {
@@ -234,7 +203,7 @@ static char *complete_context_dont_include(const char *line, const char *word,
                                struct ast_context *nc = NULL;
                                int already_served = 0;
 
-                               if (!partial_match(i_name, word, len))
+                               if (!partial_match(i_name, a->word, len))
                                        continue;       /* not matched */
 
                                /* check if this include is already served or not */
@@ -245,7 +214,7 @@ static char *complete_context_dont_include(const char *line, const char *word,
                                while ( (nc = ast_walk_contexts(nc)) && nc != c && !already_served)
                                        already_served = lookup_ci(nc, i_name);
 
-                               if (!already_served && ++which > state)
+                               if (!already_served && ++which > a->n)
                                        res = strdup(i_name);
                        }
                        ast_unlock_context(c);
@@ -253,15 +222,15 @@ static char *complete_context_dont_include(const char *line, const char *word,
 
                ast_unlock_contexts();
                return res;
-       } else if (pos == 3) { /* "dont include CTX _X_" */
+       } else if (a->pos == 4) { /* "dialplan remove include CTX _X_" */
                /*
-                * complete as 'in', but only if previous context is really
+                * complete as 'from', but only if previous context is really
                 * included somewhere
                 */
                char *context, *dupline;
-               const char *s = skip_words(line, 2); /* skip 'dont' 'include' */
+               const char *s = skip_words(a->line, 3); /* skip 'dialplan' 'remove' 'include' */
 
-               if (state > 0)
+               if (a->n > 0)
                        return NULL;
                context = dupline = strdup(s);
                if (!dupline) {
@@ -270,7 +239,7 @@ static char *complete_context_dont_include(const char *line, const char *word,
                }
                strsep(&dupline, " ");
 
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock contexts list\n");
                        free(context);
                        return NULL;
@@ -278,19 +247,19 @@ static char *complete_context_dont_include(const char *line, const char *word,
 
                /* go through all contexts and check if is included ... */
                while (!res && (c = ast_walk_contexts(c)))
-                       if (lookup_ci(c, context)) /* context is really included, complete "in" command */
-                               res = strdup("in");
+                       if (lookup_ci(c, context)) /* context is really included, complete "from" command */
+                               res = strdup("from");
                ast_unlock_contexts();
                if (!res)
                        ast_log(LOG_WARNING, "%s not included anywhere\n", context);
                free(context);
                return res;
-       } else if (pos == 4) { /* "dont include CTX in _X_" */
+       } else if (a->pos == 5) { /* "dialplan remove include CTX from _X_" */
                /*
                 * Context from which we removing include ... 
                 */
-               char *context, *dupline, *in;
-               const char *s = skip_words(line, 2); /* skip 'dont' 'include' */
+               char *context, *dupline, *from;
+               const char *s = skip_words(a->line, 3); /* skip 'dialplan' 'remove' 'include' */
                context = dupline = strdup(s);
                if (!dupline) {
                        ast_log(LOG_ERROR, "Out of free memory\n");
@@ -299,14 +268,14 @@ static char *complete_context_dont_include(const char *line, const char *word,
 
                strsep(&dupline, " "); /* skip context */
 
-               /* third word must be 'in' */
-               in = strsep(&dupline, " ");
-               if (!in || strcmp(in, "in")) {
+               /* fourth word must be 'from' */
+               from = strsep(&dupline, " ");
+               if (!from || strcmp(from, "from")) {
                        free(context);
                        return NULL;
                }
 
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock context list\n");
                        free(context);
                        return NULL;
@@ -316,10 +285,10 @@ static char *complete_context_dont_include(const char *line, const char *word,
                c = NULL;
                while ( !res && (c = ast_walk_contexts(c))) {
                        const char *c_name = ast_get_context_name(c);
-                       if (!partial_match(c_name, word, len))  /* not a good target */
+                       if (!partial_match(c_name, a->word, len))       /* not a good target */
                                continue;
                        /* walk through all includes and check if it is our context */  
-                       if (lookup_ci(c, context) && ++which > state)
+                       if (lookup_ci(c, context) && ++which > a->n)
                                res = strdup(c_name);
                }
                ast_unlock_contexts();
@@ -333,19 +302,33 @@ static char *complete_context_dont_include(const char *line, const char *word,
 /*!
  * REMOVE EXTENSION command stuff
  */
-static int handle_context_remove_extension(int fd, int argc, char *argv[])
+static char *handle_cli_dialplan_remove_extension(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
        int removing_priority = 0;
-       char *exten, *context;
-       int ret = RESULT_FAILURE;
+       char *exten, *context, *cid;
+       char *ret = CLI_FAILURE;
+
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan remove extension";
+               e->usage =
+                       "Usage: dialplan remove extension exten[/cid]@context [priority]\n"
+                       "       Remove an extension from a given context. If a priority\n"
+                       "       is given, only that specific priority from the given extension\n"
+                       "       will be removed.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return complete_dialplan_remove_extension(a);
+       }
 
-       if (argc != 4 && argc != 3) return RESULT_SHOWUSAGE;
+       if (a->argc != 5 && a->argc != 4)
+               return CLI_SHOWUSAGE;
 
        /*
         * Priority input checking ...
         */
-       if (argc == 4) {
-               char *c = argv[3];
+       if (a->argc == 5) {
+               const char *c = a->argv[4];
 
                /* check for digits in whole parameter for right priority ...
                 * why? because atoi (strtol) returns 0 if any characters in
@@ -357,131 +340,76 @@ static int handle_context_remove_extension(int fd, int argc, char *argv[])
                        while (*c && isdigit(*c))
                                c++;
                        if (*c) { /* non-digit in string */
-                               ast_cli(fd, "Invalid priority '%s'\n", argv[3]);
-                               return RESULT_FAILURE;
+                               ast_cli(a->fd, "Invalid priority '%s'\n", a->argv[4]);
+                               return CLI_FAILURE;
                        }
-                       removing_priority = atoi(argv[3]);
+                       removing_priority = atoi(a->argv[4]);
                }
 
                if (removing_priority == 0) {
-                       ast_cli(fd, "If you want to remove whole extension, please " \
+                       ast_cli(a->fd, "If you want to remove whole extension, please " \
                                "omit priority argument\n");
-                       return RESULT_FAILURE;
+                       return CLI_FAILURE;
                }
        }
 
-       /* XXX original overwrote argv[2] */
+       /* XXX original overwrote argv[3] */
        /*
         * Format exten@context checking ...
         */
-       if (split_ec(argv[2], &exten, &context))
-               return RESULT_FAILURE; /* XXX malloc failure */
+       if (split_ec(a->argv[3], &exten, &context, &cid))
+               return CLI_FAILURE; /* XXX malloc failure */
        if ((!strlen(exten)) || (!(strlen(context)))) {
-               ast_cli(fd, "Missing extension or context name in second argument '%s'\n",
-                       argv[2]);
+               ast_cli(a->fd, "Missing extension or context name in third argument '%s'\n",
+                       a->argv[3]);
                free(exten);
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
-       if (!ast_context_remove_extension(context, exten, removing_priority, registrar)) {
+       if (!ast_context_remove_extension_callerid(context, exten, removing_priority,
+                       /* Do NOT substitute S_OR; it is NOT the same thing */
+                       cid ? cid : (removing_priority ? "" : NULL), cid ? 1 : 0, registrar)) {
                if (!removing_priority)
-                       ast_cli(fd, "Whole extension %s@%s removed\n",
+                       ast_cli(a->fd, "Whole extension %s@%s removed\n",
                                exten, context);
                else
-                       ast_cli(fd, "Extension %s@%s with priority %d removed\n",
+                       ast_cli(a->fd, "Extension %s@%s with priority %d removed\n",
                                exten, context, removing_priority);
                        
-               ret = RESULT_SUCCESS;
+               ret = CLI_SUCCESS;
        } else {
-               ast_cli(fd, "Failed to remove extension %s@%s\n", exten, context);
-               ret = RESULT_FAILURE;
+               if (cid) {
+                       ast_cli(a->fd, "Failed to remove extension %s/%s@%s\n", exten, cid, context);
+               } else {
+                       ast_cli(a->fd, "Failed to remove extension %s@%s\n", exten, context);
+               }
+               ret = CLI_FAILURE;
        }
        free(exten);
        return ret;
 }
 
-#define BROKEN_READLINE 1
-
-#ifdef BROKEN_READLINE
-/*
- * There is one funny thing, when you have word like 300@ and you hit
- * <tab>, you arguments will like as your word is '300 ', so it '@'
- * characters acts sometimes as word delimiter and sometimes as a part
- * of word
- *
- * This fix function, allocates new word variable and store here every
- * time xxx@yyy always as one word and correct pos is set too
- *
- * It's ugly, I know, but I'm waiting for Mark suggestion if upper is
- * bug or feature ...
- */
-static int fix_complete_args(const char *line, char **word, int *pos)
-{
-       char *_line, *_strsep_line, *_previous_word = NULL, *_word = NULL;
-       int words = 0;
-
-       _line = strdup(line);
-
-       _strsep_line = _line;
-       while (_strsep_line) {
-               _previous_word = _word;
-               _word = strsep(&_strsep_line, " ");
-
-               if (_word && strlen(_word)) words++;
-       }
-
-
-       if (_word || _previous_word) {
-               if (_word) {
-                       if (!strlen(_word)) words++;
-                       *word = strdup(_word);
-               } else
-                       *word = strdup(_previous_word);
-               *pos = words - 1;
-               free(_line);
-               return 0;
-       }
-
-       free(_line);
-       return -1;
-}
-#endif /* BROKEN_READLINE */
-
-static char *complete_context_remove_extension(const char *line, const char *word, int pos,
-       int state)
+static char *complete_dialplan_remove_extension(struct ast_cli_args *a)
 {
        char *ret = NULL;
        int which = 0;
 
-#ifdef BROKEN_READLINE
-       char *word2;
-       /*
-        * Fix arguments, *word is a new allocated structure, REMEMBER to
-        * free *word when you want to return from this function ...
-        */
-       if (fix_complete_args(line, &word2, &pos)) {
-               ast_log(LOG_ERROR, "Out of free memory\n");
-               return NULL;
-       }
-       word = word2;
-#endif
-
-       if (pos == 2) { /* 'remove extension _X_' (exten@context ... */
+       if (a->pos == 3) { /* 'dialplan remove extension _X_' (exten@context ... */
                struct ast_context *c = NULL;
-               char *context = NULL, *exten = NULL;
+               char *context = NULL, *exten = NULL, *cid = NULL;
                int le = 0;     /* length of extension */
                int lc = 0;     /* length of context */
+               int lcid = 0; /* length of cid */
 
-               lc = split_ec(word, &exten, &context);
-#ifdef BROKEN_READLINE
-               free(word2);
-#endif
-               if (lc) /* error */
+               lc = split_ec(a->word, &exten, &context, &cid);
+               if (lc) { /* error */
                        return NULL;
+               }
                le = strlen(exten);
                lc = strlen(context);
+               lcid = cid ? strlen(cid) : -1;
 
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock context list\n");
                        goto error2;
                }
@@ -493,11 +421,28 @@ static char *complete_context_remove_extension(const char *line, const char *wor
                        if (!partial_match(ast_get_context_name(c), context, lc))
                                continue;       /* context not matched */
                        while ( (e = ast_walk_context_extensions(c, e)) ) { /* try to complete extensions ... */
-                               if ( partial_match(ast_get_extension_name(e), exten, le) && ++which > state) { /* n-th match */
-                                       /* If there is an extension then return exten@context. XXX otherwise ? */
-                                       if (exten)
-                                               asprintf(&ret, "%s@%s", ast_get_extension_name(e), ast_get_context_name(c));
-                                       break;
+                               if ( !strchr(a->word, '/') ||
+                                               (!strchr(a->word, '@') && partial_match(ast_get_extension_cidmatch(e), cid, lcid)) ||
+                                               (strchr(a->word, '@') && !strcmp(ast_get_extension_cidmatch(e), cid))) {
+                                       if ( ((strchr(a->word, '/') || strchr(a->word, '@')) && !strcmp(ast_get_extension_name(e), exten)) ||
+                                                (!strchr(a->word, '/') && !strchr(a->word, '@') && partial_match(ast_get_extension_name(e), exten, le))) { /* n-th match */
+                                               if (++which > a->n) {
+                                                       /* If there is an extension then return exten@context. */
+                                                       if (ast_get_extension_matchcid(e) && (!strchr(a->word, '@') || strchr(a->word, '/'))) {
+                                                               if (asprintf(&ret, "%s/%s@%s", ast_get_extension_name(e), ast_get_extension_cidmatch(e), ast_get_context_name(c)) < 0) {
+                                                                       ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
+                                                                       ret = NULL;
+                                                               }
+                                                               break;
+                                                       } else if (!ast_get_extension_matchcid(e) && !strchr(a->word, '/')) {
+                                                               if (asprintf(&ret, "%s@%s", ast_get_extension_name(e), ast_get_context_name(c)) < 0) {
+                                                                       ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
+                                                                       ret = NULL;
+                                                               }
+                                                               break;
+                                                       }
+                                               }
+                                       }
                                }
                        }
                        if (e)  /* got a match */
@@ -506,14 +451,13 @@ static char *complete_context_remove_extension(const char *line, const char *wor
 
                ast_unlock_contexts();
        error2:
-               if (exten)
-                       free(exten);
-       } else if (pos == 3) { /* 'remove extension EXT _X_' (priority) */
-               char *exten = NULL, *context, *p;
+               free(exten);
+       } else if (a->pos == 4) { /* 'dialplan remove extension EXT _X_' (priority) */
+               char *exten = NULL, *context, *cid, *p;
                struct ast_context *c;
                int le, lc, len;
-               const char *s = skip_words(line, 2); /* skip 'remove' 'extension' */
-               int i = split_ec(s, &exten, &context);  /* parse ext@context */
+               const char *s = skip_words(a->line, 3); /* skip 'dialplan' 'remove' 'extension' */
+               int i = split_ec(s, &exten, &context, &cid);    /* parse ext@context */
 
                if (i)  /* error */
                        goto error3;
@@ -523,11 +467,11 @@ static char *complete_context_remove_extension(const char *line, const char *wor
                        *p = '\0';
                le = strlen(exten);
                lc = strlen(context);
-               len = strlen(word);
+               len = strlen(a->word);
                if (le == 0 || lc == 0)
                        goto error3;
 
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock context list\n");
                        goto error3;
                }
@@ -545,13 +489,16 @@ static char *complete_context_remove_extension(const char *line, const char *wor
                                struct ast_exten *priority;
                                char buffer[10];
 
+                               if (cid && strcmp(ast_get_extension_cidmatch(e), cid) != 0) {
+                                       continue;
+                               }
                                if (strcmp(ast_get_extension_name(e), exten) != 0)
                                        continue;
                                /* XXX lock e ? */
                                priority = NULL;
                                while ( !ret && (priority = ast_walk_extension_priorities(e, priority)) ) {
                                        snprintf(buffer, sizeof(buffer), "%u", ast_get_extension_priority(priority));
-                                       if (partial_match(buffer, word, len) && ++which > state) /* n-th match */
+                                       if (partial_match(buffer, a->word, len) && ++which > a->n) /* n-th match */
                                                ret = strdup(buffer);
                                }
                                break;
@@ -560,11 +507,7 @@ static char *complete_context_remove_extension(const char *line, const char *wor
                }
                ast_unlock_contexts();
        error3:
-               if (exten)
-                       free(exten);
-#ifdef BROKEN_READLINE
-               free(word2);
-#endif
+               free(exten);
        }
        return ret; 
 }
@@ -572,117 +515,127 @@ static char *complete_context_remove_extension(const char *line, const char *wor
 /*!
  * Include context ...
  */
-static int handle_context_add_include(int fd, int argc, char *argv[])
+static char *handle_cli_dialplan_add_include(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-       if (argc != 5) /* include context CTX in CTX */
-               return RESULT_SHOWUSAGE;
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan add include";
+               e->usage =
+                       "Usage: dialplan add include <context> into <context>\n"
+                       "       Include a context in another context.\n";
+               return NULL;
+       case CLI_GENERATE:
+               return complete_dialplan_add_include(a);
+       }
 
-       /* third arg must be 'in' ... */
-       if (strcmp(argv[3], "in") && strcmp(argv[3], "into")) /* XXX why both ? */
-               return RESULT_SHOWUSAGE;
+       if (a->argc != 6) /* dialplan add include CTX in CTX */
+               return CLI_SHOWUSAGE;
 
-       if (ast_context_add_include(argv[4], argv[2], registrar)) {
+       /* fifth arg must be 'into' ... */
+       if (strcmp(a->argv[4], "into"))
+               return CLI_SHOWUSAGE;
+
+       if (ast_context_add_include(a->argv[5], a->argv[3], registrar)) {
                switch (errno) {
                case ENOMEM:
-                       ast_cli(fd, "Out of memory for context addition\n");
+                       ast_cli(a->fd, "Out of memory for context addition\n");
                        break;
 
                case EBUSY:
-                       ast_cli(fd, "Failed to lock context(s) list, please try again later\n");
+                       ast_cli(a->fd, "Failed to lock context(s) list, please try again later\n");
                        break;
 
                case EEXIST:
-                       ast_cli(fd, "Context '%s' already included in '%s' context\n",
-                               argv[2], argv[4]);
+                       ast_cli(a->fd, "Context '%s' already included in '%s' context\n",
+                               a->argv[3], a->argv[5]);
                        break;
 
                case ENOENT:
                case EINVAL:
-                       ast_cli(fd, "There is no existence of context '%s'\n",
-                               errno == ENOENT ? argv[4] : argv[2]);
+                       ast_cli(a->fd, "There is no existence of context '%s'\n",
+                               errno == ENOENT ? a->argv[5] : a->argv[3]);
                        break;
 
                default:
-                       ast_cli(fd, "Failed to include '%s' in '%s' context\n",
-                               argv[2], argv[4]);
+                       ast_cli(a->fd, "Failed to include '%s' in '%s' context\n",
+                               a->argv[3], a->argv[5]);
                        break;
                }
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
        /* show some info ... */
-       ast_cli(fd, "Context '%s' included in '%s' context\n",
-               argv[2], argv[4]);
+       ast_cli(a->fd, "Context '%s' included in '%s' context\n",
+               a->argv[3], a->argv[5]);
 
-       return RESULT_SUCCESS;
+       return CLI_SUCCESS;
 }
 
-static char *complete_context_add_include(const char *line, const char *word, int pos,
-    int state)
+static char *complete_dialplan_add_include(struct ast_cli_args *a)
 {
        struct ast_context *c;
        int which = 0;
        char *ret = NULL;
-       int len = strlen(word);
+       int len = strlen(a->word);
 
-       if (pos == 2) {         /* 'include context _X_' (context) ... */
-               if (ast_lock_contexts()) {
+       if (a->pos == 3) {              /* 'dialplan add include _X_' (context) ... */
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock context list\n");
                        return NULL;
                }
                for (c = NULL; !ret && (c = ast_walk_contexts(c)); )
-                       if (partial_match(ast_get_context_name(c), word, len) && ++which > state)
+                       if (partial_match(ast_get_context_name(c), a->word, len) && ++which > a->n)
                                ret = strdup(ast_get_context_name(c));
                ast_unlock_contexts();
                return ret;
-       } else if (pos == 3) { /* include context CTX _X_ */
-               /* complete  as 'in' if context exists or we are unable to check */
+       } else if (a->pos == 4) { /* dialplan add include CTX _X_ */
+               /* complete  as 'into' if context exists or we are unable to check */
                char *context, *dupline;
-               struct ast_context *c;
-               const char *s = skip_words(line, 2);    /* should not fail */
+               const char *s = skip_words(a->line, 3); /* should not fail */
 
-               if (state != 0) /* only once */
+               if (a->n != 0)  /* only once */
                        return NULL;
 
                /* parse context from line ... */
                context = dupline = strdup(s);
                if (!context) {
                        ast_log(LOG_ERROR, "Out of free memory\n");
-                       return strdup("in");
+                       return strdup("into");
                }
                strsep(&dupline, " ");
 
                /* check for context existence ... */
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock context list\n");
-                       /* our fault, we can't check, so complete 'in' ... */
-                       ret = strdup("in");
+                       /* our fault, we can't check, so complete 'into' ... */
+                       ret = strdup("into");
                } else {
-                       for (c = NULL; !ret && (c = ast_walk_contexts(c)); )
-                               if (!strcmp(context, ast_get_context_name(c)))
-                                       ret = strdup("in"); /* found */
+                       struct ast_context *ctx;
+                       for (ctx = NULL; !ret && (ctx = ast_walk_contexts(ctx)); )
+                               if (!strcmp(context, ast_get_context_name(ctx)))
+                                       ret = strdup("into"); /* found */
                        ast_unlock_contexts();
                }
                free(context);
                return ret;
-       } else if (pos == 4) { /* 'include context CTX in _X_' (dst context) */
-               char *context, *dupline, *in;
-               const char *s = skip_words(line, 2); /* should not fail */
+       } else if (a->pos == 5) { /* 'dialplan add include CTX into _X_' (dst context) */
+               char *context, *dupline, *into;
+               const char *s = skip_words(a->line, 3); /* should not fail */
                context = dupline = strdup(s);
                if (!dupline) {
                        ast_log(LOG_ERROR, "Out of free memory\n");
                        return NULL;
                }
                strsep(&dupline, " "); /* skip context */
-               in = strsep(&dupline, " ");
-               /* error if missing context or third word is not 'in' */
-               if (!strlen(context) || strcmp(in, "in")) {
-                       ast_log(LOG_ERROR, "bad context %s or missing in %s\n",
-                               context, in);
+               into = strsep(&dupline, " ");
+               /* error if missing context or fifth word is not 'into' */
+               if (!strlen(context) || strcmp(into, "into")) {
+                       ast_log(LOG_ERROR, "bad context %s or missing into %s\n",
+                               context, into);
                        goto error3;
                }
 
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock context list\n");
                        goto error3;
                }
@@ -695,9 +648,9 @@ static char *complete_context_add_include(const char *line, const char *word, in
                        for (c = NULL; !ret && (c = ast_walk_contexts(c)); ) {
                                if (!strcmp(context, ast_get_context_name(c)))
                                        continue; /* skip ourselves */
-                               if (partial_match(ast_get_context_name(c), word, len) &&
+                               if (partial_match(ast_get_context_name(c), a->word, len) &&
                                                !lookup_ci(c, context) /* not included yet */ &&
-                                               ++which > state)
+                                               ++which > a->n)
                                        ret = strdup(ast_get_context_name(c));
                        }
                } else {
@@ -715,40 +668,54 @@ static char *complete_context_add_include(const char *line, const char *word, in
 /*!
  * \brief 'save dialplan' CLI command implementation functions ...
  */
-static int handle_save_dialplan(int fd, int argc, char *argv[])
+static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-       char filename[256];
+       char filename[256], overrideswitch[256] = "";
        struct ast_context *c;
        struct ast_config *cfg;
        struct ast_variable *v;
        int incomplete = 0; /* incomplete config write? */
        FILE *output;
-
+       struct ast_flags config_flags = { 0 };
        const char *base, *slash, *file;
 
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan save";
+               e->usage =
+                       "Usage: dialplan save [/path/to/extension/file]\n"
+                       "       Save dialplan created by pbx_config module.\n"
+                       "\n"
+                       "Example: dialplan save                 (/etc/asterisk/extensions.conf)\n"
+                       "         dialplan save /home/markster  (/home/markster/extensions.conf)\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;
+       }
+
        if (! (static_config && !write_protect_config)) {
-               ast_cli(fd,
+               ast_cli(a->fd,
                        "I can't save dialplan now, see '%s' example file.\n",
                        config);
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
-       if (argc != 2 && argc != 3)
-               return RESULT_SHOWUSAGE;
+       if (a->argc != 2 && a->argc != 3)
+               return CLI_SHOWUSAGE;
 
        if (ast_mutex_lock(&save_dialplan_lock)) {
-               ast_cli(fd,
+               ast_cli(a->fd,
                        "Failed to lock dialplan saving (another proccess saving?)\n");
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
        /* XXX the code here is quite loose, a pathname with .conf in it
         * is assumed to be a complete pathname
         */
-       if (argc == 3) {        /* have config path. Look for *.conf */
-               base = argv[2];
-               if (!strstr(argv[2], ".conf")) { /*no, this is assumed to be a pathname */
+       if (a->argc == 3) {     /* have config path. Look for *.conf */
+               base = a->argv[2];
+               if (!strstr(a->argv[2], ".conf")) { /*no, this is assumed to be a pathname */
                        /* if filename ends with '/', do not add one */
-                       slash = (*(argv[2] + strlen(argv[2]) -1) == '/') ? "/" : "";
+                       slash = (*(a->argv[2] + strlen(a->argv[2]) -1) == '/') ? "/" : "";
                        file = config;  /* default: 'extensions.conf' */
                } else {        /* yes, complete file name */
                        slash = "";
@@ -762,33 +729,37 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
        }
        snprintf(filename, sizeof(filename), "%s%s%s", base, slash, config);
 
-       cfg = ast_config_load("extensions.conf");
+       cfg = ast_config_load("extensions.conf", config_flags);
 
        /* try to lock contexts list */
-       if (ast_lock_contexts()) {
-               ast_cli(fd, "Failed to lock contexts list\n");
+       if (ast_rdlock_contexts()) {
+               ast_cli(a->fd, "Failed to lock contexts list\n");
                ast_mutex_unlock(&save_dialplan_lock);
                ast_config_destroy(cfg);
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
        /* create new file ... */
        if (!(output = fopen(filename, "wt"))) {
-               ast_cli(fd, "Failed to create file '%s'\n",
+               ast_cli(a->fd, "Failed to create file '%s'\n",
                        filename);
                ast_unlock_contexts();
                ast_mutex_unlock(&save_dialplan_lock);
                ast_config_destroy(cfg);
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
        /* fireout general info */
-       fprintf(output, "[general]\nstatic=%s\nwriteprotect=%s\nautofallthrough=%s\nclearglobalvars=%s\npriorityjumping=%s\n\n",
+       if (overrideswitch_config) {
+               snprintf(overrideswitch, sizeof(overrideswitch), "overrideswitch=%s\n", overrideswitch_config);
+       }
+       fprintf(output, "[general]\nstatic=%s\nwriteprotect=%s\nautofallthrough=%s\nclearglobalvars=%s\n%sextenpatternmatchnew=%s\n\n",
                static_config ? "yes" : "no",
                write_protect_config ? "yes" : "no",
                 autofallthrough_config ? "yes" : "no",
-                clearglobalvars_config ? "yes" : "no",
-               ast_true(ast_variable_retrieve(cfg, "general", "priorityjumping")) ? "yes" : "no");
+                               clearglobalvars_config ? "yes" : "no",
+                               overrideswitch_config ? overrideswitch : "",
+                               extenpatternmatchnew_config ? "yes" : "no");
 
        if ((v = ast_variable_browse(cfg, "globals"))) {
                fprintf(output, "[globals]\n");
@@ -811,13 +782,13 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
        /* walk all contexts */
        for (c = NULL; (c = ast_walk_contexts(c)); ) {
                int context_header_written = 0;
-               struct ast_exten *e, *last_written_e = NULL;
+               struct ast_exten *ext, *last_written_e = NULL;
                struct ast_include *i;
                struct ast_ignorepat *ip;
                struct ast_sw *sw;
 
                /* try to lock context and fireout all info */  
-               if (ast_lock_context(c)) { /* lock failure */
+               if (ast_rdlock_context(c)) { /* lock failure */
                        incomplete = 1;
                        continue;
                }
@@ -829,11 +800,11 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
                }
 
                /* walk extensions ... */
-               for (e = NULL; (e = ast_walk_context_extensions(c, e)); ) {
+               for (ext = NULL; (ext = ast_walk_context_extensions(c, ext)); ) {
                        struct ast_exten *p = NULL;
 
                        /* fireout priorities */
-                       while ( (p = ast_walk_extension_priorities(e, p)) ) {
+                       while ( (p = ast_walk_extension_priorities(ext, p)) ) {
                                if (strcmp(ast_get_extension_registrar(p), registrar) != 0) /* not this source */
                                        continue;
                
@@ -846,37 +817,28 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
                        
                                PUT_CTX_HDR;
 
-                               if (ast_get_extension_priority(p)==PRIORITY_HINT) { /* easy */
+                               if (ast_get_extension_priority(p) == PRIORITY_HINT) { /* easy */
                                        fprintf(output, "exten => %s,hint,%s\n",
                                                    ast_get_extension_name(p),
                                                    ast_get_extension_app(p));
-                               } else { /* copy and replace '|' with ',' */
+                               } else {
                                        const char *sep, *cid;
-                                       char *tempdata;
-                                       char *s;
                                        const char *el = ast_get_extension_label(p);
-                                       char label[128];
+                                       char label[128] = "";
  
-                                       tempdata = ast_strdupa(ast_get_extension_app_data(p));
-
-                                       for (s = tempdata; *s; s++) {
-                                               if (*s == '|')
-                                                       *s = ',';
-                                       }
-
                                        if (ast_get_extension_matchcid(p)) {
                                                sep = "/";
                                                cid = ast_get_extension_cidmatch(p);
                                        } else
                                                sep = cid = "";
                                
-                                       if (el && (snprintf(label, 127, "(%s)", el) != (strlen(el) + 2)))
+                                       if (el && (snprintf(label, sizeof(label), "(%s)", el) != (strlen(el) + 2)))
                                                incomplete = 1; /* error encountered or label > 125 chars */
                                        
                                        fprintf(output, "exten => %s%s%s,%d%s,%s(%s)\n",
-                                           ast_get_extension_name(p), sep, cid,
+                                           ast_get_extension_name(p), (ast_strlen_zero(sep) ? "" : sep), (ast_strlen_zero(cid) ? "" : cid),
                                            ast_get_extension_priority(p), label,
-                                           ast_get_extension_app(p), tempdata);
+                                           ast_get_extension_app(p), (ast_strlen_zero(ast_get_extension_app_data(p)) ? "" : (const char *)ast_get_extension_app_data(p)));
                                }
                        }
                }
@@ -924,19 +886,19 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
        fclose(output);
 
        if (incomplete) {
-               ast_cli(fd, "Saved dialplan is incomplete\n");
-               return RESULT_FAILURE;
+               ast_cli(a->fd, "Saved dialplan is incomplete\n");
+               return CLI_FAILURE;
        }
 
-       ast_cli(fd, "Dialplan successfully saved into '%s'\n",
+       ast_cli(a->fd, "Dialplan successfully saved into '%s'\n",
                filename);
-       return RESULT_SUCCESS;
+       return CLI_SUCCESS;
 }
 
 /*!
  * \brief ADD EXTENSION command stuff
  */
-static int handle_context_add_extension(int fd, int argc, char *argv[])
+static char *handle_cli_dialplan_add_extension(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
        char *whole_exten;
        char *exten, *prior;
@@ -944,29 +906,47 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
        char *cidmatch, *app, *app_data;
        char *start, *end;
 
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan add extension";
+               e->usage =
+                       "Usage: dialplan add extension <exten>,<priority>,<app>,<app-data>\n"
+                       "       into <context> [replace]\n\n"
+                       "       This command will add new extension into <context>. If there is an\n"
+                       "       existence of extension with the same priority and last 'replace'\n"
+                       "       arguments is given here we simply replace this extension.\n"
+                       "\n"
+                       "Example: dialplan add extension 6123,1,Dial,IAX/216.207.245.56/6123 into local\n"
+                       "         Now, you can dial 6123 and talk to Markster :)\n";
+               return NULL;
+       case CLI_GENERATE:
+               return complete_dialplan_add_extension(a);
+       }
+
        /* check for arguments at first */
-       if (argc != 5 && argc != 6)
-               return RESULT_SHOWUSAGE;
-       if (strcmp(argv[3], "into"))
-               return RESULT_SHOWUSAGE;
-       if (argc == 6) if (strcmp(argv[5], "replace")) return RESULT_SHOWUSAGE;
-
-       /* XXX overwrite argv[2] */
-       whole_exten = argv[2];
-       exten   = strsep(&whole_exten,",");
+       if (a->argc != 6 && a->argc != 7)
+               return CLI_SHOWUSAGE;
+       if (strcmp(a->argv[4], "into"))
+               return CLI_SHOWUSAGE;
+       if (a->argc == 7)
+               if (strcmp(a->argv[6], "replace"))
+                       return CLI_SHOWUSAGE;
+
+       whole_exten = ast_strdupa(a->argv[3]);
+       exten = strsep(&whole_exten,",");
        if (strchr(exten, '/')) {
                cidmatch = exten;
                strsep(&cidmatch,"/");
        } else {
                cidmatch = NULL;
        }
-       prior       = strsep(&whole_exten,",");
+       prior = strsep(&whole_exten,",");
        if (prior) {
                if (!strcmp(prior, "hint")) {
                        iprior = PRIORITY_HINT;
                } else {
-                       if (sscanf(prior, "%d", &iprior) != 1) {
-                               ast_cli(fd, "'%s' is not a valid priority\n", prior);
+                       if (sscanf(prior, "%30d", &iprior) != 1) {
+                               ast_cli(a->fd, "'%s' is not a valid priority\n", prior);
                                prior = NULL;
                        }
                }
@@ -975,7 +955,6 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
        if (app && (start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
                *start = *end = '\0';
                app_data = start + 1;
-               ast_process_quotes_and_slashes(app_data, ',', '|');
        } else {
                if (app) {
                        app_data = strchr(app, ',');
@@ -988,75 +967,74 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
        }
 
        if (!exten || !prior || !app || (!app_data && iprior != PRIORITY_HINT))
-               return RESULT_SHOWUSAGE;
+               return CLI_SHOWUSAGE;
 
        if (!app_data)
                app_data="";
-       if (ast_add_extension(argv[4], argc == 6 ? 1 : 0, exten, iprior, NULL, cidmatch, app,
-               (void *)strdup(app_data), free, registrar)) {
+       if (ast_add_extension(a->argv[5], a->argc == 7 ? 1 : 0, exten, iprior, NULL, cidmatch, app,
+               (void *)strdup(app_data), ast_free_ptr, registrar)) {
                switch (errno) {
                case ENOMEM:
-                       ast_cli(fd, "Out of free memory\n");
+                       ast_cli(a->fd, "Out of free memory\n");
                        break;
 
                case EBUSY:
-                       ast_cli(fd, "Failed to lock context(s) list, please try again later\n");
+                       ast_cli(a->fd, "Failed to lock context(s) list, please try again later\n");
                        break;
 
                case ENOENT:
-                       ast_cli(fd, "No existence of '%s' context\n", argv[4]);
+                       ast_cli(a->fd, "No existence of '%s' context\n", a->argv[5]);
                        break;
 
                case EEXIST:
-                       ast_cli(fd, "Extension %s@%s with priority %s already exists\n",
-                               exten, argv[4], prior);
+                       ast_cli(a->fd, "Extension %s@%s with priority %s already exists\n",
+                               exten, a->argv[5], prior);
                        break;
 
                default:
-                       ast_cli(fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n",
-                                       exten, prior, app, app_data, argv[4]);
+                       ast_cli(a->fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n",
+                                       exten, prior, app, app_data, a->argv[5]);
                        break;
                }
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
-       if (argc == 6) 
-               ast_cli(fd, "Extension %s@%s (%s) replace by '%s,%s,%s,%s'\n",
-                       exten, argv[4], prior, exten, prior, app, app_data);
+       if (a->argc == 7)
+               ast_cli(a->fd, "Extension %s@%s (%s) replace by '%s,%s,%s,%s'\n",
+                       exten, a->argv[5], prior, exten, prior, app, app_data);
        else
-               ast_cli(fd, "Extension '%s,%s,%s,%s' added into '%s' context\n",
-                       exten, prior, app, app_data, argv[4]);
+               ast_cli(a->fd, "Extension '%s,%s,%s,%s' added into '%s' context\n",
+                       exten, prior, app, app_data, a->argv[5]);
 
-       return RESULT_SUCCESS;
+       return CLI_SUCCESS;
 }
 
-/*! add extension 6123,1,Dial,IAX/212.71.138.13/6123 into local */
-static char *complete_context_add_extension(const char *line, const char *word,
-       int pos, int state)
+/*! dialplan add extension 6123,1,Dial,IAX/212.71.138.13/6123 into local */
+static char *complete_dialplan_add_extension(struct ast_cli_args *a)
 {
        int which = 0;
 
-       if (pos == 3) {         /* complete 'into' word ... */
-               return (state == 0) ? strdup("into") : NULL;
-       } else if (pos == 4) { /* complete context */
+       if (a->pos == 4) {              /* complete 'into' word ... */
+               return (a->n == 0) ? strdup("into") : NULL;
+       } else if (a->pos == 5) { /* complete context */
                struct ast_context *c = NULL;
-               int len = strlen(word);
+               int len = strlen(a->word);
                char *res = NULL;
 
                /* try to lock contexts list ... */
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_WARNING, "Failed to lock contexts list\n");
                        return NULL;
                }
 
                /* walk through all contexts */
                while ( !res && (c = ast_walk_contexts(c)) )
-                       if (partial_match(ast_get_context_name(c), word, len) && ++which > state)
+                       if (partial_match(ast_get_context_name(c), a->word, len) && ++which > a->n)
                                res = strdup(ast_get_context_name(c));
                ast_unlock_contexts();
                return res;
-       } else if (pos == 5) {
-               return state == 0 ? strdup("replace") : NULL;
+       } else if (a->pos == 6) {
+               return a->n == 0 ? strdup("replace") : NULL;
        }
        return NULL;
 }
@@ -1064,60 +1042,74 @@ static char *complete_context_add_extension(const char *line, const char *word,
 /*!
  * IGNOREPAT CLI stuff
  */
-static int handle_context_add_ignorepat(int fd, int argc, char *argv[])
+static char *handle_cli_dialplan_add_ignorepat(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-       if (argc != 5)
-               return RESULT_SHOWUSAGE;
-       if (strcmp(argv[3], "into"))
-               return RESULT_SHOWUSAGE;
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan add ignorepat";
+               e->usage =
+                       "Usage: dialplan add ignorepat <pattern> into <context>\n"
+                       "       This command adds a new ignore pattern into context <context>\n"
+                       "\n"
+                       "Example: dialplan add ignorepat _3XX into local\n";
+               return NULL;
+       case CLI_GENERATE:
+               return complete_dialplan_add_ignorepat(a);
+       }
 
-       if (ast_context_add_ignorepat(argv[4], argv[2], registrar)) {
+       if (a->argc != 6)
+               return CLI_SHOWUSAGE;
+
+       if (strcmp(a->argv[4], "into"))
+               return CLI_SHOWUSAGE;
+
+       if (ast_context_add_ignorepat(a->argv[5], a->argv[3], registrar)) {
                switch (errno) {
                case ENOMEM:
-                       ast_cli(fd, "Out of free memory\n");
+                       ast_cli(a->fd, "Out of free memory\n");
                        break;
 
                case ENOENT:
-                       ast_cli(fd, "There is no existence of '%s' context\n", argv[4]);
+                       ast_cli(a->fd, "There is no existence of '%s' context\n", a->argv[5]);
                        break;
 
                case EEXIST:
-                       ast_cli(fd, "Ignore pattern '%s' already included in '%s' context\n",
-                               argv[2], argv[4]);
+                       ast_cli(a->fd, "Ignore pattern '%s' already included in '%s' context\n",
+                               a->argv[3], a->argv[5]);
                        break;
 
                case EBUSY:
-                       ast_cli(fd, "Failed to lock context(s) list, please, try again later\n");
+                       ast_cli(a->fd, "Failed to lock context(s) list, please, try again later\n");
                        break;
 
                default:
-                       ast_cli(fd, "Failed to add ingore pattern '%s' into '%s' context\n",
-                               argv[2], argv[4]);
+                       ast_cli(a->fd, "Failed to add ingore pattern '%s' into '%s' context\n",
+                               a->argv[3], a->argv[5]);
                        break;
                }
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
-       ast_cli(fd, "Ignore pattern '%s' added into '%s' context\n",
-               argv[2], argv[4]);
-       return RESULT_SUCCESS;
+       ast_cli(a->fd, "Ignore pattern '%s' added into '%s' context\n",
+               a->argv[3], a->argv[5]);
+
+       return CLI_SUCCESS;
 }
 
-static char *complete_context_add_ignorepat(const char *line, const char *word,
-       int pos, int state)
+static char *complete_dialplan_add_ignorepat(struct ast_cli_args *a)
 {
-       if (pos == 3)
-               return state == 0 ? strdup("into") : NULL;
-       else if (pos == 4) {
+       if (a->pos == 4)
+               return a->n == 0 ? strdup("into") : NULL;
+       else if (a->pos == 5) {
                struct ast_context *c;
                int which = 0;
                char *dupline, *ignorepat = NULL;
                const char *s;
                char *ret = NULL;
-               int len = strlen(word);
+               int len = strlen(a->word);
 
-               /* XXX skip first two words 'add' 'ignorepat' */
-               s = skip_words(line, 2);
+               /* XXX skip first three words 'dialplan' 'add' 'ignorepat' */
+               s = skip_words(a->line, 3);
                if (s == NULL)
                        return NULL;
                dupline = strdup(s);
@@ -1127,7 +1119,7 @@ static char *complete_context_add_ignorepat(const char *line, const char *word,
                }
                ignorepat = strsep(&dupline, " ");
 
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_ERROR, "Failed to lock contexts list\n");
                        return NULL;
                }
@@ -1135,16 +1127,15 @@ static char *complete_context_add_ignorepat(const char *line, const char *word,
                for (c = NULL; !ret && (c = ast_walk_contexts(c));) {
                        int found = 0;
 
-                       if (!partial_match(ast_get_context_name(c), word, len))
+                       if (!partial_match(ast_get_context_name(c), a->word, len))
                                continue; /* not mine */
                        if (ignorepat) /* there must be one, right ? */
                                found = lookup_c_ip(c, ignorepat);
-                       if (!found && ++which > state)
+                       if (!found && ++which > a->n)
                                ret = strdup(ast_get_context_name(c));
                }
 
-               if (ignorepat)
-                       free(ignorepat);
+               free(ignorepat);
                ast_unlock_contexts();
                return ret;
        }
@@ -1152,60 +1143,64 @@ static char *complete_context_add_ignorepat(const char *line, const char *word,
        return NULL;
 }
 
-static int handle_context_remove_ignorepat(int fd, int argc, char *argv[])
+static char *handle_cli_dialplan_remove_ignorepat(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
-       if (argc != 5)
-               return RESULT_SHOWUSAGE;
-       if (strcmp(argv[3], "from"))
-               return RESULT_SHOWUSAGE;
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan remove ignorepat";
+               e->usage =
+                       "Usage: dialplan remove ignorepat <pattern> from <context>\n"
+                       "       This command removes an ignore pattern from context <context>\n"
+                       "\n"
+                       "Example: dialplan remove ignorepat _3XX from local\n";
+               return NULL;
+       case CLI_GENERATE:
+               return complete_dialplan_remove_ignorepat(a);
+       }
 
-       if (ast_context_remove_ignorepat(argv[4], argv[2], registrar)) {
+       if (a->argc != 6)
+               return CLI_SHOWUSAGE;
+
+       if (strcmp(a->argv[4], "from"))
+               return CLI_SHOWUSAGE;
+
+       if (ast_context_remove_ignorepat(a->argv[5], a->argv[3], registrar)) {
                switch (errno) {
                case EBUSY:
-                       ast_cli(fd, "Failed to lock context(s) list, please try again later\n");
+                       ast_cli(a->fd, "Failed to lock context(s) list, please try again later\n");
                        break;
 
                case ENOENT:
-                       ast_cli(fd, "There is no existence of '%s' context\n", argv[4]);
+                       ast_cli(a->fd, "There is no existence of '%s' context\n", a->argv[5]);
                        break;
 
                case EINVAL:
-                       ast_cli(fd, "There is no existence of '%s' ignore pattern in '%s' context\n",
-                                       argv[2], argv[4]);
+                       ast_cli(a->fd, "There is no existence of '%s' ignore pattern in '%s' context\n",
+                                       a->argv[3], a->argv[5]);
                        break;
 
                default:
-                       ast_cli(fd, "Failed to remove ignore pattern '%s' from '%s' context\n", argv[2], argv[4]);
+                       ast_cli(a->fd, "Failed to remove ignore pattern '%s' from '%s' context\n",
+                                       a->argv[3], a->argv[5]);
                        break;
                }
-               return RESULT_FAILURE;
+               return CLI_FAILURE;
        }
 
-       ast_cli(fd, "Ignore pattern '%s' removed from '%s' context\n",
-               argv[2], argv[4]);
-       return RESULT_SUCCESS;
-}
-
-static int pbx_load_module(void);
-
-static int handle_reload_extensions(int fd, int argc, char *argv[])
-{
-       if (argc!=2)
-               return RESULT_SHOWUSAGE;
-       pbx_load_module();
-       return RESULT_SUCCESS;
+       ast_cli(a->fd, "Ignore pattern '%s' removed from '%s' context\n",
+               a->argv[3], a->argv[5]);
+       return CLI_SUCCESS;
 }
 
-static char *complete_context_remove_ignorepat(const char *line, const char *word,
-       int pos, int state)
+static char *complete_dialplan_remove_ignorepat(struct ast_cli_args *a)
 {
        struct ast_context *c;
        int which = 0;
        char *ret = NULL;
 
-       if (pos == 2) {
-               int len = strlen(word);
-               if (ast_lock_contexts()) {
+       if (a->pos == 3) {
+               int len = strlen(a->word);
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_WARNING, "Failed to lock contexts list\n");
                        return NULL;
                }
@@ -1213,11 +1208,11 @@ static char *complete_context_remove_ignorepat(const char *line, const char *wor
                for (c = NULL; !ret && (c = ast_walk_contexts(c));) {
                        struct ast_ignorepat *ip;
 
-                       if (ast_lock_context(c))        /* error, skip it */
+                       if (ast_rdlock_context(c))      /* error, skip it */
                                continue;
                        
                        for (ip = NULL; !ret && (ip = ast_walk_context_ignorepats(c, ip));) {
-                               if (partial_match(ast_get_ignorepat_name(ip), word, len) && ++which > state) {
+                               if (partial_match(ast_get_ignorepat_name(ip), a->word, len) && ++which > a->n) {
                                        /* n-th match */
                                        struct ast_context *cw = NULL;
                                        int found = 0;
@@ -1233,13 +1228,13 @@ static char *complete_context_remove_ignorepat(const char *line, const char *wor
                }
                ast_unlock_contexts();
                return ret;
-       } else if (pos == 3) {
-                return state == 0 ? strdup("from") : NULL;
-       } else if (pos == 4) { /* XXX check this */
+       } else if (a->pos == 4) {
+                return a->n == 0 ? strdup("from") : NULL;
+       } else if (a->pos == 5) { /* XXX check this */
                char *dupline, *duplinet, *ignorepat;
-               int len = strlen(word);
+               int len = strlen(a->word);
 
-               dupline = strdup(line);
+               dupline = strdup(a->line);
                if (!dupline) {
                        ast_log(LOG_WARNING, "Out of free memory\n");
                        return NULL;
@@ -1255,18 +1250,18 @@ static char *complete_context_remove_ignorepat(const char *line, const char *wor
                        return NULL;
                }
 
-               if (ast_lock_contexts()) {
+               if (ast_rdlock_contexts()) {
                        ast_log(LOG_WARNING, "Failed to lock contexts list\n");
                        free(dupline);
                        return NULL;
                }
 
                for (c = NULL; !ret && (c = ast_walk_contexts(c)); ) {
-                       if (ast_lock_context(c))        /* fail, skip it */
+                       if (ast_rdlock_context(c))      /* fail, skip it */
                                continue;
-                       if (!partial_match(ast_get_context_name(c), word, len))
+                       if (!partial_match(ast_get_context_name(c), a->word, len))
                                continue;
-                       if (lookup_c_ip(c, ignorepat) && ++which > state)
+                       if (lookup_c_ip(c, ignorepat) && ++which > a->n)
                                ret = strdup(ast_get_context_name(c));
                        ast_unlock_context(c);
                }
@@ -1278,220 +1273,329 @@ static char *complete_context_remove_ignorepat(const char *line, const char *wor
        return NULL;
 }
 
+static int pbx_load_module(void);
+
+static char *handle_cli_dialplan_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "dialplan reload";
+               e->usage =
+                       "Usage: dialplan reload\n"
+                       "       Reload extensions.conf without reloading any other\n"
+                       "       modules.  This command does not delete global variables\n"
+                       "       unless clearglobalvars is set to yes in extensions.conf\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;
+       }
+
+       if (a->argc != 2)
+               return CLI_SHOWUSAGE;
+
+       if (clearglobalvars_config)
+               pbx_builtin_clear_globals();
+
+       pbx_load_module();
+       ast_cli(a->fd, "Dialplan reloaded.\n");
+       return CLI_SUCCESS;
+}
+
 /*!
  * CLI entries for commands provided by this module
  */
-static struct ast_cli_entry context_dont_include_cli =
-       { { "dont", "include", NULL }, handle_context_dont_include,
-               "Remove a specified include from context", context_dont_include_help,
-               complete_context_dont_include };
-
-static struct ast_cli_entry context_remove_extension_cli =
-       { { "remove", "extension", NULL }, handle_context_remove_extension,
-               "Remove a specified extension", context_remove_extension_help,
-               complete_context_remove_extension };
-
-static struct ast_cli_entry context_add_include_cli =
-       { { "include", "context", NULL }, handle_context_add_include,
-               "Include context in other context", context_add_include_help,
-               complete_context_add_include };
-
-static struct ast_cli_entry save_dialplan_cli =
-       { { "save", "dialplan", NULL }, handle_save_dialplan,
-               "Save dialplan", save_dialplan_help };
-
-static struct ast_cli_entry context_add_extension_cli =
-       { { "add", "extension", NULL }, handle_context_add_extension,
-               "Add new extension into context", context_add_extension_help,
-               complete_context_add_extension };
-
-static struct ast_cli_entry context_add_ignorepat_cli =
-       { { "add", "ignorepat", NULL }, handle_context_add_ignorepat,
-               "Add new ignore pattern", context_add_ignorepat_help,
-               complete_context_add_ignorepat };
-
-static struct ast_cli_entry context_remove_ignorepat_cli =
-       { { "remove", "ignorepat", NULL }, handle_context_remove_ignorepat,
-               "Remove ignore pattern from context", context_remove_ignorepat_help,
-               complete_context_remove_ignorepat };
-
-static struct ast_cli_entry reload_extensions_cli = 
-       { { "extensions", "reload", NULL}, handle_reload_extensions,
-               "Reload extensions and *only* extensions", reload_extensions_help };
+static struct ast_cli_entry cli_pbx_config[] = {
+       AST_CLI_DEFINE(handle_cli_dialplan_add_extension,    "Add new extension into context"),
+       AST_CLI_DEFINE(handle_cli_dialplan_remove_extension, "Remove a specified extension"),
+       AST_CLI_DEFINE(handle_cli_dialplan_add_ignorepat,    "Add new ignore pattern"),
+       AST_CLI_DEFINE(handle_cli_dialplan_remove_ignorepat, "Remove ignore pattern from context"),
+       AST_CLI_DEFINE(handle_cli_dialplan_add_include,      "Include context in other context"),
+       AST_CLI_DEFINE(handle_cli_dialplan_remove_include,   "Remove a specified include from context"),
+       AST_CLI_DEFINE(handle_cli_dialplan_reload,           "Reload extensions and *only* extensions")
+};
+
+static struct ast_cli_entry cli_dialplan_save =
+       AST_CLI_DEFINE(handle_cli_dialplan_save, "Save dialplan");
 
 /*!
  * Standard module functions ...
  */
 static int unload_module(void)
 {
-       ast_cli_unregister(&context_add_extension_cli);
        if (static_config && !write_protect_config)
-               ast_cli_unregister(&save_dialplan_cli);
-       ast_cli_unregister(&context_add_include_cli);
-       ast_cli_unregister(&context_dont_include_cli);
-       ast_cli_unregister(&context_remove_extension_cli);
-       ast_cli_unregister(&context_remove_ignorepat_cli);
-       ast_cli_unregister(&context_add_ignorepat_cli);
-       ast_cli_unregister(&reload_extensions_cli);
+               ast_cli_unregister(&cli_dialplan_save);
+       if (overrideswitch_config) {
+               ast_free(overrideswitch_config);
+       }
+       ast_cli_unregister_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config));
        ast_context_destroy(NULL, registrar);
        return 0;
 }
 
+/*!\note Protect against misparsing based upon commas in the middle of fields
+ * like character classes.  We've taken steps to permit pretty much every other
+ * printable character in a character class, so properly handling a comma at
+ * this level is a natural extension.  This is almost like the standard
+ * application parser in app.c, except that it handles square brackets. */
+static char *pbx_strsep(char **destructible, const char *delim)
+{
+       int square = 0;
+       char *res = *destructible;
+       for (; destructible && *destructible && **destructible; (*destructible)++) {
+               if (**destructible == '[' && !strchr(delim, '[')) {
+                       square++;
+               } else if (**destructible == ']' && !strchr(delim, ']')) {
+                       if (square) {
+                               square--;
+                       }
+               } else if (**destructible == '\\' && !strchr(delim, '\\')) {
+                       (*destructible)++;
+               } else if (strchr(delim, **destructible) && !square) {
+                       **destructible = '\0';
+                       (*destructible)++;
+                       break;
+               }
+       }
+       if (destructible && *destructible && **destructible == '\0') {
+               *destructible = NULL;
+       }
+       return res;
+}
+
 static int pbx_load_config(const char *config_file)
 {
        struct ast_config *cfg;
        char *end;
        char *label;
+#ifdef LOW_MEMORY
        char realvalue[256];
+#else
+       char realvalue[8192];
+#endif
        int lastpri = -2;
        struct ast_context *con;
        struct ast_variable *v;
-       char *cxt;
-
-       cfg = ast_config_load(config_file);
-       if (!cfg)
+       const char *cxt;
+       const char *aft;
+       const char *newpm, *ovsw;
+       struct ast_flags config_flags = { 0 };
+       char lastextension[256];
+       cfg = ast_config_load(config_file, config_flags);
+       if (!cfg || cfg == CONFIG_STATUS_FILEINVALID)
                return 0;
 
        /* Use existing config to populate the PBX table */
        static_config = ast_true(ast_variable_retrieve(cfg, "general", "static"));
        write_protect_config = ast_true(ast_variable_retrieve(cfg, "general", "writeprotect"));
-       autofallthrough_config = ast_true(ast_variable_retrieve(cfg, "general", "autofallthrough"));
+       if ((aft = ast_variable_retrieve(cfg, "general", "autofallthrough")))
+               autofallthrough_config = ast_true(aft);
+       if ((newpm = ast_variable_retrieve(cfg, "general", "extenpatternmatchnew")))
+               extenpatternmatchnew_config = ast_true(newpm);
        clearglobalvars_config = ast_true(ast_variable_retrieve(cfg, "general", "clearglobalvars"));
-       ast_set2_flag(&ast_options, ast_true(ast_variable_retrieve(cfg, "general", "priorityjumping")), AST_OPT_FLAG_PRIORITY_JUMPING);
+       if ((ovsw = ast_variable_retrieve(cfg, "general", "overrideswitch"))) {
+               if (overrideswitch_config) {
+                       ast_free(overrideswitch_config);
+               }
+               if (!ast_strlen_zero(ovsw)) {
+                       overrideswitch_config = ast_strdup(ovsw);
+               } else {
+                       overrideswitch_config = NULL;
+               }
+       }
 
-       if ((cxt = ast_variable_retrieve(cfg, "general", "userscontext"))) 
-               ast_copy_string(userscontext, cxt, sizeof(userscontext));
-       else
-               ast_copy_string(userscontext, "default", sizeof(userscontext));
+       ast_copy_string(userscontext, ast_variable_retrieve(cfg, "general", "userscontext") ?: "default", sizeof(userscontext));
                                                                    
        for (v = ast_variable_browse(cfg, "globals"); v; v = v->next) {
-               memset(realvalue, 0, sizeof(realvalue));
                pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
                pbx_builtin_setvar_helper(NULL, v->name, realvalue);
        }
-       for (cxt = NULL; (cxt = ast_category_browse(cfg, cxt)); ) {
+       for (cxt = ast_category_browse(cfg, NULL);
+            cxt;
+            cxt = ast_category_browse(cfg, cxt)) {
                /* All categories but "general" or "globals" are considered contexts */
-               if (!strcasecmp(cxt, "general") || !strcasecmp(cxt, "globals"))
+               if (!strcasecmp(cxt, "general") || !strcasecmp(cxt, "globals")) {
                        continue;
-               con=ast_context_find_or_create(&local_contexts,cxt, registrar);
-               if (con == NULL)
+               }
+               if (!(con = ast_context_find_or_create(&local_contexts, local_table, cxt, registrar))) {
                        continue;
+               }
+
+               /* Reset continuation items at the beginning of each context */
+               lastextension[0] = '\0';
+               lastpri = -2;
 
                for (v = ast_variable_browse(cfg, cxt); v; v = v->next) {
-                       if (!strcasecmp(v->name, "exten")) {
-                               char *tc = ast_strdup(v->value);
-                               if (tc) {
-                                       int ipri = -2;
-                                       char realext[256]="";
-                                       char *plus, *firstp, *firstc;
-                                       char *pri, *appl, *data, *cidmatch;
-                                       char *stringp = tc;
-                                       char *ext = strsep(&stringp, ",");
-                                       if (!ext)
-                                               ext="";
-                                       pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1);
-                                       cidmatch = strchr(realext, '/');
-                                       if (cidmatch) {
-                                               *cidmatch++ = '\0';
-                                               ast_shrink_phone_number(cidmatch);
+                       char *tc = NULL;
+                       char realext[256] = "";
+                       char *stringp, *ext;
+
+                       if (!strncasecmp(v->name, "same", 4)) {
+                               if (ast_strlen_zero(lastextension)) {
+                                       ast_log(LOG_ERROR, "No previous pattern in the first entry of context '%s' to match '%s' at line %d!\n", cxt, v->name, v->lineno);
+                                       continue;
+                               }
+                               if ((stringp = tc = ast_strdup(v->value))) {
+                                       ast_copy_string(realext, lastextension, sizeof(realext));
+                                       goto process_extension;
+                               }
+                       } else if (!strcasecmp(v->name, "exten")) {
+                               int ipri;
+                               char *plus, *firstp;
+                               char *pri, *appl, *data, *cidmatch;
+
+                               if (!(stringp = tc = ast_strdup(v->value))) {
+                                       continue;
+                               }
+
+                               ext = S_OR(pbx_strsep(&stringp, ","), "");
+                               pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1);
+                               ast_copy_string(lastextension, realext, sizeof(lastextension));
+process_extension:
+                               ipri = -2;
+                               if ((cidmatch = strchr(realext, '/'))) {
+                                       *cidmatch++ = '\0';
+                                       ast_shrink_phone_number(cidmatch);
+                               }
+                               pri = ast_strip(S_OR(strsep(&stringp, ","), ""));
+                               if ((label = strchr(pri, '('))) {
+                                       *label++ = '\0';
+                                       if ((end = strchr(label, ')'))) {
+                                               *end = '\0';
+                                       } else {
+                                               ast_log(LOG_WARNING, "Label missing trailing ')' at line %d\n", v->lineno);
+                                               ast_free(tc);
+                                               continue;
                                        }
-                                       pri = strsep(&stringp, ",");
-                                       if (!pri)
-                                               pri="";
-                                       label = strchr(pri, '(');
-                                       if (label) {
-                                               *label++ = '\0';
-                                               end = strchr(label, ')');
-                                               if (end)
-                                                       *end = '\0';
-                                               else
-                                                       ast_log(LOG_WARNING, "Label missing trailing ')' at line %d\n", v->lineno);
+                               }
+                               if ((plus = strchr(pri, '+'))) {
+                                       *plus++ = '\0';
+                               }
+                               if (!strcmp(pri,"hint")) {
+                                       ipri = PRIORITY_HINT;
+                               } else if (!strcmp(pri, "next") || !strcmp(pri, "n")) {
+                                       if (lastpri > -2) {
+                                               ipri = lastpri + 1;
+                                       } else {
+                                               ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry at line %d!\n", v->lineno);
+                                               ast_free(tc);
+                                               continue;
                                        }
-                                       plus = strchr(pri, '+');
-                                       if (plus)
-                                               *plus++ = '\0';
-                                       if (!strcmp(pri,"hint"))
-                                               ipri=PRIORITY_HINT;
-                                       else if (!strcmp(pri, "next") || !strcmp(pri, "n")) {
-                                               if (lastpri > -2)
-                                                       ipri = lastpri + 1;
-                                               else
-                                                       ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry!\n");
-                                       } else if (!strcmp(pri, "same") || !strcmp(pri, "s")) {
-                                               if (lastpri > -2)
-                                                       ipri = lastpri;
-                                               else
-                                                       ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry!\n");
-                                       } else if (sscanf(pri, "%d", &ipri) != 1 &&
-                                           (ipri = ast_findlabel_extension2(NULL, con, realext, pri, cidmatch)) < 1) {
-                                               ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno);
-                                               ipri = 0;
+                               } else if (!strcmp(pri, "same") || !strcmp(pri, "s")) {
+                                       if (lastpri > -2) {
+                                               ipri = lastpri;
+                                       } else {
+                                               ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry at line %d!\n", v->lineno);
+                                               ast_free(tc);
+                                               continue;
                                        }
-                                       appl = S_OR(stringp, "");
-                                       /* Find the first occurrence of either '(' or ',' */
-                                       firstc = strchr(appl, ',');
-                                       firstp = strchr(appl, '(');
-                                       if (firstc && (!firstp || firstc < firstp)) {
-                                               /* comma found, no parenthesis */
-                                               /* or both found, but comma found first */
-                                               appl = strsep(&stringp, ",");
-                                               data = stringp;
-                                       } else if (!firstc && !firstp) {
-                                               /* Neither found */
+                               } else if (sscanf(pri, "%30d", &ipri) != 1 &&
+                                          (ipri = ast_findlabel_extension2(NULL, con, realext, pri, cidmatch)) < 1) {
+                                       ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno);
+                                       ipri = 0;
+                                       ast_free(tc);
+                                       continue;
+                               } else if (ipri < 1) {
+                                       ast_log(LOG_WARNING, "Invalid priority '%s' at line %d\n", pri, v->lineno);
+                                       ast_free(tc);
+                                       continue;
+                               }
+                               appl = S_OR(stringp, "");
+                               /* Find the first occurrence of '(' */
+                               if (!(firstp = strchr(appl, '('))) {
+                                       /* No arguments */
+                                       data = "";
+                               } else {
+                                       char *orig_appl = ast_strdup(appl);
+
+                                       if (!orig_appl) {
+                                               ast_free(tc);
+                                               continue;
+                                       }
+
+                                       appl = strsep(&stringp, "(");
+
+                                       /* check if there are variables or expressions without an application, like: exten => 100,hint,DAHDI/g0/${GLOBAL(var)}  */
+                                       if (strstr(appl, "${") || strstr(appl, "$[")){
+                                               /* set appl to original one */
+                                               strcpy(appl, orig_appl);
+                                               /* set no data */
                                                data = "";
+                                       /* no variable before application found -> go ahead */
                                        } else {
-                                               /* Final remaining case is parenthesis found first */
-                                               appl = strsep(&stringp, "(");
-                                               data = stringp;
-                                               end = strrchr(data, ')');
+                                               data = S_OR(stringp, "");
                                                if ((end = strrchr(data, ')'))) {
                                                        *end = '\0';
                                                } else {
-                                                       ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data);
+                                                       ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s' at line %d\n", appl, data, v->lineno);
                                                }
-                                               ast_process_quotes_and_slashes(data, ',', '|');
                                        }
+                                       ast_free(orig_appl);
+                               }
 
-                                       if (!data)
-                                               data="";
-                                       appl = ast_skip_blanks(appl);
-                                       if (ipri) {
-                                               if (plus)
-                                                       ipri += atoi(plus);
-                                               lastpri = ipri;
-                                               if (!ast_opt_dont_warn && !strcmp(realext, "_."))
-                                                       ast_log(LOG_WARNING, "The use of '_.' for an extension is strongly discouraged and can have unexpected behavior.  Please use '_X.' instead at line %d\n", v->lineno);
-                                               if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, strdup(data), ast_free, registrar)) {
-                                                       ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno);
-                                               }
+                               appl = ast_skip_blanks(appl);
+                               if (ipri) {
+                                       if (plus) {
+                                               ipri += atoi(plus);
+                                       }
+                                       lastpri = ipri;
+                                       if (!ast_opt_dont_warn && (!strcmp(realext, "_.") || !strcmp(realext, "_!"))) {
+                                               ast_log(LOG_WARNING, "The use of '%s' for an extension is strongly discouraged and can have unexpected behavior.  Please use '_X%c' instead at line %d\n", realext, realext[1], v->lineno);
+                                       }
+                                       if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, strdup(data), ast_free_ptr, registrar)) {
+                                               ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno);
                                        }
-                                       free(tc);
                                }
+                               free(tc);
                        } else if (!strcasecmp(v->name, "include")) {
-                               memset(realvalue, 0, sizeof(realvalue));
                                pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
-                               if (ast_context_add_include2(con, realvalue, registrar))
-                                       ast_log(LOG_WARNING, "Unable to include context '%s' in context '%s'\n", v->value, cxt);
+                               if (ast_context_add_include2(con, realvalue, registrar)) {
+                                       switch (errno) {
+                                               case ENOMEM:
+                                                       ast_log(LOG_WARNING, "Out of memory for context addition\n");
+                                                       break;
+
+                                               case EBUSY:
+                                                       ast_log(LOG_WARNING, "Failed to lock context(s) list, please try again later\n");
+                                                       break;
+
+                                               case EEXIST:
+                                                       ast_log(LOG_WARNING, "Context '%s' already included in '%s' context on include at line %d\n",
+                                                                       v->value, cxt, v->lineno);
+                                                       break;
+
+                                               case ENOENT:
+                                               case EINVAL:
+                                                       ast_log(LOG_WARNING, "There is no existence of context '%s' included at line %d\n",
+                                                                       errno == ENOENT ? v->value : cxt, v->lineno);
+                                                       break;
+
+                                               default:
+                                                       ast_log(LOG_WARNING, "Failed to include '%s' in '%s' context at line %d\n",
+                                                                       v->value, cxt, v->lineno);
+                                                       break;
+                                       }
+                               }
                        } else if (!strcasecmp(v->name, "ignorepat")) {
-                               memset(realvalue, 0, sizeof(realvalue));
                                pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
-                               if (ast_context_add_ignorepat2(con, realvalue, registrar))
-                                       ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s'\n", v->value, cxt);
+                               if (ast_context_add_ignorepat2(con, realvalue, registrar)) {
+                                       ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s' at line %d\n", v->value, cxt, v->lineno);
+                               }
                        } else if (!strcasecmp(v->name, "switch") || !strcasecmp(v->name, "lswitch") || !strcasecmp(v->name, "eswitch")) {
-                               char *stringp= realvalue;
+                               char *stringp = realvalue;
                                char *appl, *data;
-
-                               memset(realvalue, 0, sizeof(realvalue));
-                               if (!strcasecmp(v->name, "switch"))
+                               
+                               if (!strcasecmp(v->name, "switch")) {
                                        pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
-                               else
+                               } else {
                                        ast_copy_string(realvalue, v->value, sizeof(realvalue));
+                               }
                                appl = strsep(&stringp, "/");
-                               data = strsep(&stringp, ""); /* XXX what for ? */
-                               if (!data)
-                                       data = "";
-                               if (ast_context_add_switch2(con, appl, data, !strcasecmp(v->name, "eswitch"), registrar))
-                                       ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s'\n", v->value, cxt);
+                               data = S_OR(stringp, "");
+                               if (ast_context_add_switch2(con, appl, data, !strcasecmp(v->name, "eswitch"), registrar)) {
+                                       ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s' at line %d\n", v->value, cxt, v->lineno);
+                               }
+                       } else {
+                               ast_log(LOG_WARNING, "==!!== Unknown directive: %s at line %d -- IGNORING!!!\n", v->name, v->lineno);
                        }
                }
        }
@@ -1515,23 +1619,22 @@ static void pbx_load_users(void)
 {
        struct ast_config *cfg;
        char *cat, *chan;
-       char *zapchan;
-       char *hasexten;
+       const char *dahdichan;
+       const char *hasexten, *altexts;
        char tmp[256];
        char iface[256];
-       char zapcopy[256];
+       char dahdicopy[256];
+       char *ext, altcopy[256];
        char *c;
        int len;
        int hasvoicemail;
        int start, finish, x;
-       struct ast_context *con;
+       struct ast_context *con = NULL;
+       struct ast_flags config_flags = { 0 };
        
-       cfg = ast_config_load("users.conf");
+       cfg = ast_config_load("users.conf", config_flags);
        if (!cfg)
                return;
-       con = ast_context_find_or_create(&local_contexts, userscontext, registrar);
-       if (!con)
-               return;
 
        for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) {
                if (!strcasecmp(cat, "general"))
@@ -1543,24 +1646,28 @@ static void pbx_load_users(void)
                        append_interface(iface, sizeof(iface), tmp);
                }
                if (ast_true(ast_config_option(cfg, cat, "hasiax"))) {
-                       snprintf(tmp, sizeof(tmp), "IAX/%s", cat);
+                       snprintf(tmp, sizeof(tmp), "IAX2/%s", cat);
+                       append_interface(iface, sizeof(iface), tmp);
+               }
+               if (ast_true(ast_config_option(cfg, cat, "hash323"))) {
+                       snprintf(tmp, sizeof(tmp), "H323/%s", cat);
                        append_interface(iface, sizeof(iface), tmp);
                }
                hasexten = ast_config_option(cfg, cat, "hasexten");
                if (hasexten && !ast_true(hasexten))
                        continue;
                hasvoicemail = ast_true(ast_config_option(cfg, cat, "hasvoicemail"));
-               zapchan = ast_variable_retrieve(cfg, cat, "zapchan");
-               if (!zapchan)
-                       zapchan = ast_variable_retrieve(cfg, "general", "zapchan");
-               if (!ast_strlen_zero(zapchan)) {
-                       ast_copy_string(zapcopy, zapchan, sizeof(zapcopy));
-                       c = zapcopy;
+               dahdichan = ast_variable_retrieve(cfg, cat, "dahdichan");
+               if (!dahdichan)
+                       dahdichan = ast_variable_retrieve(cfg, "general", "dahdichan");
+               if (!ast_strlen_zero(dahdichan)) {
+                       ast_copy_string(dahdicopy, dahdichan, sizeof(dahdicopy));
+                       c = dahdicopy;
                        chan = strsep(&c, ",");
                        while (chan) {
-                               if (sscanf(chan, "%d-%d", &start, &finish) == 2) {
+                               if (sscanf(chan, "%30d-%30d", &start, &finish) == 2) {
                                        /* Range */
-                               } else if (sscanf(chan, "%d", &start)) {
+                               } else if (sscanf(chan, "%30d", &start)) {
                                        /* Just one */
                                        finish = start;
                                } else {
@@ -1572,21 +1679,42 @@ static void pbx_load_users(void)
                                        start = x;
                                }
                                for (x = start; x <= finish; x++) {
-                                       snprintf(tmp, sizeof(tmp), "Zap/%d", x);
+                                       snprintf(tmp, sizeof(tmp), "DAHDI/%d", x);
                                        append_interface(iface, sizeof(iface), tmp);
                                }
                                chan = strsep(&c, ",");
                        }
                }
                if (!ast_strlen_zero(iface)) {
+                       /* Only create a context here when it is really needed. Otherwise default empty context
+                       created by pbx_config may conflict with the one explicitly created by pbx_ael */
+                       if (!con)
+                               con = ast_context_find_or_create(&local_contexts, local_table, userscontext, registrar);
+
+                       if (!con) {
+                               ast_log(LOG_ERROR, "Can't find/create user context '%s'\n", userscontext);
+                               return;
+                       }
+
                        /* Add hint */
-                       ast_add_extension2(con, 0, cat, -1, NULL, NULL, iface, strdup(""), ast_free, registrar);
+                       ast_add_extension2(con, 0, cat, -1, NULL, NULL, iface, NULL, NULL, registrar);
                        /* If voicemail, use "stdexten" else use plain old dial */
                        if (hasvoicemail) {
-                               snprintf(tmp, sizeof(tmp), "stdexten|%s|${HINT}", cat);
-                               ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Macro", strdup(tmp), ast_free, registrar);
+                               snprintf(tmp, sizeof(tmp), "stdexten,%s,${HINT}", cat);
+                               ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Macro", strdup(tmp), ast_free_ptr, registrar);
                        } else {
-                               ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free, registrar);
+                               ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
+                       }
+                       altexts = ast_variable_retrieve(cfg, cat, "alternateexts");
+                       if (!ast_strlen_zero(altexts)) {
+                               snprintf(tmp, sizeof(tmp), "%s,1", cat);
+                               ast_copy_string(altcopy, altexts, sizeof(altcopy));
+                               c = altcopy;
+                               ext = strsep(&c, ",");
+                               while (ext) {
+                                       ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free_ptr, registrar);
+                                       ext = strsep(&c, ",");
+                               }
                        }
                }
        }
@@ -1597,45 +1725,45 @@ static int pbx_load_module(void)
 {
        struct ast_context *con;
 
-       if(!pbx_load_config(config))
+       if (!local_table)
+               local_table = ast_hashtab_create(17, ast_hashtab_compare_contexts, ast_hashtab_resize_java, ast_hashtab_newsize_java, ast_hashtab_hash_contexts, 0);
+
+       if (!pbx_load_config(config))
                return AST_MODULE_LOAD_DECLINE;
        
        pbx_load_users();
 
-       ast_merge_contexts_and_delete(&local_contexts, registrar);
+       ast_merge_contexts_and_delete(&local_contexts, local_table, registrar);
+       local_table = NULL; /* the local table has been moved into the global one. */
+       local_contexts = NULL;
 
        for (con = NULL; (con = ast_walk_contexts(con));)
                ast_context_verify_includes(con);
 
+       pbx_set_overrideswitch(overrideswitch_config);
        pbx_set_autofallthrough(autofallthrough_config);
+       pbx_set_extenpatternmatchnew(extenpatternmatchnew_config);
 
-       return 0;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
 static int load_module(void)
 {
+       if (static_config && !write_protect_config)
+               ast_cli_register(&cli_dialplan_save);
+       ast_cli_register_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config));
+
        if (pbx_load_module())
                return AST_MODULE_LOAD_DECLINE;
-       ast_cli_register(&context_remove_extension_cli);
-       ast_cli_register(&context_dont_include_cli);
-       ast_cli_register(&context_add_include_cli);
-       if (static_config && !write_protect_config)
-               ast_cli_register(&save_dialplan_cli);
-       ast_cli_register(&context_add_extension_cli);
-       ast_cli_register(&context_add_ignorepat_cli);
-       ast_cli_register(&context_remove_ignorepat_cli);
-       ast_cli_register(&reload_extensions_cli);
 
-       return 0;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
 static int reload(void)
 {
        if (clearglobalvars_config)
                pbx_builtin_clear_globals();
-       pbx_load_module();
-       return 0;
+       return pbx_load_module();
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration",