From 160e1299ef3d95f8e8c48706d7f61dd3dc6c6b60 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 11 Feb 2020 11:29:07 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=20tab=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libjin/net/net_manager.cpp |  30 ++--
 src/libjin/net/net_manager.h   |  64 +++----
 src/libjin/net/socket.cpp      | 370 ++++++++++++++++++++---------------------
 src/libjin/net/socket.h        | 260 ++++++++++++++---------------
 4 files changed, 362 insertions(+), 362 deletions(-)

(limited to 'src/libjin/net')

diff --git a/src/libjin/net/net_manager.cpp b/src/libjin/net/net_manager.cpp
index 632219c..53ddfbc 100644
--- a/src/libjin/net/net_manager.cpp
+++ b/src/libjin/net/net_manager.cpp
@@ -2,23 +2,23 @@
 
 namespace JinEngine
 {
-    namespace Net
-    {
+	namespace Net
+	{
 
-        bool NetManager::startSystem(const SettingBase* setting)
-        {
-        #ifdef _WIN32
-        #if jin_net == jin_net_tekcos 
-            tk_init();
-        #endif 
-        #endif
-            return true;
-        }
+		bool NetManager::startSystem(const SettingBase* setting)
+		{
+		#ifdef _WIN32
+		#if jin_net == jin_net_tekcos 
+			tk_init();
+		#endif 
+		#endif
+			return true;
+		}
 
-        void NetManager::quitSystem()
-        {
+		void NetManager::quitSystem()
+		{
 
-        }
+		}
 
-    } // namespace Net
+	} // namespace Net
 } // namespace JinEngine
\ No newline at end of file
diff --git a/src/libjin/net/net_manager.h b/src/libjin/net/net_manager.h
index 36238f8..19c0192 100644
--- a/src/libjin/net/net_manager.h
+++ b/src/libjin/net/net_manager.h
@@ -9,38 +9,38 @@
 
 namespace JinEngine
 {
-    namespace Net
-    {
-
-        ///
-        ///
-        ///
-        class NetManager : public Subsystem<NetManager>
-        {
-        public:
-            ///
-            ///
-            ///
-            NetManager() {};
-
-            ///
-            ///
-            ///
-            ~NetManager() {};
-
-            ///
-            ///
-            ///
-            bool startSystem(const SettingBase* setting) override;
-
-            ///
-            ///
-            ///
-            void quitSystem() override;
-
-        };
-
-    } // namespace Net
+	namespace Net
+	{
+
+		///
+		///
+		///
+		class NetManager : public Subsystem<NetManager>
+		{
+		public:
+			///
+			///
+			///
+			NetManager() {};
+
+			///
+			///
+			///
+			~NetManager() {};
+
+			///
+			///
+			///
+			bool startSystem(const SettingBase* setting) override;
+
+			///
+			///
+			///
+			void quitSystem() override;
+
+		};
+
+	} // namespace Net
 } // namespace JinEngine
 
 #endif // defined(jin_net)
