[asterisk-commits] jsmith: trunk r235298 - in /trunk: ./ configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: jsmith
Date: Tue Dec 15 23:24:58 2009
New Revision: 235298

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=235298
Log:
Merged revisions 235181 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r235181 | jsmith | 2009-12-15 15:07:55 -0600 (Tue, 15 Dec 2009) | 4 lines
  
  Add a line showing that we can use CIDR notation.
  
  patch by jsmith, after discussion with jtodd
........

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-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=235298&r1=235297&r2=235298
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Tue Dec 15 23:24:58 2009
@@ -1196,6 +1196,7 @@
 ;defaultip=192.168.0.60          ; IP address to use if peer has not registered
 ;deny=0.0.0.0/0.0.0.0            ; ACL: Control access to this account based on IP address
 ;permit=192.168.0.60/255.255.255.0
+;permit=192.168.0.60/24          ; we can also use CIDR notation for subnet masks
 
 ;[cisco1]
 ;type=friend