diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-11-02 03:24:47 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-11-02 03:24:47 +0000 |
commit | a84cff117d1f862a6b345f87d0ba1f158e5feecd (patch) | |
tree | 816da062b06ce3bdef561447c7fb0b6ff7dd7ef1 /apps/confbridge | |
parent | 0721b1de836da3e91ac71d54c972caa80a9e2379 (diff) |
confbridge: Separate user muting from system muting overrides.
The system overrides the user muting requests when MOH is playing or a
waitmarked user is waiting for a marked user to join. System muting
overrides interfere with what the user may wish the muting to be when the
system override ends.
* User muting requests are now independent of the system muting overrides.
The effective muting is now the logical or of the user request and system
override.
* Added a Muted flag to the CLI "confbridge list <conference>" command.
* Added a Muted header to the AMI ConfbridgeList action ConfbridgeList
event.
(closes issue AST-1102)
Reported by: John Bigelow
Review: https://reviewboard.asterisk.org/r/2960/
........
Merged revisions 402425 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 402427 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/confbridge')
-rw-r--r-- | apps/confbridge/conf_state.c | 3 | ||||
-rw-r--r-- | apps/confbridge/conf_state_inactive.c | 2 | ||||
-rw-r--r-- | apps/confbridge/conf_state_multi.c | 2 | ||||
-rw-r--r-- | apps/confbridge/conf_state_multi_marked.c | 22 | ||||
-rw-r--r-- | apps/confbridge/conf_state_single.c | 2 | ||||
-rw-r--r-- | apps/confbridge/conf_state_single_marked.c | 2 | ||||
-rw-r--r-- | apps/confbridge/include/confbridge.h | 10 |
7 files changed, 29 insertions, 14 deletions
diff --git a/apps/confbridge/conf_state.c b/apps/confbridge/conf_state.c index 988e2e250..03dd7d9af 100644 --- a/apps/confbridge/conf_state.c +++ b/apps/confbridge/conf_state.c @@ -57,12 +57,11 @@ void conf_invalid_event_fn(struct confbridge_user *user) */ static void conf_mute_moh_inactive_waitmarked(struct confbridge_user *user) { - /* Be sure we are muted so we can't talk to anybody else waiting */ - user->features.mute = 1; /* Start music on hold if needed */ if (ast_test_flag(&user->u_profile, USER_OPT_MUSICONHOLD)) { conf_moh_start(user); } + conf_update_user_mute(user); } void conf_default_join_waitmarked(struct confbridge_user *user) diff --git a/apps/confbridge/conf_state_inactive.c b/apps/confbridge/conf_state_inactive.c index 28447983d..379f071a5 100644 --- a/apps/confbridge/conf_state_inactive.c +++ b/apps/confbridge/conf_state_inactive.c @@ -61,7 +61,7 @@ static void join_unmarked(struct confbridge_user *user) static void join_marked(struct confbridge_user *user) { conf_add_user_marked(user->conference, user); - conf_handle_second_active(user->conference); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI_MARKED); } diff --git a/apps/confbridge/conf_state_multi.c b/apps/confbridge/conf_state_multi.c index 70098158b..829774253 100644 --- a/apps/confbridge/conf_state_multi.c +++ b/apps/confbridge/conf_state_multi.c @@ -54,11 +54,13 @@ struct confbridge_state *CONF_STATE_MULTI = &STATE_MULTI; static void join_unmarked(struct confbridge_user *user) { conf_add_user_active(user->conference, user); + conf_update_user_mute(user); } static void join_marked(struct confbridge_user *user) { conf_add_user_marked(user->conference, user); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI_MARKED); } diff --git a/apps/confbridge/conf_state_multi_marked.c b/apps/confbridge/conf_state_multi_marked.c index 2739be55b..a469cf737 100644 --- a/apps/confbridge/conf_state_multi_marked.c +++ b/apps/confbridge/conf_state_multi_marked.c @@ -60,11 +60,13 @@ struct confbridge_state *CONF_STATE_MULTI_MARKED = &STATE_MULTI_MARKED; static void join_active(struct confbridge_user *user) { conf_add_user_active(user->conference, user); + conf_update_user_mute(user); } static void join_marked(struct confbridge_user *user) { conf_add_user_marked(user->conference, user); + conf_update_user_mute(user); } static void leave_active(struct confbridge_user *user) @@ -95,8 +97,8 @@ static void leave_marked(struct confbridge_user *user) AST_LIST_TRAVERSE_SAFE_BEGIN(&user->conference->active_list, user_iter, list) { /* Kick ENDMARKED user_iters */ if (ast_test_flag(&user_iter->u_profile, USER_OPT_ENDMARKED)) { - if (ast_test_flag(&user_iter->u_profile, USER_OPT_WAITMARKED) && - !ast_test_flag(&user_iter->u_profile, USER_OPT_MARKEDUSER)) { + if (ast_test_flag(&user_iter->u_profile, USER_OPT_WAITMARKED) + && !ast_test_flag(&user_iter->u_profile, USER_OPT_MARKEDUSER)) { AST_LIST_REMOVE_CURRENT(list); user_iter->conference->activeusers--; AST_LIST_INSERT_TAIL(&user_iter->conference->waiting_list, user_iter, list); @@ -104,17 +106,18 @@ static void leave_marked(struct confbridge_user *user) } user_iter->kicked = 1; ast_bridge_remove(user_iter->conference->bridge, user_iter->chan); - } else if (ast_test_flag(&user_iter->u_profile, USER_OPT_WAITMARKED) && - !ast_test_flag(&user_iter->u_profile, USER_OPT_MARKEDUSER)) { + } else if (ast_test_flag(&user_iter->u_profile, USER_OPT_WAITMARKED) + && !ast_test_flag(&user_iter->u_profile, USER_OPT_MARKEDUSER)) { AST_LIST_REMOVE_CURRENT(list); user_iter->conference->activeusers--; AST_LIST_INSERT_TAIL(&user_iter->conference->waiting_list, user_iter, list); user_iter->conference->waitingusers++; - /* Handle muting/moh of user_iter if necessary */ + + /* Handle moh of user_iter if necessary */ if (ast_test_flag(&user_iter->u_profile, USER_OPT_MUSICONHOLD)) { - user_iter->features.mute = 1; conf_moh_start(user_iter); } + conf_update_user_mute(user_iter); } } AST_LIST_TRAVERSE_SAFE_END; @@ -170,7 +173,7 @@ static void transition_to_marked(struct confbridge_user *user) conf_handle_first_marked_common(user); } - /* Move all waiting users to active, stopping MOH and umuting if necessary */ + /* Move all waiting users to active, stopping MOH and unmuting if necessary */ AST_LIST_TRAVERSE_SAFE_BEGIN(&user->conference->waiting_list, user_iter, list) { AST_LIST_REMOVE_CURRENT(list); user->conference->waitingusers--; @@ -179,10 +182,7 @@ static void transition_to_marked(struct confbridge_user *user) if (user_iter->playing_moh) { conf_moh_stop(user_iter); } - /* only unmute them if they are not supposed to start muted */ - if (!ast_test_flag(&user_iter->u_profile, USER_OPT_STARTMUTED)) { - user_iter->features.mute = 0; - } + conf_update_user_mute(user_iter); } AST_LIST_TRAVERSE_SAFE_END; } diff --git a/apps/confbridge/conf_state_single.c b/apps/confbridge/conf_state_single.c index 2d01420b0..e3e0ca11c 100644 --- a/apps/confbridge/conf_state_single.c +++ b/apps/confbridge/conf_state_single.c @@ -55,6 +55,7 @@ static void join_unmarked(struct confbridge_user *user) { conf_add_user_active(user->conference, user); conf_handle_second_active(user->conference); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI); } @@ -63,6 +64,7 @@ static void join_marked(struct confbridge_user *user) { conf_add_user_marked(user->conference, user); conf_handle_second_active(user->conference); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI_MARKED); } diff --git a/apps/confbridge/conf_state_single_marked.c b/apps/confbridge/conf_state_single_marked.c index 340245831..f72ef5ec1 100644 --- a/apps/confbridge/conf_state_single_marked.c +++ b/apps/confbridge/conf_state_single_marked.c @@ -54,6 +54,7 @@ static void join_active(struct confbridge_user *user) { conf_add_user_active(user->conference, user); conf_handle_second_active(user->conference); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI_MARKED); } @@ -62,6 +63,7 @@ static void join_marked(struct confbridge_user *user) { conf_add_user_marked(user->conference, user); conf_handle_second_active(user->conference); + conf_update_user_mute(user); conf_change_state(user, CONF_STATE_MULTI_MARKED); } diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h index 492cf8557..1efefea0b 100644 --- a/apps/confbridge/include/confbridge.h +++ b/apps/confbridge/include/confbridge.h @@ -242,6 +242,7 @@ struct confbridge_user { struct ast_bridge_features features; /*!< Bridge features structure */ struct ast_bridge_tech_optimizations tech_args; /*!< Bridge technology optimizations for talk detection */ unsigned int suspended_moh; /*!< Count of active suspended MOH actions. */ + unsigned int muted:1; /*!< Has the user requested to be muted? */ unsigned int kicked:1; /*!< User has been kicked from the conference */ unsigned int playing_moh:1; /*!< MOH is currently being played to the user */ AST_LIST_HEAD_NOLOCK(, post_join_action) post_join_list; /*!< List of sounds to play after joining */; @@ -385,6 +386,15 @@ int play_sound_file(struct confbridge_conference *conference, const char *filena void conf_ended(struct confbridge_conference *conference); /*! + * \brief Update the actual mute status of the user and set it on the bridge. + * + * \param user User to update the mute status. + * + * \return Nothing + */ +void conf_update_user_mute(struct confbridge_user *user); + +/*! * \brief Stop MOH for the conference user. * * \param user Conference user to stop MOH on. |