[svn-commits] mmichelson: branch 1.6.1 r159561 - in /branches/1.6.1: ./ apps/app_dial.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Nov 26 13:58:43 2008
New Revision: 159561

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

........
r159554 | mmichelson | 2008-11-26 13:57:11 -0600 (Wed, 26 Nov 2008) | 19 lines

Add some necessary hangup commands in the case that forwarding
a call fails

1) Hang up the original destination if the local channel cannot
   be requested.
2) Hang up the local channel (in addition to the original destination)
   if ast_call fails when calling the newly created local channel.

This prevents channels from sticking around forever in the
case of a botched call forward (e.g. to an extension which does not
exist).

(closes issue #13764)
Reported by: davidw
Patches:
      13764_v2.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, davidw


........

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=159561&r1=159560&r2=159561
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Wed Nov 26 13:58:43 2008
@@ -527,6 +527,7 @@
 	if (!c) {
 		ast_clear_flag64(o, DIAL_STILLGOING);
 		handle_cause(cause, num);
+		ast_hangup(original);
 	} else {
 		char *new_cid_num, *new_cid_name;
 		struct ast_channel *src;
@@ -554,6 +555,7 @@
 			ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
 			ast_clear_flag64(o, DIAL_STILLGOING);
 			ast_hangup(original);
+			ast_hangup(c);
 			c = o->chan = NULL;
 			num->nochan++;
 		} else {