[asterisk-commits] jsmith: branch 1.6.0 r235332 - in /branches/1.6.0: ./ configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: jsmith
Date: Wed Dec 16 10:25:30 2009
New Revision: 235332

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

................
  r235298 | jsmith | 2009-12-15 23:24:58 -0600 (Tue, 15 Dec 2009) | 11 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/sip.conf.sample

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

Modified: branches/1.6.0/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/sip.conf.sample?view=diff&rev=235332&r1=235331&r2=235332
==============================================================================
--- branches/1.6.0/configs/sip.conf.sample (original)
+++ branches/1.6.0/configs/sip.conf.sample Wed Dec 16 10:25:30 2009
@@ -1018,6 +1018,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