Include netutil.h for IPPROTO_SCTP constant where necessary. Fixes #868

nmap.cc

@@ -173,6 +173,10 @@
 #include <shlobj.h>
 #endif
 
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 #if HAVE_OPENSSL
 #include <openssl/opensslv.h>
 #endif

nmap.h

@@ -166,11 +166,6 @@
 #include <sys/param.h> /* Defines MAXHOSTNAMELEN on BSD*/
 #endif
 
-/* For systems without SCTP in netinet/in.h, such as MacOS X */
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-
 /* Keep assert() defined for security reasons */
 #undef NDEBUG
 

nse_utility.cc

@@ -8,6 +8,10 @@
 #include "nse_main.h"
 #include "nse_utility.h"
 
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 int nseU_checkinteger (lua_State *L, int arg)
 {
   lua_Number n = luaL_checknumber(L, arg);

protocols.h

@@ -139,6 +139,10 @@
 #include <netdb.h>
 #endif
 
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 #define PROTOCOL_TABLE_SIZE 256
 
 struct protocol_list {

scan_engine.cc

@@ -151,6 +151,10 @@
 
 #include "struct_ip.h"
 
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 #include <math.h>
 #include <list>
 #include <map>

scan_engine.h

@@ -139,6 +139,11 @@
 #include <dnet.h>
 
 #include "timing.h"
+
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 #include <pcap.h>
 #include <list>
 #include <vector>

scan_engine_raw.cc

@@ -140,6 +140,10 @@
 #include "utils.h"
 #include <string>
 
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 extern NmapOps o;
 
 /* Pass an arp packet, including ethernet header. Must be 42bytes */

service_scan.cc

@@ -168,6 +168,10 @@
 # endif
 #endif
 
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 #include <algorithm>
 #include <list>
 

traceroute.cc

@@ -180,6 +180,10 @@ individually.
 
 #include "struct_ip.h"
 
+#ifndef IPPROTO_SCTP
+#include "libnetutil/netutil.h"
+#endif
+
 #include <dnet.h>
 
 #include <algorithm>