[svn-commits] tilghman: branch 1.6.1 r152370 - in /branches/1.6.1: ./ apps/app_dial.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Oct 28 12:08:47 2008
New Revision: 152370

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152370
Log:
Merged revisions 152369 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines
  
  Merged revisions 152368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines
    
    Reset all DIAL variables back to blank, in case Dial is called multiple times
    per call (which could otherwise lead to inconsistent status reports).
    (closes issue #13216)
     Reported by: ruddy
     Patches: 
           20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
     Tested by: ruddy
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_dial.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.digium.com/view/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=152370&r1=152369&r2=152370
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Tue Oct 28 12:08:47 2008
@@ -1283,6 +1283,13 @@
 	struct ast_dial_features *caller_features;
 	int fulldial = 0, num_dialed = 0;
 
+	/* Reset all DIAL variables back to blank, to prevent confusion (in case we don't reset all of them). */
+	pbx_builtin_setvar_helper(chan, "DIALSTATUS", "");
+	pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", "");
+	pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", "");
+	pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", "");
+	pbx_builtin_setvar_helper(chan, "DIALEDTIME", "");
+
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "Dial requires an argument (technology/number)\n");
 		pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status);