kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 195162 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r195162 | eliel | 2009-05-18 10:45:23 -0400 (Mon, 18 May 2009) | 9 lines
  
  Warn about the use of the application WaitExten() within a Macro().
  
  Update applications documentation to warn the user about the use of the
  WaitExten() application within a Macro(). Recommend the use of Read()
  instead.
  
  (closes issue #14444)
  Reported by: ewieling
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@195167 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Eliel C. Sardanons
2009-05-18 15:13:34 +00:00
parent 9ac77f49aa
commit 2f92da1e7e
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_dial.c
View File

@@ -168,6 +168,8 @@ static char *descrip =
" You cannot use any additional action post answer options in conjunction\n"
" with this option. Also, pbx services are not run on the peer (called) channel,\n"
" so you will not be able to set timeouts via the TIMEOUT() function in this macro.\n"
" Be aware of the limitations that macros have, specifically with regards to use of\n"
" the WaitExten application. For more information, see the documentation for Macro()\n"
" n - This option is a modifier for the screen/privacy mode. It specifies\n"
" that no introductions are to be saved in the priv-callerintros\n"
" directory.\n"

13
apps/app_macro.c
View File

@@ -42,6 +42,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/* special result value used to force macro exit */
#define MACRO_EXIT_RESULT 1024
#define WAITEXTENWARNING "Use of the application WaitExten within a macro will not function as expected.\n" \
"Please use the Read application in order to read DTMF from a channel currently\n" \
"executing a macro.\n"
static char *descrip =
" Macro(macroname,arg1,arg2...): Executes a macro using the context\n"
"'macro-<macroname>', jumping to the 's' extension of that context and\n"
@@ -61,20 +65,23 @@ static char *descrip =
" Asterisk to crash earlier than this limit. It is advised that if you\n"
" need to deeply nest macro calls, that you use the Gosub application\n"
" (now allows arguments like a Macro) with explict Return() calls\n"
" instead.\n";
" instead.\n"
WAITEXTENWARNING;
static char *if_descrip =
" MacroIf(<expr>?macroname_a[,arg1][:macroname_b[,arg1]])\n"
"Executes macro defined in <macroname_a> if <expr> is true\n"
"(otherwise <macroname_b> if provided)\n"
"Arguments and return values as in application Macro()\n";
"Arguments and return values as in application Macro()\n"
WAITEXTENWARNING;
static char *exclusive_descrip =
" MacroExclusive(macroname,arg1,arg2...):\n"
"Executes macro defined in the context 'macro-macroname'\n"
"Only one call at a time may run the macro.\n"
"(we'll wait if another call is busy executing in the Macro)\n"
"Arguments and return values as in application Macro()\n";
"Arguments and return values as in application Macro()\n"
WAITEXTENWARNING;
static char *exit_descrip =
" MacroExit():\n"