网络比较庞大，独立一个目录

Core/_Core.h

@@ -16,7 +16,7 @@ extern "C"
 #endif
 }
 
-#ifdef USE_FULL_ASSERT
+#if defined(DEBUG) && defined(USE_FULL_ASSERT)
 
 #define assert_ptr(expr) (assert_ptr_(expr) ? (void)0 : assert_failed2("ptr==nullptr", (const char*)__FILE__, __LINE__))
 bool assert_ptr_(const void* p);

Drivers/Enc28j60.h

@@ -5,7 +5,7 @@
 #include "Spi.h"
 #include "Power.h"
 #include "Net\ITransport.h"
-#include "Socket.h"
+#include "Net\Socket.h"
 
 // Enc28j60类
 class Enc28j60 : public ITransport

Drivers/Esp8266.h

@@ -4,7 +4,7 @@
 #include "Sys.h"
 #include "Port.h"
 #include "Net\ITransport.h"
-#include "Socket.h"
+#include "Net\Socket.h"
 #include "Message\DataStore.h"
 
 

Drivers/W5500.cpp

@@ -4,7 +4,7 @@
 #include "Spi.h"
 #include "Power.h"
 #include "Net\ITransport.h"
-#include "Socket.h"
+#include "Net\Socket.h"
 #include "Message\DataStore.h"
 
 #include "Net\Dhcp.h"

Drivers/W5500.h

@@ -1,6 +1,8 @@
 #ifndef _W5500_H_
 #define _W5500_H_
 
+#include "Net\Socket.h"
+
 // 硬件Socket基类
 class HardSocket;
 

Message/BinaryPair.h

@@ -4,7 +4,7 @@
 #include "Sys.h"
 #include "Message.h"
 
-#include "Socket.h"
+#include "Net\IPEndPoint.h"
 
 // 二进制名值对
 class BinaryPair : public Object

Test/W5500Test.cpp

@@ -2,7 +2,7 @@
 #include "Spi.h"
 #include "Power.h"
 #include "Net\ITransport.h"
-#include "Socket.h"
+#include "Net\Socket.h"
 #include "Message\DataStore.h"
 #include "Drivers\W5500.h"
 

TinyIP/TinyIP.h

@@ -5,7 +5,7 @@
 
 #include "Sys.h"
 #include "Net\ITransport.h"
-#include "Socket.h"
+#include "Net\Socket.h"
 #include "Net\Ethernet.h"
 
 class TinyIP;

TokenNet/DeviceMessage.h

@@ -2,7 +2,6 @@
 #define __DeviceMessage_H__
 
 #include "Message\MessageBase.h"
-#include "Socket.h"
 #include "TokenNet\Device.h"
 
 enum class DeviceAtions : byte

TokenNet/HelloMessage.h

@@ -2,7 +2,7 @@
 #define __HelloMessage_H__
 
 #include "Message\MessageBase.h"
-#include "Socket.h"
+#include "Net\Socket.h"
 
 // 握手消息
 // 请求：2版本 + S类型 + S名称 + 8本地时间 + 6本地IP端口 + S支持加密算法列表

TokenNet/LoginMessage.h

@@ -2,7 +2,6 @@
 #define __LoginMessage_H__
 
 #include "Message\MessageBase.h"
-#include "Socket.h"
 
 // 登录消息
 class LoginMessage : public MessageBase

TokenNet/RegisterMessage.cpp

@@ -1,6 +1,6 @@
 #include "RegisterMessage.h"
 #include "Message\BinaryPair.h"
-#include "Socket.h"
+#include "Net\Socket.h"
 
 // 初始化消息，各字段为0
 RegisterMessage::RegisterMessage() : User(), Pass(), Salt(0)

TokenNet/Token.h

@@ -3,6 +3,7 @@
 
 #include "Sys.h"
 #include "Net\ITransport.h"
+#include "Net\Socket.h"
 #include "Message\DataStore.h"
 
 #include "TokenNet\TokenClient.h"

TokenNet/TokenClient.cpp

@@ -1,7 +1,6 @@
 #include "Time.h"
 
-#include "Socket.h"
-#include "Net\DNS.h"
+#include "Net\Socket.h"
 
 #include "Message\BinaryPair.h"
 

TokenNet/TokenConfig.cpp

@@ -1,4 +1,6 @@
-#include "TokenConfig.h"
+#include "Net\IPEndPoint.h"
+
+#include "TokenConfig.h"
 
 TokenConfig* TokenConfig::Current	= nullptr;
 

TokenNet/TokenConfig.h

@@ -3,7 +3,7 @@
 
 #include "Sys.h"
 #include "Config.h"
-#include "Socket.h"
+#include "Net\IPAddress.h"
 
 // 必须设定为1字节对齐，否则offsetof会得到错误的位置
 //#pragma pack(push)	// 保存对齐状态

TokenNet/TokenController.cpp

@@ -1,7 +1,7 @@
 #include "Time.h"
 #include "TokenController.h"
 
-#include "Socket.h"
+#include "Net\Socket.h"
 #include "Security\RC4.h"
 #include "Security\Crc.h"
 

TokenNet/TokenDevice.cpp

@@ -1,7 +1,6 @@
 #include "Time.h"
 
-#include "Socket.h"
-#include "Net\DNS.h"
+#include "Net\Socket.h"
 
 #include "TokenClient.h"
 
@@ -11,5 +10,3 @@
 #include "RegisterMessage.h"
 
 #include "Security\MD5.h"
-
-

TokenNet/TokenMessage.cpp

@@ -1,7 +1,7 @@
 #include "Time.h"
 #include "TokenMessage.h"
 
-#include "Socket.h"
+#include "Net\Socket.h"
 #include "Security\RC4.h"
 #include "Security\Crc.h"