[Asterisk-cvs] asterisk/configs sip.conf.sample,1.26,1.27

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/configs
In directory mongoose.digium.com:/tmp/cvs-serv25672/configs

Modified Files:
	sip.conf.sample 
Log Message:
Show peers formatting fixes, SIP strlen optimizations, and using ACL for local network matching (bugs #1587, 1586, 1585, 1584)


Index: sip.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/sip.conf.sample,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sip.conf.sample	6 May 2004 20:00:19 -0000	1.26
+++ sip.conf.sample	8 May 2004 20:58:24 -0000	1.27
@@ -68,11 +68,15 @@
 
 ;externip = 200.201.202.203	; Address that we're going to put in outbound SIP messages
 				; if we're behind a NAT
-;localnet = 192.168.1.0		; Internal NETWORK address
-;localmask = 255.255.255.0     	; Internal netmask
-				; The externip, localnet and localmask is used
-				; when registering and communication with other proxies
+
+				; The externip and localnet is used
+				; when registering and communicating with other proxies
 				; that we're registered with
+				; You may add multiple local networks.  A reasonable set of defaults
+				; are:
+;localnet=192.168.0.0/255.255.0.0; All RFC 1918 addresses are local networks
+;localnet=10.0.0.0/255.0.0.0	; Also RFC1918
+;localnet=169.254.0.0/255.255.0.0 ;Zero conf local network
 
 ;[snomsip]
 ;type=friend