diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-06 20:27:51 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-06-06 20:27:51 +0000 |
commit | b2cbb6a75dfc8ea70554192ea223c3bd5dd52ed8 (patch) | |
tree | 2caa31e5bbb676cf8588f73516608ecef258757b | |
parent | 2d6a1fbb231a5e8e082a2172a31d8def4a6e9607 (diff) |
remove experimental module version tags
add per-file revision tags and 'show version files' CLI command
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5864 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | acl.c | 4 | ||||
-rwxr-xr-x | alaw.c | 4 | ||||
-rwxr-xr-x | app.c | 5 | ||||
-rwxr-xr-x | asterisk.c | 86 | ||||
-rwxr-xr-x | astmm.c | 4 | ||||
-rwxr-xr-x | autoservice.c | 4 | ||||
-rwxr-xr-x | callerid.c | 4 | ||||
-rwxr-xr-x | cdr.c | 4 | ||||
-rwxr-xr-x | channel.c | 5 | ||||
-rwxr-xr-x | chanvars.c | 4 | ||||
-rwxr-xr-x | cli.c | 46 | ||||
-rwxr-xr-x | config.c | 5 | ||||
-rwxr-xr-x | config_old.c | 4 | ||||
-rwxr-xr-x | db.c | 5 | ||||
-rwxr-xr-x | dns.c | 4 | ||||
-rwxr-xr-x | dnsmgr.c | 5 | ||||
-rwxr-xr-x | dsp.c | 4 | ||||
-rwxr-xr-x | enum.c | 4 | ||||
-rwxr-xr-x | file.c | 5 | ||||
-rwxr-xr-x | frame.c | 5 | ||||
-rwxr-xr-x | fskmodem.c | 4 | ||||
-rwxr-xr-x | funcs/pbx_functions.c | 9 | ||||
-rwxr-xr-x | image.c | 5 | ||||
-rwxr-xr-x | include/asterisk.h | 23 | ||||
-rwxr-xr-x | include/asterisk/linkedlists.h | 8 | ||||
-rwxr-xr-x | include/asterisk/module.h | 4 | ||||
-rwxr-xr-x | indications.c | 4 | ||||
-rwxr-xr-x | io.c | 4 | ||||
-rwxr-xr-x | jitterbuf.c | 4 | ||||
-rwxr-xr-x | loader.c | 24 | ||||
-rwxr-xr-x | logger.c | 5 | ||||
-rwxr-xr-x | manager.c | 4 | ||||
-rwxr-xr-x | md5.c | 4 | ||||
-rwxr-xr-x | pbx.c | 5 | ||||
-rwxr-xr-x | plc.c | 4 | ||||
-rwxr-xr-x | privacy.c | 5 | ||||
-rwxr-xr-x | rtp.c | 4 | ||||
-rwxr-xr-x | say.c | 7 | ||||
-rwxr-xr-x | sched.c | 4 | ||||
-rwxr-xr-x | srv.c | 4 | ||||
-rwxr-xr-x | tdd.c | 4 | ||||
-rwxr-xr-x | term.c | 4 | ||||
-rwxr-xr-x | translate.c | 4 | ||||
-rwxr-xr-x | ulaw.c | 4 | ||||
-rwxr-xr-x | utils.c | 4 |
45 files changed, 300 insertions, 66 deletions
@@ -36,6 +36,10 @@ #include <sys/sockio.h> #endif +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/acl.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -11,6 +11,10 @@ * the GNU General Public License */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/alaw.h" #define AMI_MASK 0x55 @@ -23,6 +23,10 @@ #include <sys/stat.h> #include <regex.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/file.h" @@ -33,7 +37,6 @@ #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/indications.h" -#include "asterisk.h" #define MAX_OTHER_FORMATS 10 diff --git a/asterisk.c b/asterisk.c index 1c0ba53d0..91db7d9a5 100755 --- a/asterisk.c +++ b/asterisk.c @@ -28,12 +28,16 @@ #include <grp.h> #include <pwd.h> #include <sys/stat.h> +#include <regex.h> #if defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS) #include <netdb.h> #endif #include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/cli.h" @@ -60,6 +64,7 @@ #include "asterisk/config.h" #include "asterisk/version.h" #include "asterisk/build.h" +#include "asterisk/linkedlists.h" #include "defaults.h" @@ -147,6 +152,85 @@ static int shuttingdown = 0; static int restartnow = 0; static pthread_t consolethread = AST_PTHREADT_NULL; +struct file_version { + const char *file; + const char *version; + AST_LIST_ENTRY(file_version) list; +}; + +static AST_LIST_HEAD_STATIC(file_versions, file_version); + +void ast_register_file_version(const char *file, const char *version) +{ + struct file_version *new; + + new = calloc(1, sizeof(*new)); + if (!new) + return; + + new->file = file; + new->version = version; + AST_LIST_LOCK(&file_versions); + AST_LIST_INSERT_HEAD(&file_versions, new, list); + AST_LIST_UNLOCK(&file_versions); +} + +void ast_unregister_file_version(const char *file) +{ + struct file_version *find; + + AST_LIST_LOCK(&file_versions); + AST_LIST_TRAVERSE_SAFE_BEGIN(&file_versions, find, list) { + if (!strcasecmp(find->file, file)) { + AST_LIST_REMOVE_CURRENT(&file_versions, list); + break; + } + } + AST_LIST_TRAVERSE_SAFE_END; + AST_LIST_UNLOCK(&file_versions); +} + +static char show_version_files_help[] = +"Usage: show version files [like <pattern>]\n" +" Shows the revision numbers of the files used to build this copy of Asterisk.\n" +" Optional regular expression pattern is used to filter the file list.\n"; + +static int handle_show_version_files(int fd, int argc, char *argv[]) +{ + struct file_version *iterator; + + AST_LIST_LOCK(&file_versions); + AST_LIST_TRAVERSE(&file_versions, iterator, list) { + ast_cli(fd, "%-25.25s %-20.20s\n", iterator->file, iterator->version); + } + AST_LIST_UNLOCK(&file_versions); + return RESULT_SUCCESS; +} + +static char *complete_show_version_files(char *line, char *word, int pos, int state) +{ + struct file_version *find; + int which = 0; + char *ret = NULL; + int matchlen = strlen(word); + + if (pos != 3) + return NULL; + + AST_LIST_LOCK(&file_versions); + AST_LIST_TRAVERSE(&file_versions, find, list) { + if (!strncasecmp(word, find->file, matchlen)) { + if (++which > state) { + ret = strdup(find->file); + break; + } + } + } + AST_LIST_UNLOCK(&file_versions); + + return ret; +} + int ast_register_atexit(void (*func)(void)) { int res = -1; @@ -936,6 +1020,8 @@ static struct ast_cli_entry core_cli[] = { "Restart Asterisk at empty call volume", restart_when_convenient_help }, { { "!", NULL }, handle_bang, "Execute a shell command", bang_help }, + { { "show", "version", "files", NULL }, handle_show_version_files, + "Show versions of files used to build Asterisk", show_version_files_help, complete_show_version_files }, }; static int ast_el_read_char(EditLine *el, char *cp) @@ -20,6 +20,10 @@ #include <string.h> #include <time.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/cli.h" #include "asterisk/logger.h" #include "asterisk/options.h" diff --git a/autoservice.c b/autoservice.c index 25c9ae887..1a655a790 100755 --- a/autoservice.c +++ b/autoservice.c @@ -20,6 +20,10 @@ #include <unistd.h> #include <math.h> /* For PI */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/pbx.h" #include "asterisk/frame.h" #include "asterisk/sched.h" diff --git a/callerid.c b/callerid.c index 430f3cedc..d51721d48 100755 --- a/callerid.c +++ b/callerid.c @@ -22,6 +22,10 @@ #include <math.h> #include <ctype.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/ulaw.h" #include "asterisk/alaw.h" #include "asterisk/frame.h" @@ -20,6 +20,10 @@ #include <stdio.h> #include <signal.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/cdr.h" @@ -32,6 +32,10 @@ #endif #endif +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/pbx.h" #include "asterisk/frame.h" #include "asterisk/sched.h" @@ -53,7 +57,6 @@ #include "asterisk/lock.h" #include "asterisk/app.h" #include "asterisk/transcap.h" -#include "asterisk.h" /* uncomment if you have problems with 'monitoring' synchronized files */ #if 0 diff --git a/chanvars.c b/chanvars.c index 3d768b213..fe4cc1564 100755 --- a/chanvars.c +++ b/chanvars.c @@ -14,6 +14,10 @@ #include <stdlib.h> #include <string.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/chanvars.h" #include "asterisk/logger.h" @@ -19,6 +19,10 @@ #include <string.h> #include <ctype.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/cli.h" @@ -31,7 +35,6 @@ /* For rl_filename_completion */ #include "editline/readline/readline.h" /* For module directory */ -#include "asterisk.h" #include "asterisk/version.h" #include "asterisk/build.h" @@ -227,17 +230,17 @@ static int handle_unload(int fd, int argc, char *argv[]) return RESULT_SUCCESS; } -#define MODLIST_FORMAT "%-30s %-40.40s %-20.20s %-10d\n" -#define MODLIST_FORMAT2 "%-30s %-40.40s %-20.20s %-10s\n" +#define MODLIST_FORMAT "%-30s %-40.40s %-10d\n" +#define MODLIST_FORMAT2 "%-30s %-40.40s %-10s\n" AST_MUTEX_DEFINE_STATIC(climodentrylock); static int climodentryfd = -1; -static int modlist_modentry(const char *module, const char *description, int usecnt, const char *version, const char *like) +static int modlist_modentry(const char *module, const char *description, int usecnt, const char *like) { /* Comparing the like with the module */ if (strstr(module, like) != NULL) { - ast_cli(climodentryfd, MODLIST_FORMAT, module, description, version, usecnt); + ast_cli(climodentryfd, MODLIST_FORMAT, module, description, usecnt); return 1; } return 0; @@ -384,7 +387,7 @@ static int handle_modlist(int fd, int argc, char *argv[]) ast_mutex_lock(&climodentrylock); climodentryfd = fd; - ast_cli(fd, MODLIST_FORMAT2, "Module", "Description", "Version", "Use Count"); + ast_cli(fd, MODLIST_FORMAT2, "Module", "Description", "Use Count"); ast_cli(fd,"%d modules loaded\n", ast_update_module_list(modlist_modentry, like)); climodentryfd = -1; ast_mutex_unlock(&climodentrylock); @@ -822,6 +825,22 @@ static struct ast_cli_entry *find_cli(char *cmds[], int exact) int y; int match; struct ast_cli_entry *e=NULL; + + for (e=helpers;e;e=e->next) { + match = 1; + for (y=0;match && cmds[y]; y++) { + if (!e->cmda[y] && !exact) + break; + if (!e->cmda[y] || strcasecmp(e->cmda[y], cmds[y])) + match = 0; + } + if ((exact > -1) && e->cmda[y]) + match = 0; + if (match) + break; + } + if (e) + return e; for (x=0;builtins[x].cmda[0];x++) { /* start optimistic */ match = 1; @@ -843,20 +862,7 @@ static struct ast_cli_entry *find_cli(char *cmds[], int exact) if (match) return &builtins[x]; } - for (e=helpers;e;e=e->next) { - match = 1; - for (y=0;match && cmds[y]; y++) { - if (!e->cmda[y] && !exact) - break; - if (!e->cmda[y] || strcasecmp(e->cmda[y], cmds[y])) - match = 0; - } - if ((exact > -1) && e->cmda[y]) - match = 0; - if (match) - break; - } - return e; + return NULL; } static void join(char *dest, size_t destsize, char *w[]) @@ -25,6 +25,10 @@ # include <glob.h> #endif +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/config.h" #include "asterisk/cli.h" #include "asterisk/lock.h" @@ -33,7 +37,6 @@ #include "asterisk/utils.h" #include "asterisk/channel.h" #include "asterisk/app.h" -#include "asterisk.h" #define MAX_NESTED_COMMENTS 128 #define COMMENT_START ";--" diff --git a/config_old.c b/config_old.c index 1c8a91290..770d8e50d 100755 --- a/config_old.c +++ b/config_old.c @@ -17,6 +17,10 @@ #include <string.h> #include <errno.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/config.h" #include "asterisk/logger.h" @@ -24,6 +24,10 @@ #include <unistd.h> #include <dirent.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/channel.h" #include "asterisk/file.h" #include "asterisk/app.h" @@ -36,7 +40,6 @@ #include "asterisk/lock.h" #include "asterisk/manager.h" #include "db1-ast/include/db.h" -#include "asterisk.h" static DB *astdb; AST_MUTEX_DEFINE_STATIC(dblock); @@ -16,6 +16,10 @@ #include <resolv.h> #include <unistd.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/dns.h" @@ -23,6 +23,10 @@ #include <regex.h> #include <signal.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/dnsmgr.h" #include "asterisk/linkedlists.h" #include "asterisk/utils.h" @@ -31,7 +35,6 @@ #include "asterisk/sched.h" #include "asterisk/options.h" #include "asterisk/cli.h" -#include "asterisk.h" static struct sched_context *sched; static int refresh_sched = -1; @@ -36,6 +36,10 @@ #include <errno.h> #include <stdio.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/frame.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -26,6 +26,10 @@ #include <unistd.h> #include <errno.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/enum.h" @@ -22,6 +22,10 @@ #include <sys/types.h> #include <sys/stat.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/frame.h" #include "asterisk/file.h" #include "asterisk/cli.h" @@ -33,7 +37,6 @@ #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/app.h" -#include "asterisk.h" struct ast_format { /* Name of format */ @@ -17,6 +17,10 @@ #include <errno.h> #include <stdio.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/frame.h" #include "asterisk/logger.h" @@ -25,7 +29,6 @@ #include "asterisk/cli.h" #include "asterisk/term.h" #include "asterisk/utils.h" -#include "asterisk.h" #ifdef TRACE_FRAMES static int headers = 0; diff --git a/fskmodem.c b/fskmodem.c index df30581ae..20716717f 100755 --- a/fskmodem.c +++ b/fskmodem.c @@ -16,6 +16,10 @@ #include <stdio.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/fskmodem.h" #define NBW 2 diff --git a/funcs/pbx_functions.c b/funcs/pbx_functions.c index 5171c6271..c998b61ed 100755 --- a/funcs/pbx_functions.c +++ b/funcs/pbx_functions.c @@ -14,6 +14,10 @@ #include <sys/types.h> #include <stdlib.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/module.h" #include "asterisk/pbx.h" #include "pbx_functions.h" @@ -56,8 +60,3 @@ char *key() { return ASTERISK_GPL_KEY; } - -const char *version() -{ - return "$Revision$"; -} @@ -20,6 +20,10 @@ #include <errno.h> #include <unistd.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/sched.h" #include "asterisk/options.h" #include "asterisk/channel.h" @@ -29,7 +33,6 @@ #include "asterisk/translate.h" #include "asterisk/cli.h" #include "asterisk/lock.h" -#include "asterisk.h" static struct ast_imager *list; AST_MUTEX_DEFINE_STATIC(listlock); diff --git a/include/asterisk.h b/include/asterisk.h index b4b26a775..0e9d2e365 100755 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -3,9 +3,9 @@ * * General Definitions for Asterisk top level program * - * Copyright (C) 1999, Mark Spencer + * Copyright (C) 1999-2005, Mark Spencer * - * Mark Spencer <markster@linux-support.net> + * Mark Spencer <markster@digium.com> * * This program is free software, distributed under the terms of * the GNU General Public License @@ -54,4 +54,21 @@ extern void ast_channels_init(void); extern int dnsmgr_init(void); extern void dnsmgr_reload(void); -#endif +void ast_register_file_version(const char *file, const char *version); +void ast_unregister_file_version(const char *file); + +#ifdef __GNUC__ +#define ASTERISK_FILE_VERSION(x) \ + static void __attribute__((constructor)) __register_file_version(void) \ + { \ + ast_register_file_version(__FILE__, x); \ + } \ + static void __attribute__((destructor)) __unregister_file_version(void) \ + { \ + ast_unregister_file_version(__FILE__); \ + } +#else /* ! __GNUC__ */ +#define ASTERISK_FILE_VERSION(x) static const char __file_version[] = x; +#endif /* __GNUC__ */ + +#endif /* _ASTERISK_H */ diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index d90365920..9f5f216fd 100755 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -66,14 +66,14 @@ struct name { \ Example usage: \code - static AST_LIST_HEAD_STATIC(entry_list, entry) entries; + static AST_LIST_HEAD_STATIC(entry_list, entry); \endcode - This would define \c struct \c entry_list, and declare an instance of it named - \a entries, all intended to hold a list of type \c struct \c entry. + This would define \c struct \c entry_list, intended to hold a list of + type \c struct \c entry. */ #define AST_LIST_HEAD_STATIC(name, type) \ -struct name { \ +struct name { \ struct type *first; \ ast_mutex_t lock; \ } name = { \ diff --git a/include/asterisk/module.h b/include/asterisk/module.h index c674d16ae..4889550a1 100755 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -66,8 +66,6 @@ char *key(void); /*! Return the below mentioned key, unmodified */ */ int reload(void); /*! reload configs */ -const char *version(void); - #define ASTERISK_GPL_KEY \ "This paragraph is Copyright (C) 2000, Linux Support Services, Inc. \ In order for your module to load, it must return this key via a function \ @@ -116,7 +114,7 @@ void ast_update_use_count(void); * For each of the modules loaded, modentry will be executed with the resource, description, * version, and usecount values of each particular module. */ -int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *version, const char *like), +int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *like), const char *like); /*! Ask this procedure to be run with modules have been updated */ diff --git a/indications.c b/indications.c index 4867fd4bd..59641e0ab 100755 --- a/indications.c +++ b/indications.c @@ -21,6 +21,10 @@ #include <string.h> #include <math.h> /* For PI */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/indications.h" #include "asterisk/frame.h" #include "asterisk/options.h" @@ -18,6 +18,10 @@ #include <string.h> /* for memset */ #include <sys/ioctl.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/io.h" #include "asterisk/logger.h" diff --git a/jitterbuf.c b/jitterbuf.c index 2ffa143f7..3b69e5151 100755 --- a/jitterbuf.c +++ b/jitterbuf.c @@ -17,6 +17,10 @@ #include <stdlib.h> #include <string.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "jitterbuf.h" /* define these here, just for ancient compiler systems */ @@ -17,6 +17,10 @@ #include <stdlib.h> #include <string.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/module.h" #include "asterisk/options.h" #include "asterisk/config.h" @@ -34,7 +38,6 @@ #include <dlfcn.h> #endif #include "asterisk/md5.h" -#include "asterisk.h" #ifndef RTLD_NOW #define RTLD_NOW 0 @@ -51,7 +54,6 @@ struct module { char *(*description)(void); char *(*key)(void); int (*reload)(void); - const char *(*version)(void); void *lib; char resource[256]; struct module *next; @@ -253,11 +255,6 @@ int ast_module_reload(const char *name) return reloaded; } -static const char *unknown_version(void) -{ - return "--unknown--"; -} - static int __load_resource(const char *resource_name, const struct ast_config *cfg) { static char fn[256]; @@ -358,12 +355,6 @@ static int __load_resource(const char *resource_name, const struct ast_config *c if (m->reload == NULL) m->reload = dlsym(m->lib, "_reload"); - m->version = dlsym(m->lib, "version"); - if (m->version == NULL) - m->version = dlsym(m->lib, "_version"); - if (m->version == NULL) - m->version = unknown_version; - if (!m->key || !(key = m->key())) { ast_log(LOG_WARNING, "Key routine returned NULL in module %s\n", fn); key = NULL; @@ -563,7 +554,7 @@ void ast_update_use_count(void) } -int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *version, const char *like), +int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *like), const char *like) { struct module *m; @@ -574,10 +565,7 @@ int ast_update_module_list(int (*modentry)(const char *module, const char *descr unlock = 0; m = module_list; while (m) { - char ver_string[80]; - - ast_copy_string(ver_string, m->version(), sizeof(ver_string)); - total_mod_loaded += modentry(m->resource, m->description(), m->usecount(), ast_strip(ast_strip_quoted(ver_string, "$", "$")), like); + total_mod_loaded += modentry(m->resource, m->description(), m->usecount(), like); m = m->next; } if (unlock) @@ -25,6 +25,10 @@ from <syslog.h> which is included by logger.h */ #include <syslog.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/options.h" #include "asterisk/channel.h" @@ -33,7 +37,6 @@ #include "asterisk/cli.h" #include "asterisk/utils.h" #include "asterisk/manager.h" -#include "asterisk.h" static int syslog_level_map[] = { LOG_DEBUG, @@ -27,6 +27,10 @@ #include <errno.h> #include <unistd.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/channel.h" #include "asterisk/file.h" #include "asterisk/manager.h" @@ -19,6 +19,10 @@ */ #include <string.h> /* for memcpy() */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/endian.h" #include "asterisk/md5.h" @@ -22,6 +22,10 @@ #include <time.h> #include <sys/time.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/cli.h" #include "asterisk/pbx.h" @@ -41,7 +45,6 @@ #include "asterisk/causes.h" #include "asterisk/musiconhold.h" #include "asterisk/app.h" -#include "asterisk.h" /* * I M P O R T A N T : @@ -35,6 +35,10 @@ #include <math.h> #include <limits.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/plc.h" #if !defined(FALSE) @@ -20,6 +20,10 @@ #include <unistd.h> #include <dirent.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/channel.h" #include "asterisk/file.h" #include "asterisk/app.h" @@ -31,7 +35,6 @@ #include "asterisk/privacy.h" #include "asterisk/utils.h" #include "asterisk/lock.h" -#include "asterisk.h" int ast_privacy_check(char *dest, char *cid) { @@ -26,6 +26,10 @@ #include <arpa/inet.h> #include <fcntl.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/rtp.h" #include "asterisk/frame.h" #include "asterisk/logger.h" @@ -21,11 +21,16 @@ #include <time.h> #include <ctype.h> #include <math.h> +#include <stdio.h> #ifdef SOLARIS #include <iso/limits_iso.h> #endif +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/file.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -33,8 +38,6 @@ #include "asterisk/lock.h" #include "asterisk/localtime.h" #include "asterisk/utils.h" -#include "asterisk.h" -#include <stdio.h> /* Forward declaration */ static int wait_file(struct ast_channel *chan, const char *ints, const char *file, const char *lang); @@ -23,6 +23,10 @@ #include <unistd.h> #include <string.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/sched.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -22,6 +22,10 @@ #include <string.h> #include <unistd.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/channel.h" #include "asterisk/logger.h" #include "asterisk/srv.h" @@ -22,6 +22,10 @@ #include <math.h> #include <ctype.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/ulaw.h" #include "asterisk/tdd.h" #include "asterisk/logger.h" @@ -22,6 +22,10 @@ #include <fcntl.h> #include <unistd.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/term.h" #include "asterisk/options.h" #include "asterisk/lock.h" diff --git a/translate.c b/translate.c index 890e04222..4c79fbcb5 100755 --- a/translate.c +++ b/translate.c @@ -19,6 +19,10 @@ #include <string.h> #include <stdio.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/logger.h" @@ -11,6 +11,10 @@ * the GNU General Public License */ +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/ulaw.h" #define ZEROTRAP /* turn on the trap as per the MIL-STD */ @@ -24,6 +24,10 @@ #include <netinet/in.h> #include <arpa/inet.h> +#include "asterisk.h" + +ASTERISK_FILE_VERSION("$Revision$") + #include "asterisk/lock.h" #include "asterisk/utils.h" #include "asterisk/io.h" |