MoH: Don't restart stream on repeated start calls

Currently, music on hold will stop and then start again from the
beginning if ast_moh_start() is called multiple times. This can happen
if a call is put on hold repeatedly (the channel receives multiple
HOLD control frames) and can be triggered from ARI by starting MoH on a
channel multiple times. This is fairly jarring/annoying to users.

This change prevents MoH from being restarted if the requested music
class is the same as the one currently playing.

This includes an extra check to prevent the errors previously
experienced in the testsuite and has 100+ test runs behind it.

Review: https://reviewboard.asterisk.org/r/3615/

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@416439 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 3baffd1416d3552c2c13dca1b91e5a606ac20d71..f64bd1e1a78762ef477457c2e200641dee9ea68a 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1320,7 +1320,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
        struct mohclass *mohclass = NULL;
        struct moh_files_state *state = chan->music_state;
        struct ast_variable *var = NULL;
-       int res;
+       int res = 0;
        int realtime_possible = ast_check_realtime("musiconhold");
 
        /* The following is the order of preference for which class to use:
@@ -1518,10 +1518,12 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 
        ast_set_flag(chan, AST_FLAG_MOH);
 
-       if (mohclass->total_files) {
-               res = ast_activate_generator(chan, &moh_file_stream, mohclass);
-       } else {
-               res = ast_activate_generator(chan, &mohgen, mohclass);
+       if (!state || !state->class || strcmp(mohclass->name, state->class->name)) {
+               if (mohclass->total_files) {
+                       res = ast_activate_generator(chan, &moh_file_stream, mohclass);
+               } else {
+                       res = ast_activate_generator(chan, &mohgen, mohclass);
+               }
        }
 
        mohclass = mohclass_unref(mohclass, "unreffing local reference to mohclass in local_ast_moh_start");