- Add DOC file about caller ID presentation values

- Add callingpres to sip.conf
- Add reference to README.callingpres from zapata.conf

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

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 3452b77..61ea9ba 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -267,6 +267,7 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 ; User config options:        Peer configuration:
 ; --------------------        -------------------
 ; context                     context
+; callingpres                callingpres
 ; permit                      permit
 ; deny                        deny
 ; secret                      secret
@@ -365,6 +366,8 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 ;allow=g723.1                  ; Asterisk only supports g723.1 pass-thru!
 ;allow=g729                    ; Pass-thru only unless g729 license obtained
 ;astdb=chan2ext/SIP/grandstream1=1234  ; ensures an astDB entry exists
+;callingpres=allowed_passed_screen     ; Set caller ID presentation
+                               ; See README.callingpres for more information
 
 
 ;[xlite1]

diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample
index ac797bf..1fc0179 100644 (file)
--- a/configs/zapata.conf.sample
+++ b/configs/zapata.conf.sample
@@ -250,6 +250,7 @@ callwaiting=yes
 ;
 ; Whether or not use the caller ID presentation for the outgoing call that the
 ; calling switch is sending.
+; See README.callingpres
 ;
 usecallingpres=yes
 ;

diff --git a/doc/README.callingpres b/doc/README.callingpres
new file mode 100644 (file)
index 0000000..0fa1ff4
--- /dev/null
+++ b/doc/README.callingpres
@@ -0,0 +1,18 @@
+Caller ID presentation values
+-----------------------------
+
+In some channels it is possible to set Caller ID presentation for a device. It is 
+also possible to set the presentation for an active channel in the dial plan
+with the setcallerpres() application.
+
+Valid values are:
+
+      allowed_not_screened    : Presentation Allowed, Not Screened
+      allowed_passed_screen   : Presentation Allowed, Passed Screen
+      allowed_failed_screen   : Presentation Allowed, Failed Screen
+      allowed                 : Presentation Allowed, Network Number
+      prohib_not_screened     : Presentation Prohibited, Not Screened
+      prohib_passed_screen    : Presentation Prohibited, Passed Screen
+      prohib_failed_screen    : Presentation Prohibited, Failed Screen
+      prohib                  : Presentation Prohibited, Network Number
+      unavailable             : Number Unavailable