summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2012-02-28 22:31:24 +0000
committerJonathan Rose <jrose@digium.com>2012-02-28 22:31:24 +0000
commit0b988da21c1ec856b7b8bad2434bf93498d17cfd (patch)
tree0790c85e6c2c4db1dc67e6636ca18108f6214971
parent876215a6887c82fcafceb063d0271e35a21df549 (diff)
Adding transport=udp to sample sip.conf - Also changes version of Asterisk 1.8 in UPGRADE
(issue ASTERISK-19352) Reported by: jamicque Patches: asterisk-19352-transport-warning-message-v1.patch uploaded by Michael L. Young (license 5026) ........ Merged revisions 357490 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 357497 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--UPGRADE-1.8.txt2
-rw-r--r--configs/sip.conf.sample3
2 files changed, 4 insertions, 1 deletions
diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt
index e04723611..d83d03145 100644
--- a/UPGRADE-1.8.txt
+++ b/UPGRADE-1.8.txt
@@ -18,7 +18,7 @@
===
===========================================================
-from 1.8.11 to 1.8.12:
+From 1.8.10 to 1.8.11:
* If no transport is specified in sip.conf, transport will default to UDP.
Also, if multiple transport= lines are used, only the last will be used.
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index d54610686..129ec4249 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -229,6 +229,9 @@ tcpbindaddr=0.0.0.0 ; IP address for TCP server to bind to (0.0.0.0
; unauthenticated sessions that will be allowed
; to connect at any given time. (default: 100)
+transport=udp ; Set the default transports. The order determines the primary default transport.
+ ; If tcpenable=no and the transport set is tcp, we will fallback to UDP.
+
srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; Note: Asterisk only uses the first host
; in SRV records