kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

mer feb 12 14:56:57 CET 2003

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matteo Brancaleoni
2003-02-12 13:59:15 +00:00
parent d2f186de49
commit 2bd936105e
62 changed files with 1371 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pbx/.cvsignore Executable file
View File

@@ -0,0 +1 @@
pbx_kdeconsole.moc

31
pbx/pbx_config.c
View File

@@ -1059,6 +1059,7 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
char *whole_exten;
char *exten, *prior;
char *cidmatch, *app, *app_data;
char *start, *end;
/* check for arguments at first */
if (argc != 5 && argc != 6) return RESULT_SHOWUSAGE;
@@ -1075,7 +1076,14 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
}
prior = strsep(&whole_exten,",");
app = strsep(&whole_exten,",");
app_data = whole_exten;
if ((start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
*start = *end = '\0';
app_data = start + 1;
for (start = app_data; *start; start++)
if (*start == ',')
*start = '|';
} else
app_data = whole_exten;
if (!exten || !prior || !app || !app_data) return RESULT_SHOWUSAGE;
@@ -1466,6 +1474,7 @@ static int pbx_load_module(void)
struct ast_variable *v;
char *cxt, *ext, *pri, *appl, *data, *tc, *cidmatch;
struct ast_context *con;
char *start, *end;
cfg = ast_load(config);
if (cfg) {
@@ -1474,10 +1483,15 @@ static int pbx_load_module(void)
"static"));
write_protect_config = ast_true(ast_variable_retrieve(cfg, "general",
"writeprotect"));
v = ast_variable_browse(cfg, "globals");
while(v) {
pbx_builtin_setvar_helper(NULL, v->name, v->value);
v = v->next;
}
cxt = ast_category_browse(cfg, NULL);
while(cxt) {
/* All categories but "general" are considered contexts */
if (!strcasecmp(cxt, "general")) {
if (!strcasecmp(cxt, "general") || !strcasecmp(cxt, "globals")) {
cxt = ast_category_browse(cfg, cxt);
continue;
}
@@ -1495,10 +1509,18 @@ static int pbx_load_module(void)
pri = strsep(&stringp, ",");
if (!pri)
pri="";
appl = strsep(&stringp, ",");
appl = stringp;
if (!(start = strchr(appl, '(')))
appl = strsep(&stringp, ",");
if (!appl)
appl="";
if (stringp!=NULL && *stringp=='"') {
if (start && (end = strrchr(appl, ')'))) {
*start = *end = '\0';
data = start + 1;
for (start = data; *start; start++)
if (*start == ',')
*start = '|';
} else if (stringp!=NULL && *stringp=='"') {
stringp++;
data = strsep(&stringp, "\"");
stringp++;
@@ -1566,6 +1588,7 @@ int load_module(void)
int reload(void)
{
ast_context_destroy(NULL, registrar);
pbx_builtin_clear_globals();
pbx_load_module();
return 0;
}