Author: rmudgett
Date: Wed Aug 27 10:40:48 2014
New Revision: 422159
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422159
Log:
Resolve conflict, restart automerge
Modified:
team/rmudgett/bridge_tasks/ (props changed)
team/rmudgett/bridge_tasks/apps/app_confbridge.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 10:40:48 2014
@@ -1,1 +1,1 @@
-/trunk:1-422088
+/trunk:1-422141
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=422159&r1=422158&r2=422159
==============================================================================
--- team/rmudgett/bridge_tasks/apps/app_confbridge.c (original)
+++ team/rmudgett/bridge_tasks/apps/app_confbridge.c Wed Aug 27 10:40:48 2014
@@ -211,6 +211,8 @@
<parameter name="Conference" required="true" />
<parameter name="Channel" required="true">
<para>If this parameter is not a complete
channel name, the first channel with this prefix will be used.</para>
+ <para>If this parameter is "all", all channels
will be muted.</para>
+ <para>If this parameter is "participants", all
non-admin channels will be muted.</para>
</parameter>
</syntax>
<description>
@@ -225,6 +227,8 @@
<parameter name="Conference" required="true" />
<parameter name="Channel" required="true">
<para>If this parameter is not a complete
channel name, the first channel with this prefix will be used.</para>
+ <para>If this parameter is "all", all channels
will be unmuted.</para>
+ <para>If this parameter is "participants", all
non-admin channels will be unmuted.</para>
</parameter>
</syntax>
<description>
@@ -238,8 +242,8 @@
<xi:include
xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])"
/>
<parameter name="Conference" required="true" />
<parameter name="Channel" required="true" >
- <para>If this parameter is not a complete
channel name, the first channel with this prefix will be used.</para>
<para>If this parameter is "all", all channels
will be kicked from the conference.</para>
+ <para>If this parameter is "participants", all
non-admin channels will be kicked from the conference.</para>
</parameter>
</syntax>
<description>
@@ -2181,37 +2185,47 @@
return 0;
}
-static int kick_conference_participant(struct confbridge_conference
*conference, const char *channel)
+static int kick_conference_participant(struct confbridge_conference
*conference,
+ const char *channel)
{
int res = -1;
+ int match;
struct confbridge_user *user = NULL;
+ int all = !strcasecmp("all", channel);
+ int participants = !strcasecmp("participants", channel);
SCOPED_AO2LOCK(bridge_lock, conference);
AST_LIST_TRAVERSE(&conference->active_list, user, list) {
- if (!strcasecmp(ast_channel_name(user->chan), channel) &&
!user->kicked) {
- user->kicked = 1;
- pbx_builtin_setvar_helper(user->chan,
"CONFBRIDGE_RESULT", "KICKED");
- ast_bridge_remove(conference->bridge, user->chan);
- return 0;
- } else if (!strcasecmp("all", channel)) {
+ if (user->kicked) {
+ continue;
+ }
+ match = !strcasecmp(channel, ast_channel_name(user->chan));
+ if (match || all
+ || (participants &&
!ast_test_flag(&user->u_profile, USER_OPT_ADMIN))) {
user->kicked = 1;
pbx_builtin_setvar_helper(user->chan,
"CONFBRIDGE_RESULT", "KICKED");
ast_bridge_remove(conference->bridge, user->chan);
res = 0;
+ if (match) {
+ return res;
+ }
}
}
AST_LIST_TRAVERSE(&conference->waiting_list, user, list) {
- if (!strcasecmp(ast_channel_name(user->chan), channel) &&
!user->kicked) {
- user->kicked = 1;
- pbx_builtin_setvar_helper(user->chan,
"CONFBRIDGE_RESULT", "KICKED");
- ast_bridge_remove(conference->bridge, user->chan);
- return 0;
- } else if (!strcasecmp("all", channel)) {
+ if (user->kicked) {
+ continue;
+ }
+ match = !strcasecmp(channel, ast_channel_name(user->chan));
+ if (match || all
+ || (participants &&
!ast_test_flag(&user->u_profile, USER_OPT_ADMIN))) {
user->kicked = 1;
pbx_builtin_setvar_helper(user->chan,
"CONFBRIDGE_RESULT", "KICKED");
ast_bridge_remove(conference->bridge, user->chan);
res = 0;
+ if (match) {
+ return res;
+ }
}
}
@@ -2253,10 +2267,13 @@
return NULL;
}
- if (!state) {
+ if (!strncasecmp("all", word, wordlen) && ++which > state) {
return ast_strdup("all");
}
- state--;
+
+ if (!strncasecmp("participants", word, wordlen) && ++which > state) {
+ return ast_strdup("participants");
+ }
{
SCOPED_AO2LOCK(bridge_lock, conference);
@@ -2287,7 +2304,8 @@
e->command = "confbridge kick";
e->usage =
"Usage: confbridge kick <conference> <channel>\n"
- " Kicks a channel out of the conference bridge
(all to kick everyone).\n";
+ " Kicks a channel out of the conference bridge.\n"
+ " (all to kick everyone, participants to
kick non-admins).\n";
return NULL;
case CLI_GENERATE:
if (a->pos == 2) {
@@ -2311,10 +2329,14 @@
not_found = kick_conference_participant(conference, a->argv[3]);
ao2_ref(conference, -1);
if (not_found) {
- ast_cli(a->fd, "No participant named '%s' found!\n",
a->argv[3]);
+ if (!strcasecmp("all", a->argv[3]) ||
!strcasecmp("participants", a->argv[3])) {
+ ast_cli(a->fd, "No participants found!\n");
+ } else {
+ ast_cli(a->fd, "No participant named '%s' found!\n",
a->argv[3]);
+ }
return CLI_SUCCESS;
}
- ast_cli(a->fd, "Participant '%s' kicked out of conference '%s'\n",
a->argv[3], a->argv[2]);
+ ast_cli(a->fd, "Kicked '%s' out of conference '%s'\n", a->argv[3],
a->argv[2]);
return CLI_SUCCESS;
}
@@ -2447,51 +2469,70 @@
}
/* \internal
+ * \brief Mute/unmute a single user.
+ */
+static void generic_mute_unmute_user(struct confbridge_conference *conference,
struct confbridge_user *user, int mute)
+{
+ /* Set user level mute request. */
+ user->muted = mute ? 1 : 0;
+
+ conf_update_user_mute(user);
+ if (mute) {
+ send_mute_event(user->chan, conference);
+ } else {
+ send_unmute_event(user->chan, conference);
+ }
+}
+
+/* \internal
* \brief finds a conference user by channel name and mutes/unmutes them.
*
* \retval 0 success
* \retval -1 conference not found
* \retval -2 user not found
*/
-static int generic_mute_unmute_helper(int mute, const char *conference_name,
const char *chan_name)
-{
- struct confbridge_conference *conference;
+static int generic_mute_unmute_helper(int mute, const char *conference_name,
+ const char *chan_name)
+{
+ RAII_VAR(struct confbridge_conference *, conference, NULL, ao2_cleanup);
struct confbridge_user *user;
- int res = 0;
+ int all = !strcasecmp("all", chan_name);
+ int participants = !strcasecmp("participants", chan_name);
+ int res = -2;
conference = ao2_find(conference_bridges, conference_name, OBJ_KEY);
if (!conference) {
return -1;
}
- ao2_lock(conference);
- AST_LIST_TRAVERSE(&conference->active_list, user, list) {
- if (!strncmp(chan_name, ast_channel_name(user->chan),
strlen(chan_name))) {
- break;
- }
- }
- if (!user) {
- /* user is not in the active list so check the waiting list as
well */
+
+ {
+ SCOPED_AO2LOCK(bridge_lock, conference);
+ AST_LIST_TRAVERSE(&conference->active_list, user, list) {
+ int match = !strncasecmp(chan_name,
ast_channel_name(user->chan),
+ strlen(chan_name));
+ if (match || all
+ || (participants &&
!ast_test_flag(&user->u_profile, USER_OPT_ADMIN))) {
+ generic_mute_unmute_user(conference, user,
mute);
+ res = 0;
+ if (match) {
+ return res;
+ }
+ }
+ }
+
AST_LIST_TRAVERSE(&conference->waiting_list, user, list) {
- if (!strncmp(chan_name, ast_channel_name(user->chan),
strlen(chan_name))) {
- break;
+ int match = !strncasecmp(chan_name,
ast_channel_name(user->chan),
+ strlen(chan_name));
+ if (match || all
+ || (participants &&
!ast_test_flag(&user->u_profile, USER_OPT_ADMIN))) {
+ generic_mute_unmute_user(conference, user,
mute);
+ res = 0;
+ if (match) {
+ return res;
+ }
}
}
}
- if (user) {
- /* Set user level mute request. */
- user->muted = mute ? 1 : 0;
-
- conf_update_user_mute(user);
- if (mute) {
- send_mute_event(user->chan, conference);
- } else {
- send_unmute_event(user->chan, conference);
- }
- } else {
- res = -2;;
- }
- ao2_unlock(conference);
- ao2_ref(conference, -1);
return res;
}
@@ -2504,7 +2545,11 @@
ast_cli(a->fd, "No conference bridge named '%s' found!\n",
a->argv[2]);
return -1;
} else if (res == -2) {
- ast_cli(a->fd, "No channel named '%s' found in conference
%s\n", a->argv[3], a->argv[2]);
+ if (!strcasecmp("all", a->argv[3]) ||
!strcasecmp("participants", a->argv[3])) {
+ ast_cli(a->fd, "No participants found in conference
%s\n", a->argv[2]);
+ } else {
+ ast_cli(a->fd, "No channel named '%s' found in
conference %s\n", a->argv[3], a->argv[2]);
+ }
return -1;
}
ast_cli(a->fd, "%s %s from confbridge %s\n", mute ? "Muting" :
"Unmuting", a->argv[3], a->argv[2]);
@@ -2519,6 +2564,7 @@
e->usage =
"Usage: confbridge mute <conference> <channel>\n"
" Mute a channel in a conference.\n"
+ " (all to mute everyone, participants to
mute non-admins)\n"
" If the specified channel is a prefix,\n"
" the action will be taken on the first\n"
" matching channel.\n";
@@ -2549,6 +2595,7 @@
e->usage =
"Usage: confbridge unmute <conference> <channel>\n"
" Unmute a channel in a conference.\n"
+ " (all to unmute everyone, participants to
unmute non-admins)\n"
" If the specified channel is a prefix,\n"
" the action will be taken on the first\n"
" matching channel.\n";
@@ -2719,8 +2766,8 @@
static struct ast_cli_entry cli_confbridge[] = {
AST_CLI_DEFINE(handle_cli_confbridge_list, "List conference bridges and
participants."),
AST_CLI_DEFINE(handle_cli_confbridge_kick, "Kick participants out of
conference bridges."),
- AST_CLI_DEFINE(handle_cli_confbridge_mute, "Mute a participant."),
- AST_CLI_DEFINE(handle_cli_confbridge_unmute, "Unmute a participant."),
+ AST_CLI_DEFINE(handle_cli_confbridge_mute, "Mute participants."),
+ AST_CLI_DEFINE(handle_cli_confbridge_unmute, "Unmute participants."),
AST_CLI_DEFINE(handle_cli_confbridge_lock, "Lock a conference."),
AST_CLI_DEFINE(handle_cli_confbridge_unlock, "Unlock a conference."),
AST_CLI_DEFINE(handle_cli_confbridge_start_record, "Start recording a
conference"),
--
_____________________________________________________________________
-- 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
