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

Migrate SHARED's use of the VarSet AMI event to Stasis-Core

Browse Source 
This patch removes the direct call to AMI from the SHARED function
and instead call Stasis-Core. Stasis-Core delivers the notification
that a shared variable has changed on a channel to all interested
consumers.

(issue ASTERISK-21462)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@387630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-05-04 15:24:31 +00:00
parent 1eac5a7988
commit b3bb6608ef
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
funcs/func_global.c
View File

@@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h" #include "asterisk/pbx.h"
#include "asterisk/channel.h" #include "asterisk/channel.h"
#include "asterisk/app.h" #include "asterisk/app.h"
#include "asterisk/manager.h" #include "asterisk/stasis_channels.h"
/*** DOCUMENTATION /*** DOCUMENTATION
<function name="GLOBAL" language="en_US"> <function name="GLOBAL" language="en_US">
@@ -83,7 +83,25 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
using it in a set of calculations (or you might be surprised by the result).</para> using it in a set of calculations (or you might be surprised by the result).</para>
</description> </description>
</function> </function>
<managerEvent language="en_US" name="VarSet">
<managerEventInstance class="EVENT_FLAG_DIALPLAN">
<synopsis>Raised when a variable is shared between channels.</synopsis>
<syntax>
<xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
<parameter name="Variable">
<para>The SHARED variable being set.</para>
<note><para>The variable name will always be enclosed with
<literal>SHARED()</literal></para></note>
</parameter>
<parameter name="Value">
<para>The new value of the variable.</para>
</parameter>
</syntax>
<see-also>
<ref type="function">SHARED</ref>
</see-also>
</managerEventInstance>
</managerEvent>
***/ ***/
static void shared_variable_free(void *data); static void shared_variable_free(void *data);
@@ -197,6 +215,8 @@ static int shared_write(struct ast_channel *chan, const char *cmd, char *data, c
AST_APP_ARG(chan); AST_APP_ARG(chan);
); );
struct ast_channel *c_ref = NULL; struct ast_channel *c_ref = NULL;
int len;
RAII_VAR(char *, shared_buffer, NULL, ast_free);
if (ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SHARED() requires an argument: SHARED(<var>[,<chan>])\n"); ast_log(LOG_WARNING, "SHARED() requires an argument: SHARED(<var>[,<chan>])\n");
@@ -215,6 +235,15 @@ static int shared_write(struct ast_channel *chan, const char *cmd, char *data, c
chan = c_ref; chan = c_ref;
} }
len = 9 + strlen(args.var); /* SHARED() + var */
shared_buffer = ast_malloc(len);
if (!shared_buffer) {
if (c_ref) {
ast_channel_unref(c_ref);
}
return -1;
}
ast_channel_lock(chan); ast_channel_lock(chan);
if (!(varstore = ast_channel_datastore_find(chan, &shared_variable_info, NULL))) { if (!(varstore = ast_channel_datastore_find(chan, &shared_variable_info, NULL))) {
@@ -255,13 +284,9 @@ static int shared_write(struct ast_channel *chan, const char *cmd, char *data, c
var = ast_var_assign(args.var, S_OR(value, "")); var = ast_var_assign(args.var, S_OR(value, ""));
AST_LIST_INSERT_HEAD(varshead, var, entries); AST_LIST_INSERT_HEAD(varshead, var, entries);
manager_event(EVENT_FLAG_DIALPLAN, "VarSet",
"Channel: %s\r\n" sprintf(shared_buffer, "SHARED(%s)", args.var);
"Variable: SHARED(%s)\r\n" ast_channel_publish_varset(chan, shared_buffer, value);
"Value: %s\r\n"
"Uniqueid: %s\r\n",
chan ? ast_channel_name(chan) : "none", args.var, value,
chan ? ast_channel_uniqueid(chan) : "none");
ast_channel_unlock(chan); ast_channel_unlock(chan);