aboutsummaryrefslogtreecommitdiffstats
path: root/utils/conf2ael.c
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-16 19:40:28 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-16 19:40:28 +0000
commit0fb9c73a989207650aa3ba603824e4593809611b (patch)
tree64c5f9f5ea46aab528e4877886c8a346f9a7dc5b /utils/conf2ael.c
parentf31085f99c91d5a1339d65deff7e6423f9af6595 (diff)
Many thanks to mvanbaak for his update to translate hints; I added the -d option for local testing purposes. This is from bug 10472
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79736 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils/conf2ael.c')
-rw-r--r--utils/conf2ael.c35
1 files changed, 31 insertions, 4 deletions
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 7616b305f..9b0f8a6c0 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -340,9 +340,17 @@ int main(int argc, char **argv)
struct ast_sw *sw = 0;
struct ast_ignorepat *ipi;
pval *incl=0;
+ int localdir = 0, i;
tree = 0;
tmptree = 0;
+
+ /* process the command line args */
+ for (i=1; i<argc; i++)
+ {
+ if (strcmp(argv[i],"-d")==0)
+ localdir =1;
+ }
/* 3 simple steps: */
/* 1. read in the extensions.conf config file
@@ -358,11 +366,15 @@ int main(int argc, char **argv)
printf(" The result will most likely need careful attention to\n");
printf(" finish the job!!!!!\n");
+ if (!localdir)
+ printf(" (You could use -d the use the extensions.conf in the current directory!)\n");
+
strcpy(ast_config_AST_CONFIG_DIR,"/etc/asterisk");
printf("Loading %s/%s...\n", ast_config_AST_CONFIG_DIR, config);
- localized_use_conf_dir();
+ if (!localdir)
+ localized_use_conf_dir();
localized_pbx_load_module();
printf("... Done!\n");
@@ -491,28 +503,43 @@ int main(int argc, char **argv)
pval *exten = pvalCreateNode(PV_EXTENSION);
pvalContextAddStatement(tmptree, exten);
pvalExtenSetName(exten, ast_strdup(eroot->exten));
-
+
if (eroot->peer) {
pval *block = pvalCreateNode(PV_STATEMENTBLOCK);
pvalExtenSetStatement(exten, block);
e = 0;
while ( (e = localized_walk_extension_priorities(eroot, e)) ) {
- /* printf(" %s(%s)\n", e->app, (char*)e->data); */
pval *statemnt = pvalCreateNode(PV_APPLICATION_CALL);
pval *args = pvalCreateNode(PV_WORD);
+ /* printf(" %s(%s)\n", e->app, (char*)e->data); */
+
pvalAppCallSetAppName(statemnt, ast_strdup(e->app));
pvalWordSetString(args, ast_strdup(e->data));
pvalAppCallAddArg(statemnt, args);
pvalStatementBlockAddStatement(block, statemnt);
}
- } else {
+ } else if (eroot->priority == -1) {
+
pval *statemnt = pvalCreateNode(PV_APPLICATION_CALL);
pval *args = pvalCreateNode(PV_WORD);
+ /* printf("Mike, we have a hint on exten %s with data %s\n", eroot->exten, eroot->app); */
+
+ pvalAppCallSetAppName(statemnt, "NoOp");
+ pvalWordSetString(args, ast_strdup(eroot->app));
+
+
+ pvalExtenSetStatement(exten, statemnt);
+ pvalExtenSetHints(exten, ast_strdup(eroot->app));
+ } else {
+
+ pval *statemnt = pvalCreateNode(PV_APPLICATION_CALL);
+ pval *args = pvalCreateNode(PV_WORD);
+
/* printf(" %s (%s)\n", eroot->app, (char *)eroot->data); */
pvalAppCallSetAppName(statemnt, ast_strdup(eroot->app));