[asterisk-commits] tzafrir: branch 1.6.1 r238351 - in /branches/1.6.1: ./ configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Thu Jan  7 06:09:55 2010
New Revision: 238351

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238351
Log:
Merged revisions 238313 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r238313 | tzafrir | 2010-01-07 11:14:57 +0200 (ה', 07 ינו 2010) | 2 lines
  
  Document the usefulness of explicit udp:// in the register string
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/sip.conf.sample

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/sip.conf.sample?view=diff&rev=238351&r1=238350&r2=238351
==============================================================================
--- branches/1.6.1/configs/sip.conf.sample (original)
+++ branches/1.6.1/configs/sip.conf.sample Thu Jan  7 06:09:55 2010
@@ -520,7 +520,13 @@
 ;    Tip 1: Avoid assigning hostname to a sip.conf section like [provider.com]
 ;    Tip 2: Use separate type=peer and type=user sections for SIP providers
 ;           (instead of type=friend) if you have calls in both directions
-  
+;
+;register => tls://username:xxxxxx@sip-tls-proxy.example.org
+;
+;    The 'transport' part defaults to 'udp' but may also be 'tcp' or 'tls'.
+;    Using 'udp://' explicitly is also useful in case the username part
+;    contains a '/' ('user/name').
+
 ;registertimeout=20             ; retry registration calls every 20 seconds (default)
 ;registerattempts=10            ; Number of registration attempts before we give up
                                 ; 0 = continue forever, hammering the other server