diff --git a/src/libjin/net/socket.cpp b/src/libjin/net/socket.cpp
index 3d59a57..cbea27f 100644
--- a/src/libjin/net/socket.cpp
+++ b/src/libjin/net/socket.cpp
@@ -2,189 +2,189 @@
 
 namespace JinEngine
 {
-    namespace Net
-    {
-        Socket::Socket(const Socket& socket)
-            : mHandle(socket.mHandle)
-            , mType(socket.mType)
-        {
-        }
-
-        Socket::Socket(const SocketInformation& info)
-            : mType(info.type)
-        {
-            if (mType == SocketType::TCP)
-            {
-                tk_IPaddress ip;
-                ip.host = info.address;
-                ip.port = info.port;
-                mHandle.tcpHandle = tk_tcp_open(ip);
-            }
-            else if (mType == SocketType::UDP)
-            {
-                mHandle.udpHandle = tk_udp_open(info.port);
-            }
-        }
-
-        Socket::Socket(SocketType type, const char* address, unsigned short port)
-        {
-            mType = type;
-            if (mType == SocketType::TCP)
-            {
-                tk_IPaddress ip;
-            #if jin_net == jin_net_tekcos
-                ip.host = tk_strtohl(address);
-                ip.port = port;
-                mHandle.tcpHandle = tk_tcp_open(ip);
-            #endif
-            }
-            else if (mType == SocketType::UDP)
-            {
-                mHandle.udpHandle = tk_udp_open(port);
-            }
-        }
-
-        Socket::Socket(SocketType type, unsigned int address, unsigned short port)
-        {
-            mType = type;
-            if (mType == SocketType::TCP)
-            {
-                tk_IPaddress ip;
-                ip.host = address;
-                ip.port = port;
-                mHandle.tcpHandle = tk_tcp_open(ip);
-            }
-            else if (mType == SocketType::UDP)
-            {
-                mHandle.udpHandle = tk_udp_open(port);
-            }
-        }
-
-        Socket::Socket(SocketType type, unsigned short port)
-        {
-            mType = type;
-            if (mType == SocketType::TCP)
-            {
-                tk_IPaddress ip;
-                ip.host = 0;
-                ip.port = port;
-                mHandle.tcpHandle = tk_tcp_open(ip);
-            }
-            else if (mType == SocketType::UDP)
-            {
-                mHandle.udpHandle = tk_udp_open(port);
-            }
-        }
-
-    #if jin_net == jin_net_tekcos
-
-        Socket::Socket(const tk_TCPsocket& tcphandle)
-        {
-            mHandle.tcpHandle = tcphandle;
-        }
-
-        Socket::Socket(const tk_UDPsocket& udphandle)
-        {
-            mHandle.udpHandle = udphandle;
-        }
-
-    #endif // jin_net == jin_net_tekcos
-
-        Socket::~Socket()
-        {
-        }
-
-        void Socket::configureBlocking(bool blocking)
-        {
-            if (mType != SocketType::TCP)
-                return;
-        #if jin_net == jin_net_tekcos
-            if (blocking)
-                tk_tcp_blocking(&mHandle.tcpHandle);
-            else
-                tk_tcp_nonblocking(&mHandle.tcpHandle);
-        #endif
-        }
-
-        Socket* Socket::accept()
-        {
-            if (mType != SocketType::TCP)
-                return nullptr;
-            Socket* client;
-        #if jin_net == jin_net_tekcos
-            tk_TCPsocket socket = tk_tcp_accept(&mHandle.tcpHandle);
-            client = new Socket(socket);
-        #endif
-            return client;
-        }
-
-        int Socket::receive(char* buffer, int size)
-        {
-            if (mType != SocketType::TCP)
-                return 0;
-        #if jin_net == jin_net_tekcos
-            int len;
-            tk_tcp_recv(&mHandle.tcpHandle, buffer, size, &len);
-            return len;
-        #endif
-        }
-    
-        int Socket::send(char* buffer, int size)
-        {
-            if (mType != SocketType::TCP)
-                return 0;
-        #if jin_net == jin_net_tekcos
-            int len;
-            tk_tcp_send(&mHandle.tcpHandle, buffer, size, &len);
-            return len;
-        #endif
-        }
-
-        void Socket::sendTo(char* buffer, int size, unsigned int address, unsigned int port)
-        {
-            if (mType != SocketType::UDP)
-                return;
-        #if jin_net == jin_net_tekcos
-            tk_UDPpack pack;
-            pack.data = buffer;
-            pack.len = size; 
-            pack.ip.host = address;
-            pack.ip.port = port;
-            tk_udp_sendto(&mHandle.udpHandle, &pack);
-        #endif
-        }
-    
-        int Socket::receiveFrom(char* buffer, int size, unsigned int address, unsigned int port)
-        {
-            if (mType != SocketType::UDP)
-                return 0;
-            int len;
-        #if jin_net == jin_net_tekcos
-            tk_UDPpack pack;
-            pack.data = buffer;
-            pack.len = size;
-            pack.ip.host = address;
-            pack.ip.port = port;
-            tk_udp_recvfrom(&mHandle.udpHandle, &pack);
-            return pack.len;
-        #endif
-        }
-
-        void Socket::close()
-        {
-            if (mType == SocketType::TCP)
-            {
-            #if jin_net == jin_net_tekcos
-                tk_tcp_close(&mHandle.tcpHandle);
-            #endif
-            }
-            else if (mType == SocketType::UDP)
-            {
-            #if jin_net == jin_net_tekcos
-                tk_udp_close(&mHandle.udpHandle);
-            #endif
-            }
-        }
-
-    } // namespace Net
+	namespace Net
+	{
+		Socket::Socket(const Socket& socket)
+			: mHandle(socket.mHandle)
+			, mType(socket.mType)
+		{
+		}
+
+		Socket::Socket(const SocketInformation& info)
+			: mType(info.type)
+		{
+			if (mType == SocketType::TCP)
+			{
+				tk_IPaddress ip;
+				ip.host = info.address;
+				ip.port = info.port;
+				mHandle.tcpHandle = tk_tcp_open(ip);
+			}
+			else if (mType == SocketType::UDP)
+			{
+				mHandle.udpHandle = tk_udp_open(info.port);
+			}
+		}
+
+		Socket::Socket(SocketType type, const char* address, unsigned short port)
+		{
+			mType = type;
+			if (mType == SocketType::TCP)
+			{
+				tk_IPaddress ip;
+			#if jin_net == jin_net_tekcos
+				ip.host = tk_strtohl(address);
+				ip.port = port;
+				mHandle.tcpHandle = tk_tcp_open(ip);
+			#endif
+			}
+			else if (mType == SocketType::UDP)
+			{
+				mHandle.udpHandle = tk_udp_open(port);
+			}
+		}
+
+		Socket::Socket(SocketType type, unsigned int address, unsigned short port)
+		{
+			mType = type;
+			if (mType == SocketType::TCP)
+			{
+				tk_IPaddress ip;
+				ip.host = address;
+				ip.port = port;
+				mHandle.tcpHandle = tk_tcp_open(ip);
+			}
+			else if (mType == SocketType::UDP)
+			{
+				mHandle.udpHandle = tk_udp_open(port);
+			}
+		}
+
+		Socket::Socket(SocketType type, unsigned short port)
+		{
+			mType = type;
+			if (mType == SocketType::TCP)
+			{
+				tk_IPaddress ip;
+				ip.host = 0;
+				ip.port = port;
+				mHandle.tcpHandle = tk_tcp_open(ip);
+			}
+			else if (mType == SocketType::UDP)
+			{
+				mHandle.udpHandle = tk_udp_open(port);
+			}
+		}
+
+	#if jin_net == jin_net_tekcos
+
+		Socket::Socket(const tk_TCPsocket& tcphandle)
+		{
+			mHandle.tcpHandle = tcphandle;
+		}
+
+		Socket::Socket(const tk_UDPsocket& udphandle)
+		{
+			mHandle.udpHandle = udphandle;
+		}
+
+	#endif // jin_net == jin_net_tekcos
+
+		Socket::~Socket()
+		{
+		}
+
+		void Socket::configureBlocking(bool blocking)
+		{
+			if (mType != SocketType::TCP)
+				return;
+		#if jin_net == jin_net_tekcos
+			if (blocking)
+				tk_tcp_blocking(&mHandle.tcpHandle);
+			else
+				tk_tcp_nonblocking(&mHandle.tcpHandle);
+		#endif
+		}
+
+		Socket* Socket::accept()
+		{
+			if (mType != SocketType::TCP)
+				return nullptr;
+			Socket* client;
+		#if jin_net == jin_net_tekcos
+			tk_TCPsocket socket = tk_tcp_accept(&mHandle.tcpHandle);
+			client = new Socket(socket);
+		#endif
+			return client;
+		}
+
+		int Socket::receive(char* buffer, int size)
+		{
+			if (mType != SocketType::TCP)
+				return 0;
+		#if jin_net == jin_net_tekcos
+			int len;
+			tk_tcp_recv(&mHandle.tcpHandle, buffer, size, &len);
+			return len;
+		#endif
+		}
+	
+		int Socket::send(char* buffer, int size)
+		{
+			if (mType != SocketType::TCP)
+				return 0;
+		#if jin_net == jin_net_tekcos
+			int len;
+			tk_tcp_send(&mHandle.tcpHandle, buffer, size, &len);
+			return len;
+		#endif
+		}
+
+		void Socket::sendTo(char* buffer, int size, unsigned int address, unsigned int port)
+		{
+			if (mType != SocketType::UDP)
+				return;
+		#if jin_net == jin_net_tekcos
+			tk_UDPpack pack;
+			pack.data = buffer;
+			pack.len = size; 
+			pack.ip.host = address;
+			pack.ip.port = port;
+			tk_udp_sendto(&mHandle.udpHandle, &pack);
+		#endif
+		}
+	
+		int Socket::receiveFrom(char* buffer, int size, unsigned int address, unsigned int port)
+		{
+			if (mType != SocketType::UDP)
+				return 0;
+			int len;
+		#if jin_net == jin_net_tekcos
+			tk_UDPpack pack;
+			pack.data = buffer;
+			pack.len = size;
+			pack.ip.host = address;
+			pack.ip.port = port;
+			tk_udp_recvfrom(&mHandle.udpHandle, &pack);
+			return pack.len;
+		#endif
+		}
+
+		void Socket::close()
+		{
+			if (mType == SocketType::TCP)
+			{
+			#if jin_net == jin_net_tekcos
+				tk_tcp_close(&mHandle.tcpHandle);
+			#endif
+			}
+			else if (mType == SocketType::UDP)
+			{
+			#if jin_net == jin_net_tekcos
+				tk_udp_close(&mHandle.udpHandle);
+			#endif
+			}
+		}
+
+	} // namespace Net
 } // namespace JinEngine
