[svn-commits] jrose: trunk r352513 - in /trunk: ./ configs/sip.conf.sample

[SVN commits to the Digium repositories]

Author: jrose
Date: Wed Jan 25 10:42:55 2012
New Revision: 352513

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=352513
Log:
Redocuments sip types peer, user, friend in sip.conf.sample

There was faulty information in the sample config describing user as a synonym for friend
so it has been changed to better elaborate on the differences between the three entity
types.

(closes issue ASTERISK-15537)
Reported by: yarique
........

Merged revisions 352511 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 352512 from http://svn.asterisk.org/svn/asterisk/branches/10

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=352513&r1=352512&r2=352513
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Wed Jan 25 10:42:55 2012
@@ -1087,15 +1087,25 @@
 ;------------------------------------------------------------------------------
 ; DEVICE CONFIGURATION
 ;
-; The SIP channel has two types of devices, the friend and the peer.
-; * The type=friend is a device type that accepts both incoming and outbound calls,
-;   where Asterisk match on the From: username on incoming calls.
-;   (A synonym for friend is "user"). This is a type you use for your local
-;   SIP phones.
-; * The type=peer also handles both incoming and outbound calls. On inbound calls,
-;   Asterisk only matches on IP/port, not on names. This is mostly used for SIP
-;   trunks.
-;
+; SIP entities have a 'type' which determines their roles within Asterisk.
+; * For entities with 'type=peer':
+;   Peers handle both inbound and outbound calls and are matched by ip/port, so for
+;   The case of incoming calls from the peer, the IP address must match in order for
+;   The invitation to work. This means calls made from either direction won't work if
+;   The peer is unregistered while host=dynamic or if the host is otherise not set to
+;   the correct IP of the sender.
+; * For entities with 'type=user':
+;   Asterisk users handle inbound calls only (meaning they call Asterisk, Asterisk can't
+;   call them) and are matched by their authorization information (authname and secret).
+;   Asterisk doesn't rely on their IP and will accept calls regardless of the host setting
+;   as long as the incoming SIP invite authorizes successfully.
+; * For entities with 'type=friend':
+;   Asterisk will create the entity as both a friend and a peer. Asterisk will accept
+;   calls from friends like it would for users, requiring only that the authorization
+;   matches rather than the IP address. Since it is also a peer, a friend entity can
+;   be called as long as its IP is known to Asterisk. In the case of host=dynamic,
+;   this means it is necessary for the entity to register before Asterisk can call it.
+; 
 ; Use remotesecret for outbound authentication, and secret for authenticating
 ; inbound requests. For historical reasons, if no remotesecret is supplied for an
 ; outbound registration or call, the secret will be used.