Moved InetAddress from trantor to core.

core/SCsub

@@ -6,6 +6,7 @@ env.core_sources = []
 
 env.add_source_files(env.core_sources, "*.cpp")
 env.add_source_files(env.core_sources, "./math/*.cpp")
+env.add_source_files(env.core_sources, "./net/*.cpp")
 env.add_source_files(env.core_sources, "./containers/*.cpp")
 env.add_source_files(env.core_sources, "./log/*.cpp")
 env.add_source_files(env.core_sources, "./os/*.cpp")

core/net/inet_address.cpp

@@ -6,10 +6,7 @@
 
 // Author: Shuo Chen (chenshuo at chenshuo dot com)
 
-#include <trantor/net/InetAddress.h>
-
-#include <trantor/utils/Logger.h>
-//#include <muduo/net/Endian.h>
+#include "inet_address.h"
 
 #ifdef _WIN32
 struct in6_addr_uint {
@@ -23,6 +20,7 @@ struct in6_addr_uint {
 #include <netdb.h>
 #include <netinet/tcp.h>
 #include <strings.h> // memset
+#include <cstring>
 #endif
 
 // INADDR_ANY use (type)value casting.

core/net/inet_address.h

@@ -20,8 +20,6 @@
 #ifndef MUDUO_NET_INETADDRESS_H
 #define MUDUO_NET_INETADDRESS_H
 
-#include <trantor/exports.h>
-
 #ifdef _WIN32
 #include <ws2tcpip.h>
 using sa_family_t = unsigned short;
@@ -35,13 +33,14 @@ using uint16_t = unsigned short;
 #include <string>
 #include <unordered_map>
 #include <mutex>
+
 namespace trantor
 {
 /**
  * @brief Wrapper of sockaddr_in. This is an POD interface class.
  *
  */
-class TRANTOR_EXPORT InetAddress
+class InetAddress
 {
   public:
     /**

web_backends/drogon/drogon/lib/inc/drogon/WebSocketConnection.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <http/HttpTypes.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <trantor/utils/NonCopyable.h>
 #include <memory>
 #include <string>

web_backends/drogon/drogon/lib/inc/drogon/drogon.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include "core/math/date.h"
 #include <trantor/utils/Logger.h>
 

web_backends/drogon/drogon/lib/inc/http/HttpRequest.h

@@ -21,7 +21,7 @@
 
 #include <drogon/utils/string_view.h>
 #include <json/json.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include "core/math/date.h"
 #include <memory>
 #include <string>

web_backends/drogon/drogon/lib/inc/http/HttpRequestImpl.h

@@ -21,7 +21,7 @@
 #include <drogon/utils/Utilities.h>
 #include <stdio.h>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <trantor/utils/Logger.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <trantor/utils/NonCopyable.h>

web_backends/drogon/drogon/lib/inc/http/HttpResponseImpl.h

@@ -19,7 +19,7 @@
 #include <http/HttpResponse.h>
 
 #include <drogon/utils/Utilities.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include "core/math/date.h"
 #include <trantor/utils/MsgBuffer.h>
 #include <atomic>

web_backends/drogon/drogon/lib/src/WebSocketClientImpl.cc

@@ -21,7 +21,7 @@
 #include "WebSocketConnectionImpl.h"
 
 #include <drogon/utils/Utilities.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #ifdef OPENSSL_FOUND
 #include <openssl/sha.h>
 #else

web_backends/drogon/drogon_web_server.h

@@ -12,7 +12,7 @@
 #include <memory>
 #include <mutex>
 
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <trantor/net/Resolver.h>
 #include <trantor/utils/Logger.h>
 

web_backends/drogon/trantor/net/Resolver.h

@@ -9,7 +9,7 @@
 #include <trantor/exports.h>
 #include <memory>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 
 namespace trantor
 {

web_backends/drogon/trantor/net/TcpClient.h

@@ -18,7 +18,7 @@
 
 #pragma once
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <trantor/net/TcpConnection.h>
 #include <trantor/exports.h>
 #include <functional>

web_backends/drogon/trantor/net/TcpConnection.h

@@ -15,7 +15,7 @@
 #pragma once
 #include <trantor/exports.h>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <trantor/utils/NonCopyable.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <trantor/net/callbacks.h>

web_backends/drogon/trantor/net/TcpServer.h

@@ -17,7 +17,7 @@
 #include <trantor/utils/NonCopyable.h>
 #include <trantor/utils/Logger.h>
 #include <trantor/net/EventLoopThreadPool.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <trantor/net/TcpConnection.h>
 #include <trantor/utils/TimingWheel.h>
 #include <trantor/exports.h>

web_backends/drogon/trantor/net/inner/Acceptor.h

@@ -17,7 +17,7 @@
 #include <trantor/net/EventLoop.h>
 #include <trantor/utils/NonCopyable.h>
 #include "Socket.h"
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include "Channel.h"
 #include <functional>
 

web_backends/drogon/trantor/net/inner/Connector.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <atomic>
 #include <memory>
 

web_backends/drogon/trantor/net/inner/Socket.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <trantor/utils/NonCopyable.h>
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <trantor/utils/Logger.h>
 #include <string>
 #ifndef _WIN32

web_backends/drogon/trantor/unittests/InetAddressUnittest.cc

@@ -1,4 +1,4 @@
-#include <trantor/net/InetAddress.h>
+#include "core/net/inet_address.h"
 #include <gtest/gtest.h>
 #include <string>
 #include <iostream>