[svn-commits] russell: trunk r163716 - in /trunk: CHANGES res/res_clioriginate.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Dec 12 14:12:23 2008
New Revision: 163716

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163716
Log:
Add a new CLI command, "channel redirect", which is similar in operation
to AMI Redirect.

Review: http://reviewboard.digium.com/r/89/

Modified:
    trunk/CHANGES
    trunk/res/res_clioriginate.c

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?view=diff&rev=163716&r1=163715&r2=163716
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri Dec 12 14:12:23 2008
@@ -73,6 +73,8 @@
 
 Miscellaneous
 -------------
+ * The Asterisk CLI has a new command, "channel redirect", which is similar in
+   operation to the AMI Redirect action.
  * res_jabber: autoprune has been disabled by default, to avoid misconfiguration 
    that would end up being interpreted as a bug once Asterisk started removing 
    the contacts from a user list.

Modified: trunk/res/res_clioriginate.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_clioriginate.c?view=diff&rev=163716&r1=163715&r2=163716
==============================================================================
--- trunk/res/res_clioriginate.c (original)
+++ trunk/res/res_clioriginate.c Fri Dec 12 14:12:23 2008
@@ -172,17 +172,59 @@
 	return res;
 }
 
+static char *handle_redirect(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+	const char *name, *dest;
+	struct ast_channel *chan;
+	int res;
+
+	switch (cmd) {
+	case CLI_INIT:
+		e->command = "channel redirect";
+		e->usage = ""
+		"Usage: channel redirect <channel> <[[context,]exten,]priority>\n"
+		"    Redirect an active channel to a specified extension.\n";
+		return NULL;
+	case CLI_GENERATE:
+		return ast_complete_channels(a->line, a->word, a->pos, a->n, 2);
+	}
+
+	if (a->argc != e->args + 2) {
+		return CLI_SHOWUSAGE;
+	}
+
+	name = a->argv[2];
+	dest = a->argv[3];
+
+	chan = ast_get_channel_by_name_locked(name);
+	if (!chan) {
+		ast_cli(a->fd, "Channel '%s' not found\n", name);
+		return CLI_FAILURE;
+	}
+
+	res = ast_async_parseable_goto(chan, dest);
+
+	ast_channel_unlock(chan);
+
+	if (!res) {
+		ast_cli(a->fd, "Channel '%s' successfully redirected to %s\n", name, dest);
+	} else {
+		ast_cli(a->fd, "Channel '%s' failed to be redirected to %s\n", name, dest);
+	}
+
+	return res ? CLI_FAILURE : CLI_SUCCESS;
+}
+
 static struct ast_cli_entry cli_cliorig[] = {
 	AST_CLI_DEFINE(handle_orig, "Originate a call"),
+	AST_CLI_DEFINE(handle_redirect, "Redirect a call"),
 };
 
-/*! \brief Unload orginate module */
 static int unload_module(void)
 {
 	return ast_cli_unregister_multiple(cli_cliorig, ARRAY_LEN(cli_cliorig));
 }
 
-/*! \brief Load orginate module */
 static int load_module(void)
 {
 	int res;
@@ -190,4 +232,4 @@
 	return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call origination from the CLI");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call origination and redirection from the CLI");