mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-03 12:25:35 +00:00
https://origsvn.digium.com/svn/asterisk/trunk Merging this rev from trunk to 1.6.0 was not simple. Why? Because we've enhanced trunk to do a [fast] merge-and-delete operation which also solved problems with contexts having entries from different registrars. Fast as in the amount of time the contexts are locked down. That *is* fast, but traversing the entire dialplan looking for priorities to delete takes more time overall. This particular fix involved pulling in those enhancements from trunk, along with all the various fixes and refinements made along the way. Merging all this from trunk into 1.6 involved: a. mergetrunk6 in the stuff from 130145; b. revert all but the prop changes c. catalog all revisions to pbx.c since 1.6.0 was forked (at rev 105596). d. catalog all revisions to pbx.c in trunk since 1.6.0 was forked, making special note of all revs that were not merged into 1.6.0. e. study each rev in trunk not applied to 1.6.0, and determine if it was involved in the merge_and_delete enhancements in trunk. 25 commits were done in 1.6.0, all but one (106306) was a merge from trunk. Trunk had 22 additional changes, of which 7 were involved in the merge_and_delete enhancements: 106757 108894 109169 116461 123358 130145 130297 f. Go to trunk and collect patches, one by one, of the changes made by each rev across the entire source tree, using svn diff -c <num> > pfile g. Apply each patch in order to 1.6.0, and resolve all failures and compilation problems before proceding to the next patch. h. test the stuff. i. profit! ........ r130145 | murf | 2008-07-11 12:24:31 -0600 (Fri, 11 Jul 2008) | 40 lines (closes issue #13041) Reported by: eliel Tested by: murf (closes issue #12960) Reported by: mnicholson In this 'omnibus' fix, I **think** I solved both the problem in 13041, where unloading pbx_ael.so caused crashes, or incomplete removal of previous registrar'ed entries. And I added code to completely remove all includes, switches, and ignorepats that had a matching registrar entry, which should appease 12960. I also added a lot of seemingly useless brackets around single statement if's, which helped debug so much that I'm leaving them there. I added a routine to check the correlation between the extension tree lists and the hashtab tables. It can be amazingly helpful when you have lots of dialplan stuff, and need to narrow down where a problem is occurring. It's ifdef'd out by default. I cleaned up the code around the new CIDmatch code. It was leaving hanging extens with bad ptrs, getting confused over which objects to remove, etc. I tightened up the code and changed the call to remove_exten in the merge_and_delete code. I added more conditions to check for empty context worthy of deletion. It's not empty if there are any includes, switches, or ignorepats present. If I've missed anything, please re-open this bug, and be prepared to supply example dialplan code. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
354 lines
9.3 KiB
C
354 lines
9.3 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2006, Digium, Inc.
|
|
*
|
|
* Steve Murphy <murf@parsetree.com>
|
|
*
|
|
* 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.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief Compile symbolic Asterisk Extension Logic into Asterisk extensions, version 2.
|
|
*
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<depend>res_ael_share</depend>
|
|
***/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include <ctype.h>
|
|
#include <regex.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "asterisk/pbx.h"
|
|
#include "asterisk/config.h"
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/logger.h"
|
|
#include "asterisk/cli.h"
|
|
#include "asterisk/app.h"
|
|
#include "asterisk/callerid.h"
|
|
#include "asterisk/hashtab.h"
|
|
#include "asterisk/ael_structs.h"
|
|
#include "asterisk/pval.h"
|
|
#ifdef AAL_ARGCHECK
|
|
#include "asterisk/argdesc.h"
|
|
#endif
|
|
|
|
/* these functions are in ../ast_expr2.fl */
|
|
|
|
#define DEBUG_READ (1 << 0)
|
|
#define DEBUG_TOKENS (1 << 1)
|
|
#define DEBUG_MACROS (1 << 2)
|
|
#define DEBUG_CONTEXTS (1 << 3)
|
|
|
|
static char *config = "extensions.ael";
|
|
static char *registrar = "pbx_ael";
|
|
static int pbx_load_module(void);
|
|
|
|
#ifndef AAL_ARGCHECK
|
|
/* for the time being, short circuit all the AAL related structures
|
|
without permanently removing the code; after/during the AAL
|
|
development, this code can be properly re-instated
|
|
*/
|
|
|
|
#endif
|
|
|
|
#ifdef AAL_ARGCHECK
|
|
int option_matches_j( struct argdesc *should, pval *is, struct argapp *app);
|
|
int option_matches( struct argdesc *should, pval *is, struct argapp *app);
|
|
int ael_is_funcname(char *name);
|
|
#endif
|
|
|
|
int check_app_args(pval *appcall, pval *arglist, struct argapp *app);
|
|
void check_pval(pval *item, struct argapp *apps, int in_globals);
|
|
void check_pval_item(pval *item, struct argapp *apps, int in_globals);
|
|
void check_switch_expr(pval *item, struct argapp *apps);
|
|
void ast_expr_register_extra_error_info(char *errmsg);
|
|
void ast_expr_clear_extra_error_info(void);
|
|
struct pval *find_macro(char *name);
|
|
struct pval *find_context(char *name);
|
|
struct pval *find_context(char *name);
|
|
struct pval *find_macro(char *name);
|
|
struct ael_priority *new_prio(void);
|
|
struct ael_extension *new_exten(void);
|
|
void destroy_extensions(struct ael_extension *exten);
|
|
void set_priorities(struct ael_extension *exten);
|
|
void add_extensions(struct ael_extension *exten);
|
|
void ast_compile_ael2(struct ast_context **local_contexts, struct ast_hashtab *local_table, struct pval *root);
|
|
void destroy_pval(pval *item);
|
|
void destroy_pval_item(pval *item);
|
|
int is_float(char *arg );
|
|
int is_int(char *arg );
|
|
int is_empty(char *arg);
|
|
|
|
/* static void substitute_commas(char *str); */
|
|
|
|
static int aeldebug = 0;
|
|
|
|
/* interface stuff */
|
|
|
|
/* if all the below are static, who cares if they are present? */
|
|
|
|
static int pbx_load_module(void)
|
|
{
|
|
int errs=0, sem_err=0, sem_warn=0, sem_note=0;
|
|
char *rfilename;
|
|
struct ast_context *local_contexts=NULL, *con;
|
|
struct ast_hashtab *local_table=NULL;
|
|
|
|
struct pval *parse_tree;
|
|
|
|
ast_log(LOG_NOTICE, "Starting AEL load process.\n");
|
|
if (config[0] == '/')
|
|
rfilename = (char *)config;
|
|
else {
|
|
rfilename = alloca(strlen(config) + strlen(ast_config_AST_CONFIG_DIR) + 2);
|
|
sprintf(rfilename, "%s/%s", ast_config_AST_CONFIG_DIR, config);
|
|
}
|
|
if (access(rfilename,R_OK) != 0) {
|
|
ast_log(LOG_NOTICE, "File %s not found; AEL declining load\n", rfilename);
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
}
|
|
|
|
parse_tree = ael2_parse(rfilename, &errs);
|
|
ast_log(LOG_NOTICE, "AEL load process: parsed config file name '%s'.\n", rfilename);
|
|
ael2_semantic_check(parse_tree, &sem_err, &sem_warn, &sem_note);
|
|
if (errs == 0 && sem_err == 0) {
|
|
ast_log(LOG_NOTICE, "AEL load process: checked config file name '%s'.\n", rfilename);
|
|
local_table = ast_hashtab_create(11, ast_hashtab_compare_contexts, ast_hashtab_resize_java, ast_hashtab_newsize_java, ast_hashtab_hash_contexts, 0);
|
|
ast_compile_ael2(&local_contexts, local_table, parse_tree);
|
|
ast_log(LOG_NOTICE, "AEL load process: compiled config file name '%s'.\n", rfilename);
|
|
|
|
ast_merge_contexts_and_delete(&local_contexts, local_table, registrar);
|
|
local_table = NULL; /* it's the dialplan global now */
|
|
local_contexts = NULL;
|
|
ast_log(LOG_NOTICE, "AEL load process: merged config file name '%s'.\n", rfilename);
|
|
for (con = ast_walk_contexts(NULL); con; con = ast_walk_contexts(con))
|
|
ast_context_verify_includes(con);
|
|
ast_log(LOG_NOTICE, "AEL load process: verified config file name '%s'.\n", rfilename);
|
|
} else {
|
|
ast_log(LOG_ERROR, "Sorry, but %d syntax errors and %d semantic errors were detected. It doesn't make sense to compile.\n", errs, sem_err);
|
|
destroy_pval(parse_tree); /* free up the memory */
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
}
|
|
destroy_pval(parse_tree); /* free up the memory */
|
|
|
|
return AST_MODULE_LOAD_SUCCESS;
|
|
}
|
|
|
|
/* CLI interface */
|
|
static char *handle_cli_ael_debug_multiple_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
|
{
|
|
switch (cmd) {
|
|
case CLI_INIT:
|
|
e->command = "ael debug [read|tokens|macros|contexts|off]";
|
|
e->usage =
|
|
"Usage: ael debug [read|tokens|macros|contexts|off]\n"
|
|
" Enable AEL read, token, macro, or context debugging,\n"
|
|
" or disable all AEL debugging messages. Note: this\n"
|
|
" currently does nothing.\n";
|
|
return NULL;
|
|
case CLI_GENERATE:
|
|
return NULL;
|
|
}
|
|
|
|
if (a->argc != 3)
|
|
return CLI_SHOWUSAGE;
|
|
|
|
if (!strcasecmp(a->argv[2], "read"))
|
|
aeldebug |= DEBUG_READ;
|
|
else if (!strcasecmp(a->argv[2], "tokens"))
|
|
aeldebug |= DEBUG_TOKENS;
|
|
else if (!strcasecmp(a->argv[2], "macros"))
|
|
aeldebug |= DEBUG_MACROS;
|
|
else if (!strcasecmp(a->argv[2], "contexts"))
|
|
aeldebug |= DEBUG_CONTEXTS;
|
|
else if (!strcasecmp(a->argv[2], "off"))
|
|
aeldebug = 0;
|
|
else
|
|
return CLI_SHOWUSAGE;
|
|
|
|
return CLI_SUCCESS;
|
|
}
|
|
|
|
static char *handle_cli_ael_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
|
{
|
|
switch (cmd) {
|
|
case CLI_INIT:
|
|
e->command = "ael set debug {read|tokens|macros|contexts|off}";
|
|
e->usage =
|
|
"Usage: ael debug {read|tokens|macros|contexts|off}\n"
|
|
" Enable AEL read, token, macro, or context debugging,\n"
|
|
" or disable all AEL debugging messages. Note: this\n"
|
|
" currently does nothing.\n";
|
|
return NULL;
|
|
case CLI_GENERATE:
|
|
return NULL;
|
|
}
|
|
|
|
if (a->argc != e->args)
|
|
return CLI_SHOWUSAGE;
|
|
|
|
if (!strcasecmp(a->argv[3], "read"))
|
|
aeldebug |= DEBUG_READ;
|
|
else if (!strcasecmp(a->argv[3], "tokens"))
|
|
aeldebug |= DEBUG_TOKENS;
|
|
else if (!strcasecmp(a->argv[3], "macros"))
|
|
aeldebug |= DEBUG_MACROS;
|
|
else if (!strcasecmp(a->argv[3], "contexts"))
|
|
aeldebug |= DEBUG_CONTEXTS;
|
|
else if (!strcasecmp(a->argv[3], "off"))
|
|
aeldebug = 0;
|
|
else
|
|
return CLI_SHOWUSAGE;
|
|
|
|
return CLI_SUCCESS;
|
|
}
|
|
|
|
static char *handle_cli_ael_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
|
{
|
|
switch (cmd) {
|
|
case CLI_INIT:
|
|
e->command = "ael reload";
|
|
e->usage =
|
|
"Usage: ael reload\n"
|
|
" Reloads AEL configuration.\n";
|
|
return NULL;
|
|
case CLI_GENERATE:
|
|
return NULL;
|
|
}
|
|
|
|
if (a->argc != 2)
|
|
return CLI_SHOWUSAGE;
|
|
|
|
return (pbx_load_module() ? CLI_FAILURE : CLI_SUCCESS);
|
|
}
|
|
|
|
static struct ast_cli_entry cli_ael_debug_multiple_deprecated = AST_CLI_DEFINE(handle_cli_ael_debug_multiple_deprecated, "Enable AEL debugging flags");
|
|
static struct ast_cli_entry cli_ael[] = {
|
|
AST_CLI_DEFINE(handle_cli_ael_reload, "Reload AEL configuration"),
|
|
AST_CLI_DEFINE(handle_cli_ael_set_debug, "Enable AEL debugging flags", .deprecate_cmd = &cli_ael_debug_multiple_deprecated)
|
|
};
|
|
|
|
static int unload_module(void)
|
|
{
|
|
ast_context_destroy(NULL, registrar);
|
|
ast_cli_unregister_multiple(cli_ael, sizeof(cli_ael) / sizeof(struct ast_cli_entry));
|
|
return 0;
|
|
}
|
|
|
|
static int load_module(void)
|
|
{
|
|
ast_cli_register_multiple(cli_ael, sizeof(cli_ael) / sizeof(struct ast_cli_entry));
|
|
return (pbx_load_module());
|
|
}
|
|
|
|
static int reload(void)
|
|
{
|
|
return pbx_load_module();
|
|
}
|
|
|
|
#ifdef STANDALONE_AEL
|
|
#define AST_MODULE "ael"
|
|
int ael_external_load_module(void);
|
|
int ael_external_load_module(void)
|
|
{
|
|
pbx_load_module();
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Extension Language Compiler",
|
|
.load = load_module,
|
|
.unload = unload_module,
|
|
.reload = reload,
|
|
);
|
|
|
|
#ifdef AAL_ARGCHECK
|
|
static char *ael_funclist[] =
|
|
{
|
|
"AGENT",
|
|
"ARRAY",
|
|
"BASE64_DECODE",
|
|
"BASE64_ENCODE",
|
|
"CALLERID",
|
|
"CDR",
|
|
"CHANNEL",
|
|
"CHECKSIPDOMAIN",
|
|
"CHECK_MD5",
|
|
"CURL",
|
|
"CUT",
|
|
"DB",
|
|
"DB_EXISTS",
|
|
"DUNDILOOKUP",
|
|
"ENUMLOOKUP",
|
|
"ENV",
|
|
"EVAL",
|
|
"EXISTS",
|
|
"FIELDQTY",
|
|
"FILTER",
|
|
"GROUP",
|
|
"GROUP_COUNT",
|
|
"GROUP_LIST",
|
|
"GROUP_MATCH_COUNT",
|
|
"IAXPEER",
|
|
"IF",
|
|
"IFTIME",
|
|
"ISNULL",
|
|
"KEYPADHASH",
|
|
"LANGUAGE",
|
|
"LEN",
|
|
"MATH",
|
|
"MD5",
|
|
"MUSICCLASS",
|
|
"QUEUEAGENTCOUNT",
|
|
"QUEUE_MEMBER_COUNT",
|
|
"QUEUE_MEMBER_LIST",
|
|
"QUOTE",
|
|
"RAND",
|
|
"REGEX",
|
|
"SET",
|
|
"SHA1",
|
|
"SIPCHANINFO",
|
|
"SIPPEER",
|
|
"SIP_HEADER",
|
|
"SORT",
|
|
"STAT",
|
|
"STRFTIME",
|
|
"STRPTIME",
|
|
"TIMEOUT",
|
|
"TXTCIDNAME",
|
|
"URIDECODE",
|
|
"URIENCODE",
|
|
"VMCOUNT"
|
|
};
|
|
|
|
|
|
int ael_is_funcname(char *name)
|
|
{
|
|
int s,t;
|
|
t = sizeof(ael_funclist)/sizeof(char*);
|
|
s = 0;
|
|
while ((s < t) && strcasecmp(name, ael_funclist[s]))
|
|
s++;
|
|
if ( s < t )
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
#endif
|