From dd049d429dab4ed667a9e625f03dcb648173d296 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 28 Oct 2008 17:07:39 +0000 Subject: [PATCH] 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@152369 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/app_dial.c b/apps/app_dial.c index bf995d8982..a3dba3c506 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1283,6 +1283,13 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags 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);