summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2008-03-21 15:24:43 +0000
committerRussell Bryant <russell@russellbryant.com>2008-03-21 15:24:43 +0000
commita567b4108394145c278b3b12c789e86c31aeffd8 (patch)
tree5954a88f7e4da07d70e1d518b0074344d358e8ec
parente3ea6829bb357b6fc4fb6e0af1a1ccfc2518aaaf (diff)
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: https://origsvn.digium.com/svn/asterisk/trunk@110499 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--CHANGES4
-rw-r--r--configs/sip.conf.sample6
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 165bb513b..ba0ede212 100644
--- a/CHANGES
+++ b/CHANGES
@@ -179,8 +179,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.
* Added a new configuration option "authfailureevents" that enables manager events when
a peer can't authenticate properly.
* Added DNS manager support to registrations not referencing a peer entry.
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index e9421fcc4..baabc9b6e 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)