diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 22:19:37 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 22:19:37 +0000 |
commit | b65162be4420d0726c6c2d8af387b434cb4ff775 (patch) | |
tree | a94f0995b544fa12251022c3e6fb2c8e0fd12e3e /apps/app_dial.c | |
parent | ab9fa9a907c630821965072cbb9d6559e14804b2 (diff) |
Merged revisions 152216,152287,152369,152467,152569,152605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r152216 | tilghman | 2008-10-27 16:34:04 -0500 (Mon, 27 Oct 2008) | 13 lines
Merged revisions 152215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152215 | tilghman | 2008-10-27 16:32:00 -0500 (Mon, 27 Oct 2008) | 6 lines
Inherit ALL elements of CallerID across a local channel.
(closes issue #13368)
Reported by: Peter Schlaile
Patches:
20080826__bug13368.diff.txt uploaded by Corydon76 (license 14)
........
................
r152287 | jpeeler | 2008-10-27 18:31:39 -0500 (Mon, 27 Oct 2008) | 10 lines
Merged revisions 152286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152286 | jpeeler | 2008-10-27 18:28:49 -0500 (Mon, 27 Oct 2008) | 2 lines
Buffer policy setting for half is not needed.
........
................
r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines
Merged revisions 152368 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines
Reset all DIAL variables back to blank, in case Dial is called multiple times
per call (which could otherwise lead to inconsistent status reports).
(closes issue #13216)
Reported by: ruddy
Patches:
20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
Tested by: ruddy
........
................
r152467 | tilghman | 2008-10-28 17:33:40 -0500 (Tue, 28 Oct 2008) | 10 lines
Merged revisions 152463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152463 | tilghman | 2008-10-28 17:32:34 -0500 (Tue, 28 Oct 2008) | 3 lines
Quoting in the wrong direction
(Fixes AST-107)
........
................
r152569 | russell | 2008-10-29 00:34:26 -0500 (Wed, 29 Oct 2008) | 15 lines
Merged revisions 152539 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152539 | russell | 2008-10-29 00:23:51 -0500 (Wed, 29 Oct 2008) | 7 lines
Fix an incorrect usage of sizeof()
(closes issue #13795)
Reported by: andrew53
Patches:
chan_sip_sizeof.patch uploaded by andrew53 (license 519)
........
................
r152605 | murf | 2008-10-29 00:47:13 -0500 (Wed, 29 Oct 2008) | 22 lines
Merged revisions 152538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines
A little documentation cross-ref between features and
dial and queue... I wasted some time (stupidly) trying
to get the one-touch parking stuff working, because it
didn't occur to me that I had to also have the corresponding
options in the dial command! Duh! (In all this time, I never
set this up before!)
So, to keep some poor fool from suffering the same fate,
I made the features.conf.sample file mention the corresponding
opts in dial/queue; and the docs for dial/app specifically
mention the corresponding decls in the feature.conf file.
I hope this doesn't spoil some vast, eternal plan...
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160388 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 4eaf30f8f..142fe9f25 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -122,14 +122,18 @@ static char *descrip = " Optionally, an extension, or extension and context may be specified. \n" " Otherwise, the current extension is used. You cannot use any additional\n" " action post answer options in conjunction with this option.\n" -" h - Allow the called party to hang up by sending the '*' DTMF digit.\n" -" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n" +" h - Allow the called party to hang up by sending the '*' DTMF digit, or\n" +" whatever sequence was defined in the featuremap section for\n" +" 'disconnect' in features.conf\n" +" H - Allow the calling party to hang up by hitting the '*' DTMF digit, or\n" +" whatever sequence was defined in the featuremap section for\n" +" 'disconnect' in features.conf\n" " i - Asterisk will ignore any forwarding requests it may receive on this\n" " dial attempt.\n" " k - Allow the called party to enable parking of the call by sending\n" -" the DTMF sequence defined for call parking in features.conf.\n" +" the DTMF sequence defined for call parking in the featuremap section of features.conf.\n" " K - Allow the calling party to enable parking of the call by sending\n" -" the DTMF sequence defined for call parking in features.conf.\n" +" the DTMF sequence defined for call parking in the featuremap section of features.conf.\n" " L(x[:y][:z]) - Limit the call to 'x' ms. Play a warning when 'y' ms are\n" " left. Repeat the warning every 'z' ms. The following special\n" " variables can be used with this option:\n" @@ -188,9 +192,11 @@ static char *descrip = " S(x) - Hang up the call after 'x' seconds *after* the called party has\n" " answered the call.\n" " t - Allow the called party to transfer the calling party by sending the\n" -" DTMF sequence defined in features.conf.\n" +" DTMF sequence defined in the blindxfer setting in the featuremap section\n" +" of features.conf.\n" " T - Allow the calling party to transfer the called party by sending the\n" -" DTMF sequence defined in features.conf.\n" +" DTMF sequence defined in the blindxfer setting in the featuremap section\n" +" of features.conf.\n" " U(x[^arg]) - Execute via Gosub the routine 'x' for the *called* channel before connecting\n" " to the calling channel. Arguments can be specified to the Gosub\n" " using '^' as a delimeter. The Gosub routine can set the variable\n" @@ -207,13 +213,17 @@ static char *descrip = " with this option. Also, pbx services are not run on the peer (called) channel,\n" " so you will not be able to set timeouts via the TIMEOUT() function in this routine.\n" " w - Allow the called party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch recording in features.conf.\n" +" the DTMF sequence defined in the automon setting in the featuremap section\n" +" of features.conf.\n" " W - Allow the calling party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch recording in features.conf.\n" +" the DTMF sequence defined in the automon setting in the featuremap section\n" +" of features.conf.\n" " x - Allow the called party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch automixmonitor in features.conf\n" +" the DTMF sequence defined in the automixmon setting in the featuremap section\n" +" of features.conf.\n" " X - Allow the calling party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch automixmonitor in features.conf\n"; +" the DTMF sequence defined in the automixmon setting in the featuremap section\n" +" of features.conf.\n"; /* RetryDial App by Anthony Minessale II <anthmct@yahoo.com> Jan/2005 */ static char *rapp = "RetryDial"; @@ -1285,6 +1295,13 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags struct ast_dial_features *caller_features; int fulldial = 0, num_dialed = 0; + /* Reset all DIAL variables back to blank, to prevent confusion (in case we don't reset all of them). */ + pbx_builtin_setvar_helper(chan, "DIALSTATUS", ""); + pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", ""); + pbx_builtin_setvar_helper(chan, "DIALEDPEERNAME", ""); + pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", ""); + pbx_builtin_setvar_helper(chan, "DIALEDTIME", ""); + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Dial requires an argument (technology/number)\n"); pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status); |