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

Add dialplan variables for asterisk.conf directories

Browse Source 
Review: https://reviewboard.asterisk.org/r/1075/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2011-01-13 16:27:22 +00:00
parent c6858b9a1d
commit f485bfd1d3
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -34,6 +34,12 @@ CDR
* The filter option in cdr_adaptive_odbc now supports negating the argument,
thus allowing records which do NOT match the specified filter.
Dialplan Variables
------------------
* Added ASTETCDIR, ASTMODDIR, ASTVARLIBDIR, ASTDBDIR, ASTKEYDIR, ASTDATADIR,
ASTAGIDIR, ASTSPOOLDIR, ASTRUNDIR, ASTLOGDIR which hold the equivalent
variables from asterisk.conf.
libpri channel driver (chan_dahdi) DAHDI changes
--------------------------
* Added moh_signaling option to specify what to do when the channel's bridged

20
main/pbx.c
View File

@@ -3159,6 +3159,26 @@ const char *ast_str_retrieve_variable(struct ast_str **str, ssize_t maxlen, stru
s = ast_str_buffer(*str);
} else if (!strcmp(var, "SYSTEMNAME")) {
s = ast_config_AST_SYSTEM_NAME;
} else if (!strcmp(var, "ASTETCDIR")) {
s = ast_config_AST_CONFIG_DIR;
} else if (!strcmp(var, "ASTMODDIR")) {
s = ast_config_AST_MODULE_DIR;
} else if (!strcmp(var, "ASTVARLIBDIR")) {
s = ast_config_AST_VAR_DIR;
} else if (!strcmp(var, "ASTDBDIR")) {
s = ast_config_AST_DB;
} else if (!strcmp(var, "ASTKEYDIR")) {
s = ast_config_AST_KEY_DIR;
} else if (!strcmp(var, "ASTDATADIR")) {
s = ast_config_AST_DATA_DIR;
} else if (!strcmp(var, "ASTAGIDIR")) {
s = ast_config_AST_AGI_DIR;
} else if (!strcmp(var, "ASTSPOOLDIR")) {
s = ast_config_AST_SPOOL_DIR;
} else if (!strcmp(var, "ASTRUNDIR")) {
s = ast_config_AST_RUN_DIR;
} else if (!strcmp(var, "ASTLOGDIR")) {
s = ast_config_AST_LOG_DIR;
} else if (!strcmp(var, "ENTITYID")) {
char workspace[20];
ast_eid_to_str(workspace, sizeof(workspace), &ast_eid_default);