kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 00:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 255504 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255504 | lmadsen | 2010-03-31 12:48:09 -0500 (Wed, 31 Mar 2010) | 5 lines
  
  Add documentation clarifying when 't' and 'T' can be used.
  
  (closes issue #17021)
  Reported by: kovzol
  Tested by: lmadsen, kovzol, davidw, ebroad
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@255506 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Leif Madsen
2010-03-31 17:51:39 +00:00
parent e406f7f781
commit 8585bbf16e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_dial.c
View File

@@ -202,10 +202,12 @@ static char *descrip =
" answered the call.\n" " answered the call.\n"
" t - Allow the called party to transfer the calling party by sending the\n" " t - Allow the called party to transfer the calling party by sending the\n"
" DTMF sequence defined in the blindxfer setting in the featuremap section\n" " DTMF sequence defined in the blindxfer setting in the featuremap section\n"
" of features.conf.\n" " of features.conf. This setting does not perform policy enforcement on\n"
" transfers initiated by other methods.\n"
" T - Allow the calling party to transfer the called party by sending the\n" " T - Allow the calling party to transfer the called party by sending the\n"
" DTMF sequence defined in the blindxfer setting in the featuremap section\n" " DTMF sequence defined in the blindxfer setting in the featuremap section\n"
" of features.conf.\n" " of features.conf. This setting does not perform policy enforcement on\n"
" transfers initiated by other methods.\n"
" U(x[^arg]) - Execute via Gosub the routine 'x' for the *called* channel before connecting\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" " to the calling channel. Arguments can be specified to the Gosub\n"
" using '^' as a delimiter. The Gosub routine can set the variable\n" " using '^' as a delimiter. The Gosub routine can set the variable\n"

3
configs/sip.conf.sample
View File

@@ -94,7 +94,8 @@ context=default ; Default context for incoming calls
; instead of the From: field. ; instead of the From: field.
allowoverlap=no ; Disable overlap dialing support. (Default is yes) allowoverlap=no ; Disable overlap dialing support. (Default is yes)
;allowtransfer=no ; Disable all transfers (unless enabled in peers or users) ;allowtransfer=no ; Disable all transfers (unless enabled in peers or users)
; Default is enabled ; Default is enabled. The Dial() options 't' and 'T' are not
; related as to whether SIP transfers are allowed or not.
;realm=mydomain.tld ; Realm for digest authentication ;realm=mydomain.tld ; Realm for digest authentication
; defaults to "asterisk". If you set a system name in ; defaults to "asterisk". If you set a system name in
; asterisk.conf, it defaults to that system name ; asterisk.conf, it defaults to that system name