PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-24 08:29:04 +00:00
Code Issues Projects Releases Wiki Activity

Extend libnetutil's isipprivate function to check for 169.254/16

Browse Source
This commit is contained in:
dmiller
2015-12-19 20:44:55 +00:00
parent 9ddff31f86
commit 2450dee71e
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libnetutil/netutil.cc
View File

@@ -495,13 +495,13 @@ int ip_is_reserved(struct in_addr *ip)
break;
}
/* 172.16.0.0/12 is reserved for private nets by RFC1819 */
/* 172.16.0.0/12 is reserved for private nets by RFC1918 */
if (i1 == 172 && i2 >= 16 && i2 <= 31)
return 1;
/* 192.0.2.0/24 is reserved for documentation and examples (RFC5737) */
/* 192.88.99.0/24 is used as 6to4 Relay anycast prefix by RFC3068 */
/* 192.168.0.0/16 is reserved for private nets by RFC1819 */
/* 192.168.0.0/16 is reserved for private nets by RFC1918 */
if (i1 == 192) {
if (i2 == 0 && i3 == 2)
return 1;
@@ -520,7 +520,7 @@ int ip_is_reserved(struct in_addr *ip)
return 1;
}
/* 169.254.0.0/16 is reserved for DHCP clients seeking addresses */
/* 169.254.0.0/16 is reserved for DHCP clients seeking addresses - RFC3927 */
if (i1 == 169 && i2 == 254)
return 1;
@@ -1789,6 +1789,9 @@ int islocalhost(const struct sockaddr_storage *ss) {
/* Determines whether the supplied address corresponds to a private,
* non-Internet-routable address. See RFC1918 for details.
*
* Also checks for link-local addressing per RFC3927.
*
* Returns 1 if the address is private or 0 otherwise. */
int isipprivate(const struct sockaddr_storage *addr) {
const struct sockaddr_in *sin;
@@ -1813,6 +1816,10 @@ int isipprivate(const struct sockaddr_storage *addr) {
if (i1 == 172 && i2 >= 16 && i2 <= 31)
return 1;
/* 169.254.0.0/16 - RFC 3927 */
if (i1 == 169 && i2 == 254)
return 1;
/* 192.168.0.0/16 */
if (i1 == 192 && i2 == 168)
return 1;