apps/app_dial: Fix Dial 'z' option
authorMatthew Jordan <mjordan@digium.com>
Sun, 17 Aug 2014 23:10:21 +0000 (23:10 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sun, 17 Aug 2014 23:10:21 +0000 (23:10 +0000)
The 'z' option is supposed to disable the dial timeout in the case of a call
forward. Unfortunately, the wrong timeout timer was passed to the do_forward
function, resulting in the option not working.

ASTERISK-24225 #close
Reported by: dimitripietro
Tested by: dimitripietro
patches:
  jira_asterisk_24225_v1.8.patch uploaded by rmudgett (License 5621)
  jira_asterisk_24225_v11.patch uploaded by rmudgett (License 5621)
........

Merged revisions 421232 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 421233 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 421234 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 421235 from http://svn.asterisk.org/svn/asterisk/branches/13

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

apps/app_dial.c

index b48a226..2faff84 100644 (file)
@@ -1212,7 +1212,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                        ast_channel_unlock(in);
                                }
 
-                               do_forward(o, &num, peerflags, single, caller_entertained, to,
+                               do_forward(o, &num, peerflags, single, caller_entertained, &orig,
                                        forced_clid, stored_clid);
 
                                if (single && o->chan