merge soc07 r5283:5298 - updating ip_is_reserved(); add sys/types.h include so it compiles on OpenBSD

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

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       */

reason.h

@@ -108,6 +108,8 @@
 #include <netinet/in.h>
 #endif
 
+#include <sys/types.h>
+
 class Target;
 class PortList;