From 3d0c27970e149ee3d6091f0af18ba79ee10d51c3 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Sat, 27 Sep 2008 16:36:39 +0000 Subject: Merged revisions 144949-144951 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r144949 | kpfleming | 2008-09-27 10:52:56 -0500 (Sat, 27 Sep 2008) | 17 lines Merged revisions 144924-144925 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r144924 | kpfleming | 2008-09-27 10:00:48 -0500 (Sat, 27 Sep 2008) | 6 lines improve header inclusion process in a few small ways: - it is no longer necessary to forcibly include asterisk/autoconfig.h; every module already includes asterisk.h as its first header (even before system headers), which serves the same purpose - astmm.h is now included by asterisk.h when needed, instead of being forced by the Makefile; this means external modules will build properly against installed headers with MALLOC_DEBUG enabled - simplify the usage of some of these headers in the AEL-related stuff in the utils directory ........ r144925 | kpfleming | 2008-09-27 10:13:30 -0500 (Sat, 27 Sep 2008) | 2 lines fix some minor issues with rev 144924 ........ ................ r144950 | kpfleming | 2008-09-27 11:10:33 -0500 (Sat, 27 Sep 2008) | 2 lines fix bugs caused by r144949 when MALLOC_DEBUG is defined ................ r144951 | kpfleming | 2008-09-27 11:17:43 -0500 (Sat, 27 Sep 2008) | 1 line remove incorrect comment ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@144991 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 2 -- Makefile.moddir_rules | 6 ---- agi/Makefile | 5 ++++ include/asterisk.h | 11 +++----- include/asterisk/astmm.h | 7 +++++ main/Makefile | 9 ++++-- main/ast_expr2.c | 66 +++++-------------------------------------- main/ast_expr2.fl | 6 ++-- main/ast_expr2.y | 66 +++++-------------------------------------- main/ast_expr2f.c | 8 +++--- main/astmm.c | 4 +-- main/stdtime/localtime.c | 1 - pbx/pbx_ael.c | 4 ++- utils/Makefile | 49 ++++++++++++++++---------------- utils/ael_main.c | 10 ------- utils/astman.c | 2 ++ utils/extconf.c | 73 ++---------------------------------------------- 17 files changed, 76 insertions(+), 253 deletions(-) diff --git a/Makefile b/Makefile index a874a7c1a..f8bfcdf90 100644 --- a/Makefile +++ b/Makefile @@ -226,8 +226,6 @@ endif ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) -ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h - ifeq ($(AST_DEVMODE),yes) ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2 endif diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 9258e8d63..18670f9a5 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -18,12 +18,6 @@ # Also note that we can only set one variable per rule, so we have to # repeat the left hand side to set multiple variables. -ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),) - ifeq ($(findstring astmm.h,$(ASTCFLAGS)),) - ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h - endif -endif - ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),) ASTCFLAGS+=${GC_CFLAGS} endif diff --git a/agi/Makefile b/agi/Makefile index 0cb6f3f02..d580a1632 100644 --- a/agi/Makefile +++ b/agi/Makefile @@ -29,9 +29,14 @@ all: $(AGIS) strcompat.c: ../main/strcompat.c @cp $< $@ +strcompat.o: ASTCFLAGS+=-DSTANDALONE + +eagi-test.o: ASTCFLAGS+=-DSTANDALONE eagi-test: eagi-test.o strcompat.o +eagi-sphinx-test.o: ASTCFLAGS+=-DSTANDALONE + eagi-sphinx-test: eagi-sphinx-test.o install: all diff --git a/include/asterisk.h b/include/asterisk.h index 9d5c1ae8a..f55d5bb0d 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -18,15 +18,12 @@ #ifndef _ASTERISK_H #define _ASTERISK_H -/* The include of 'autoconfig.h' is not necessary for any modules that - are part of the Asterisk source tree, because the top-level Makefile - will forcibly include that header in all compilations before all - other headers (even system headers). However, leaving this here will - help out-of-tree module builders, and doesn't cause any harm for the - in-tree modules. -*/ #include "asterisk/autoconfig.h" +#if !defined(NO_MALLOC_DEBUG) && !defined(STANDALONE) && defined(MALLOC_DEBUG) +#include "asterisk/astmm.h" +#endif + #include "asterisk/compat.h" #include "asterisk/logger.h" diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h index f2a632e3c..5d0d47ff5 100644 --- a/include/asterisk/astmm.h +++ b/include/asterisk/astmm.h @@ -27,6 +27,13 @@ #include "asterisk.h" +/* Include these now to prevent them from being needed later */ +#include +#include +#include +#include +#include + /* Undefine any macros */ #undef malloc #undef calloc diff --git a/main/Makefile b/main/Makefile index b3a53a39f..fe9caa967 100644 --- a/main/Makefile +++ b/main/Makefile @@ -117,9 +117,12 @@ ast_expr2.c ast_expr2.h: bison -o $@ -d --name-prefix=ast_yy ast_expr2.y ast_expr2f.c: - flex -o $@ --full ast_expr2.fl # moved the correction of yyfree into the flex input file itself. - sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz - mv zz ast_expr2f.c + flex -o $@ --full ast_expr2.fl + sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix + echo "#include \"asterisk.h\"" > $@ + echo >> $@ + cat $@.fix >> $@ + rm $@.fix ast_expr2f.o: ASTCFLAGS+=-Wno-unused diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 693a7896a..2534938b2 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -131,11 +131,14 @@ * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $ */ +#include "asterisk.h" + #include #include -#include "asterisk.h" + +#if !defined(STANDALONE) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#ifdef STANDALONE +#else #ifndef __USE_ISOC99 #define __USE_ISOC99 1 #endif @@ -423,7 +426,6 @@ static int to_number __P((struct val *)); static void to_string __P((struct val *)); static struct expr_node *alloc_expr_node(enum node_type); static void destroy_arglist(struct expr_node *arglist); -static int is_really_num(char *str); /* uh, if I want to predeclare yylex with a YYLTYPE, I have to predeclare the yyltype... sigh */ typedef struct yyltype @@ -2473,61 +2475,6 @@ is_zero_or_null (struct val *vp) /* NOTREACHED */ } -#ifdef STANDALONE - -void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) -{ - va_list vars; - va_start(vars,fmt); - - printf("LOG: lev:%d file:%s line:%d func: %s ", - level, file, line, function); - vprintf(fmt, vars); - fflush(stdout); - va_end(vars); -} - - -int main(int argc,char **argv) { - char s[4096]; - char out[4096]; - FILE *infile; - - if( !argv[1] ) - exit(20); - - if( access(argv[1],F_OK)== 0 ) - { - int ret; - - infile = fopen(argv[1],"r"); - if( !infile ) - { - printf("Sorry, couldn't open %s for reading!\n", argv[1]); - exit(10); - } - while( fgets(s,sizeof(s),infile) ) - { - if( s[strlen(s)-1] == '\n' ) - s[strlen(s)-1] = 0; - - ret = ast_expr(s, out, sizeof(out),NULL); - printf("Expression: %s Result: [%d] '%s'\n", - s, ret, out); - } - fclose(infile); - } - else - { - if (ast_expr(argv[1], s, sizeof(s), NULL)) - printf("=====%s======\n",s); - else - printf("No result\n"); - } -} - -#endif - #undef ast_yyerror #define ast_yyerror(x) ast_yyerror(x, YYLTYPE *yylloc, struct parse_io *parseio) @@ -2552,6 +2499,7 @@ static void destroy_arglist(struct expr_node *arglist) } } +#if !defined(STANDALONE) static char *compose_func_args(struct expr_node *arglist) { struct expr_node *t = arglist; @@ -2601,7 +2549,7 @@ static int is_really_num(char *str) else return 0; } - +#endif static struct val *op_func(struct val *funcname, struct expr_node *arglist, struct ast_channel *chan) { diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 0749686fa..a6b5dc1d4 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -22,12 +22,10 @@ * \brief Dialplan Expression Lexical Scanner */ -#include "asterisk.h" - #include #include -#ifndef STANDALONE +#if !defined(STANDALONE) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #else #ifndef __USE_ISOC99 @@ -275,7 +273,7 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan) return_value = (res_length <= length) ? res_length : length; } else { if (io.val->u.s) -#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL) +#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE) strncpy(buf, io.val->u.s, length - 1); #else /* !STANDALONE && !LOW_MEMORY */ ast_copy_string(buf, io.val->u.s, length); diff --git a/main/ast_expr2.y b/main/ast_expr2.y index 7eba6d165..de7360020 100644 --- a/main/ast_expr2.y +++ b/main/ast_expr2.y @@ -12,11 +12,14 @@ * $FreeBSD: src/bin/expr/expr.y,v 1.16 2000/07/22 10:59:36 se Exp $ */ +#include "asterisk.h" + #include #include -#include "asterisk.h" + +#if !defined(STANDALONE) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#ifdef STANDALONE +#else #ifndef __USE_ISOC99 #define __USE_ISOC99 1 #endif @@ -304,7 +307,6 @@ static int to_number __P((struct val *)); static void to_string __P((struct val *)); static struct expr_node *alloc_expr_node(enum node_type); static void destroy_arglist(struct expr_node *arglist); -static int is_really_num(char *str); /* uh, if I want to predeclare yylex with a YYLTYPE, I have to predeclare the yyltype... sigh */ typedef struct yyltype @@ -645,61 +647,6 @@ is_zero_or_null (struct val *vp) /* NOTREACHED */ } -#ifdef STANDALONE - -void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) -{ - va_list vars; - va_start(vars,fmt); - - printf("LOG: lev:%d file:%s line:%d func: %s ", - level, file, line, function); - vprintf(fmt, vars); - fflush(stdout); - va_end(vars); -} - - -int main(int argc,char **argv) { - char s[4096]; - char out[4096]; - FILE *infile; - - if( !argv[1] ) - exit(20); - - if( access(argv[1],F_OK)== 0 ) - { - int ret; - - infile = fopen(argv[1],"r"); - if( !infile ) - { - printf("Sorry, couldn't open %s for reading!\n", argv[1]); - exit(10); - } - while( fgets(s,sizeof(s),infile) ) - { - if( s[strlen(s)-1] == '\n' ) - s[strlen(s)-1] = 0; - - ret = ast_expr(s, out, sizeof(out),NULL); - printf("Expression: %s Result: [%d] '%s'\n", - s, ret, out); - } - fclose(infile); - } - else - { - if (ast_expr(argv[1], s, sizeof(s), NULL)) - printf("=====%s======\n",s); - else - printf("No result\n"); - } -} - -#endif - #undef ast_yyerror #define ast_yyerror(x) ast_yyerror(x, YYLTYPE *yylloc, struct parse_io *parseio) @@ -724,6 +671,7 @@ static void destroy_arglist(struct expr_node *arglist) } } +#if !defined(STANDALONE) static char *compose_func_args(struct expr_node *arglist) { struct expr_node *t = arglist; @@ -773,7 +721,7 @@ static int is_really_num(char *str) else return 0; } - +#endif static struct val *op_func(struct val *funcname, struct expr_node *arglist, struct ast_channel *chan) { diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index 3d97d8b82..8046d6556 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -1,3 +1,5 @@ +#include "asterisk.h" + #line 2 "ast_expr2f.c" #line 4 "ast_expr2f.c" @@ -506,12 +508,10 @@ static yyconst flex_int16_t yy_chk[139] = * \brief Dialplan Expression Lexical Scanner */ -#include "asterisk.h" - #include #include -#ifndef STANDALONE +#if !defined(STANDALONE) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #else #ifndef __USE_ISOC99 @@ -2369,7 +2369,7 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan) return_value = (res_length <= length) ? res_length : length; } else { if (io.val->u.s) -#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL) +#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE) strncpy(buf, io.val->u.s, length - 1); #else /* !STANDALONE && !LOW_MEMORY */ ast_copy_string(buf, io.val->u.s, length); diff --git a/main/astmm.c b/main/astmm.c index 04a19037d..f5191c2e5 100644 --- a/main/astmm.c +++ b/main/astmm.c @@ -23,10 +23,10 @@ * \author Mark Spencer */ -#ifdef __AST_DEBUG_MALLOC - #include "asterisk.h" +#ifdef __AST_DEBUG_MALLOC + ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/paths.h" /* use ast_config_AST_LOG_DIR */ diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 445f93a55..b25b8ab14 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -44,7 +44,6 @@ /*LINTLIBRARY*/ - #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 22ec24105..81801f1c9 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -28,7 +28,9 @@ #include "asterisk.h" +#if !defined(STANDALONE) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#endif #include #include @@ -262,7 +264,7 @@ static int reload(void) return pbx_load_module(); } -#ifdef STANDALONE_AEL +#ifdef STANDALONE #define AST_MODULE "ael" int ael_external_load_module(void); int ael_external_load_module(void) diff --git a/utils/Makefile b/utils/Makefile index 87b79302c..8af5b14b4 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -16,8 +16,9 @@ ASTTOPDIR?=.. .PHONY: clean all uninstall -# to get check_expr, add it to the ALL_UTILS list -ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted check_expr conf2ael hashtest2 hashtest astcanary +ALL_UTILS:=astman smsq stereorize streamplayer muted check_expr hashtest2 hashtest astcanary +# aelparse and conf2ael currently not being built because they rely on extconf, which is horribly broken +# ALL_UTILS:=aelparse conf2ael UTILS:=$(ALL_UTILS) LIBS += $(BKTR_LIB) # astobj2 with devmode uses backtrace @@ -80,85 +81,83 @@ clean: md5.c: $(ASTTOPDIR)/main/md5.c @cp $< $@ +md5.o: ASTCFLAGS+=-DSTANDALONE + astman: astman.o md5.o astman: LIBS+=$(NEWT_LIB) +astman.o: ASTCFLAGS+=-DSTANDALONE stereorize: stereorize.o frame.o stereorize: LIBS+=-lm hashtab.c: $(ASTTOPDIR)/main/hashtab.c @cp $< $@ +hashtab.o: ASTCFLAGS+=-DSTANDALONE strcompat.c: $(ASTTOPDIR)/main/strcompat.c @cp $< $@ - -$(ASTTOPDIR)/main/ast_expr2.c: - @echo " [BISON] $(ASTTOPDIR)/main/ast_expr2.y -> $@" - @bison -o $@ -d --name-prefix=ast_yy $(ASTTOPDIR)/main/ast_expr2.y - -$(ASTTOPDIR)/main/ast_expr2f.c: - @echo " [FLEX] $(ASTTOPDIR)/main/ast_expr2.fl -> $@" - @flex -o $@ --full $(ASTTOPDIR)/main/ast_expr2.fl +strcompat.o: ASTCFLAGS+=-DSTANDALONE pval.c: $(ASTTOPDIR)/res/ael/pval.c @cp $< $@ +pval.o : ASTCFLAGS+=-DSTANDALONE ast_expr2.c: $(ASTTOPDIR)/main/ast_expr2.c @cp $< $@ +ast_expr2.o: ASTCFLAGS+=-DSTANDALONE ast_expr2f.c: $(ASTTOPDIR)/main/ast_expr2f.c @cp $< $@ - -ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE_AEL -I$(ASTTOPDIR)/main -Wno-unused - -pval.o : ASTCFLAGS+=-DSTANDALONE +ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE -I$(ASTTOPDIR)/main -Wno-unused check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o threadstorage.o clicompat.o +check_expr.o: ASTCFLAGS+=-DSTANDALONE aelbison.c: $(ASTTOPDIR)/res/ael/ael.tab.c @cp $< $@ - -aelbison.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0 +aelbison.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res/ael -DYYENABLE_NLS=0 -DSTANDALONE pbx_ael.c: $(ASTTOPDIR)/pbx/pbx_ael.c @cp $< $@ - -pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL +pbx_ael.o: ASTCFLAGS+=-DSTANDALONE aelparse.c: $(ASTTOPDIR)/res/ael/ael_lex.c @cp $< $@ -aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE_AEL -Wno-unused +ael_main.o: ASTCFLAGS+=-DSTANDALONE +aelparse.o: ASTCFLAGS+=-I$(ASTTOPDIR)/res -DSTANDALONE -Wno-unused aelparse: aelparse.o aelbison.o pbx_ael.o hashtab.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o astobj2.c: $(ASTTOPDIR)/main/astobj2.c @cp $< $@ +astobj2.o: ASTCFLAGS+=-DSTANDALONE utils.c: $(ASTTOPDIR)/main/utils.c @cp $< $@ +utils.o: ASTCFLAGS+=-DSTANDALONE sha1.c: $(ASTTOPDIR)/main/sha1.c @cp $< $@ +sha1.o: ASTCFLAGS+=-DSTANDALONE threadstorage.c: $(ASTTOPDIR)/main/threadstorage.c @cp $< $@ +threadstorage.o: ASTCFLAGS+=-DSTANDALONE -hashtest2.o: ASTCFLAGS+=-O0 - +hashtest2.o: ASTCFLAGS+=-O0 -DSTANDALONE hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o clicompat.o - -hashtest.o: ASTCFLAGS+=-O0 +hashtest.o: ASTCFLAGS+=-O0 -DSTANDALONE extconf.o: extconf.c conf2ael: conf2ael.o ast_expr2f.o ast_expr2.o hashtab.o aelbison.o aelparse.o pbx_ael.o pval.o extconf.o strcompat.o testexpr2s: $(ASTTOPDIR)/main/ast_expr2f.c $(ASTTOPDIR)/main/ast_expr2.c $(ASTTOPDIR)/main/ast_expr2.h - $(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE_AEL $(ASTTOPDIR)/main/ast_expr2f.c -o ast_expr2f.o - $(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE_AEL $(ASTTOPDIR)/main/ast_expr2.c -o ast_expr2.o + $(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE $(ASTTOPDIR)/main/ast_expr2f.c -o ast_expr2f.o + $(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE $(ASTTOPDIR)/main/ast_expr2.c -o ast_expr2.o $(CC) -g -o testexpr2s ast_expr2f.o ast_expr2.o rm ast_expr2.o ast_expr2f.o ./testexpr2s expr2.testinput diff --git a/utils/ael_main.c b/utils/ael_main.c index 55b640dba..74b023d66 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -169,16 +169,6 @@ struct ast_custom_function *ast_custom_function_find(const char *name) return 0; /* in "standalone" mode, functions are just not avail */ } -void ast_register_file_version(const char *file, const char *version); -void ast_register_file_version(const char *file, const char *version) -{ -} - -void ast_unregister_file_version(const char *file); -void ast_unregister_file_version(const char *file) -{ -} - #if !defined(LOW_MEMORY) int ast_add_profile(const char *x, uint64_t scale) { diff --git a/utils/astman.c b/utils/astman.c index 3cfc27d81..7e11d2565 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -24,6 +24,8 @@ #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#include "asterisk.h" + #include #include #include diff --git a/utils/extconf.c b/utils/extconf.c index d388586e0..96be73fe8 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -23,6 +23,8 @@ * for operations outside of asterisk. A huge, awful hack. * */ +#include "asterisk.h" + #undef DEBUG_THREADS #include "asterisk/compat.h" @@ -81,12 +83,6 @@ struct ast_channel #define VERBOSE_PREFIX_3 " -- " #define VERBOSE_PREFIX_4 " > " -/* IN CONFLICT: void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) - __attribute__ ((format (printf, 5, 6))); */ - -static void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6))); - - void ast_backtrace(void); void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...) @@ -100,9 +96,6 @@ int ast_unregister_verbose(void (*verboser)(const char *string)); void ast_console_puts(const char *string); -void ast_console_puts_mutable(const char *string); -void ast_console_toggle_mute(int fd); - #define _A_ __FILE__, __LINE__, __PRETTY_FUNCTION__ #ifdef LOG_DEBUG @@ -1767,56 +1760,6 @@ static void ast_config_destroy(struct ast_config *cfg) #define AST_CACHE_DIR_LEN 512 #define AST_FILENAME_MAX 80 -/*! \ingroup main_options */ -enum ast_option_flags { - /*! Allow \#exec in config files */ - AST_OPT_FLAG_EXEC_INCLUDES = (1 << 0), - /*! Do not fork() */ - AST_OPT_FLAG_NO_FORK = (1 << 1), - /*! Keep quiet */ - AST_OPT_FLAG_QUIET = (1 << 2), - /*! Console mode */ - AST_OPT_FLAG_CONSOLE = (1 << 3), - /*! Run in realtime Linux priority */ - AST_OPT_FLAG_HIGH_PRIORITY = (1 << 4), - /*! Initialize keys for RSA authentication */ - AST_OPT_FLAG_INIT_KEYS = (1 << 5), - /*! Remote console */ - AST_OPT_FLAG_REMOTE = (1 << 6), - /*! Execute an asterisk CLI command upon startup */ - AST_OPT_FLAG_EXEC = (1 << 7), - /*! Don't use termcap colors */ - AST_OPT_FLAG_NO_COLOR = (1 << 8), - /*! Are we fully started yet? */ - AST_OPT_FLAG_FULLY_BOOTED = (1 << 9), - /*! Trascode via signed linear */ - AST_OPT_FLAG_TRANSCODE_VIA_SLIN = (1 << 10), - /*! Enable priority jumping in applications */ - AST_OPT_FLAG_PRIORITY_JUMPING = (1 << 11), - /*! Dump core on a seg fault */ - AST_OPT_FLAG_DUMP_CORE = (1 << 12), - /*! Cache sound files */ - AST_OPT_FLAG_CACHE_RECORD_FILES = (1 << 13), - /*! Display timestamp in CLI verbose output */ - AST_OPT_FLAG_TIMESTAMP = (1 << 14), - /*! Override config */ - AST_OPT_FLAG_OVERRIDE_CONFIG = (1 << 15), - /*! Reconnect */ - AST_OPT_FLAG_RECONNECT = (1 << 16), - /*! Transmit Silence during Record() */ - AST_OPT_FLAG_TRANSMIT_SILENCE = (1 << 17), - /*! Suppress some warnings */ - AST_OPT_FLAG_DONT_WARN = (1 << 18), - /*! End CDRs before the 'h' extension */ - AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN = (1 << 19), - /*! Use DAHDI Timing for generators if available */ - AST_OPT_FLAG_INTERNAL_TIMING = (1 << 20), - /*! Always fork, even if verbose or debug settings are non-zero */ - AST_OPT_FLAG_ALWAYS_FORK = (1 << 21), - /*! Disable log/verbose output to remote consoles */ - AST_OPT_FLAG_MUTE = (1 << 22) -}; - /*! These are the options that set by default when Asterisk starts */ #define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN @@ -1850,8 +1793,6 @@ extern int option_maxcalls; /*!< Maximum number of simultaneous channels */ extern double option_maxload; extern char defaultlanguage[]; -extern time_t ast_startuptime; -extern time_t ast_lastreloadtime; extern pid_t ast_mainpid; extern char record_cache_dir[AST_CACHE_DIR_LEN]; @@ -2706,14 +2647,6 @@ static const char *ast_var_name(const struct ast_var_t *var) return name; } - -/* stolen from asterisk.c */ - -static struct ast_flags ast_options = { AST_DEFAULT_OPTIONS }; -static int option_verbose = 0; /*!< Verbosity level */ -static int option_debug = 0; /*!< Debug level */ - - /* experiment 1: see if it's easier just to use existing config code * to read in the extensions.conf file. In this scenario, I have to rip/copy code from other modules, because they @@ -2735,7 +2668,7 @@ static void ast_log(int level, const char *file, int line, const char *function, va_end(vars); } -static void __attribute__((format (printf, 1, 2))) ast_verbose(const char *fmt, ...) +void __attribute__((format (printf, 1, 2))) ast_verbose(const char *fmt, ...) { va_list vars; va_start(vars,fmt); -- cgit v1.2.3