kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 00:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add #tryinclude statement

Browse Source 
This provides the same functionality as #include however an asterisk module will
still load if the filename does not exist.

Review: https://reviewboard.asterisk.org/r/1476/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@345735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2011-11-21 16:40:17 +00:00
parent 6e7359f594
commit 298d015828
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -389,6 +389,12 @@ SIP Changes
* Addition of the 'auth_options_requests' option for turning on and off * Addition of the 'auth_options_requests' option for turning on and off
authentication for OPTIONS requests in chan_sip. authentication for OPTIONS requests in chan_sip.
Configuration files
-------------------
* Add #tryinclude statement for config files. This provides the same
functionality as the #include statement however an asterisk module will
still load if the filename does not exist. Using the #include statement
Asterisk will not allow the module to load.
IAX2 Changes IAX2 Changes
----------- -----------

10
main/config.c
View File

@@ -1202,6 +1202,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
char *cur2; char *cur2;
char real_inclusion_name[256]; char real_inclusion_name[256];
int do_include = 0; /* otherwise, it is exec */ int do_include = 0; /* otherwise, it is exec */
int try_include = 0;
cur++; cur++;
c = cur; c = cur;
@@ -1221,6 +1222,9 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
} }
if (!strcasecmp(cur, "include")) { if (!strcasecmp(cur, "include")) {
do_include = 1; do_include = 1;
} else if (!strcasecmp(cur, "tryinclude")) {
do_include = 1;
try_include = 1;
} else if (!strcasecmp(cur, "exec")) { } else if (!strcasecmp(cur, "exec")) {
if (!ast_opt_exec_includes) { if (!ast_opt_exec_includes) {
ast_log(LOG_WARNING, "Cannot perform #exec unless execincludes option is enabled in asterisk.conf (options section)!\n"); ast_log(LOG_WARNING, "Cannot perform #exec unless execincludes option is enabled in asterisk.conf (options section)!\n");
@@ -1232,8 +1236,8 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
} }
if (c == NULL) { if (c == NULL) {
ast_log(LOG_WARNING, "Directive '#%s' needs an argument (%s) at line %d of %s\n", ast_log(LOG_WARNING, "Directive '#%s' needs an argument (%s) at line %d of %s\n",
do_include ? "include" : "exec", do_include ? "include / tryinclude" : "exec",
do_include ? "filename" : "/path/to/executable", do_include ? "filename" : "/path/to/executable",
lineno, lineno,
configfile); configfile);
@@ -1278,7 +1282,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
do_include = ast_config_internal_load(cur, cfg, flags, real_inclusion_name, who_asked) ? 1 : 0; do_include = ast_config_internal_load(cur, cfg, flags, real_inclusion_name, who_asked) ? 1 : 0;
if (!ast_strlen_zero(exec_file)) if (!ast_strlen_zero(exec_file))
unlink(exec_file); unlink(exec_file);
if (!do_include) { if (!do_include && !try_include) {
ast_log(LOG_ERROR, "The file '%s' was listed as a #include but it does not exist.\n", cur); ast_log(LOG_ERROR, "The file '%s' was listed as a #include but it does not exist.\n", cur);
return -1; return -1;
} }