[svn-commits] murf: branch 1.6.1 r152606 - in /branches/1.6.1: ./ apps/ configs/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Oct 29 00:52:42 CDT 2008
Author: murf
Date: Wed Oct 29 00:52:41 2008
New Revision: 152606
URL: http://svn.digium.com/view/asterisk?view=rev&rev=152606
Log:
Merged revisions 152605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r152605 | murf | 2008-10-28 23:47:13 -0600 (Tue, 28 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...
........
................
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/apps/app_dial.c
branches/1.6.1/apps/app_queue.c
branches/1.6.1/configs/features.conf.sample
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=152606&r1=152605&r2=152606
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Wed Oct 29 00:52:41 2008
@@ -126,14 +126,18 @@
" 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"
@@ -192,9 +196,11 @@
" 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 delimiter. The Gosub routine can set the variable\n"
@@ -211,13 +217,17 @@
" 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 at yahoo.com> Jan/2005 */
static char *rapp = "RetryDial";
Modified: branches/1.6.1/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=152606&r1=152605&r2=152606
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Wed Oct 29 00:52:41 2008
@@ -160,26 +160,37 @@
"The option string may contain zero or more of the following characters:\n"
" 'c' -- continue in the dialplan if the callee hangs up.\n"
" 'd' -- data-quality (modem) call (minimum delay).\n"
-" 'h' -- allow callee to hang up by pressing *.\n"
-" 'H' -- allow caller to hang up by pressing *.\n"
+" 'h' -- allow callee to hang up by hitting '*', or whatver disconnect sequence\n"
+" that is defined in the featuremap section in features.conf.\n"
+" 'H' -- allow caller to hang up by hitting '*', or whatever disconnect sequence\n"
+" that is defined in the featuremap section in features.conf.\n"
" 'n' -- no retries on the timeout; will exit this application and \n"
" go to the next step.\n"
" 'i' -- ignore call forward requests from queue members and do nothing\n"
" when they are requested.\n"
" 'r' -- ring instead of playing MOH. Periodic Announcements are still made, if applicable.\n"
-" 't' -- allow the called user to transfer the calling user.\n"
-" 'T' -- allow the calling user to transfer the call.\n"
-" 'w' -- allow the called user to write the conversation to disk via Monitor.\n"
-" 'W' -- allow the calling user to write the conversation to disk via Monitor.\n"
+" 't' -- allow the called user transfer the calling user by pressing '#' or\n"
+" whatever blindxfer sequence defined in the featuremap section in\n"
+" features.conf\n"
+" 'T' -- to allow the calling user to transfer the call by pressing '#' or\n"
+" whatever blindxfer sequence defined in the featuremap section in\n"
+" features.conf\n"
+" 'w' -- allow the called user to write the conversation to disk via Monitor\n"
+" by pressing the automon sequence defined in the featuremap section in\n"
+" features.conf\n"
+" 'W' -- allow the calling user to write the conversation to disk via Monitor\n"
+" by pressing the automon sequence defined in the featuremap section in\n"
+" features.conf\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"
" '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"
" 'x' -- allow the called user to write the conversation to disk via MixMonitor\n"
+" by pressing the automixmon sequence defined in the featuremap section in\n"
+" features.conf\n"
" 'X' -- allow the calling user to write the conversation to disk via MixMonitor\n"
-
-" In addition to transferring the call, a call may be parked and then picked\n"
-"up by another user.\n"
+" by pressing the automixmon sequence defined in the featuremap section in\n"
+" features.conf\n"
" The optional URL will be sent to the called party if the channel supports\n"
"it.\n"
" The optional AGI parameter will setup an AGI script to be executed on the \n"
Modified: branches/1.6.1/configs/features.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/configs/features.conf.sample?view=diff&rev=152606&r1=152605&r2=152606
==============================================================================
--- branches/1.6.1/configs/features.conf.sample (original)
+++ branches/1.6.1/configs/features.conf.sample Wed Oct 29 00:52:41 2008
@@ -52,12 +52,12 @@
[featuremap]
-;blindxfer => #1 ; Blind transfer (default is #)
-;disconnect => *0 ; Disconnect (default is *)
-;automon => *1 ; One Touch Record a.k.a. Touch Monitor
-;atxfer => *2 ; Attended transfer
-;parkcall => #72 ; Park call (one step parking)
-;automixmon => *3 ; One Touch Record a.k.a. Touch MixMonitor
+;blindxfer => #1 ; Blind transfer (default is #) -- Make sure to set the T and/or t option in the Dial() or Queue() app call!
+;disconnect => *0 ; Disconnect (default is *) -- Make sure to set the H and/or h option in the Dial() or Queue() app call!
+;automon => *1 ; One Touch Record a.k.a. Touch Monitor -- Make sure to set the W and/or w option in the Dial() or Queue() app call!
+;atxfer => *2 ; Attended transfer -- Make sure to set the T and/or t option in the Dial() or Queue() app call!
+;parkcall => #72 ; Park call (one step parking) -- Make sure to set the K and/or K option in the Dial() app call!
+;automixmon => *3 ; One Touch Record a.k.a. Touch MixMonitor -- Make sure to set the X and/or x option in the Dial() or Queue() app call!
[applicationmap]
; Note that the DYNAMIC_FEATURES channel variable must be set to use the features
More information about the svn-commits
mailing list