diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-12 17:05:31 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-12 17:05:31 +0000 |
commit | c3edb94f9a71594917107d9198cf5d066635d7ad (patch) | |
tree | 61b7e05164d6c3a5496a3daf47bc07e180fcf5b0 /main | |
parent | d29f0d053aadf8d72558acf656c951a75b542546 (diff) |
Merged revisions 291263 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r291263 | tilghman | 2010-10-12 11:55:30 -0500 (Tue, 12 Oct 2010) | 2 lines
Oops, incorrect range (although unallocated at ARIN)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@291264 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/acl.c b/main/acl.c index 7fbd81d11..258f3c2de 100644 --- a/main/acl.c +++ b/main/acl.c @@ -77,8 +77,8 @@ static void score_address(const struct sockaddr_in *sin, struct in_addr *best_ad /* 172.20.0.0 - 172.29.255.255, but not 172.200.0.0 - 172.255.255.255 nor 172.2.0.0 - 172.2.255.255 */ } else if (address[4] == '2' && address[6] == '.') { score = -5; - /* 172.30.0.0 - 172.31.255.255 */ - } else if (address[4] == '3' && address[5] <= '1') { + /* 172.30.0.0 - 172.31.255.255, but not 172.3.0.0 - 172.3.255.255 */ + } else if (address[4] == '3' && (address[5] == '0' || address[5] == '1')) { score = -5; /* All other 172 addresses are public */ } else { |