[asterisk-commits] tilghman: branch 1.6.1 r244394 - in /branches/1.6.1: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Feb  2 14:35:35 2010
New Revision: 244394

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

........
  r244393 | tilghman | 2010-02-02 14:32:29 -0600 (Tue, 02 Feb 2010) | 18 lines
  
  Properly respect GOSUB_RESULT as to what to do with the master channel.
  
  Previously, we would parse GOSUB_RESULT, but not actually do anything with it.
  
  (closes issue #16686)
   Reported by: bklang
   Patches: 
         app_dial-respect-gosub_result.patch uploaded by bklang (license 919)
         (with modifications)
........

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://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=244394&r1=244393&r2=244394
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Tue Feb  2 14:35:35 2010
@@ -1950,23 +1950,23 @@
 				if (!strcasecmp(gosub_result, "BUSY")) {
 					ast_copy_string(pa.status, gosub_result, sizeof(pa.status));
 					ast_set_flag64(peerflags, OPT_GO_ON);
-					res9 = -1;
+					res = -1;
 				} else if (!strcasecmp(gosub_result, "CONGESTION") || !strcasecmp(gosub_result, "CHANUNAVAIL")) {
 					ast_copy_string(pa.status, gosub_result, sizeof(pa.status));
 					ast_set_flag64(peerflags, OPT_GO_ON);
-					res9 = -1;
+					res = -1;
 				} else if (!strcasecmp(gosub_result, "CONTINUE")) {
 					/* hangup peer and keep chan alive assuming the macro has changed
 					   the context / exten / priority or perhaps
 					   the next priority in the current exten is desired.
 					*/
 					ast_set_flag64(peerflags, OPT_GO_ON);
-					res9 = -1;
+					res = -1;
 				} else if (!strcasecmp(gosub_result, "ABORT")) {
 					/* Hangup both ends unless the caller has the g flag */
-					res9 = -1;
+					res = -1;
 				} else if (!strncasecmp(gosub_result, "GOTO:", 5) && (gosub_transfer_dest = ast_strdupa(gosub_result + 5))) {
-					res9 = -1;
+					res = -1;
 					/* perform a transfer to a new extension */
 					if (strchr(gosub_transfer_dest, '^')) { /* context^exten^priority*/
 						replace_macro_delimiter(gosub_transfer_dest);