diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-21 15:25:06 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-21 15:25:06 +0000 |
| commit | 229781f514678ab914332503237c0e87c94e8f99 (patch) | |
| tree | d5d5d142d13caa481af9fd3a763714c570ff83a0 | |
| parent | 2746b4c4bbe3c6970f6cf9893aef5a2e578e7acf (diff) | |
Merged revisions 110499 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r110499 | russell | 2008-03-21 10:24:43 -0500 (Fri, 21 Mar 2008) | 3 lines
Note that the TCP and TLS support is currently considered experimental and
is subject to change while we work out the remaining issues.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@110501 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | configs/sip.conf.sample | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -149,8 +149,8 @@ SIP changes * Added SIP Session Timers support (RFC 4028). This prevents stuck SIP sessions that were not properly torn down due to network or endpoint failures during an established SIP session. - * Added TCP and TLS support for SIP. See doc/siptls.txt and configs/sip.conf.sample for - more information on how it is used. + * Added experimental TCP and TLS support for SIP. See doc/siptls.txt and + configs/sip.conf.sample for more information on how it is used. IAX2 changes ------------ diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index df18aea12..0d4f92e8e 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -80,6 +80,12 @@ bindport=5060 ; UDP Port to bind to (SIP standard port is 5060) ; bindport is the local UDP port that Asterisk will listen on bindaddr=0.0.0.0 ; IP address to bind to (0.0.0.0 binds to all) +; +; Note that the TCP and TLS support for chan_sip is currently considered +; experimental. Since it is new, all of the related configuration options are +; subject to change in any release. If they are changed, the changes will +; be reflected in this sample configuration file, as well as in the UPGRADE.txt file. +; tcpenable=yes ; Enable server for incoming TCP connections (default is yes) tcpbindaddr=0.0.0.0 ; IP address for TCP server to bind to (0.0.0.0 binds to all interfaces) ; Optionally add a port number, 192.168.1.1:5062 (default is port 5060) |