kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow disabling pattern match searches within the Realtime dialplan switch.

Browse Source 
(closes issue #13698)
 Reported by: fhackenberger
 Patches: 
       20081211__bug13698.diff.txt uploaded by Corydon76 (license 14)
 Tested by: fhackenberger


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@164485 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-15 21:17:07 +00:00
parent 763d4dcabb
commit e62193f887
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -87,6 +87,8 @@ Miscellaneous
which are interpreted as relative to the astvarlibdir setting in asterisk.conf. which are interpreted as relative to the astvarlibdir setting in asterisk.conf.
* All deprecated CLI commands are removed from the sourcecode. They are now handled * All deprecated CLI commands are removed from the sourcecode. They are now handled
by the new clialiases module. See cli_aliases.conf.sample file. by the new clialiases module. See cli_aliases.conf.sample file.
* The realtime switch now supports an option flag, 'p', which disables searches for
pattern matches.
Asterisk Manager Interface Asterisk Manager Interface
-------------------------- --------------------------

13
configs/extconfig.conf.sample
View File

@@ -60,4 +60,17 @@
;queue_members => odbc,asterisk ;queue_members => odbc,asterisk
;musiconhold => mysql,asterisk ;musiconhold => mysql,asterisk
;queue_log => mysql,aasterisk ;queue_log => mysql,aasterisk
;
;
; While most dynamic realtime engines are automatically used when defined in
; this file, 'extensions', distinctively, is not. To activate dynamic realtime
; extensions, you must turn them on in each respective context within
; extensions.conf with a switch statement. The syntax is:
; switch => Realtime/[[db_context@]tablename]/<opts>
; The only option available currently is the 'p' option, which disallows
; extension pattern queries to the database. If you have no patterns defined
; in a particular context, this will save quite a bit of CPU time. However,
; note that using dynamic realtime extensions is not recommended anymore as a
; best practice; instead, you should consider writing a static dialplan with
; proper data abstraction via a tool like func_odbc.

21
pbx/pbx_realtime.c
View File

@@ -46,6 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h" #include "asterisk/utils.h"
#include "asterisk/crypto.h" #include "asterisk/crypto.h"
#include "asterisk/astdb.h" #include "asterisk/astdb.h"
#include "asterisk/app.h"
#define MODE_MATCH 0 #define MODE_MATCH 0
#define MODE_MATCHMORE 1 #define MODE_MATCHMORE 1
@@ -53,6 +54,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define EXT_DATA_SIZE 256 #define EXT_DATA_SIZE 256
enum {
OPTION_PATTERNS_DISABLED = (1 << 0),
} option_flags;
AST_APP_OPTIONS(switch_opts, {
AST_APP_OPTION('p', OPTION_PATTERNS_DISABLED),
});
/* Realtime switch looks up extensions in the supplied realtime table. /* Realtime switch looks up extensions in the supplied realtime table.
[context@][realtimetable][/options] [context@][realtimetable][/options]
@@ -67,7 +76,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
*/ */
static struct ast_variable *realtime_switch_common(const char *table, const char *context, const char *exten, int priority, int mode) static struct ast_variable *realtime_switch_common(const char *table, const char *context, const char *exten, int priority, int mode, struct ast_flags flags)
{ {
struct ast_variable *var; struct ast_variable *var;
struct ast_config *cfg; struct ast_config *cfg;
@@ -97,7 +106,7 @@ static struct ast_variable *realtime_switch_common(const char *table, const char
ast_copy_string(rexten, exten, sizeof(rexten)); ast_copy_string(rexten, exten, sizeof(rexten));
} }
var = ast_load_realtime(table, ematch, rexten, "context", context, "priority", pri, SENTINEL); var = ast_load_realtime(table, ematch, rexten, "context", context, "priority", pri, SENTINEL);
if (!var) { if (!var && !ast_test_flag(&flags, OPTION_PATTERNS_DISABLED)) {
cfg = ast_load_realtime_multientry(table, "exten LIKE", "\\_%", "context", context, "priority", pri, SENTINEL); cfg = ast_load_realtime_multientry(table, "exten LIKE", "\\_%", "context", context, "priority", pri, SENTINEL);
if (cfg) { if (cfg) {
char *cat = ast_category_browse(cfg, NULL); char *cat = ast_category_browse(cfg, NULL);
@@ -131,8 +140,11 @@ static struct ast_variable *realtime_common(const char *context, const char *ext
const char *ctx = NULL; const char *ctx = NULL;
char *table; char *table;
struct ast_variable *var=NULL; struct ast_variable *var=NULL;
struct ast_flags flags = { 0, };
char *buf = ast_strdupa(data); char *buf = ast_strdupa(data);
if (buf) { if (buf) {
/* "Realtime" prefix is stripped off in the parent engine. The
* remaining string is: [[context@]table][/opts] */
char *opts = strchr(buf, '/'); char *opts = strchr(buf, '/');
if (opts) if (opts)
*opts++ = '\0'; *opts++ = '\0';
@@ -143,7 +155,10 @@ static struct ast_variable *realtime_common(const char *context, const char *ext
} }
ctx = S_OR(ctx, context); ctx = S_OR(ctx, context);
table = S_OR(table, "extensions"); table = S_OR(table, "extensions");
var = realtime_switch_common(table, ctx, exten, priority, mode); if (!ast_strlen_zero(opts)) {
ast_app_parse_options(switch_opts, &flags, NULL, opts);
}
var = realtime_switch_common(table, ctx, exten, priority, mode, flags);
} }
return var; return var;
} }