kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-04 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recorded merge of revisions 192171 via svnmerge from

Browse Source 
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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@192172 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-05-04 19:30:34 +00:00
parent ed8fb52309
commit 2497320ba8
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configure vendored
View File

@@ -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

11
res/res_agi.c
View File

@@ -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 },