[asterisk-commits] murf: trunk r39431 - /trunk/utils/ael_main.c
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Aug 8 18:17:48 MST 2006
Author: murf
Date: Tue Aug 8 20:17:47 2006
New Revision: 39431
URL: http://svn.digium.com/view/asterisk?rev=39431&view=rev
Log:
This commit adds the enhancemnt per bug 7606, adding
the -w option to aelparse.
Modified:
trunk/utils/ael_main.c
Modified: trunk/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/ael_main.c?rev=39431&r1=39430&r2=39431&view=diff
==============================================================================
--- trunk/utils/ael_main.c (original)
+++ trunk/utils/ael_main.c Tue Aug 8 20:17:47 2006
@@ -18,6 +18,58 @@
#include "asterisk/module.h"
#include "asterisk/ael_structs.h"
+struct namelist
+{
+ char name[100];
+ char name2[100];
+ struct namelist *next;
+};
+
+struct ast_context
+{
+ int extension_count;
+ char name[100];
+ char registrar[100];
+ struct namelist *includes;
+ struct namelist *ignorepats;
+ struct namelist *switches;
+ struct namelist *eswitches;
+
+ struct namelist *includes_last;
+ struct namelist *ignorepats_last;
+ struct namelist *switches_last;
+ struct namelist *eswitches_last;
+
+ struct ast_context *next;
+};
+
+#define ADD_LAST(headptr,memptr) if(!headptr){ headptr=(memptr); (headptr##_last)=(memptr);} else {(headptr##_last)->next = (memptr); (headptr##_last) = (memptr);}
+
+void destroy_namelist(struct namelist *x);
+void destroy_namelist(struct namelist *x)
+{
+ struct namelist *z,*z2;
+ for(z=x; z; z = z2)
+ {
+ z2 = z->next;
+ z->next = 0;
+ free(z);
+ }
+}
+
+struct namelist *create_name(char *name);
+struct namelist *create_name(char *name)
+{
+ struct namelist *x = (struct namelist *)calloc(sizeof(struct namelist),1);
+ strncpy(x->name,name,100);
+ return x;
+}
+
+struct ast_context *context_list;
+struct ast_context *last_context;
+struct namelist *globalvars;
+struct namelist *globalvars_last;
+
int conts=0, extens=0, priors=0;
char last_exten[18000];
char ast_config_AST_CONFIG_DIR[PATH_MAX];
@@ -27,15 +79,15 @@
void ast_cli_register_multiple(void);
void ast_register_file_version(void);
void ast_unregister_file_version(void);
-int ast_add_extension2(void *con,
+int ast_add_extension2(struct ast_context *con,
int replace, const char *extension, int priority, const char *label, const char *callerid,
const char *application, void *data, void (*datad)(void *),
const char *registrar);
void pbx_builtin_setvar(void *chan, void *data);
-void ast_context_create(void **extcontexts, const char *name, const char *registrar);
-void ast_context_add_ignorepat2(void *con, const char *value, const char *registrar);
-void ast_context_add_include2(void *con, const char *value, const char *registrar);
-void ast_context_add_switch2(void *con, const char *value, const char *data, int eval, const char *registrar);
+struct ast_context * ast_context_create(void **extcontexts, const char *name, const char *registrar);
+void ast_context_add_ignorepat2(struct ast_context *con, const char *value, const char *registrar);
+void ast_context_add_include2(struct ast_context *con, const char *value, const char *registrar);
+void ast_context_add_switch2(struct ast_context *con, const char *value, const char *data, int eval, const char *registrar);
void ast_merge_contexts_and_delete(void);
void ast_context_verify_includes(void);
struct ast_context * ast_walk_contexts(void);
@@ -45,8 +97,13 @@
char *ast_process_quotes_and_slashes(char *start, char find, char replace_with);
void ast_verbose(const char *fmt, ...);
struct ast_app *pbx_findapp(const char *app);
+void filter_leading_space_from_exprs(char *str);
+void filter_newlines(char *str);
static int no_comp = 0;
static int use_curr_dir = 0;
+static int dump_extensions = 0;
+static int FIRST_TIME = 0;
+static FILE *dumpfile;
struct ast_app *pbx_findapp(const char *app)
{
@@ -68,21 +125,22 @@
void ast_register_file_version(void)
{
if(!no_comp)
- printf("Executed ast_register_file_version();\n");
+ printf("Executed ast_register_file_version();\n");
}
void ast_unregister_file_version(void)
{
if(!no_comp)
- printf("Executed ast_unregister_file_version();\n");
-
-}
-int ast_add_extension2(void *con,
- int replace, const char *extension, int priority, const char *label, const char *callerid,
- const char *application, void *data, void (*datad)(void *),
- const char *registrar)
+ printf("Executed ast_unregister_file_version();\n");
+
+}
+int ast_add_extension2(struct ast_context *con,
+ int replace, const char *extension, int priority, const char *label, const char *callerid,
+ const char *application, void *data, void (*datad)(void *),
+ const char *registrar)
{
priors++;
+ con->extension_count++;
if (strcmp(extension,last_exten) != 0) {
extens++;
strcpy(last_exten, extension);
@@ -96,10 +154,61 @@
if (!application) {
application = "(null)";
}
- if(!no_comp)
- printf("Executed ast_add_extension2(con, rep=%d, exten=%s, priority=%d, label=%s, callerid=%s, appl=%s, data=%s, FREE, registrar=%s);\n",
- replace, extension, priority, label, callerid, application, (data?(char*)data:"(null)"), registrar);
-
+
+ if(!no_comp)
+ printf("Executed ast_add_extension2(context=%s, rep=%d, exten=%s, priority=%d, label=%s, callerid=%s, appl=%s, data=%s, FREE, registrar=%s);\n",
+ con->name, replace, extension, priority, label, callerid, application, (data?(char*)data:"(null)"), registrar);
+
+ if( dump_extensions && dumpfile ) {
+ struct namelist *n;
+
+ if( FIRST_TIME ) {
+ FIRST_TIME = 0;
+
+ if( globalvars )
+ fprintf(dumpfile,"[globals]\n");
+
+ for(n=globalvars;n;n=n->next) {
+ fprintf(dumpfile, "%s\n", n->name);
+ }
+ }
+
+ /* print out each extension , possibly the context header also */
+ if( con != last_context ) {
+ fprintf(dumpfile,"\n\n[%s]\n", con->name);
+ last_context = con;
+ for(n=con->ignorepats;n;n=n->next) {
+ fprintf(dumpfile, "ignorepat => %s\n", n->name);
+ }
+ for(n=con->includes;n;n=n->next) {
+ fprintf(dumpfile, "include => %s\n", n->name);
+ }
+ for(n=con->switches;n;n=n->next) {
+ fprintf(dumpfile, "switch => %s/%s\n", n->name, n->name2);
+ }
+ for(n=con->eswitches;n;n=n->next) {
+ fprintf(dumpfile, "eswitch => %s/%s\n", n->name, n->name2);
+ }
+
+ }
+ if( data ) {
+ filter_newlines((char*)data);
+ filter_leading_space_from_exprs((char*)data);
+
+ if( strcmp(label,"(null)") != 0 )
+ fprintf(dumpfile,"exten => %s,%d(%s),%s(%s)\n", extension, priority, label, application, (char*)data);
+ else
+ fprintf(dumpfile,"exten => %s,%d,%s(%s)\n", extension, priority, application, (char*)data);
+
+ } else {
+
+ if( strcmp(label,"(null)") != 0 )
+ fprintf(dumpfile,"exten => %s,%d(%s),%s\n", extension, priority, label, application);
+ else
+ fprintf(dumpfile,"exten => %s,%d,%s\n", extension, priority, application);
+ }
+ }
+
/* since add_extension2 is responsible for the malloc'd data stuff */
if( data )
free(data);
@@ -108,59 +217,94 @@
void pbx_builtin_setvar(void *chan, void *data)
{
- if(!no_comp)
- printf("Executed pbx_builtin_setvar(chan, data=%s);\n", (char*)data);
-}
-
-
-void ast_context_create(void **extcontexts, const char *name, const char *registrar)
-{
- if(!no_comp)
- printf("Executed ast_context_create(conts, name=%s, registrar=%s);\n", name, registrar);
+ struct namelist *x = create_name((char*)data);
+ if(!no_comp)
+ printf("Executed pbx_builtin_setvar(chan, data=%s);\n", (char*)data);
+
+ if( dump_extensions ) {
+ x = create_name((char*)data);
+ ADD_LAST(globalvars,x);
+ }
+}
+
+
+struct ast_context * ast_context_create(void **extcontexts, const char *name, const char *registrar)
+{
+ struct ast_context *x = (struct ast_context *)calloc(sizeof(struct ast_context),1);
+ x->next = context_list;
+ context_list = x;
+ if(!no_comp)
+ printf("Executed ast_context_create(conts, name=%s, registrar=%s);\n", name, registrar);
conts++;
-}
-
-void ast_context_add_ignorepat2(void *con, const char *value, const char *registrar)
-{
- if(!no_comp)
- printf("Executed ast_context_add_ignorepat2(con, value=%s, registrar=%s);\n", value, registrar);
-}
-
-void ast_context_add_include2(void *con, const char *value, const char *registrar)
-{
- if(!no_comp)
- printf("Executed ast_context_add_include2(con, value=%s, registrar=%s);\n", value, registrar);
-}
-
-void ast_context_add_switch2(void *con, const char *value, const char *data, int eval, const char *registrar)
-{
- if(!no_comp)
- printf("Executed ast_context_add_switch2(con, value=%s, data=%s, eval=%d, registrar=%s);\n", value, data, eval, registrar);
+ strncpy(x->name,name,100);
+ strncpy(x->registrar,registrar,100);
+ return x;
+}
+
+void ast_context_add_ignorepat2(struct ast_context *con, const char *value, const char *registrar)
+{
+ if(!no_comp)
+ printf("Executed ast_context_add_ignorepat2(con, value=%s, registrar=%s);\n", value, registrar);
+ if( dump_extensions ) {
+ struct namelist *x;
+ x = create_name((char*)value);
+ ADD_LAST(con->ignorepats,x);
+ }
+}
+
+void ast_context_add_include2(struct ast_context *con, const char *value, const char *registrar)
+{
+ if(!no_comp)
+ printf("Executed ast_context_add_include2(con, value=%s, registrar=%s);\n", value, registrar);
+ if( dump_extensions ) {
+ struct namelist *x;
+ x = create_name((char*)value);
+ ADD_LAST(con->includes,x);
+ }
+}
+
+void ast_context_add_switch2(struct ast_context *con, const char *value, const char *data, int eval, const char *registrar)
+{
+ if(!no_comp)
+ printf("Executed ast_context_add_switch2(con, value=%s, data=%s, eval=%d, registrar=%s);\n", value, data, eval, registrar);
+ if( dump_extensions ) {
+ struct namelist *x;
+ x = create_name((char*)value);
+ strncpy(x->name2,data,100);
+ if( eval ) {
+
+ ADD_LAST(con->switches,x);
+
+ } else {
+
+ ADD_LAST(con->eswitches,x);
+ }
+ }
}
void ast_merge_contexts_and_delete(void)
{
if(!no_comp)
- printf("Executed ast_merge_contexts_and_delete();\n");
+ printf("Executed ast_merge_contexts_and_delete();\n");
}
void ast_context_verify_includes(void)
{
if(!no_comp)
- printf("Executed ast_context_verify_includes();\n");
+ printf("Executed ast_context_verify_includes();\n");
}
struct ast_context * ast_walk_contexts(void)
{
if(!no_comp)
- printf("Executed ast_walk_contexts();\n");
+ printf("Executed ast_walk_contexts();\n");
return 0;
}
void ast_cli_unregister_multiple(void)
{
if(!no_comp)
- printf("Executed ast_cli_unregister_multiple();\n");
+ printf("Executed ast_cli_unregister_multiple();\n");
}
void ast_context_destroy(void)
@@ -217,19 +361,58 @@
return dataPut;
}
+void filter_leading_space_from_exprs(char *str)
+{
+ /* Mainly for aesthetics */
+ char *t, *v, *u = str;
+
+ while ( u && *u ) {
+
+ if( *u == '$' && *(u+1) == '[' ) {
+ t = u+2;
+ while( *t == '\n' || *t == '\r' || *t == '\t' || *t == ' ' ) {
+ v = t;
+ while ( *v ) {
+ *v = *(v+1);
+ v++;
+ }
+ }
+ }
+
+ u++;
+ }
+}
+
+void filter_newlines(char *str)
+{
+ /* remove all newlines, returns */
+ char *t=str;
+ while( t && *t ) {
+ if( *t == '\n' || *t == '\r' ) {
+ *t = ' '; /* just replace newlines and returns with spaces; they act as
+ token separators, and just blindly removing them could be
+ harmful. */
+ }
+ t++;
+ }
+}
+
+
extern struct module_symbols mod_data;
-
int main(int argc, char **argv)
{
int i;
-
- for(i=1;i<argc;i++)
- {
+ struct namelist *n;
+ struct ast_context *lp,*lp2;
+
+ for(i=1;i<argc;i++) {
if( argv[i][0] == '-' && argv[i][1] == 'n' )
no_comp =1;
if( argv[i][0] == '-' && argv[i][1] == 'd' )
use_curr_dir =1;
+ if( argv[i][0] == '-' && argv[i][1] == 'w' )
+ dump_extensions =1;
}
@@ -237,20 +420,70 @@
printf("\n(You can use the -n option if you aren't interested in seeing all the instructions generated by the compiler)\n\n");
if( !use_curr_dir )
printf("\n(You can use the -d option if you want to use the current working directory as the CONFIG_DIR. I will look in this dir for extensions.ael* and its included files)\n\n");
-
- if( use_curr_dir )
- {
+ if( !dump_extensions )
+ printf("\n(You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)\n");
+
+ if( use_curr_dir ) {
strcpy(ast_config_AST_CONFIG_DIR, ".");
}
- else
- {
+ else {
strcpy(ast_config_AST_CONFIG_DIR, "/etc/asterisk");
}
strcpy(ast_config_AST_VAR_DIR, "/var/lib/asterisk");
+ if( dump_extensions ) {
+ dumpfile = fopen("extensions.conf.aeldump","w");
+ if( !dumpfile ) {
+ printf("\n\nSorry, cannot open extensions.conf.aeldump for writing! Correct the situation and try again!\n\n");
+ exit(10);
+ }
+
+ }
+
+ FIRST_TIME = 1;
+
mod_data.load_module(0);
ast_log(4, "ael2_parse", __LINE__, "main", "%d contexts, %d extensions, %d priorities\n", conts, extens, priors);
+
+ if( dump_extensions && dumpfile ) {
+
+ for( lp = context_list; lp; lp = lp->next ) { /* print out any contexts that didn't have any
+ extensions in them */
+ if( lp->extension_count == 0 ) {
+
+ fprintf(dumpfile,"\n\n[%s]\n", lp->name);
+
+ for(n=lp->ignorepats;n;n=n->next) {
+ fprintf(dumpfile, "ignorepat => %s\n", n->name);
+ }
+ for(n=lp->includes;n;n=n->next) {
+ fprintf(dumpfile, "include => %s\n", n->name);
+ }
+ for(n=lp->switches;n;n=n->next) {
+ fprintf(dumpfile, "switch => %s/%s\n", n->name, n->name2);
+ }
+ for(n=lp->eswitches;n;n=n->next) {
+ fprintf(dumpfile, "eswitch => %s/%s\n", n->name, n->name2);
+ }
+ }
+ }
+ }
+
+ if( dump_extensions && dumpfile )
+ fclose(dumpfile);
+
+ for( lp = context_list; lp; lp = lp2 ) { /* free the ast_context structs */
+ lp2 = lp->next;
+ lp->next = 0;
+
+ destroy_namelist(lp->includes);
+ destroy_namelist(lp->ignorepats);
+ destroy_namelist(lp->switches);
+ destroy_namelist(lp->eswitches);
+
+ free(lp);
+ }
return 0;
}
More information about the asterisk-commits
mailing list