diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2018-01-31 15:45:42 -0600 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2018-02-05 13:47:30 -0600 |
| commit | f4b161440bc9d1cd2335aa3594afa223b92facfb (patch) | |
| tree | f174399a3c31000eaec64a3e1c06a94d3155abf0 /apps | |
| parent | 0a784a91a37061e29702db5a1d4e2c753a2567f3 (diff) | |
app_confbridge: Add the Muted header to ConfbridgeJoin AMI event.
ASTERISK-27651
Change-Id: Idef2ca54d242d1b894efd3fc7b360bc6fd5bdc34
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_confbridge.c | 6 | ||||
| -rw-r--r-- | apps/confbridge/confbridge_manager.c | 37 |
2 files changed, 32 insertions, 11 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 7e6f94c34..25ae299f0 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -530,9 +530,9 @@ static void send_join_event(struct confbridge_user *user, struct confbridge_conf { struct ast_json *json_object; - json_object = ast_json_pack("{s: b}", - "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN) - ); + json_object = ast_json_pack("{s: b, s: b}", + "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN), + "muted", user->muted); if (!json_object) { return; } diff --git a/apps/confbridge/confbridge_manager.c b/apps/confbridge/confbridge_manager.c index e5db648da..0f3c7fb17 100644 --- a/apps/confbridge/confbridge_manager.c +++ b/apps/confbridge/confbridge_manager.c @@ -81,6 +81,13 @@ <enum name="No"/> </enumlist> </parameter> + <parameter name="Muted"> + <para>The joining mute status.</para> + <enumlist> + <enum name="Yes"/> + <enum name="No"/> + </enumlist> + </parameter> </syntax> <see-also> <ref type="managerEvent">ConfbridgeLeave</ref> @@ -252,20 +259,33 @@ static void confbridge_publish_manager_event( "%s", conference_name, ast_str_buffer(bridge_text), - S_COR(channel_text, ast_str_buffer(channel_text), ""), - S_COR(extra_text, ast_str_buffer(extra_text), "")); + channel_text ? ast_str_buffer(channel_text) : "", + extra_text ? ast_str_buffer(extra_text) : ""); } -static int get_admin_header(struct ast_str **extra_text, struct stasis_message *message) +static int get_bool_header(struct ast_str **extra_text, struct stasis_message *message, + const char *json_key, const char *ami_header) { const struct ast_bridge_blob *blob = stasis_message_data(message); - const struct ast_json *admin = ast_json_object_get(blob->blob, "admin"); - if (!admin) { + const struct ast_json *obj; + + obj = ast_json_object_get(blob->blob, json_key); + if (!obj) { return -1; } - return ast_str_append_event_header(extra_text, "Admin", - S_COR(ast_json_is_true(admin), "Yes", "No")); + return ast_str_append_event_header(extra_text, ami_header, + AST_YESNO(ast_json_is_true(obj))); +} + +static int get_admin_header(struct ast_str **extra_text, struct stasis_message *message) +{ + return get_bool_header(extra_text, message, "admin", "Admin"); +} + +static int get_muted_header(struct ast_str **extra_text, struct stasis_message *message) +{ + return get_bool_header(extra_text, message, "muted", "Muted"); } static void confbridge_start_cb(void *data, struct stasis_subscription *sub, @@ -296,7 +316,8 @@ static void confbridge_join_cb(void *data, struct stasis_subscription *sub, { struct ast_str *extra_text = NULL; - if (!get_admin_header(&extra_text, message)) { + if (!get_admin_header(&extra_text, message) + && !get_muted_header(&extra_text, message)) { confbridge_publish_manager_event(message, "ConfbridgeJoin", extra_text); } ast_free(extra_text); |