aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-31 17:42:58 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-31 17:42:58 +0000
commit47c25e828daf22f0f99a52858275a3b65891436b (patch)
tree5218cf1b7d0fd0775e0d080d5456dcc2be48cf15
parent8fc8e65175891e2715865720a83cbb48f437d892 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@255503 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_dial.c6
-rw-r--r--configs/sip.conf.sample3
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c
index b8ce0fabe..48a4d3b01 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -203,10 +203,12 @@ static char *descrip =
" answered the call.\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"
-" 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"
" 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"
" w - Allow the called party to enable recording of the call by sending\n"
" the DTMF sequence defined in the automon setting in the featuremap section\n"
" of features.conf.\n"
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 838196d80..f0235bcd1 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -47,7 +47,8 @@ context=default ; Default context for incoming calls
;allowguest=no ; Allow or reject guest calls (default is yes)
allowoverlap=no ; Disable overlap dialing support. (Default is yes)
;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
; defaults to "asterisk". If you set a system name in
; asterisk.conf, it defaults to that system name