diff options
| author | Jonathan Rose <jrose@digium.com> | 2014-04-15 16:13:35 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2014-04-15 16:13:35 +0000 |
| commit | cc4a0a7fc9f2154e47f871650a2ec52c8c5bafc6 (patch) | |
| tree | 319751a077355a1f23a72174d7ac1a95e63304de /configs | |
| parent | c87f8a599b18e00345808d3bc0719b425f027c07 (diff) | |
Reverting r411189 so that it can be put up for public review
---
r411189 | jrose | 2014-03-26 10:50:48 -0500 (Wed, 26 Mar 2014) | 12 lines
chan_sip: Send real CallerID information with P-Assserted-Identity (RFC-3325)
Prior to this patch, the P-Asserted-Identity header would include anonymous
caller id information which seems to go against the point of the
P-Asserted-Identity header. Now the real caller ID information will be
included in this header. Also, no privacy header would be included.
This patch adds 'Privacy: id' to outgoing SIP messages that include the
P-Asserted-Identity header.
(closes issue AST-1301)
---
........
Merged revisions 412328 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 412329 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 412330 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sip.conf.sample | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 2b26589d9..46af79043 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -1431,8 +1431,7 @@ 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 ;callingpres=allowed_passed_screen ; Set caller ID presentation - ; See function CALLERPRES documentation for possible - ; values. + ; See README.callingpres for more information ;[xlite1] ; Turn off silence suppression in X-Lite ("Transmit Silence"=YES)! |