diff options
-rwxr-xr-x | configure | 26 | ||||
-rw-r--r-- | res/res_agi.c | 11 |
2 files changed, 24 insertions, 13 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 190095 . +# From configure.ac Revision: 191369 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -36302,8 +36302,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${NETSNMP_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${NETSNMP_LIB}" + saved_libs="${LIBS}" + LIBS="${NETSNMP_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -36359,7 +36359,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_NETSNMP=1 @@ -46194,8 +46194,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${GMIME_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${GMIME_LIB}" + saved_libs="${LIBS}" + LIBS="${GMIME_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -46249,7 +46249,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_GMIME=1 @@ -48992,8 +48992,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${SDL_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${SDL_LIB}" + saved_libs="${LIBS}" + LIBS="${SDL_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -49047,7 +49047,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_SDL=1 @@ -50388,8 +50388,8 @@ fi fi CPPFLAGS="${CPPFLAGS} ${GTK_INCLUDE}" - saved_ldflags="${LDFLAGS}" - LDFLAGS="${GTK_LIB}" + saved_libs="${LIBS}" + LIBS="${GTK_LIB}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -50443,7 +50443,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" - LDFLAGS="${saved_ldflags}" + LIBS="${saved_libs}" else PBX_GTK=1 diff --git a/res/res_agi.c b/res/res_agi.c index 977dbd6d7..0631694b3 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -774,6 +774,12 @@ static int handle_answer(struct ast_channel *chan, AGI *agi, int argc, char *arg 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[]) { int res, to; @@ -2287,11 +2293,16 @@ static char usage_speechrecognize[] = " 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 }, |