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

Merge "Stasis: Use control queue to prevent crash." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-01-23 10:07:44 -06:00
committed by Gerrit Code Review
parent 1003c2eb05 eedd77fda0
commit fcb6c1737d
1 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
res/stasis/control.c
View File

@@ -355,14 +355,39 @@ int stasis_app_control_dial(struct stasis_app_control *control, const char *endp
return 0; return 0;
} }
static int app_control_add_role(struct stasis_app_control *control,
struct ast_channel *chan, void *data)
{
char *role = data;
return ast_channel_add_bridge_role(chan, role);
}
int stasis_app_control_add_role(struct stasis_app_control *control, const char *role) int stasis_app_control_add_role(struct stasis_app_control *control, const char *role)
{ {
return ast_channel_add_bridge_role(control->channel, role); char *role_dup;
role_dup = ast_strdup(role);
if (!role_dup) {
return -1;
}
stasis_app_send_command_async(control, app_control_add_role, role_dup, ast_free_ptr);
return 0;
}
static int app_control_clear_roles(struct stasis_app_control *control,
struct ast_channel *chan, void *data)
{
ast_channel_clear_bridge_roles(chan);
return 0;
} }
void stasis_app_control_clear_roles(struct stasis_app_control *control) void stasis_app_control_clear_roles(struct stasis_app_control *control)
{ {
ast_channel_clear_bridge_roles(control->channel); stasis_app_send_command_async(control, app_control_clear_roles, NULL, NULL);
} }
int control_command_count(struct stasis_app_control *control) int control_command_count(struct stasis_app_control *control)
@@ -598,9 +623,28 @@ int stasis_app_control_unmute(struct stasis_app_control *control, unsigned int d
return 0; return 0;
} }
static int app_control_set_channel_var(struct stasis_app_control *control,
struct ast_channel *chan, void *data)
{
struct ast_variable *var = data;
pbx_builtin_setvar_helper(control->channel, var->name, var->value);
return 0;
}
int stasis_app_control_set_channel_var(struct stasis_app_control *control, const char *variable, const char *value) int stasis_app_control_set_channel_var(struct stasis_app_control *control, const char *variable, const char *value)
{ {
return pbx_builtin_setvar_helper(control->channel, variable, value); struct ast_variable *var;
var = ast_variable_new(variable, value, "ARI");
if (!var) {
return -1;
}
stasis_app_send_command_async(control, app_control_set_channel_var, var, ast_free_ptr);
return 0;
} }
static int app_control_hold(struct stasis_app_control *control, static int app_control_hold(struct stasis_app_control *control,