[asterisk-commits] eliel: branch 1.6.1 r195167 - in /branches/1.6.1: ./ apps/ main/

[SVN commits to the Asterisk project]

Author: eliel
Date: Mon May 18 10:13:34 2009
New Revision: 195167

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195167
Log:
Merged revisions 195162 via svnmerge from 
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_dial.c
    branches/1.6.1/apps/app_macro.c
    branches/1.6.1/main/pbx.c

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

Modified: branches/1.6.1/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=195167&r1=195166&r2=195167
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Mon May 18 10:13:34 2009
@@ -168,6 +168,8 @@
 "           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"

Modified: branches/1.6.1/apps/app_macro.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_macro.c?view=diff&rev=195167&r1=195166&r2=195167
==============================================================================
--- branches/1.6.1/apps/app_macro.c (original)
+++ branches/1.6.1/apps/app_macro.c Mon May 18 10:13:34 2009
@@ -41,6 +41,10 @@
 
 /* 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"
@@ -61,20 +65,23 @@
 "         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"

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=195167&r1=195166&r2=195167
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Mon May 18 10:13:34 2009
@@ -722,6 +722,9 @@
 	"  Options:\n"
 	"    m[(x)] - Provide music on hold to the caller while waiting for an extension.\n"
 	"               Optionally, specify the class for music on hold within parenthesis.\n"
+	"Warning: Attempting to use this application from within a Macro will not work as\n"
+	"desired. The Read() application is recommended as an alternative to WaitExten when\n"
+	"used from a macro\n"
 	"See Also: Playback(application), Background(application).\n"
 	},
 };