From 7deac8c9f8c077d4ed1e8379ee291be64837a912 Mon Sep 17 00:00:00 2001
From: rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 22 Nov 2010 19:28:23 +0000
Subject: Merged revisions 295790 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r295790 | rmudgett | 2010-11-22 12:46:26 -0600 (Mon, 22 Nov 2010) | 46 lines

  The channel redirect function (CLI or AMI) hangs up the call instead of redirecting the call.

  To recreate the problem:
  1) Party A calls Party B
  2) Invoke CLI "channel redirect" command to redirect channel call leg
  associated with A.
  3) All associated channels are hung up.

  Note that if the CLI command were done on the channel call leg associated
  with B it works.

  This regression was a result of the fix for issue #16946
  (https://reviewboard.asterisk.org/r/740/).

  The regression affects all features that use an async goto to execute the
  dialplan because of an external event: Channel redirect, AMI redirect, SIP
  REFER, and FAX detection.

  The struct ast_channel._softhangup code is a mess.  The variable is used
  for several purposes that do not necessarily result in the call being hung
  up.  I have added doxygen comments to describe how the various _softhangup
  bits are used.  I have corrected all the places where the variable was
  tested in a non-bit oriented manner.

  The primary fix is the new AST_CONTROL_END_OF_Q frame.  It acts as a weak
  hangup request so the soft hangup requests that do not normally result in
  a hangup do not hangup.

  JIRA SWP-2470
  JIRA SWP-2489

  (closes issue #18171)
  Reported by: SantaFox
  (closes issue #18185)
  Reported by: kwemheuer
  (closes issue #18211)
  Reported by: zahir_koradia
  (closes issue #18230)
  Reported by: vmarrone
  (closes issue #18299)
  Reported by: mbrevda
  (closes issue #18322)
  Reported by: nerbos

  Review:	https://reviewboard.asterisk.org/r/1013/
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@295843 f38db490-d61c-443f-a65b-d21fe96a405b
---
 apps/app_macro.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'apps')

diff --git a/apps/app_macro.c b/apps/app_macro.c
index faf97a83a..7c0f616dd 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -520,20 +520,20 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
 	}
 
 	if (!strcasecmp(chan->context, fullmacro)) {
+		const char *offsets;
+
   		/* If we're leaving the macro normally, restore original information */
 		chan->priority = oldpriority;
 		ast_copy_string(chan->context, oldcontext, sizeof(chan->context));
-		if (!(ast_check_hangup(chan) & AST_SOFTHANGUP_ASYNCGOTO)) {
-			/* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */
-			const char *offsets;
-			ast_copy_string(chan->exten, oldexten, sizeof(chan->exten));
-			if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) {
-				/* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue
-			   	normally if there is any problem */
-				if (sscanf(offsets, "%30d", &offset) == 1) {
-					if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + offset + 1, chan->cid.cid_num)) {
-						chan->priority += offset;
-					}
+		ast_copy_string(chan->exten, oldexten, sizeof(chan->exten));
+		if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) {
+			/* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue
+			normally if there is any problem */
+			if (sscanf(offsets, "%30d", &offset) == 1) {
+				if (ast_exists_extension(chan, chan->context, chan->exten,
+					chan->priority + offset + 1,
+					chan->cid.cid_num)) {
+					chan->priority += offset;
 				}
 			}
 		}
-- 
cgit v1.2.3