From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 31 May 2006 16:11:55 +0000 (+0000)
Subject: cleanups for commit from issue #5657... set a cause code for a rejected forward reque... 
X-Git-Tag: 1.4.0-beta1~1143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f3cc8b8866a5624182f586679a88d30b173e64c;p=thirdparty%2Fasterisk.git

cleanups for commit from issue #5657... set a cause code for a rejected forward request, and actually set tmp->chan to NULL when we reject the forward request


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 5f7533e6c6..2edf3b30ea 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -488,6 +488,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
 						if (option_verbose > 2)
 							ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n", in->name, tech, stuff);
 						c = o->chan = NULL;
+						cause = AST_CAUSE_BUSY;
 					} else {
 						/* Setup parameters */
 						c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
@@ -1083,6 +1084,8 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 				ast_hangup(tmp->chan);
 				/* If we have been told to ignore forwards, just set this channel to null and continue processing extensions normally */
 				if (ast_test_flag(&opts, OPT_IGNORE_FORWARDING)) {
+					tmp->chan = NULL;
+					cause = AST_CAUSE_BUSY;
 					if (option_verbose > 2)
 						ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n", chan->name, tech, stuff);
 				} else {