From 0dc44d08b086ddd7142e4a68f05aa50c7d036c52 Mon Sep 17 00:00:00 2001 From: fyodor Date: Sat, 11 Aug 2007 06:05:07 +0000 Subject: [PATCH] merge soc07 r5283:5298 - updating ip_is_reserved(); add sys/types.h include so it compiles on OpenBSD --- CHANGELOG | 5 +++++ nmap.cc | 2 -- reason.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 06ca47dc7..839a1426c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,11 @@ o Fixed an output bug on systems like Windows which return -1 when vsnprintf is passed a too-small buffer rather than returning the size needed. Thanks to jah (jah(a)zadkiel.plus.com) for the report. +o Added sys/types.h include to reason.h to help OpenBSD compilation. + Thanks to Olivier Meyer for the patch. + +o Updated IANA assignment IP list for random IP (-iR) generation. [Kris] + 4.22SOC2 o NSE compilation fixes by Stoiko and Kris diff --git a/nmap.cc b/nmap.cc index 598d028b1..917e2aaac 100644 --- a/nmap.cc +++ b/nmap.cc @@ -369,8 +369,6 @@ static int ip_is_reserved(struct in_addr *ip) case 49: /* 049/8 is IANA reserved */ case 50: /* 050/8 is IANA reserved */ case 55: /* misc. U.S.A. Armed forces */ - case 94: /* 094/8 is IANA reserved */ - case 95: /* 095/8 is IANA reserved */ case 127: /* 127/8 is reserved for loopback */ case 197: /* 197/8 is IANA reserved */ case 223: /* 223/8 is IANA reserved */ diff --git a/reason.h b/reason.h index 97763c7bc..f891c2f32 100644 --- a/reason.h +++ b/reason.h @@ -108,6 +108,8 @@ #include #endif +#include + class Target; class PortList;