diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-12 17:07:20 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-12 17:07:20 +0000 |
| commit | 350e91a51432e0e33266fd5f35266b38b40c114a (patch) | |
| tree | a9f4ccfa22995f47309d588cdc9656b20c42cfca /main/acl.c | |
| parent | 5673d0855e9d879a0c5455429eaed6729fc8cc35 (diff) | |
Merged revisions 291265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r291265 | tilghman | 2010-10-12 12:06:23 -0500 (Tue, 12 Oct 2010) | 16 lines
Merged revisions 291264 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r291264 | tilghman | 2010-10-12 12:05:31 -0500 (Tue, 12 Oct 2010) | 9 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@291266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/acl.c')
| -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 fa028dc66..09ae0167d 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 { |