Author: rmudgett
Date: Wed Aug 27 16:04:45 2014
New Revision: 422199
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422199
Log:
Resolve conflict, restart automerge
Modified:
team/rmudgett/bridge_tasks/ (props changed)
team/rmudgett/bridge_tasks/apps/app_confbridge.c
team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c
Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
automerge = *
Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.
Propchange: team/rmudgett/bridge_tasks/
------------------------------------------------------------------------------
--- bridge_tasks-integrated (original)
+++ bridge_tasks-integrated Wed Aug 27 16:04:45 2014
@@ -1,1 +1,1 @@
-/trunk:1-422171
+/trunk:1-422198
Modified: team/rmudgett/bridge_tasks/apps/app_confbridge.c
URL:
http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_tasks/apps/app_confbridge.c?view=diff&rev=422199&r1=422198&r2=422199
==============================================================================
--- team/rmudgett/bridge_tasks/apps/app_confbridge.c (original)
+++ team/rmudgett/bridge_tasks/apps/app_confbridge.c Wed Aug 27 16:04:45 2014
@@ -445,7 +445,8 @@
return "";
}
-static void send_conf_stasis(struct confbridge_conference *conference, struct
ast_channel *chan, struct stasis_message_type *type, struct ast_json *extras,
int channel_topic)
+static void send_conf_stasis(struct confbridge_conference *conference, struct
ast_channel *chan,
+ struct stasis_message_type *type, struct ast_json *extras, int
channel_topic)
{
RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
RAII_VAR(struct ast_json *, json_object, NULL, ast_json_unref);
@@ -487,14 +488,32 @@
send_conf_stasis(conference, NULL, confbridge_end_type(), NULL, 0);
}
-static void send_join_event(struct ast_channel *chan, struct
confbridge_conference *conference)
-{
- send_conf_stasis(conference, chan, confbridge_join_type(), NULL, 0);
-}
-
-static void send_leave_event(struct ast_channel *chan, struct
confbridge_conference *conference)
-{
- send_conf_stasis(conference, chan, confbridge_leave_type(), NULL, 0);
+static void send_join_event(struct confbridge_user *user, struct
confbridge_conference *conference)
+{
+ struct ast_json *json_object;
+
+ json_object = ast_json_pack("{s: b}",
+ "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN)
+ );
+ if (!json_object) {
+ return;
+ }
+ send_conf_stasis(conference, user->chan, confbridge_join_type(),
json_object, 0);
+ ast_json_unref(json_object);
+}
+
+static void send_leave_event(struct confbridge_user *user, struct
confbridge_conference *conference)
+{
+ struct ast_json *json_object;
+
+ json_object = ast_json_pack("{s: b}",
+ "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN)
+ );
+ if (!json_object) {
+ return;
+ }
+ send_conf_stasis(conference, user->chan, confbridge_leave_type(),
json_object, 0);
+ ast_json_unref(json_object);
}
static void send_start_record_event(struct confbridge_conference *conference)
@@ -507,14 +526,32 @@
send_conf_stasis(conference, NULL, confbridge_stop_record_type(), NULL,
0);
}
-static void send_mute_event(struct ast_channel *chan, struct
confbridge_conference *conference)
-{
- send_conf_stasis(conference, chan, confbridge_mute_type(), NULL, 1);
-}
-
-static void send_unmute_event(struct ast_channel *chan, struct
confbridge_conference *conference)
-{
- send_conf_stasis(conference, chan, confbridge_unmute_type(), NULL, 1);
+static void send_mute_event(struct confbridge_user *user, struct
confbridge_conference *conference)
+{
+ struct ast_json *json_object;
+
+ json_object = ast_json_pack("{s: b}",
+ "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN)
+ );
+ if (!json_object) {
+ return;
+ }
+ send_conf_stasis(conference, user->chan, confbridge_mute_type(),
json_object, 1);
+ ast_json_unref(json_object);
+}
+
+static void send_unmute_event(struct confbridge_user *user, struct
confbridge_conference *conference)
+{
+ struct ast_json *json_object;
+
+ json_object = ast_json_pack("{s: b}",
+ "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN)
+ );
+ if (!json_object) {
+ return;
+ }
+ send_conf_stasis(conference, user->chan, confbridge_unmute_type(),
json_object, 1);
+ ast_json_unref(json_object);
}
static void set_rec_filename(struct confbridge_conference *conference, struct
ast_str **filename, int is_new)
@@ -1454,25 +1491,21 @@
return play_sound_helper(conference, NULL, say_number);
}
-static void conf_handle_talker_destructor(void *pvt_data)
-{
- ast_free(pvt_data);
-}
-
static int conf_handle_talker_cb(struct ast_bridge_channel *bridge_channel,
void *hook_pvt, int talking)
{
- const char *conf_name = hook_pvt;
+ const struct confbridge_user *user = hook_pvt;
RAII_VAR(struct confbridge_conference *, conference, NULL, ao2_cleanup);
struct ast_json *talking_extras;
- conference = ao2_find(conference_bridges, conf_name, OBJ_KEY);
+ conference = ao2_find(conference_bridges, user->conference->name,
OBJ_KEY);
if (!conference) {
/* Remove the hook since the conference does not exist. */
return -1;
}
- talking_extras = ast_json_pack("{s: s}",
- "talking_status", talking ? "on" : "off");
+ talking_extras = ast_json_pack("{s: s, s: b}",
+ "talking_status", talking ? "on" : "off",
+ "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN));
if (!talking_extras) {
return 0;
}
@@ -1688,17 +1721,9 @@
/* Set a talker indicate call back if talking detection is requested */
if (ast_test_flag(&user.u_profile, USER_OPT_TALKER_DETECT)) {
- char *conf_name = ast_strdup(args.conf_name); /* this is freed
during feature cleanup */
-
- if (!conf_name) {
+ if (ast_bridge_talk_detector_hook(&user.features,
conf_handle_talker_cb,
+ &user, NULL, AST_BRIDGE_HOOK_REMOVE_ON_PULL)) {
pbx_builtin_setvar_helper(chan, "CONFBRIDGE_RESULT",
"FAILED");
- res = -1;
- goto confbridge_cleanup;
- }
- if (ast_bridge_talk_detector_hook(&user.features,
conf_handle_talker_cb,
- conf_name, conf_handle_talker_destructor,
AST_BRIDGE_HOOK_REMOVE_ON_PULL)) {
- pbx_builtin_setvar_helper(chan, "CONFBRIDGE_RESULT",
"FAILED");
- ast_free(conf_name);
res = -1;
goto confbridge_cleanup;
}
@@ -1767,7 +1792,7 @@
conf_moh_unsuspend(&user);
/* Join our conference bridge for real */
- send_join_event(user.chan, conference);
+ send_join_event(&user, conference);
ast_bridge_join(conference->bridge,
chan,
NULL,
@@ -1779,7 +1804,7 @@
pbx_builtin_setvar_helper(chan, "CONFBRIDGE_RESULT", "HANGUP");
}
- send_leave_event(user.chan, conference);
+ send_leave_event(&user, conference);
/* if we're shutting down, don't attempt to do further processing */
if (ast_shutting_down()) {
@@ -1838,8 +1863,7 @@
}
static int action_toggle_mute(struct confbridge_conference *conference,
- struct confbridge_user *user,
- struct ast_channel *chan)
+ struct confbridge_user *user)
{
int mute;
@@ -1849,12 +1873,12 @@
conf_update_user_mute(user);
if (mute) {
- send_mute_event(chan, conference);
+ send_mute_event(user, conference);
} else {
- send_unmute_event(chan, conference);
- }
-
- return ast_stream_and_wait(chan, (mute ?
+ send_unmute_event(user, conference);
+ }
+
+ return ast_stream_and_wait(user->chan, (mute ?
conf_get_sound(CONF_SOUND_MUTED, user->b_profile.sounds) :
conf_get_sound(CONF_SOUND_UNMUTED, user->b_profile.sounds)),
"");
@@ -2072,9 +2096,7 @@
AST_LIST_TRAVERSE(&menu_entry->actions, menu_action, action) {
switch (menu_action->id) {
case MENU_ACTION_TOGGLE_MUTE:
- res |= action_toggle_mute(conference,
- user,
- bridge_channel->chan);
+ res |= action_toggle_mute(conference, user);
break;
case MENU_ACTION_ADMIN_TOGGLE_MUTE_PARTICIPANTS:
if (!isadmin) {
@@ -2478,9 +2500,9 @@
conf_update_user_mute(user);
if (mute) {
- send_mute_event(user->chan, conference);
+ send_mute_event(user, conference);
} else {
- send_unmute_event(user->chan, conference);
+ send_unmute_event(user, conference);
}
}
Modified: team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c
URL:
http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c?view=diff&rev=422199&r1=422198&r2=422199
==============================================================================
--- team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c (original)
+++ team/rmudgett/bridge_tasks/apps/confbridge/confbridge_manager.c Wed Aug 27
16:04:45 2014
@@ -76,6 +76,13 @@
</parameter>
<bridge_snapshot/>
<channel_snapshot/>
+ <parameter name="Admin">
+ <para>Identifies this user as an admin
user.</para>
+ <enumlist>
+ <enum name="Yes"/>
+ <enum name="No"/>
+ </enumlist>
+ </parameter>
</syntax>
<see-also>
<ref type="managerEvent">ConfbridgeLeave</ref>
@@ -92,6 +99,13 @@
</parameter>
<bridge_snapshot/>
<channel_snapshot/>
+ <parameter name="Admin">
+ <para>Identifies this user as an admin
user.</para>
+ <enumlist>
+ <enum name="Yes"/>
+ <enum name="No"/>
+ </enumlist>
+ </parameter>
</syntax>
<see-also>
<ref type="managerEvent">ConfbridgeJoin</ref>
@@ -138,6 +152,13 @@
</parameter>
<bridge_snapshot/>
<channel_snapshot/>
+ <parameter name="Admin">
+ <para>Identifies this user as an admin
user.</para>
+ <enumlist>
+ <enum name="Yes"/>
+ <enum name="No"/>
+ </enumlist>
+ </parameter>
</syntax>
<see-also>
<ref type="managerEvent">ConfbridgeUnmute</ref>
@@ -154,6 +175,13 @@
</parameter>
<bridge_snapshot/>
<channel_snapshot/>
+ <parameter name="Admin">
+ <para>Identifies this user as an admin
user.</para>
+ <enumlist>
+ <enum name="Yes"/>
+ <enum name="No"/>
+ </enumlist>
+ </parameter>
</syntax>
<see-also>
<ref type="managerEvent">ConfbridgeMute</ref>
@@ -174,6 +202,13 @@
<enumlist>
<enum name="on"/>
<enum name="off"/>
+ </enumlist>
+ </parameter>
+ <parameter name="Admin">
+ <para>Identifies this user as an admin
user.</para>
+ <enumlist>
+ <enum name="Yes"/>
+ <enum name="No"/>
</enumlist>
</parameter>
</syntax>
@@ -223,6 +258,18 @@
S_COR(extra_text, ast_str_buffer(extra_text), ""));
}
+static int get_admin_header(struct ast_str **extra_text, struct stasis_message
*message)
+{
+ const struct ast_bridge_blob *blob = stasis_message_data(message);
+ const struct ast_json *admin = ast_json_object_get(blob->blob, "admin");
+ if (!admin) {
+ return -1;
+ }
+
+ return ast_str_append_event_header(extra_text, "Admin",
+ S_COR(ast_json_is_true(admin), "Yes", "No"));
+}
+
static void confbridge_start_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
@@ -238,13 +285,23 @@
static void confbridge_leave_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
- confbridge_publish_manager_event(message, "ConfbridgeLeave", NULL);
+ struct ast_str *extra_text = NULL;
+
+ if (!get_admin_header(&extra_text, message)) {
+ confbridge_publish_manager_event(message, "ConfbridgeLeave",
extra_text);
+ }
+ ast_free(extra_text);
}
static void confbridge_join_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
- confbridge_publish_manager_event(message, "ConfbridgeJoin", NULL);
+ struct ast_str *extra_text = NULL;
+
+ if (!get_admin_header(&extra_text, message)) {
+ confbridge_publish_manager_event(message, "ConfbridgeJoin",
extra_text);
+ }
+ ast_free(extra_text);
}
static void confbridge_start_record_cb(void *data, struct stasis_subscription
*sub,
@@ -262,20 +319,30 @@
static void confbridge_mute_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
- confbridge_publish_manager_event(message, "ConfbridgeMute", NULL);
+ struct ast_str *extra_text = NULL;
+
+ if (!get_admin_header(&extra_text, message)) {
+ confbridge_publish_manager_event(message, "ConfbridgeMute",
extra_text);
+ }
+ ast_free(extra_text);
}
static void confbridge_unmute_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
- confbridge_publish_manager_event(message, "ConfbridgeUnmute", NULL);
+ struct ast_str *extra_text = NULL;
+
+ if (!get_admin_header(&extra_text, message)) {
+ confbridge_publish_manager_event(message, "ConfbridgeUnmute",
extra_text);
+ }
+ ast_free(extra_text);
}
static void confbridge_talking_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
RAII_VAR(struct ast_str *, extra_text, NULL, ast_free);
- struct ast_bridge_blob *blob = stasis_message_data(message);
+ const struct ast_bridge_blob *blob = stasis_message_data(message);
const char *talking_status =
ast_json_string_get(ast_json_object_get(blob->blob, "talking_status"));
if (!talking_status) {
return;
@@ -286,7 +353,9 @@
return;
}
- confbridge_publish_manager_event(message, "ConfbridgeTalking",
extra_text);
+ if (!get_admin_header(&extra_text, message)) {
+ confbridge_publish_manager_event(message, "ConfbridgeTalking",
extra_text);
+ }
}
STASIS_MESSAGE_TYPE_DEFN(confbridge_start_type);
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
