summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/asterisk.c21
-rw-r--r--main/bridge.c22
-rw-r--r--main/channel.c78
-rw-r--r--main/file.c65
-rw-r--r--main/json.c13
-rw-r--r--main/manager_bridges.c52
-rw-r--r--main/stasis_bridges.c29
-rw-r--r--main/stasis_channels.c5
8 files changed, 215 insertions, 70 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index be6c7cc32..4a6567f73 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2691,7 +2691,11 @@ static void send_rasterisk_connect_commands(void)
}
}
+#ifdef HAVE_LIBEDIT_IS_UNICODE
+static int ast_el_read_char(EditLine *editline, wchar_t *cp)
+#else
static int ast_el_read_char(EditLine *editline, char *cp)
+#endif
{
int num_read = 0;
int lastpos = 0;
@@ -2721,10 +2725,16 @@ static int ast_el_read_char(EditLine *editline, char *cp)
}
if (!ast_opt_exec && fds[1].revents) {
- num_read = read(STDIN_FILENO, cp, 1);
+ char c = '\0';
+ num_read = read(STDIN_FILENO, &c, 1);
if (num_read < 1) {
break;
} else {
+#ifdef HAVE_LIBEDIT_IS_UNICODE
+ *cp = btowc(c);
+#else
+ *cp = c;
+#endif
return (num_read);
}
}
@@ -2768,7 +2778,11 @@ static int ast_el_read_char(EditLine *editline, char *cp)
console_print(buf);
if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
+#ifdef HAVE_LIBEDIT_IS_UNICODE
+ *cp = btowc(CC_REFRESH);
+#else
*cp = CC_REFRESH;
+#endif
return(1);
} else {
lastpos = 1;
@@ -2776,7 +2790,12 @@ static int ast_el_read_char(EditLine *editline, char *cp)
}
}
+#ifdef HAVE_LIBEDIT_IS_UNICODE
+ *cp = btowc('\0');
+#else
*cp = '\0';
+#endif
+
return (0);
}
diff --git a/main/bridge.c b/main/bridge.c
index 1bb60eb7a..13c01fa27 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -3774,8 +3774,7 @@ void ast_bridge_set_single_src_video_mode(struct ast_bridge *bridge, struct ast_
bridge->name, bridge->uniqueid,
ast_channel_name(video_src_chan),
ast_channel_uniqueid(video_src_chan));
- ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to single source\r\nVideo Mode: %u\r\nVideo Channel: %s",
- bridge->softmix.video_mode.mode, ast_channel_name(video_src_chan));
+ ast_bridge_publish_state(bridge);
ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);
ast_bridge_unlock(bridge);
}
@@ -3785,8 +3784,6 @@ void ast_bridge_set_talker_src_video_mode(struct ast_bridge *bridge)
ast_bridge_lock(bridge);
cleanup_video_mode(bridge);
bridge->softmix.video_mode.mode = AST_BRIDGE_VIDEO_MODE_TALKER_SRC;
- ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to talker source\r\nVideo Mode: %u",
- bridge->softmix.video_mode.mode);
ast_bridge_unlock(bridge);
}
@@ -3818,7 +3815,7 @@ void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct a
bridge->name, bridge->uniqueid,
ast_channel_name(data->chan_vsrc),
ast_channel_uniqueid(data->chan_vsrc));
- ast_test_suite_event_notify("BRIDGE_VIDEO_SRC", "Message: video source updated\r\nVideo Channel: %s", ast_channel_name(data->chan_vsrc));
+ ast_bridge_publish_state(bridge);
ast_indicate(data->chan_vsrc, AST_CONTROL_VIDUPDATE);
} else if ((data->average_talking_energy < talker_energy) && !is_keyframe) {
ast_indicate(chan, AST_CONTROL_VIDUPDATE);
@@ -3829,7 +3826,7 @@ void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct a
bridge->name, bridge->uniqueid,
ast_channel_name(data->chan_vsrc),
ast_channel_uniqueid(data->chan_vsrc));
- ast_test_suite_event_notify("BRIDGE_VIDEO_SRC", "Message: video source updated\r\nVideo Channel: %s", ast_channel_name(data->chan_vsrc));
+ ast_bridge_publish_state(bridge);
ast_indicate(chan, AST_CONTROL_VIDUPDATE);
} else if (!data->chan_old_vsrc && is_keyframe) {
data->chan_old_vsrc = ast_channel_ref(chan);
@@ -3920,6 +3917,19 @@ void ast_bridge_remove_video_src(struct ast_bridge *bridge, struct ast_channel *
ast_bridge_unlock(bridge);
}
+const char *ast_bridge_video_mode_to_string(enum ast_bridge_video_mode_type video_mode)
+{
+ switch (video_mode) {
+ case AST_BRIDGE_VIDEO_MODE_TALKER_SRC:
+ return "talker";
+ case AST_BRIDGE_VIDEO_MODE_SINGLE_SRC:
+ return "single";
+ case AST_BRIDGE_VIDEO_MODE_NONE:
+ default:
+ return "none";
+ }
+}
+
static int channel_hash(const void *obj, int flags)
{
const struct ast_channel *chan = obj;
diff --git a/main/channel.c b/main/channel.c
index b30bb1de7..2930b895c 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -7801,35 +7801,48 @@ struct manager_channel_variable {
char name[];
};
-static AST_RWLIST_HEAD_STATIC(channelvars, manager_channel_variable);
+AST_RWLIST_HEAD(external_vars, manager_channel_variable);
-static void free_channelvars(void)
+static struct external_vars ami_vars;
+static struct external_vars ari_vars;
+
+static void free_external_channelvars(struct external_vars *channelvars)
{
struct manager_channel_variable *var;
- AST_RWLIST_WRLOCK(&channelvars);
- while ((var = AST_RWLIST_REMOVE_HEAD(&channelvars, entry))) {
+ AST_RWLIST_WRLOCK(channelvars);
+ while ((var = AST_RWLIST_REMOVE_HEAD(channelvars, entry))) {
ast_free(var);
}
- AST_RWLIST_UNLOCK(&channelvars);
+ AST_RWLIST_UNLOCK(channelvars);
}
-int ast_channel_has_manager_vars(void)
+static int channel_has_external_vars(struct external_vars *channelvars)
{
int vars_present;
- AST_RWLIST_RDLOCK(&channelvars);
- vars_present = !AST_LIST_EMPTY(&channelvars);
- AST_RWLIST_UNLOCK(&channelvars);
+ AST_RWLIST_RDLOCK(channelvars);
+ vars_present = !AST_LIST_EMPTY(channelvars);
+ AST_RWLIST_UNLOCK(channelvars);
return vars_present;
}
-void ast_channel_set_manager_vars(size_t varc, char **vars)
+int ast_channel_has_manager_vars(void)
+{
+ return channel_has_external_vars(&ami_vars);
+}
+
+int ast_channel_has_ari_vars(void)
+{
+ return channel_has_external_vars(&ari_vars);
+}
+
+static void channel_set_external_vars(struct external_vars *channelvars, size_t varc, char **vars)
{
size_t i;
- free_channelvars();
- AST_RWLIST_WRLOCK(&channelvars);
+ free_external_channelvars(channelvars);
+ AST_RWLIST_WRLOCK(channelvars);
for (i = 0; i < varc; ++i) {
const char *var = vars[i];
struct manager_channel_variable *mcv;
@@ -7840,9 +7853,20 @@ void ast_channel_set_manager_vars(size_t varc, char **vars)
if (strchr(var, '(')) {
mcv->isfunc = 1;
}
- AST_RWLIST_INSERT_TAIL(&channelvars, mcv, entry);
+ AST_RWLIST_INSERT_TAIL(channelvars, mcv, entry);
}
- AST_RWLIST_UNLOCK(&channelvars);
+ AST_RWLIST_UNLOCK(channelvars);
+
+}
+
+void ast_channel_set_manager_vars(size_t varc, char **vars)
+{
+ channel_set_external_vars(&ami_vars, varc, vars);
+}
+
+void ast_channel_set_ari_vars(size_t varc, char **vars)
+{
+ channel_set_external_vars(&ari_vars, varc, vars);
}
/*!
@@ -7884,14 +7908,15 @@ struct varshead *ast_channel_get_vars(struct ast_channel *chan)
return ret;
}
-struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan)
+static struct varshead *channel_get_external_vars(struct external_vars *channelvars,
+ struct ast_channel *chan)
{
RAII_VAR(struct varshead *, ret, NULL, ao2_cleanup);
RAII_VAR(struct ast_str *, tmp, NULL, ast_free);
struct manager_channel_variable *mcv;
- SCOPED_LOCK(lock, &channelvars, AST_RWLIST_RDLOCK, AST_RWLIST_UNLOCK);
+ SCOPED_LOCK(lock, channelvars, AST_RWLIST_RDLOCK, AST_RWLIST_UNLOCK);
- if (AST_LIST_EMPTY(&channelvars)) {
+ if (AST_LIST_EMPTY(channelvars)) {
return NULL;
}
@@ -7902,7 +7927,7 @@ struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan)
return NULL;
}
- AST_LIST_TRAVERSE(&channelvars, mcv, entry) {
+ AST_LIST_TRAVERSE(channelvars, mcv, entry) {
const char *val = NULL;
struct ast_var_t *var;
@@ -7927,11 +7952,23 @@ struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan)
ao2_ref(ret, +1);
return ret;
+
+}
+
+struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan)
+{
+ return channel_get_external_vars(&ami_vars, chan);
+}
+
+struct varshead *ast_channel_get_ari_vars(struct ast_channel *chan)
+{
+ return channel_get_external_vars(&ari_vars, chan);
}
static void channels_shutdown(void)
{
- free_channelvars();
+ free_external_channelvars(&ami_vars);
+ free_external_channelvars(&ari_vars);
ast_data_unregister(NULL);
ast_cli_unregister_multiple(cli_channel, ARRAY_LEN(cli_channel));
@@ -7964,6 +8001,9 @@ int ast_channels_init(void)
ast_register_cleanup(channels_shutdown);
+ AST_RWLIST_HEAD_INIT(&ami_vars);
+ AST_RWLIST_HEAD_INIT(&ari_vars);
+
return 0;
}
diff --git a/main/file.c b/main/file.c
index 37b9e7911..fb4ede6c8 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1093,27 +1093,27 @@ int ast_filecopy(const char *filename, const char *filename2, const char *fmt)
return filehelper(filename, filename2, fmt, ACTION_COPY);
}
-static int __ast_file_read_dirs(struct ast_str **path, ast_file_on_file on_file,
+static int __ast_file_read_dirs(const char *path, ast_file_on_file on_file,
void *obj, int max_depth)
{
DIR *dir;
struct dirent *entry;
- size_t size;
int res;
- if (!(dir = opendir(ast_str_buffer(*path)))) {
+ if (!(dir = opendir(path))) {
ast_log(LOG_ERROR, "Error opening directory - %s: %s\n",
- ast_str_buffer(*path), strerror(errno));
+ path, strerror(errno));
return -1;
}
- size = ast_str_strlen(*path);
--max_depth;
res = 0;
while ((entry = readdir(dir)) != NULL && !errno) {
- int is_file, is_dir, used_stat = 0;
+ int is_file = 0;
+ int is_dir = 0;
+ RAII_VAR(char *, full_path, NULL, ast_free);
if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
continue;
@@ -1128,23 +1128,24 @@ static int __ast_file_read_dirs(struct ast_str **path, ast_file_on_file on_file,
if (entry->d_type != DT_UNKNOWN && entry->d_type != DT_LNK) {
is_file = entry->d_type == DT_REG;
is_dir = entry->d_type == DT_DIR;
- ast_log(LOG_VERBOSE, "!###### d_name=%s, path=%s, NO USE STAT used_stat=%d\n", entry->d_name, ast_str_buffer(*path), used_stat);
} else
#endif
{
struct stat statbuf;
/*
- * If using the stat function the file needs to be appended to the
- * path so it can be found. However, before appending make sure the
- * path contains only the directory for this depth level.
+ * Don't use alloca or we risk blowing out the stack if recursing
+ * into subdirectories.
*/
- ast_str_truncate(*path, size);
- ast_str_append(path, 0, "/%s", entry->d_name);
+ full_path = ast_malloc(strlen(path) + strlen(entry->d_name) + 2);
+ if (!full_path) {
+ return -1;
+ }
+ sprintf(full_path, "%s/%s", path, entry->d_name);
- if (stat(ast_str_buffer(*path), &statbuf)) {
+ if (stat(full_path, &statbuf)) {
ast_log(LOG_ERROR, "Error reading path stats - %s: %s\n",
- ast_str_buffer(*path), strerror(errno));
+ full_path, strerror(errno));
/*
* Output an error, but keep going. It could just be
* a broken link and other files could be fine.
@@ -1154,13 +1155,11 @@ static int __ast_file_read_dirs(struct ast_str **path, ast_file_on_file on_file,
is_file = S_ISREG(statbuf.st_mode);
is_dir = S_ISDIR(statbuf.st_mode);
- used_stat = 1;
- ast_log(LOG_VERBOSE, "!###### d_name=%s, path=%s, WE USED IT YO used_stat=%d\n", entry->d_name, ast_str_buffer(*path), used_stat);
}
if (is_file) {
/* If the handler returns non-zero then stop */
- if ((res = on_file(ast_str_buffer(*path), entry->d_name, obj))) {
+ if ((res = on_file(path, entry->d_name, obj))) {
break;
}
/* Otherwise move on to next item in directory */
@@ -1168,25 +1167,22 @@ static int __ast_file_read_dirs(struct ast_str **path, ast_file_on_file on_file,
}
if (!is_dir) {
- ast_debug(5, "Skipping %s: not a regular file or directory\n",
- ast_str_buffer(*path));
+ ast_debug(5, "Skipping %s: not a regular file or directory\n", full_path);
continue;
}
/* Only re-curse into sub-directories if not at the max depth */
if (max_depth != 0) {
- /*
- * If the stat function was used then the sub-directory has
- * already been appended, otherwise append it.
- */
- ast_log(LOG_VERBOSE, "!###### do dir d_name=%s, path=%s, used_stat=%d\n", entry->d_name, ast_str_buffer(*path), used_stat);
- if (!used_stat) {
- ast_str_truncate(*path, size);
- ast_str_append(path, 0, "/%s", entry->d_name);
- ast_log(LOG_VERBOSE, "!###### d_name=%s, path=%s\n", entry->d_name, ast_str_buffer(*path));
+ if (!full_path) {
+ /* Don't use alloca. See note above. */
+ full_path = ast_malloc(strlen(path) + strlen(entry->d_name) + 2);
+ if (!full_path) {
+ return -1;
+ }
+ sprintf(full_path, "%s/%s", path, entry->d_name);
}
- if ((res = __ast_file_read_dirs(path, on_file, obj, max_depth))) {
+ if ((res = __ast_file_read_dirs(full_path, on_file, obj, max_depth))) {
break;
}
}
@@ -1196,7 +1192,7 @@ static int __ast_file_read_dirs(struct ast_str **path, ast_file_on_file on_file,
if (!res && errno) {
ast_log(LOG_ERROR, "Error while reading directories - %s: %s\n",
- ast_str_buffer(*path), strerror(errno));
+ path, strerror(errno));
res = -1;
}
@@ -1217,27 +1213,20 @@ AST_MUTEX_DEFINE_STATIC(read_dirs_lock);
int ast_file_read_dirs(const char *dir_name, ast_file_on_file on_file, void *obj, int max_depth)
{
- struct ast_str *path;
int res;
- if (!(path = ast_str_create(256))) {
- return -1;
- }
-
- ast_str_set(&path, 0, "%s", dir_name);
errno = 0;
#if !defined(__GLIBC__)
ast_mutex_lock(&read_dirs_lock);
#endif
- res = __ast_file_read_dirs(&path, on_file, obj, max_depth);
+ res = __ast_file_read_dirs(dir_name, on_file, obj, max_depth);
#if !defined(__GLIBC__)
ast_mutex_unlock(&read_dirs_lock);
#endif
- ast_free(path);
return res;
}
diff --git a/main/json.c b/main/json.c
index 7b5cfbe7e..a28dbb2e2 100644
--- a/main/json.c
+++ b/main/json.c
@@ -1048,3 +1048,16 @@ enum ast_json_to_ast_vars_code ast_json_to_ast_variables(struct ast_json *json_v
return AST_JSON_TO_AST_VARS_CODE_SUCCESS;
}
+
+struct ast_json *ast_json_channel_vars(struct varshead *channelvars)
+{
+ struct ast_json *ret;
+ struct ast_var_t *var;
+
+ ret = ast_json_object_create();
+ AST_LIST_TRAVERSE(channelvars, var, entries) {
+ ast_json_object_set(ret, var->name, ast_json_string_create(var->value));
+ }
+
+ return ret;
+}
diff --git a/main/manager_bridges.c b/main/manager_bridges.c
index c6e997f42..b7059f40c 100644
--- a/main/manager_bridges.c
+++ b/main/manager_bridges.c
@@ -91,6 +91,21 @@ static struct stasis_message_router *bridge_state_router;
</see-also>
</managerEventInstance>
</managerEvent>
+ <managerEvent language="en_US" name="BridgeVideoSourceUpdate">
+ <managerEventInstance class="EVENT_FLAG_CALL">
+ <synopsis>Raised when the channel that is the source of video in a bridge changes.</synopsis>
+ <syntax>
+ <bridge_snapshot/>
+ <parameter name="BridgePreviousVideoSource">
+ <para>The unique ID of the channel that was the video source.</para>
+ </parameter>
+ </syntax>
+ <see-also>
+ <ref type="managerEvent">BridgeCreate</ref>
+ <ref type="managerEvent">BridgeDestroy</ref>
+ </see-also>
+ </managerEventInstance>
+ </managerEvent>
<manager name="BridgeList" language="en_US">
<synopsis>
Get a list of bridges in the system.
@@ -222,18 +237,30 @@ struct ast_str *ast_manager_build_bridge_state_string_prefix(
"%sBridgeTechnology: %s\r\n"
"%sBridgeCreator: %s\r\n"
"%sBridgeName: %s\r\n"
- "%sBridgeNumChannels: %u\r\n",
+ "%sBridgeNumChannels: %u\r\n"
+ "%sBridgeVideoSourceMode: %s\r\n",
prefix, snapshot->uniqueid,
prefix, snapshot->subclass,
prefix, snapshot->technology,
prefix, ast_strlen_zero(snapshot->creator) ? "<unknown>": snapshot->creator,
prefix, ast_strlen_zero(snapshot->name) ? "<unknown>": snapshot->name,
- prefix, snapshot->num_channels);
+ prefix, snapshot->num_channels,
+ prefix, ast_bridge_video_mode_to_string(snapshot->video_mode));
if (!res) {
ast_free(out);
return NULL;
}
+ if (snapshot->video_mode != AST_BRIDGE_VIDEO_MODE_NONE
+ && !ast_strlen_zero(snapshot->video_source_id)) {
+ res = ast_str_append(&out, 0, "%sBridgeVideoSource: %s\r\n",
+ prefix, snapshot->video_source_id);
+ if (!res) {
+ ast_free(out);
+ return NULL;
+ }
+ }
+
return out;
}
@@ -261,6 +288,25 @@ static struct ast_manager_event_blob *bridge_create(
EVENT_FLAG_CALL, "BridgeCreate", NO_EXTRA_FIELDS);
}
+/* \brief Handle video source updates */
+static struct ast_manager_event_blob *bridge_video_update(
+ struct ast_bridge_snapshot *old_snapshot,
+ struct ast_bridge_snapshot *new_snapshot)
+{
+ if (!new_snapshot || !old_snapshot) {
+ return NULL;
+ }
+
+ if (!strcmp(old_snapshot->video_source_id, new_snapshot->video_source_id)) {
+ return NULL;
+ }
+
+ return ast_manager_event_blob_create(
+ EVENT_FLAG_CALL, "BridgeVideoSourceUpdate",
+ "BridgePreviousVideoSource: %s\r\n",
+ old_snapshot->video_source_id);
+}
+
/*! \brief Handle bridge destruction */
static struct ast_manager_event_blob *bridge_destroy(
struct ast_bridge_snapshot *old_snapshot,
@@ -274,9 +320,9 @@ static struct ast_manager_event_blob *bridge_destroy(
EVENT_FLAG_CALL, "BridgeDestroy", NO_EXTRA_FIELDS);
}
-
bridge_snapshot_monitor bridge_monitors[] = {
bridge_create,
+ bridge_video_update,
bridge_destroy,
};
diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c
index 43722b90b..7f53bfe2d 100644
--- a/main/stasis_bridges.c
+++ b/main/stasis_bridges.c
@@ -242,7 +242,13 @@ struct ast_bridge_snapshot *ast_bridge_snapshot_create(struct ast_bridge *bridge
snapshot = ao2_alloc_options(sizeof(*snapshot), bridge_snapshot_dtor,
AO2_ALLOC_OPT_LOCK_NOLOCK);
- if (!snapshot || ast_string_field_init(snapshot, 128)) {
+ if (!snapshot) {
+ return NULL;
+ }
+
+ if (ast_string_field_init(snapshot, 128)
+ || ast_string_field_init_extended(snapshot, video_source_id)) {
+ ao2_ref(snapshot, -1);
return NULL;
}
@@ -268,6 +274,16 @@ struct ast_bridge_snapshot *ast_bridge_snapshot_create(struct ast_bridge *bridge
snapshot->capabilities = bridge->technology->capabilities;
snapshot->num_channels = bridge->num_channels;
snapshot->num_active = bridge->num_active;
+ snapshot->video_mode = bridge->softmix.video_mode.mode;
+ if (snapshot->video_mode == AST_BRIDGE_VIDEO_MODE_SINGLE_SRC
+ && bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc) {
+ ast_string_field_set(snapshot, video_source_id,
+ ast_channel_uniqueid(bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc));
+ } else if (snapshot->video_mode == AST_BRIDGE_VIDEO_MODE_TALKER_SRC
+ && bridge->softmix.video_mode.mode_data.talker_src_data.chan_vsrc) {
+ ast_string_field_set(snapshot, video_source_id,
+ ast_channel_uniqueid(bridge->softmix.video_mode.mode_data.talker_src_data.chan_vsrc));
+ }
ao2_ref(snapshot, +1);
return snapshot;
@@ -590,18 +606,25 @@ struct ast_json *ast_bridge_snapshot_to_json(
return NULL;
}
- json_bridge = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: s, s: o}",
+ json_bridge = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: s, s: o, s: s}",
"id", snapshot->uniqueid,
"technology", snapshot->technology,
"bridge_type", capability2str(snapshot->capabilities),
"bridge_class", snapshot->subclass,
"creator", snapshot->creator,
"name", snapshot->name,
- "channels", json_channels);
+ "channels", json_channels,
+ "video_mode", ast_bridge_video_mode_to_string(snapshot->video_mode));
if (!json_bridge) {
return NULL;
}
+ if (snapshot->video_mode != AST_BRIDGE_VIDEO_MODE_NONE
+ && !ast_strlen_zero(snapshot->video_source_id)) {
+ ast_json_object_set(json_bridge, "video_source_id",
+ ast_json_string_create(snapshot->video_source_id));
+ }
+
return ast_json_ref(json_bridge);
}
diff --git a/main/stasis_channels.c b/main/stasis_channels.c
index 91f209290..4897af89e 100644
--- a/main/stasis_channels.c
+++ b/main/stasis_channels.c
@@ -270,6 +270,7 @@ struct ast_channel_snapshot *ast_channel_snapshot_create(struct ast_channel *cha
ast_set_flag(&snapshot->softhangup_flags, ast_channel_softhangup_internal_flag(chan));
snapshot->manager_vars = ast_channel_get_manager_vars(chan);
+ snapshot->ari_vars = ast_channel_get_ari_vars(chan);
snapshot->tech_properties = ast_channel_tech(chan)->properties;
return snapshot;
@@ -918,6 +919,10 @@ struct ast_json *ast_channel_snapshot_to_json(
"creationtime", ast_json_timeval(snapshot->creationtime, NULL),
"language", snapshot->language);
+ if (snapshot->ari_vars && !AST_LIST_EMPTY(snapshot->ari_vars)) {
+ ast_json_object_set(json_chan, "channelvars", ast_json_channel_vars(snapshot->ari_vars));
+ }
+
return ast_json_ref(json_chan);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 21:48:15 +0000