Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv10735
Modified Files:
acl.c alaw.c app.c asterisk.c astmm.c autoservice.c callerid.c
cdr.c channel.c chanvars.c cli.c config.c config_old.c db.c
dns.c dnsmgr.c dsp.c enum.c file.c frame.c fskmodem.c image.c
indications.c io.c jitterbuf.c loader.c logger.c manager.c
md5.c pbx.c plc.c privacy.c rtp.c say.c sched.c srv.c tdd.c
term.c translate.c ulaw.c utils.c
Log Message:
remove experimental module version tags
add per-file revision tags and 'show version files' CLI command
Index: acl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/acl.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- acl.c 8 May 2005 16:44:25 -0000 1.44
+++ acl.c 6 Jun 2005 20:27:50 -0000 1.45
@@ -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"
Index: alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/alaw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- alaw.c 21 Apr 2005 06:02:43 -0000 1.2
+++ alaw.c 6 Jun 2005 20:27:50 -0000 1.3
@@ -11,6 +11,10 @@
* the GNU General Public License
*/
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION("$Revision$")
+
#include "asterisk/alaw.h"
#define AMI_MASK 0x55
Index: app.c
===================================================================
RCS file: /usr/cvsroot/asterisk/app.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- app.c 6 Jun 2005 03:04:58 -0000 1.65
+++ app.c 6 Jun 2005 20:27:50 -0000 1.66
@@ -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
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- asterisk.c 6 Jun 2005 03:04:58 -0000 1.160
+++ asterisk.c 6 Jun 2005 20:27:50 -0000 1.161
@@ -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 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 @@
"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)
Index: astmm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/astmm.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- astmm.c 22 Apr 2005 13:11:34 -0000 1.14
+++ astmm.c 6 Jun 2005 20:27:50 -0000 1.15
@@ -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"
Index: autoservice.c
===================================================================
RCS file: /usr/cvsroot/asterisk/autoservice.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- autoservice.c 22 Apr 2005 13:11:34 -0000 1.11
+++ autoservice.c 6 Jun 2005 20:27:50 -0000 1.12
@@ -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"
Index: callerid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/callerid.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- callerid.c 22 Apr 2005 13:11:34 -0000 1.31
+++ callerid.c 6 Jun 2005 20:27:50 -0000 1.32
@@ -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"
Index: cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cdr.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- cdr.c 3 Jun 2005 01:42:31 -0000 1.39
+++ cdr.c 6 Jun 2005 20:27:50 -0000 1.40
@@ -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"
Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- channel.c 6 Jun 2005 02:29:17 -0000 1.201
+++ channel.c 6 Jun 2005 20:27:50 -0000 1.202
@@ -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
Index: chanvars.c
===================================================================
RCS file: /usr/cvsroot/asterisk/chanvars.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- chanvars.c 21 Apr 2005 06:02:43 -0000 1.7
+++ chanvars.c 6 Jun 2005 20:27:50 -0000 1.8
@@ -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"
Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- cli.c 6 Jun 2005 18:31:29 -0000 1.85
+++ cli.c 6 Jun 2005 20:27:50 -0000 1.86
@@ -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 @@
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 @@
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 @@
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 @@
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[])
Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- config.c 6 Jun 2005 03:04:58 -0000 1.65
+++ config.c 6 Jun 2005 20:27:50 -0000 1.66
@@ -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 ";--"
Index: config_old.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config_old.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config_old.c 22 Apr 2005 13:11:34 -0000 1.3
+++ config_old.c 6 Jun 2005 20:27:50 -0000 1.4
@@ -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"
Index: db.c
===================================================================
RCS file: /usr/cvsroot/asterisk/db.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- db.c 6 Jun 2005 03:04:58 -0000 1.17
+++ db.c 6 Jun 2005 20:27:50 -0000 1.18
@@ -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);
Index: dns.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dns.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- dns.c 21 Apr 2005 06:02:43 -0000 1.13
+++ dns.c 6 Jun 2005 20:27:51 -0000 1.14
@@ -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"
Index: dnsmgr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dnsmgr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dnsmgr.c 21 Apr 2005 06:02:43 -0000 1.4
+++ dnsmgr.c 6 Jun 2005 20:27:51 -0000 1.5
@@ -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;
Index: dsp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dsp.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dsp.c 15 May 2005 17:22:41 -0000 1.42
+++ dsp.c 6 Jun 2005 20:27:51 -0000 1.43
@@ -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"
Index: enum.c
===================================================================
RCS file: /usr/cvsroot/asterisk/enum.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- enum.c 21 Apr 2005 06:02:43 -0000 1.25
+++ enum.c 6 Jun 2005 20:27:51 -0000 1.26
@@ -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"
Index: file.c
===================================================================
RCS file: /usr/cvsroot/asterisk/file.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- file.c 6 Jun 2005 03:04:58 -0000 1.67
+++ file.c 6 Jun 2005 20:27:51 -0000 1.68
@@ -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 */
Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- frame.c 19 May 2005 01:57:19 -0000 1.56
+++ frame.c 6 Jun 2005 20:27:51 -0000 1.57
@@ -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;
Index: fskmodem.c
===================================================================
RCS file: /usr/cvsroot/asterisk/fskmodem.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fskmodem.c 15 May 2005 17:22:41 -0000 1.6
+++ fskmodem.c 6 Jun 2005 20:27:51 -0000 1.7
@@ -16,6 +16,10 @@
#include <stdio.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION("$Revision$")
+
#include "asterisk/fskmodem.h"
#define NBW 2
Index: image.c
===================================================================
RCS file: /usr/cvsroot/asterisk/image.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- image.c 6 Jun 2005 03:04:58 -0000 1.14
+++ image.c 6 Jun 2005 20:27:51 -0000 1.15
@@ -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);
Index: indications.c
===================================================================
RCS file: /usr/cvsroot/asterisk/indications.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- indications.c 22 Apr 2005 13:11:34 -0000 1.24
+++ indications.c 6 Jun 2005 20:27:51 -0000 1.25
@@ -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"
Index: io.c
===================================================================
RCS file: /usr/cvsroot/asterisk/io.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- io.c 22 Apr 2005 13:11:34 -0000 1.9
+++ io.c 6 Jun 2005 20:27:51 -0000 1.10
@@ -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"
Index: jitterbuf.c
===================================================================
RCS file: /usr/cvsroot/asterisk/jitterbuf.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jitterbuf.c 2 Jun 2005 17:45:38 -0000 1.14
+++ jitterbuf.c 6 Jun 2005 20:27:51 -0000 1.15
@@ -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 */
Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- loader.c 6 Jun 2005 18:42:15 -0000 1.44
+++ loader.c 6 Jun 2005 20:27:51 -0000 1.45
@@ -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 @@
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 @@
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 @@
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 @@
}
-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 @@
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)
Index: logger.c
===================================================================
RCS file: /usr/cvsroot/asterisk/logger.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- logger.c 6 Jun 2005 03:04:58 -0000 1.73
+++ logger.c 6 Jun 2005 20:27:51 -0000 1.74
@@ -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,
Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- manager.c 6 Jun 2005 02:29:17 -0000 1.98
+++ manager.c 6 Jun 2005 20:27:51 -0000 1.99
@@ -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"
Index: md5.c
===================================================================
RCS file: /usr/cvsroot/asterisk/md5.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- md5.c 22 Apr 2005 13:11:34 -0000 1.13
+++ md5.c 6 Jun 2005 20:27:51 -0000 1.14
@@ -19,6 +19,10 @@
*/
#include <string.h> /* for memcpy() */
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION("$Revision$")
+
#include "asterisk/endian.h"
#include "asterisk/md5.h"
Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- pbx.c 6 Jun 2005 02:29:17 -0000 1.253
+++ pbx.c 6 Jun 2005 20:27:51 -0000 1.254
@@ -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 :
Index: plc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/plc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plc.c 21 Apr 2005 06:02:43 -0000 1.4
+++ plc.c 6 Jun 2005 20:27:51 -0000 1.5
@@ -35,6 +35,10 @@
#include <math.h>
#include <limits.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION("$Revision$")
+
#include "asterisk/plc.h"
#if !defined(FALSE)
Index: privacy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/privacy.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- privacy.c 21 Apr 2005 06:02:43 -0000 1.4
+++ privacy.c 6 Jun 2005 20:27:51 -0000 1.5
@@ -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)
{
Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- rtp.c 2 Jun 2005 00:50:38 -0000 1.132
+++ rtp.c 6 Jun 2005 20:27:51 -0000 1.133
@@ -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"
Index: say.c
===================================================================
RCS file: /usr/cvsroot/asterisk/say.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- say.c 2 Jun 2005 21:26:02 -0000 1.59
+++ say.c 6 Jun 2005 20:27:51 -0000 1.60
@@ -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);
Index: sched.c
===================================================================
RCS file: /usr/cvsroot/asterisk/sched.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sched.c 21 Apr 2005 06:02:43 -0000 1.18
+++ sched.c 6 Jun 2005 20:27:51 -0000 1.19
@@ -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"
Index: srv.c
===================================================================
RCS file: /usr/cvsroot/asterisk/srv.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- srv.c 21 Apr 2005 06:02:43 -0000 1.12
+++ srv.c 6 Jun 2005 20:27:51 -0000 1.13
@@ -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"
Index: tdd.c
===================================================================
RCS file: /usr/cvsroot/asterisk/tdd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tdd.c 22 Apr 2005 13:11:34 -0000 1.5
+++ tdd.c 6 Jun 2005 20:27:51 -0000 1.6
@@ -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"
Index: term.c
===================================================================
RCS file: /usr/cvsroot/asterisk/term.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- term.c 22 Apr 2005 13:11:34 -0000 1.9
+++ term.c 6 Jun 2005 20:27:51 -0000 1.10
@@ -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"
Index: translate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/translate.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- translate.c 29 Apr 2005 17:24:58 -0000 1.36
+++ translate.c 6 Jun 2005 20:27:51 -0000 1.37
@@ -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"
Index: ulaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/ulaw.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ulaw.c 21 Apr 2005 06:02:43 -0000 1.3
+++ ulaw.c 6 Jun 2005 20:27:51 -0000 1.4
@@ -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 */
Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- utils.c 27 May 2005 21:10:06 -0000 1.46
+++ utils.c 6 Jun 2005 20:27:51 -0000 1.47
@@ -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"
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
