headers: move inclusion of networking APIs to Infohash

include/opendht/infohash.h

@@ -21,6 +21,18 @@
 
 #include <msgpack.hpp>
 
+#ifndef _WIN32
+#include <netinet/in.h>
+#include <netdb.h>
+#ifdef __ANDROID__
+typedef uint16_t in_port_t;
+#endif
+#else
+#include <ws2tcpip.h>
+typedef uint16_t sa_family_t;
+typedef uint16_t in_port_t;
+#endif
+
 #include <iostream>
 #include <iomanip>
 #include <array>
@@ -197,12 +209,7 @@ public:
 
 };
 
-static constexpr InfoHash zeroes {};
-static constexpr InfoHash ones = {std::array<uint8_t, HASH_LEN>{{
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF
-}}};
+static constexpr const InfoHash zeroes {};
 
 struct NodeExport {
     InfoHash id;

include/opendht/node.h

@@ -24,8 +24,6 @@
 #include "utils.h"
 #include "infohash.h"
 
-#include <arpa/inet.h>
-
 #include <list>
 
 namespace dht {

include/opendht/value.h

@@ -26,18 +26,6 @@
 
 #include <msgpack.hpp>
 
-#ifndef _WIN32
-#include <netinet/in.h>
-#include <netdb.h>
-#ifdef __ANDROID__
-typedef uint16_t in_port_t;
-#endif
-#else
-#include <ws2tcpip.h>
-typedef uint16_t sa_family_t;
-typedef uint16_t in_port_t;
-#endif
-
 #include <string>
 #include <sstream>
 #include <bitset>