<p>Michael Bradeen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/19794">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_directory: add ability to specify configuration file<br><br>Adds 4th, optional parameter to app_directory to specify a filename<br>from which to read configuration instead of voicemail.conf ie;<br><br>same => n,Directory(,,,directory.conf)<br><br>This configuration can allow a separate listing using the<br>voicemail.conf format, ie;<br><br>2020=2020,Dog Dog,,,,attach=no|saycid=no|envelope=no|delete=no<br><br>ASTERISK-30404<br><br>Change-Id: Id58ccb1344ad1e563fa10db12f172fbd104a9d13<br>---<br>M apps/app_directory.c<br>1 file changed, 42 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/94/19794/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_directory.c b/apps/app_directory.c</span><br><span>index 36da702..47c5c75 100644</span><br><span>--- a/apps/app_directory.c</span><br><span>+++ b/apps/app_directory.c</span><br><span>@@ -110,11 +110,14 @@</span><br><span> of characters for the user to type defaults to <literal>3</literal>.</para></note></span><br><span> </span><br><span> </parameter></span><br><span style="color: hsl(120, 100%, 40%);">+ <parameter name="filename" required="false"></span><br><span style="color: hsl(120, 100%, 40%);">+ <para>Load the specified config file instead of voicemail.conf</para></span><br><span style="color: hsl(120, 100%, 40%);">+ </parameter></span><br><span> </syntax></span><br><span> <description></span><br><span> <para>This application will present the calling channel with a directory of extensions from which they can search</span><br><span> by name. The list of names and corresponding extensions is retrieved from the</span><br><span style="color: hsl(0, 100%, 40%);">- voicemail configuration file, <filename>voicemail.conf</filename>.</para></span><br><span style="color: hsl(120, 100%, 40%);">+ voicemail configuration file, <filename>voicemail.conf</filename>, or from the specified filename.</para></span><br><span> <para>This application will immediately exit if one of the following DTMF digits are</span><br><span> received and the extension to jump to exists:</para></span><br><span> <para><literal>0</literal> - Jump to the 'o' extension, if it exists.</para></span><br><span>@@ -458,7 +461,7 @@</span><br><span> </span><br><span> AST_THREADSTORAGE(commonbuf);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct ast_config *realtime_directory(char *context)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct ast_config *realtime_directory(char *context, const char *filename)</span><br><span> {</span><br><span> struct ast_config *cfg;</span><br><span> struct ast_config *rtdata = NULL;</span><br><span>@@ -475,7 +478,12 @@</span><br><span> }</span><br><span> </span><br><span> /* Load flat file config. */</span><br><span style="color: hsl(0, 100%, 40%);">- cfg = ast_config_load(VOICEMAIL_CONFIG, config_flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(filename)){</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = ast_config_load(filename, config_flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = ast_config_load(VOICEMAIL_CONFIG, config_flags);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (!cfg) {</span><br><span> /* Loading config failed. */</span><br><span>@@ -858,6 +866,7 @@</span><br><span> AST_APP_ARG(vmcontext);</span><br><span> AST_APP_ARG(dialcontext);</span><br><span> AST_APP_ARG(options);</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_APP_ARG(filename);</span><br><span> );</span><br><span> </span><br><span> parse = ast_strdupa(data);</span><br><span>@@ -867,7 +876,15 @@</span><br><span> if (args.options && ast_app_parse_options(directory_app_options, &flags, opts, args.options))</span><br><span> return -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!(cfg = realtime_directory(args.vmcontext))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_strlen_zero(args.filename)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_NOTICE, "Load custom directory file: %s\n", args.filename);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = realtime_directory(args.vmcontext, args.filename);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg = realtime_directory(args.vmcontext, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cfg) {</span><br><span> ast_log(LOG_ERROR, "Unable to read the configuration data!\n");</span><br><span> return -1;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/19794">change 19794</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/19794"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Id58ccb1344ad1e563fa10db12f172fbd104a9d13 </div>
<div style="display:none"> Gerrit-Change-Number: 19794 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Michael Bradeen <mbradeen@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>