From: Jared Smith Date: Wed, 16 Dec 2009 16:25:30 +0000 (+0000) Subject: Merged revisions 235298 via svnmerge from X-Git-Tag: 1.6.0.21-rc1~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5de230916e783adce8cb266a378a4cd9f1bbd1b5;p=thirdparty%2Fasterisk.git 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@235332 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 8ea15ec73a..9bc3a8d6b2 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -1018,6 +1018,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;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