kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-06 18:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge config updates (bug #3406)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-25 06:10:20 +00:00
parent a611ce04f1
commit 5f726ad8c7
49 changed files with 881 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pbx/pbx_config.c
View File

@@ -972,13 +972,13 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
snprintf(filename, sizeof(filename), "%s/%s",
(char *)ast_config_AST_CONFIG_DIR, config);
cfg = ast_load("extensions.conf");
cfg = ast_config_load("extensions.conf");
/* try to lock contexts list */
if (ast_lock_contexts()) {
ast_cli(fd, "Failed to lock contexts list\n");
ast_mutex_unlock(&save_dialplan_lock);
ast_destroy(cfg);
ast_config_destroy(cfg);
return RESULT_FAILURE;
}
@@ -988,7 +988,7 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
filename);
ast_unlock_contexts();
ast_mutex_unlock(&save_dialplan_lock);
ast_destroy(cfg);
ast_config_destroy(cfg);
return RESULT_FAILURE;
}
@@ -1006,7 +1006,7 @@ static int handle_save_dialplan(int fd, int argc, char *argv[])
fprintf(output, "\n");
}
ast_destroy(cfg);
ast_config_destroy(cfg);
/* walk all contexts */
c = ast_walk_contexts(NULL);
@@ -1623,7 +1623,7 @@ static int pbx_load_module(void)
char realvalue[256];
int lastpri = -2;
cfg = ast_load(config);
cfg = ast_config_load(config);
if (cfg) {
/* Use existing config to populate the PBX table */
static_config = ast_true(ast_variable_retrieve(cfg, "general",
@@ -1775,7 +1775,7 @@ static int pbx_load_module(void)
}
cxt = ast_category_browse(cfg, cxt);
}
ast_destroy(cfg);
ast_config_destroy(cfg);
}
ast_merge_contexts_and_delete(&local_contexts,registrar);

4
pbx/pbx_dundi.c
View File

@@ -4446,7 +4446,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin)
dundi_eid testeid;
dundi_ttl = DUNDI_DEFAULT_TTL;
cfg = ast_load(config_file);
cfg = ast_config_load(config_file);
if (!cfg) {
@@ -4569,7 +4569,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin)
cat = ast_category_browse(cfg, cat);
}
prune_peers();
ast_destroy(cfg);
ast_config_destroy(cfg);
load_password();
if (globalpcmodel & DUNDI_MODEL_OUTBOUND)
dundi_precache_full();

26
pbx/pbx_realtime.c
View File

@@ -13,7 +13,6 @@
#include <asterisk/logger.h>
#include <asterisk/channel.h>
#include <asterisk/config.h>
#include <asterisk/config_pvt.h>
#include <asterisk/options.h>
#include <asterisk/pbx.h>
#include <asterisk/module.h>
@@ -92,7 +91,6 @@ static struct ast_variable *realtime_switch_common(const char *table, const char
{
struct ast_variable *var;
struct ast_config *cfg;
struct ast_category *cat;
char pri[20];
char *ematch;
char rexten[AST_MAX_EXTENSION + 20]="";
@@ -116,27 +114,27 @@ static struct ast_variable *realtime_switch_common(const char *table, const char
if (!var) {
cfg = ast_load_realtime_multientry(table, "exten LIKE", "\\_%", "context", context, "priority", pri, NULL);
if (cfg) {
cat = cfg->root;
char *cat = ast_category_browse(cfg, NULL);
while(cat) {
switch(mode) {
case MODE_MATCHMORE:
match = ast_extension_close(cat->name, exten, 1);
match = ast_extension_close(cat, exten, 1);
break;
case MODE_CANMATCH:
match = ast_extension_close(cat->name, exten, 0);
match = ast_extension_close(cat, exten, 0);
break;
case MODE_MATCH:
default:
match = ast_extension_match(cat->name, exten);
match = ast_extension_match(cat, exten);
}
if (match) {
var = cat->root;
cat->root = NULL;
var = ast_category_detach_variables(ast_category_get(cfg, cat));
break;
}
cat = cat->next;
cat = ast_category_browse(cfg, cat);
}
ast_destroy(cfg);
ast_config_destroy(cfg);
}
}
return var;
@@ -145,7 +143,7 @@ static struct ast_variable *realtime_switch_common(const char *table, const char
static int realtime_exists(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data)
{
REALTIME_COMMON(MODE_MATCH);
if (var) ast_destroy_realtime(var);
if (var) ast_variables_destroy(var);
if (var)
res = 1;
return res > 0 ? res : 0;
@@ -154,7 +152,7 @@ static int realtime_exists(struct ast_channel *chan, const char *context, const
static int realtime_canmatch(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data)
{
REALTIME_COMMON(MODE_CANMATCH);
if (var) ast_destroy_realtime(var);
if (var) ast_variables_destroy(var);
if (var)
res = 1;
return res > 0 ? res : 0;
@@ -180,7 +178,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch
tmp = ast_strdupa(v->value);
v = v->next;
}
ast_destroy_realtime(var);
ast_variables_destroy(var);
if (!ast_strlen_zero(app)) {
a = pbx_findapp(app);
if (a) {
@@ -212,7 +210,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch
static int realtime_matchmore(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data)
{
REALTIME_COMMON(MODE_MATCHMORE);
if (var) ast_destroy_realtime(var);
if (var) ast_variables_destroy(var);
if (var)
res = 1;
return res > 0 ? res : 0;