diff options
Diffstat (limited to 'apps/confbridge')
| -rw-r--r-- | apps/confbridge/conf_chan_announce.c | 1 | ||||
| -rw-r--r-- | apps/confbridge/conf_chan_record.c | 1 | ||||
| -rw-r--r-- | apps/confbridge/confbridge_manager.c | 9 |
3 files changed, 8 insertions, 3 deletions
diff --git a/apps/confbridge/conf_chan_announce.c b/apps/confbridge/conf_chan_announce.c index 968308523..f3ff79fbc 100644 --- a/apps/confbridge/conf_chan_announce.c +++ b/apps/confbridge/conf_chan_announce.c @@ -134,6 +134,7 @@ static struct ast_channel_tech announce_tech = { .send_text = ast_unreal_sendtext, .queryoption = ast_unreal_queryoption, .setoption = ast_unreal_setoption, + .properties = AST_CHAN_TP_ANNOUNCER, }; struct ast_channel_tech *conf_announce_get_tech(void) diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c index 18f971f35..8198b4fa0 100644 --- a/apps/confbridge/conf_chan_record.c +++ b/apps/confbridge/conf_chan_record.c @@ -86,6 +86,7 @@ static struct ast_channel_tech record_tech = { .call = rec_call, .read = rec_read, .write = rec_write, + .properties = AST_CHAN_TP_RECORDER, }; struct ast_channel_tech *conf_record_get_tech(void) 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); |