app_chanspy: Add option to not automatically answer channel.

Add an option for ChanSpy and ExtenSpy to not answer the channel
automatically. Most applications that auto-answer by default
already have an option to disable this behavior if unwanted.

Resolves: #1358

UserNote: ChanSpy and ExtenSpy can now be configured to not
automatically answer the channel by using the 'N' option.

(cherry picked from commit e182531373a7178c2d7c2b533386587323ee5d72)

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index f5923872dd038e653717dc323f6017ea6b7455a2..ce847a75a4c473f0a4b659b348ed1e138af7f356 100644 (file)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -132,6 +132,9 @@
                                                <argument name="mailbox" />
                                                <argument name="context" />
                                        </option>
+                                       <option name="N">
+                                               <para>Do not answer the channel automatically.</para>
+                                       </option>
                                        <option name="o">
                                                <para>Only listen to audio coming from this channel.</para>
                                        </option>
@@ -289,6 +292,9 @@
                                                <argument name="mailbox" />
                                                <argument name="context" />
                                        </option>
+                                       <option name="N">
+                                               <para>Do not answer the channel automatically.</para>
+                                       </option>
                                        <option name="o">
                                                <para>Only listen to audio coming from this channel.</para>
                                        </option>
@@ -408,6 +414,7 @@ enum {
        OPTION_UNIQUEID          = (1 << 19),   /* The chanprefix is a channel uniqueid or fully specified channel name. */
        OPTION_LONG_QUEUE        = (1 << 20),   /* Allow usage of a long queue to store audio frames. */
        OPTION_INTERLEAVED       = (1 << 21),   /* Interleave the Read and Write frames in the output frame. */
+       OPTION_NOANSWER          = (1 << 22),   /* Do not automatically answer the channel */
 };
 
 enum {
@@ -432,6 +439,7 @@ AST_APP_OPTIONS(spy_opts, {
        AST_APP_OPTION_ARG('g', OPTION_GROUP, OPT_ARG_GROUP),
        AST_APP_OPTION('l', OPTION_LONG_QUEUE),
        AST_APP_OPTION_ARG('n', OPTION_NAME, OPT_ARG_NAME),
+       AST_APP_OPTION('N', OPTION_NOANSWER),
        AST_APP_OPTION('o', OPTION_READONLY),
        AST_APP_OPTION('q', OPTION_QUIET),
        AST_APP_OPTION_ARG('r', OPTION_RECORD, OPT_ARG_RECORD),
@@ -1001,8 +1009,9 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
                ast_channel_unlock(chan);
        }
 
-       if (ast_channel_state(chan) != AST_STATE_UP)
+       if (!ast_test_flag(flags, OPTION_NOANSWER) && ast_channel_state(chan) != AST_STATE_UP) {
                ast_answer(chan);
+       }
 
        ast_channel_set_flag(chan, AST_FLAG_SPYING);