\ No newline at end of file
diff --git a/src/libjin/net/socket.h b/src/libjin/net/socket.h
index 1562272..4a65245 100644
--- a/src/libjin/net/socket.h
+++ b/src/libjin/net/socket.h
@@ -9,136 +9,136 @@
 
 namespace JinEngine
 {
-    namespace Net
-    {
-
-        ///
-        ///
-        ///
-        enum SocketType
-        {
-            TCP,
-            UDP
-        };
-
-        ///
-        ///
-        ///
-        struct SocketInformation
-        {
-            unsigned int address;
-            unsigned short port;
-            SocketType type;
-        };
-
-        ///
-        ///
-        ///
-        class Socket : public Object
-        {
-        public:
-
-            ///
-            ///
-            ///
-            Socket() {};
-
-            ///
-            ///
-            ///
-            Socket(const Socket& socket);
-
-            ///
-            ///
-            ///
-            Socket(const SocketInformation& socketInformation);
-
-            ///
-            ///
-            ///
-            Socket(SocketType type, unsigned short port);
-
-            ///
-            ///
-            ///
-            Socket(SocketType type, unsigned int address, unsigned short port);
-
-            ///
-            ///
-            ///
-            Socket(SocketType type, const char* address, unsigned short port);
-
-            ///
-            ///
-            ///
-            ~Socket();
-
-            ///
-            ///
-            ///
-            void configureBlocking(bool bocking);
-
-            ///
-            ///
-            ///
-            Socket* accept();
-
-            ///
-            ///
-            ///
-            int receive(char* buffer, int size);
-
-            ///
-            ///
-            ///
-            int send(char* buffer, int size);
-
-            ///
-            ///
-            ///
-            void sendTo(char* buffer, int size, unsigned int address, unsigned int port);
-
-            ///
-            ///
-            ///
-            int receiveFrom(char* buffer, int size, unsigned int address, unsigned int port);
-
-            ///
-            ///
-            ///
-            void close();
-        
-        protected:
-        #if jin_net == jin_net_tekcos
-
-            ///
-            ///
-            ///
-            Socket(const tk_TCPsocket& tcpHandle);
-
-            ///
-            ///
-            ///
-            Socket(const tk_UDPsocket& udpHandle);
-
-            ///
-            ///
-            ///
-            union
-            {
-                tk_TCPsocket tcpHandle;
-                tk_UDPsocket udpHandle;
-            } mHandle;
-        #endif
-
-            ///
-            ///
-            ///
-            SocketType mType;
-
-        };
-
-    } // namespace Net 
+	namespace Net
+	{
+
+		///
+		///
+		///
+		enum SocketType
+		{
+			TCP,
+			UDP
+		};
+
+		///
+		///
+		///
+		struct SocketInformation
+		{
+			unsigned int address;
+			unsigned short port;
+			SocketType type;
+		};
+
+		///
+		///
+		///
+		class Socket : public Object
+		{
+		public:
+
+			///
+			///
+			///
+			Socket() {};
+
+			///
+			///
+			///
+			Socket(const Socket& socket);
+
+			///
+			///
+			///
+			Socket(const SocketInformation& socketInformation);
+
+			///
+			///
+			///
+			Socket(SocketType type, unsigned short port);
+
+			///
+			///
+			///
+			Socket(SocketType type, unsigned int address, unsigned short port);
+
+			///
+			///
+			///
+			Socket(SocketType type, const char* address, unsigned short port);
+
+			///
+			///
+			///
+			~Socket();
+
+			///
+			///
+			///
+			void configureBlocking(bool bocking);
+
+			///
+			///
+			///
+			Socket* accept();
+
+			///
+			///
+			///
+			int receive(char* buffer, int size);
+
+			///
+			///
+			///
+			int send(char* buffer, int size);
+
+			///
+			///
+			///
+			void sendTo(char* buffer, int size, unsigned int address, unsigned int port);
+
+			///
+			///
+			///
+			int receiveFrom(char* buffer, int size, unsigned int address, unsigned int port);
+
+			///
+			///
+			///
+			void close();
+		
+		protected:
+		#if jin_net == jin_net_tekcos
+
+			///
+			///
+			///
+			Socket(const tk_TCPsocket& tcpHandle);
+
+			///
+			///
+			///
+			Socket(const tk_UDPsocket& udpHandle);
+
+			///
+			///
+			///
+			union
+			{
+				tk_TCPsocket tcpHandle;
+				tk_UDPsocket udpHandle;
+			} mHandle;
+		#endif
+
+			///
+			///
+			///
+			SocketType mType;
+
+		};
+
+	} // namespace Net 
 } // namespace JinEngine 
 
 #endif // defined(jin_net)
-- 
cgit v1.1-26-g67d0