Add some necessary hangup commands in the case that forwarding
authorMark Michelson <mmichelson@digium.com>
Wed, 26 Nov 2008 19:57:11 +0000 (19:57 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 26 Nov 2008 19:57:11 +0000 (19:57 +0000)
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

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

apps/app_dial.c

index 4f53eeb..462b30e 100644 (file)
@@ -735,6 +735,7 @@ static void do_forward(struct chanlist *o,
        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;
@@ -762,6 +763,7 @@ static void do_forward(struct chanlist *o,
                        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 {