aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-12 17:06:23 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-12 17:06:23 +0000
commit71ccca8a8950302c33b76f16c87636d698ecda8a (patch)
tree44d3121720e5ce58104d3d92ab474b57ebfcec09
parentd4e76e4b217758eec20f78b9774d645bf85b4b87 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.8@291265 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/acl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/acl.c b/main/acl.c
index 79f378123..1ca0cc0bd 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 {