diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2016-01-25 17:36:50 -0600 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2016-02-05 12:01:28 -0600 |
| commit | 6f978fbfe5f2a90244ea6a84bd7063adbe97ba85 (patch) | |
| tree | 44302881037b807a2b8ebb412bfceac02e44db11 /apps/confbridge | |
| parent | 1fca22453335fe791073ce0f4c3a4ba62c196b21 (diff) | |
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
Diffstat (limited to 'apps/confbridge')
| -rw-r--r-- | apps/confbridge/conf_state_multi_marked.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/confbridge/conf_state_multi_marked.c b/apps/confbridge/conf_state_multi_marked.c index 5d977f7a2..fabe99b90 100644 --- a/apps/confbridge/conf_state_multi_marked.c +++ b/apps/confbridge/conf_state_multi_marked.c @@ -163,7 +163,7 @@ static void leave_marked(struct confbridge_user *user) 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 void leave_marked(struct confbridge_user *user) } } -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; } |