![rizzo](/assets/img/avatar_default.png)
As partly documented in loader.c and include/asterisk/module.h, modules are now expected to return all of their methods and flags into a structure 'mod_data', and are normally loaded with RTLD_NOW | RTLD_LOCAL, so symbols are resolved immediately and conflicts should be less likely. Only in a small number of cases (res_*, typically) modules are loaded RTLD_GLOBAL, so they can export symbols. The core of the change is only the two files loader.c and include/asterisk/module.h, all the rest is simply adaptation of the existing modules to the new API, a rather mechanical (but believe me, time and finger-consuming!) process whose detail you can figure out by svn diff'ing any single module. Expect some minor compilation issue after this change, please report it on mantis http://bugs.digium.com/view.php?id=6968 so we collect all the feedback in one place. I am just sorry that this change missed SVN version number 20000! git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b
186 lines
4 KiB
C
186 lines
4 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (c) 2004 - 2005 Tilghman Lesher. All rights reserved.
|
|
*
|
|
* Tilghman Lesher <app_verbose_v001@the-tilghman.com>
|
|
*
|
|
* This code is released by the author with no restrictions on usage.
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief Verbose logging application
|
|
*
|
|
* \author Tilghman Lesher <app_verbose_v001@the-tilghman.com>
|
|
*
|
|
* \ingroup applications
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include "asterisk/options.h"
|
|
#include "asterisk/logger.h"
|
|
#include "asterisk/channel.h"
|
|
#include "asterisk/pbx.h"
|
|
#include "asterisk/module.h"
|
|
|
|
|
|
static char *tdesc = "Send verbose output";
|
|
|
|
static char *app_verbose = "Verbose";
|
|
static char *verbose_synopsis = "Send arbitrary text to verbose output";
|
|
static char *verbose_descrip =
|
|
"Verbose([<level>|]<message>)\n"
|
|
" level must be an integer value. If not specified, defaults to 0.\n";
|
|
|
|
static char *app_log = "Log";
|
|
static char *log_synopsis = "Send arbitrary text to a selected log level";
|
|
static char *log_descrip =
|
|
"Log(<level>|<message>)\n"
|
|
" level must be one of ERROR, WARNING, NOTICE, DEBUG, VERBOSE, DTMF\n";
|
|
|
|
LOCAL_USER_DECL;
|
|
|
|
static int verbose_exec(struct ast_channel *chan, void *data)
|
|
{
|
|
char *vtext;
|
|
int vsize;
|
|
struct localuser *u;
|
|
|
|
LOCAL_USER_ADD(u);
|
|
|
|
if (data) {
|
|
if ((vtext = ast_strdupa(data))) {
|
|
char *tmp = strsep(&vtext, "|,");
|
|
if (vtext) {
|
|
if (sscanf(tmp, "%d", &vsize) != 1) {
|
|
vsize = 0;
|
|
ast_log(LOG_WARNING, "'%s' is not a verboser number\n", vtext);
|
|
}
|
|
} else {
|
|
vtext = tmp;
|
|
vsize = 0;
|
|
}
|
|
if (option_verbose >= vsize) {
|
|
switch (vsize) {
|
|
case 0:
|
|
ast_verbose("%s\n", vtext);
|
|
break;
|
|
case 1:
|
|
ast_verbose(VERBOSE_PREFIX_1 "%s\n", vtext);
|
|
break;
|
|
case 2:
|
|
ast_verbose(VERBOSE_PREFIX_2 "%s\n", vtext);
|
|
break;
|
|
case 3:
|
|
ast_verbose(VERBOSE_PREFIX_3 "%s\n", vtext);
|
|
break;
|
|
default:
|
|
ast_verbose(VERBOSE_PREFIX_4 "%s\n", vtext);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
LOCAL_USER_REMOVE(u);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int log_exec(struct ast_channel *chan, void *data)
|
|
{
|
|
char *level, *ltext;
|
|
struct localuser *u;
|
|
int lnum = -1;
|
|
char extension[AST_MAX_EXTENSION + 5], context[AST_MAX_EXTENSION + 2];
|
|
|
|
LOCAL_USER_ADD(u);
|
|
if (ast_strlen_zero(data)) {
|
|
LOCAL_USER_REMOVE(u);
|
|
return 0;
|
|
}
|
|
|
|
if (!(ltext = ast_strdupa(data))) {
|
|
LOCAL_USER_REMOVE(u);
|
|
return 0;
|
|
}
|
|
|
|
level = strsep(<ext, "|");
|
|
|
|
if (!strcasecmp(level, "ERROR")) {
|
|
lnum = __LOG_ERROR;
|
|
} else if (!strcasecmp(level, "WARNING")) {
|
|
lnum = __LOG_WARNING;
|
|
} else if (!strcasecmp(level, "NOTICE")) {
|
|
lnum = __LOG_NOTICE;
|
|
} else if (!strcasecmp(level, "DEBUG")) {
|
|
lnum = __LOG_DEBUG;
|
|
} else if (!strcasecmp(level, "VERBOSE")) {
|
|
lnum = __LOG_VERBOSE;
|
|
} else if (!strcasecmp(level, "DTMF")) {
|
|
lnum = __LOG_DTMF;
|
|
} else if (!strcasecmp(level, "EVENT")) {
|
|
lnum = __LOG_EVENT;
|
|
} else {
|
|
ast_log(LOG_ERROR, "Unknown log level: '%s'\n", level);
|
|
}
|
|
|
|
if (lnum > -1) {
|
|
snprintf(context, sizeof(context), "@ %s", chan->context);
|
|
snprintf(extension, sizeof(extension), "Ext. %s", chan->exten);
|
|
|
|
ast_log(lnum, extension, chan->priority, context, "%s\n", ltext);
|
|
}
|
|
LOCAL_USER_REMOVE(u);
|
|
return 0;
|
|
}
|
|
|
|
static int unload_module(void *mod)
|
|
{
|
|
int res;
|
|
|
|
res = ast_unregister_application(app_verbose);
|
|
res |= ast_unregister_application(app_log);
|
|
|
|
STANDARD_HANGUP_LOCALUSERS;
|
|
|
|
return res;
|
|
}
|
|
|
|
static int load_module(void *mod)
|
|
{
|
|
int res;
|
|
|
|
res = ast_register_application(app_log, log_exec, log_synopsis, log_descrip);
|
|
res |= ast_register_application(app_verbose, verbose_exec, verbose_synopsis, verbose_descrip);
|
|
|
|
return res;
|
|
}
|
|
|
|
static const char *description(void)
|
|
{
|
|
return tdesc;
|
|
}
|
|
|
|
static const char *key(void)
|
|
{
|
|
return ASTERISK_GPL_KEY;
|
|
}
|
|
|
|
STD_MOD1;
|