add StopMixMonitor application (issue #6122, with mods)

Rename and export ast_complete_channels for use by cli completion functions
that want to complete from the list of active channels

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

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 9febe75b9836cc619ba465ea3b79b20b0e22dec6..1884d233d8697f190535d6e4a0acb48dce24d9ea 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -80,6 +80,14 @@ static const char *desc = ""
 "The variable MIXMONITOR_FILENAME will contain the filename used to record.\n"
 "";
 
+static const char *stop_app = "StopMixMonitor";
+static const char *stop_synopsis = "Stop recording a call through MixMonitor";
+static const char *stop_desc = ""
+"  StopMixMonitor()\n\n"
+"Stops the audio recording that was started with a call to MixMonitor()\n"
+"on the current channel.\n"
+"";
+
 LOCAL_USER_DECL;
 
 static const char *mixmonitor_spy_type = "MixMonitor";
@@ -397,6 +405,25 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
        return 0;
 }
 
+static int stop_mixmonitor_exec(struct ast_channel *chan, void *data)
+{
+       struct localuser *u;
+
+       LOCAL_USER_ADD(u);
+
+       if (!ast_mutex_lock(&chan->lock)) {
+               ast_channel_spy_stop_by_type(chan, mixmonitor_spy_type);
+               ast_mutex_unlock(&chan->lock);
+       } else {
+               ast_log(LOG_WARNING, "Could not lock %s to stop MixMonitor on it\n", 
+                               chan->name);
+       }
+
+       LOCAL_USER_REMOVE(u);
+
+       return 0;
+}
+
 static int mixmonitor_cli(int fd, int argc, char **argv) 
 {
        struct ast_channel *chan;
@@ -419,20 +446,26 @@ static int mixmonitor_cli(int fd, int argc, char **argv)
        return RESULT_SUCCESS;
 }
 
+static char *complete_mixmonitor_cli(const char *line, const char *word, int pos, int state)
+{
+       return ast_complete_channels(line, word, pos, state, 2);
+}
 
 static struct ast_cli_entry cli_mixmonitor = {
        { "mixmonitor", NULL, NULL },
        mixmonitor_cli, 
-       "Execute a MixMonitor command",
-       "mixmonitor <start|stop> <chan_name> [<args>]\n"
+       "Execute a MixMonitor command. The optional arguments are passed to the\n"
+       "MixMonitor application when the 'start' command is used.\n",
+       "mixmonitor <start|stop> <chan_name> [args]\n",
+       complete_mixmonitor_cli
 };
 
-
 int unload_module(void)
 {
        int res;
 
        res = ast_cli_unregister(&cli_mixmonitor);
+       res |= ast_unregister_application(stop_app);
        res |= ast_unregister_application(app);
        
        STANDARD_HANGUP_LOCALUSERS;
@@ -446,6 +479,7 @@ int load_module(void)
 
        res = ast_cli_register(&cli_mixmonitor);
        res |= ast_register_application(app, mixmonitor_exec, synopsis, desc);
+       res |= ast_register_application(stop_app, stop_mixmonitor_exec, stop_synopsis, stop_desc);
 
        return res;
 }

diff --git a/cli.c b/cli.c
index 0afc66dd0d9bab14b4d235757ba88e13e35111a4..5915aade2f98ee8638eefd470f3b087649c1130e 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -781,7 +781,7 @@ static char *complete_show_channels(const char *line, const char *word, int pos,
        return NULL;
 }
 
-static char *complete_ch_helper(const char *line, const char *word, int pos, int state, int rpos)
+char *ast_complete_channels(const char *line, const char *word, int pos, int state, int rpos)
 {
        struct ast_channel *c = NULL;
        int which = 0;
@@ -809,12 +809,12 @@ static char *complete_ch_helper(const char *line, const char *word, int pos, int
 
 static char *complete_ch_3(const char *line, const char *word, int pos, int state)
 {
-       return complete_ch_helper(line, word, pos, state, 2);
+       return ast_complete_channels(line, word, pos, state, 2);
 }
 
 static char *complete_ch_4(const char *line, const char *word, int pos, int state)
 {
-       return complete_ch_helper(line, word, pos, state, 3);
+       return ast_complete_channels(line, word, pos, state, 3);
 }
 
 static char *complete_mod_2(const char *line, const char *word, int pos, int state)

diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h
index 884d4c166ff87515ac6add025d79234232754e9f..d230efe97cdda706cc10ce5de2b14c1d05793a36 100644 (file)
--- a/include/asterisk/cli.h
+++ b/include/asterisk/cli.h
@@ -132,6 +132,15 @@ int ast_cli_generatornummatches(const char *, const char *);
  */
 char **ast_cli_completion_matches(const char *, const char *);
 
+/*!
+ * \brief Command completion for the list of active channels
+ *
+ * This can be called from a CLI command completion function that wants to
+ * complete from the list of active channels.  'rpos' is the required
+ * position in the command.  This function will return NULL immediately if
+ * 'rpos' is not the same as the current position, 'pos'.
+ */
+char *ast_complete_channels(const char *line, const char *word, int pos, int state, int rpos);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }