aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsmith <jsmith@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-16 16:28:59 +0000
committerjsmith <jsmith@f38db490-d61c-443f-a65b-d21fe96a405b>2009-12-16 16:28:59 +0000
commit2983d871e046148cf28cbaf1e352121c425542de (patch)
tree5c77d44adf70b75d42abfcee2485118581bb3a4d
parent21b3d0d7dad943ab537624aa2c3ad5645da6a24e (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@235334 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--configs/sip.conf.sample1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 37dc005fc..a0a09f32b 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -1090,6 +1090,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