[svn-commits] rmudgett: branch 10 r354217 - in /branches/10: ./ pbx/pbx_config.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Feb 6 17:09:54 CST 2012
Author: rmudgett
Date: Mon Feb 6 17:09:50 2012
New Revision: 354217
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=354217
Log:
Improved documentation of CLI "dialplan add extension" command.
* Documented dialplan add extension <exten>,<priority>,<app(<app-data>)>
format.
* Allow acceptance of command without the app-data value. There are many
applications that do no need any parameters so it is silly to require that
field for all commands.
* Fixed a couple ast_malloc/ast_free mismatches with ast_add_extension2()
calls.
(closes issue ASTERISK-19222)
Reported by: Andrey Solovyev
Tested by: rmudgett
........
Merged revisions 354216 from http://svn.asterisk.org/svn/asterisk/branches/1.8
Modified:
branches/10/ (props changed)
branches/10/pbx/pbx_config.c
Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: branches/10/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/pbx/pbx_config.c?view=diff&rev=354217&r1=354216&r2=354217
==============================================================================
--- branches/10/pbx/pbx_config.c (original)
+++ branches/10/pbx/pbx_config.c Mon Feb 6 17:09:50 2012
@@ -912,11 +912,16 @@
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"
+ "Usage: dialplan add extension <exten>,<priority>,<app> into <context> [replace]\n"
+ "\n"
+ " app can be either:\n"
+ " app-name\n"
+ " app-name(app-data)\n"
+ " app-name,<app-data>\n"
+ "\n"
+ " This command will add the new extension into <context>. If\n"
+ " an extension with the same priority already exists and the\n"
+ " 'replace' option is given we will replace the 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";
@@ -954,23 +959,27 @@
}
}
app = whole_exten;
- if (app && (start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
- *start = *end = '\0';
- app_data = start + 1;
- } else {
- if (app) {
+ if (app) {
+ if ((start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
+ *start = *end = '\0';
+ app_data = start + 1;
+ } else {
app_data = strchr(app, ',');
if (app_data) {
- *app_data = '\0';
- app_data++;
+ *app_data++ = '\0';
}
- } else
- app_data = NULL;
- }
-
- if (!exten || !prior || !app || (!app_data && iprior != PRIORITY_HINT))
+ }
+ } else {
+ app_data = NULL;
+ }
+
+ if (!exten || !prior || !app) {
return CLI_SHOWUSAGE;
-
+ }
+
+ if (!app_data) {
+ app_data = "";
+ }
into_context = a->argv[5];
if (!ast_context_find(into_context)) {
@@ -978,15 +987,13 @@
}
if (!ast_context_find_or_create(NULL, NULL, into_context, registrar)) {
- ast_cli(a->fd, "ast_context_find_or_create() failed\n");
- ast_cli(a->fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n", exten, prior, app, app_data, into_context);
+ ast_cli(a->fd, "Failed to add '%s,%s,%s(%s)' extension into '%s' context\n",
+ exten, prior, app, app_data, into_context);
return CLI_FAILURE;
}
- if (!app_data)
- app_data="";
if (ast_add_extension(into_context, a->argc == 7 ? 1 : 0, exten, iprior, NULL, cidmatch, app,
- (void *)strdup(app_data), ast_free_ptr, registrar)) {
+ ast_strdup(app_data), ast_free_ptr, registrar)) {
switch (errno) {
case ENOMEM:
ast_cli(a->fd, "Out of free memory\n");
@@ -1006,19 +1013,20 @@
break;
default:
- ast_cli(a->fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n",
+ ast_cli(a->fd, "Failed to add '%s,%s,%s(%s)' extension into '%s' context\n",
exten, prior, app, app_data, into_context);
break;
}
return CLI_FAILURE;
}
- if (a->argc == 7)
- ast_cli(a->fd, "Extension %s@%s (%s) replace by '%s,%s,%s,%s'\n",
+ if (a->argc == 7) {
+ ast_cli(a->fd, "Extension %s@%s (%s) replace by '%s,%s,%s(%s)'\n",
exten, into_context, prior, exten, prior, app, app_data);
- else
- ast_cli(a->fd, "Extension '%s,%s,%s,%s' added into '%s' context\n",
+ } else {
+ ast_cli(a->fd, "Extension '%s,%s,%s(%s)' added into '%s' context\n",
exten, prior, app, app_data, into_context);
+ }
return CLI_SUCCESS;
}
@@ -1575,7 +1583,7 @@
"The use of '%s' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X%c' instead at line %d of %s\n",
realext, realext[1], v->lineno, vfile);
}
- if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, strdup(data), ast_free_ptr, registrar)) {
+ if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, ast_strdup(data), ast_free_ptr, registrar)) {
ast_log(LOG_WARNING,
"Unable to register extension at line %d of %s\n",
v->lineno, vfile);
@@ -1744,9 +1752,9 @@
/* 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_ptr, registrar);
+ ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Macro", ast_strdup(tmp), ast_free_ptr, registrar);
} else {
- ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", strdup("${HINT}"), ast_free_ptr, registrar);
+ ast_add_extension2(con, 0, cat, 1, NULL, NULL, "Dial", ast_strdup("${HINT}"), ast_free_ptr, registrar);
}
altexts = ast_variable_retrieve(cfg, cat, "alternateexts");
if (!ast_strlen_zero(altexts)) {
@@ -1755,7 +1763,7 @@
c = altcopy;
ext = strsep(&c, ",");
while (ext) {
- ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", strdup(tmp), ast_free_ptr, registrar);
+ ast_add_extension2(con, 0, ext, 1, NULL, NULL, "Goto", ast_strdup(tmp), ast_free_ptr, registrar);
ext = strsep(&c, ",");
}
}
More information about the svn-commits
mailing list