From 7c9805b954c0424c81c39238010574b0e05aee75 Mon Sep 17 00:00:00 2001 From: fyodor Date: Wed, 7 Feb 2007 21:06:29 +0000 Subject: [PATCH] IANA patch from Mike Phipps --- CHANGELOG | 2 +- nmap.cc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8c7800709..1f524c591 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,7 +16,7 @@ o Fixed the way Nmap detects whether one of its data files (such as o Added a bunch of nmap-services port listings from Stephanie Wen. o Update IANA assignment IP list for random IP (-iR) generation. - Thanks to Kris Katterjohn for the patch. + Thanks to Kris Katterjohn and Mike Phipps for the patches. o Fix nmap.xsl (the transform for rendering Nmap XML results as HTML) to fix some bugs related to OS detection output. Thanks to Tom diff --git a/nmap.cc b/nmap.cc index 6d3ff18b2..c931cacb2 100644 --- a/nmap.cc +++ b/nmap.cc @@ -359,13 +359,13 @@ static int ip_is_reserved(struct in_addr *ip) break; } - /* 092-95/8 is IANA reserved */ - if (i1 >= 92 && i1 <= 95) - return 1; + /* 077-079/8 is IANA reserved */ + if (i1 >= 77 && i1 <= 79) + return 1; - /* 100-120/8 is IANA reserved */ - if (i1 >= 100 && i1 <= 120) - return 1; + /* 092-123/8 is IANA reserved */ + if (i1 >= 92 && i1 <= 123) + return 1; /* 172.16.0.0/12 is reserved for private nets by RFC1819 */ if (i1 == 172 && i2 >= 16 && i2 <= 31)