[asterisk-commits] app confbridge: Only use b profile options from the conference. (asterisk[13])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Feb 5 12:22:05 CST 2016
Joshua Colp has submitted this change and it was merged.
Change subject: app_confbridge: Only use b_profile options from the conference.
......................................................................
app_confbridge: Only use b_profile options from the conference.
A user cannot set new bridge options after the conference is created by
the first user. Attempting to do so is documented as undefined behavior.
This patch ensures that the bridge profile options used are from the
conference and not what a subsequent user may have tried to set.
Change-Id: I1b6383eba654679e5739d5a8de98199cf074a266
---
M apps/app_confbridge.c
M apps/confbridge/conf_state_multi_marked.c
2 files changed, 40 insertions(+), 35 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Anonymous Coward #1000019: Verified
Joshua Colp: Looks good to me, approved
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index c00fef8..55b7b12 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -1082,7 +1082,7 @@
"Conference: %s\r\n"
"Channel: %s",
mute_effective ? "muted" : "unmuted",
- user->b_profile.name,
+ user->conference->b_profile.name,
ast_channel_name(user->chan));
}
@@ -1203,7 +1203,7 @@
{
/* If we have not been quieted play back that they are waiting for the leader */
if (!ast_test_flag(&user->u_profile, USER_OPT_QUIET) && play_prompt_to_user(user,
- conf_get_sound(CONF_SOUND_WAIT_FOR_LEADER, user->b_profile.sounds))) {
+ conf_get_sound(CONF_SOUND_WAIT_FOR_LEADER, user->conference->b_profile.sounds))) {
/* user hungup while the sound was playing */
return -1;
}
@@ -1215,7 +1215,7 @@
/* If audio prompts have not been quieted or this prompt quieted play it on out */
if (!ast_test_flag(&user->u_profile, USER_OPT_QUIET | USER_OPT_NOONLYPERSON)) {
if (play_prompt_to_user(user,
- conf_get_sound(CONF_SOUND_ONLY_PERSON, user->b_profile.sounds))) {
+ conf_get_sound(CONF_SOUND_ONLY_PERSON, user->conference->b_profile.sounds))) {
/* user hungup while the sound was playing */
return -1;
}
@@ -1289,11 +1289,11 @@
/* When finding a conference bridge that already exists make sure that it is not locked, and if so that we are not an admin */
if (conference && (max_members_reached || conference->locked) && !ast_test_flag(&user->u_profile, USER_OPT_ADMIN)) {
ao2_unlock(conference_bridges);
- ao2_ref(conference, -1);
ast_debug(1, "Conference '%s' is locked and caller is not an admin\n", conference_name);
ast_stream_and_wait(user->chan,
- conf_get_sound(CONF_SOUND_LOCKED, user->b_profile.sounds),
- "");
+ conf_get_sound(CONF_SOUND_LOCKED, conference->b_profile.sounds),
+ "");
+ ao2_ref(conference, -1);
return NULL;
}
@@ -1327,7 +1327,6 @@
app, conference_name, NULL);
if (!conference->bridge) {
ao2_ref(conference, -1);
- conference = NULL;
ao2_unlock(conference_bridges);
ast_log(LOG_ERROR, "Conference '%s' mixing bridge could not be created.\n", conference_name);
return NULL;
@@ -1345,7 +1344,6 @@
/* Link it into the conference bridges container */
if (!ao2_link(conference_bridges, conference)) {
ao2_ref(conference, -1);
- conference = NULL;
ao2_unlock(conference_bridges);
ast_log(LOG_ERROR,
"Conference '%s' could not be added to the conferences list.\n", conference_name);
@@ -1390,6 +1388,7 @@
/* Invalid event, nothing was done, so we don't want to process a leave. */
ao2_unlock(conference);
ao2_ref(conference, -1);
+ user->conference = NULL;
return NULL;
}
@@ -1581,7 +1580,12 @@
const char *pin = user->u_profile.pin;
char *tmp = pin_guess;
int i, res;
- unsigned int len = MAX_PIN ;
+ unsigned int len = MAX_PIN;
+
+ /*
+ * NOTE: We have not joined a conference yet so we have to use
+ * the bridge profile requested by the user.
+ */
/* give them three tries to get the pin right */
for (i = 0; i < 3; i++) {
@@ -1833,13 +1837,13 @@
ast_autoservice_start(chan);
play_sound_file(conference, user.name_rec_location);
play_sound_file(conference,
- conf_get_sound(CONF_SOUND_HAS_JOINED, user.b_profile.sounds));
+ conf_get_sound(CONF_SOUND_HAS_JOINED, conference->b_profile.sounds));
ast_autoservice_stop(chan);
}
/* Play the Join sound to both the conference and the user entering. */
if (!quiet) {
- const char *join_sound = conf_get_sound(CONF_SOUND_JOIN, user.b_profile.sounds);
+ const char *join_sound = conf_get_sound(CONF_SOUND_JOIN, conference->b_profile.sounds);
ast_stream_and_wait(chan, join_sound, "");
ast_autoservice_start(chan);
@@ -1898,28 +1902,28 @@
ast_autoservice_start(chan);
play_sound_file(conference, user.name_rec_location);
play_sound_file(conference,
- conf_get_sound(CONF_SOUND_HAS_LEFT, user.b_profile.sounds));
+ conf_get_sound(CONF_SOUND_HAS_LEFT, conference->b_profile.sounds));
ast_autoservice_stop(chan);
}
/* play the leave sound */
if (!quiet) {
- const char *leave_sound = conf_get_sound(CONF_SOUND_LEAVE, user.b_profile.sounds);
+ const char *leave_sound = conf_get_sound(CONF_SOUND_LEAVE, conference->b_profile.sounds);
ast_autoservice_start(chan);
play_sound_file(conference, leave_sound);
ast_autoservice_stop(chan);
}
- /* Easy as pie, depart this channel from the conference bridge */
- leave_conference(&user);
- conference = NULL;
-
/* If the user was kicked from the conference play back the audio prompt for it */
if (!quiet && user.kicked) {
res = ast_stream_and_wait(chan,
- conf_get_sound(CONF_SOUND_KICKED, user.b_profile.sounds),
+ conf_get_sound(CONF_SOUND_KICKED, conference->b_profile.sounds),
"");
}
+
+ /* Easy as pie, depart this channel from the conference bridge */
+ leave_conference(&user);
+ conference = NULL;
/* Restore volume adjustments to previous values in case they were changed */
if (volume_adjustments[0]) {
@@ -1949,9 +1953,9 @@
mute = !user->muted;
generic_mute_unmute_user(conference, user, mute);
- return play_file(bridge_channel, NULL, (mute ?
- conf_get_sound(CONF_SOUND_MUTED, user->b_profile.sounds) :
- conf_get_sound(CONF_SOUND_UNMUTED, user->b_profile.sounds))) < 0;
+ return play_file(bridge_channel, NULL,
+ conf_get_sound(mute ? CONF_SOUND_MUTED : CONF_SOUND_UNMUTED,
+ conference->b_profile.sounds)) < 0;
}
static int action_toggle_mute_participants(struct confbridge_conference *conference, struct confbridge_user *user)
@@ -1976,8 +1980,9 @@
ao2_unlock(conference);
- sound_to_play = conf_get_sound((mute ? CONF_SOUND_PARTICIPANTS_MUTED : CONF_SOUND_PARTICIPANTS_UNMUTED),
- user->b_profile.sounds);
+ sound_to_play = conf_get_sound(
+ mute ? CONF_SOUND_PARTICIPANTS_MUTED : CONF_SOUND_PARTICIPANTS_UNMUTED,
+ conference->b_profile.sounds);
/* The host needs to hear it seperately, as they don't get the audio from play_sound_helper */
ast_stream_and_wait(user->chan, sound_to_play, "");
@@ -2084,7 +2089,7 @@
if (!isadmin) {
play_file(bridge_channel, NULL,
- conf_get_sound(CONF_SOUND_ERROR_MENU, user->b_profile.sounds));
+ conf_get_sound(CONF_SOUND_ERROR_MENU, conference->b_profile.sounds));
ast_log(LOG_WARNING, "Only admin users can use the kick_last menu action. Channel %s of conf %s is not an admin.\n",
ast_channel_name(bridge_channel->chan),
conference->name);
@@ -2096,7 +2101,7 @@
|| (ast_test_flag(&last_user->u_profile, USER_OPT_ADMIN))) {
ao2_unlock(conference);
play_file(bridge_channel, NULL,
- conf_get_sound(CONF_SOUND_ERROR_MENU, user->b_profile.sounds));
+ conf_get_sound(CONF_SOUND_ERROR_MENU, conference->b_profile.sounds));
} else if (last_user && !last_user->kicked) {
last_user->kicked = 1;
pbx_builtin_setvar_helper(last_user->chan, "CONFBRIDGE_RESULT", "KICKED");
@@ -2225,9 +2230,9 @@
}
conference->locked = (!conference->locked ? 1 : 0);
res |= play_file(bridge_channel, NULL,
- (conference->locked ?
- conf_get_sound(CONF_SOUND_LOCKED_NOW, user->b_profile.sounds) :
- conf_get_sound(CONF_SOUND_UNLOCKED_NOW, user->b_profile.sounds))) < 0;
+ conf_get_sound(
+ conference->locked ? CONF_SOUND_LOCKED_NOW : CONF_SOUND_UNLOCKED_NOW,
+ conference->b_profile.sounds)) < 0;
break;
case MENU_ACTION_ADMIN_KICK_LAST:
res |= action_kick_last(conference, bridge_channel, user);
@@ -2458,7 +2463,7 @@
ast_channel_name(user->chan),
flag_str,
user->u_profile.name,
- user->b_profile.name,
+ user->conference->b_profile.name,
user->menu_name,
S_COR(ast_channel_caller(user->chan)->id.number.valid,
ast_channel_caller(user->chan)->id.number.str, "<unknown>"));
diff --git a/apps/confbridge/conf_state_multi_marked.c b/apps/confbridge/conf_state_multi_marked.c
index 5d977f7..fabe99b 100644
--- a/apps/confbridge/conf_state_multi_marked.c
+++ b/apps/confbridge/conf_state_multi_marked.c
@@ -163,7 +163,7 @@
ao2_unlock(user->conference);
ast_autoservice_start(user->chan);
play_sound_file(user->conference,
- conf_get_sound(CONF_SOUND_LEADER_HAS_LEFT, user->b_profile.sounds));
+ conf_get_sound(CONF_SOUND_LEADER_HAS_LEFT, user->conference->b_profile.sounds));
ast_autoservice_stop(user->chan);
ao2_lock(user->conference);
}
@@ -182,14 +182,14 @@
}
}
-static int post_join_play_begin(struct confbridge_user *cbu)
+static int post_join_play_begin(struct confbridge_user *user)
{
int res;
- ast_autoservice_start(cbu->chan);
- res = play_sound_file(cbu->conference,
- conf_get_sound(CONF_SOUND_BEGIN, cbu->b_profile.sounds));
- ast_autoservice_stop(cbu->chan);
+ ast_autoservice_start(user->chan);
+ res = play_sound_file(user->conference,
+ conf_get_sound(CONF_SOUND_BEGIN, user->conference->b_profile.sounds));
+ ast_autoservice_stop(user->chan);
return res;
}
--
To view, visit https://gerrit.asterisk.org/2111
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b6383eba654679e5739d5a8de98199cf074a266
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
More information about the asterisk-commits
mailing list