summaryrefslogtreecommitdiff
path: root/apps/confbridge/confbridge_manager.c
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2013-07-19 19:23:39 +0000
committerKinsey Moore <kmoore@digium.com>2013-07-19 19:23:39 +0000
commit5a8f32703c445f7d09b5e029e85d76692626a67f (patch)
treeb8ad7eea354b19249f7ccf593f65584e5c1b5625 /apps/confbridge/confbridge_manager.c
parent0b83761f9a99d18105ad6cb13dd0282a85641f03 (diff)
Filter channels used as internal mechanisms
This adds new flags to the channel tech properties that flag it as different types of implementation detail used exclusively to provide a feature. Examples of channels that would have these flags include the announcement and recording channels used by confbridge which are the only two marked as such by this patch. Review: https://reviewboard.asterisk.org/r/2633/ (closes issue ASTERISK-21873) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/confbridge/confbridge_manager.c')
-rw-r--r--apps/confbridge/confbridge_manager.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/confbridge/confbridge_manager.c b/apps/confbridge/confbridge_manager.c
index 8931c1f9f..bed4006e8 100644
--- a/apps/confbridge/confbridge_manager.c
+++ b/apps/confbridge/confbridge_manager.c
@@ -195,14 +195,17 @@ static void confbridge_publish_manager_event(
{
struct ast_bridge_blob *blob = stasis_message_data(message);
const char *conference_name;
- RAII_VAR(struct ast_str *, bridge_text,
- ast_manager_build_bridge_state_string(blob->bridge, ""),
- ast_free);
+ RAII_VAR(struct ast_str *, bridge_text, NULL, ast_free);
RAII_VAR(struct ast_str *, channel_text, NULL, ast_free);
ast_assert(blob != NULL);
ast_assert(event != NULL);
+ bridge_text = ast_manager_build_bridge_state_string(blob->bridge, "");
+ if (!bridge_text) {
+ return;
+ }
+
conference_name = ast_json_string_get(ast_json_object_get(blob->blob, "conference"));
ast_assert(conference_name != NULL);