[asterisk-commits] tilghman: branch 1.6.1 r192172 - in /branches/1.6.1: ./ configure res/res_agi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon May  4 14:30:34 2009
New Revision: 192172

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192172
Log:
Recorded merge of revisions 192171 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r192171 | tilghman | 2009-05-04 14:29:13 -0500 (Mon, 04 May 2009) | 8 lines
  
  Restore 'asyncagi break' command to 1.6.1 and higher.
  (closes issue #14985)
   Reported by: nikkk
   Patches: 
         20090428__bug14985.diff.txt uploaded by tilghman (license 14)
         20090429__bug14985__1.6.1.diff.txt uploaded by tilghman (license 14)
   Tested by: nikkk
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configure
    branches/1.6.1/res/res_agi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_agi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/res/res_agi.c?view=diff&rev=192172&r1=192171&r2=192172
==============================================================================
--- branches/1.6.1/res/res_agi.c (original)
+++ branches/1.6.1/res/res_agi.c Mon May  4 14:30:34 2009
@@ -772,6 +772,12 @@
 
 	ast_agi_send(agi->fd, chan, "200 result=%d\n", res);
 	return (res >= 0) ? RESULT_SUCCESS : RESULT_FAILURE;
+}
+
+static int handle_asyncagi_break(struct ast_channel *chan, AGI *agi, int argc, char *argv[])
+{
+	ast_agi_send(agi->fd, chan, "200 result=0\n");
+	return RESULT_FAILURE;
 }
 
 static int handle_waitfordigit(struct ast_channel *chan, AGI *agi, int argc, char *argv[])
@@ -2287,11 +2293,16 @@
 " Usage: SPEECH RECOGNIZE <prompt> <timeout> [<offset>]\n"
 "       Plays back given prompt while listening for speech and dtmf.\n";
 
+static char usage_asyncagi_break[] =
+" Usage: ASYNCAGI BREAK\n"
+"       Returns control to the dialplan\n";
+
 /*!
  * \brief AGI commands list
  */
 static struct agi_command commands[] = {
 	{ { "answer", NULL }, handle_answer, "Answer channel", usage_answer , 0 },
+	{ { "asyncagi", "break", NULL }, handle_asyncagi_break, "Exit AsyncAGI processing", usage_asyncagi_break, 1 },
 	{ { "channel", "status", NULL }, handle_channelstatus, "Returns status of the connected channel", usage_channelstatus , 0 },
 	{ { "database", "del", NULL }, handle_dbdel, "Removes database key/value", usage_dbdel , 1 },
 	{ { "database", "deltree", NULL }, handle_dbdeltree, "Removes database keytree/value", usage_dbdeltree , 1 },