ChanSpy issues a beep when it starts at the beginning of a list of channels to

potentially spy on.  However, if there were no matching channels, it would beep
at you over and over, which is pretty annoying.  Now, it will only beep once in
the case that there are no channels to spy on, but it will still beep again once
it reaches the beginning of the channel list again.

(closes issue #11738, patched by me)

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

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index a99c03216ffc838fd2fb70c818f67afc00320f7c..2d781fc77c2f4c9ed09e91760b85a611339edd9a 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -377,6 +377,7 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
        int res;
        char *ptr;
        int num;
+       int num_spyed_upon = 1;
 
        if (chan->_state != AST_STATE_UP)
                ast_answer(chan);
@@ -386,7 +387,7 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
        waitms = 100;
 
        for (;;) {
-               if (!ast_test_flag(flags, OPTION_QUIET)) {
+               if (!ast_test_flag(flags, OPTION_QUIET) && num_spyed_upon) {
                        res = ast_streamfile(chan, "beep", chan->language);
                        if (!res)
                                res = ast_waitstream(chan, "");
@@ -405,6 +406,7 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
                /* reset for the next loop around, unless overridden later */
                waitms = 100;
                peer = prev = next = NULL;
+               num_spyed_upon = 0;
 
                for (peer = next_channel(peer, spec, exten, context);
                     peer;
@@ -470,7 +472,8 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
                        
                        waitms = 5000;
                        res = channel_spy(chan, peer, &volfactor, fd, flags);
-                       
+                       num_spyed_upon++;       
+
                        if (res == -1) {
                                break;
                        } else if (res > 1 && spec) {