Merge pull request #5 from libxengine/develop

xengine-qyt · web-flow · commit 0ed60ffb7218 · 2022-11-11T14:14:08.000+08:00
V1.4.0.1001 Merge
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,13 @@
+XEngine_ProxyServer V1.4.0.1001
+
+更新:匹配XEngine 7.43版本
+修改:使用新的方式来关闭客户端
+修正:当客户端关闭某些时候回崩溃的问题
+
+update:match xengine v7.43
+modify:use the new way to close the client
+fixed:crashed when client is closed
+======================================================================================
 XEngine_ProxyServer V1.3.1.1001
 
 更新:匹配XEngine 7.38版本
diff --git a/README.md b/README.md
@@ -81,6 +81,9 @@ make FLAGS=CleanAll 清理编译
 3.  提交代码
 4.  新建 Pull Request  
 
+## 开发计划
+使用线程池转发数据而不是一对一的线程  
+
 ## 关注我们
 如果你觉得这个软件对你有帮助,请你给我们一个START吧
 
diff --git a/XEngine_APPClient/APPClient_ForwardExample/APPClient_ForwardExample.cpp b/XEngine_APPClient/APPClient_ForwardExample/APPClient_ForwardExample.cpp
@@ -150,7 +150,7 @@ int main(int argc, char** argv)
 
 				memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
 
-				if (XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))
+				if (XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))
 				{
 					printf("%s\n", tszMsgBuffer);
 				}
diff --git a/XEngine_APPClient/APPClient_SocksExample/APPClient_SocksExample.cpp b/XEngine_APPClient/APPClient_SocksExample/APPClient_SocksExample.cpp
@@ -54,7 +54,7 @@ int main(int argc, char** argv)
 	nMsgLen = 2048;
 	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
 
-	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))
+	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))
 	{
 		printf("接受数据失败！\n");
 		return 0;
@@ -72,7 +72,7 @@ int main(int argc, char** argv)
 
 	nMsgLen = 2048;
 	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
-	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))
+	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))
 	{
 		printf("接受数据失败！\n");
 		return 0;
@@ -94,7 +94,7 @@ int main(int argc, char** argv)
 	}
 	nMsgLen = 2048;
 	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
-	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))
+	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))
 	{
 		printf("接受数据失败！\n");
 		return 0;
@@ -112,7 +112,7 @@ int main(int argc, char** argv)
 	{
 		nMsgLen = 2048;
 		memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
-		if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))
+		if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))
 		{
 			break;
 		}
diff --git a/XEngine_APPClient/APPClient_TunnelExample/APPClient_TunnelExample.cpp b/XEngine_APPClient/APPClient_TunnelExample/APPClient_TunnelExample.cpp
@@ -31,6 +31,7 @@ int main(int argc, char** argv)
 #endif
 	SOCKET m_Socket;
 	LPCTSTR lpszServiceAddr = _T("127.0.0.1");
+
 	if (!XClient_TCPSelect_Create(&m_Socket, lpszServiceAddr, 5401))
 	{
 		printf("连接失败！错误:%lX\n", XClient_GetLastError());
@@ -50,7 +51,7 @@ int main(int argc, char** argv)
 	nMsgLen = 2048;
 	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
 
-	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))
+	if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))
 	{
 		printf("接受数据失败！\n");
 		return 0;
@@ -68,7 +69,7 @@ int main(int argc, char** argv)
 	{
 		nMsgLen = 2048;
 		memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
-		if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))
+		if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))
 		{
 			break;
 		}
diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json
@@ -12,9 +12,9 @@
   },
   "XTime": {
     "nTimeCheck": 3,
-    "nSocksTimeOut": 0,
-    "nTunnelTimeOut": 0,
-    "nForwardTimeOut": 0
+    "nSocksTimeOut": 5,
+    "nTunnelTimeOut": 5,
+    "nForwardTimeOut": 5
   },
   "XLog": {
     "MaxSize": 1024000,
@@ -23,10 +23,11 @@
     "tszLogFile": "./XEngine_Log/XEngine_ServiceApp.log"
   },
   "XAuth": {
-    "bAuth": 2,
+    "bAuth": 0,
     "tszAuthFile": "./XEngine_Config/UserList.txt"
   },
   "XVer": [
+    "1.4.0.1001 Build20221111",
     "1.3.1.1001 Build20220804",
     "1.3.0.1001 Build20220617",
     "1.2.0.1001 Build20220413",
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_Hdr.h b/XEngine_Source/XEngine_ServiceApp/XEngine_Hdr.h
@@ -83,7 +83,7 @@ extern XHANDLE xhTunnelHeart;
 extern XHANDLE xhForwardSocket;
 extern XHANDLE xhForwardHeart;
 extern XHANDLE xhForwardPacket;
-extern XNETHANDLE xhForwardPool;
+extern XHANDLE xhForwardPool;
 //配置文件
 extern XENGINE_SERVICECONFIG st_ServiceConfig;
 
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_Network.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_Network.cpp
@@ -115,13 +115,7 @@ void XEngine_Network_Close(LPCTSTR lpszClientAddr, int nIPProto, int nCloseType)
 			SocketOpt_HeartBeat_DeleteAddrEx(xhSocksHeart, lpszClientAddr);
 			NetCore_TCPXCore_CloseForClientEx(xhSocksSocket, lpszClientAddr);
 		}
-		PROXYPROTOCOL_CLIENTINFO st_ProxyClient;
-		memset(&st_ProxyClient, '\0', sizeof(PROXYPROTOCOL_CLIENTINFO));
-		if (ProxyProtocol_SocksCore_GetInfo(lpszClientAddr, &st_ProxyClient))
-		{
-			st_ProxyClient.bClose = TRUE;
-			ProxyProtocol_SocksCore_SetInfo(lpszClientAddr, &st_ProxyClient, sizeof(PROXYPROTOCOL_CLIENTINFO));
-		}
+		ProxyProtocol_SocksCore_Delete(lpszClientAddr);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("SOCKS客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);
 	}
 	else if (XENGINE_CLIENT_NETTYPE_TUNNEL == nIPProto)
@@ -136,16 +130,10 @@ void XEngine_Network_Close(LPCTSTR lpszClientAddr, int nIPProto, int nCloseType)
 		}
 		else
 		{
-			SocketOpt_HeartBeat_DeleteAddrEx(xhTunnelHeart, lpszClientAddr);
 			NetCore_TCPXCore_CloseForClientEx(xhTunnelSocket, lpszClientAddr);
+			SocketOpt_HeartBeat_DeleteAddrEx(xhTunnelHeart, lpszClientAddr);
 		}
-		PROXYPROTOCOL_CLIENTINFO st_ProxyClient;
-		memset(&st_ProxyClient, '\0', sizeof(PROXYPROTOCOL_CLIENTINFO));
-		if (ProxyProtocol_TunnelCore_GetInfo(lpszClientAddr, &st_ProxyClient))
-		{
-			st_ProxyClient.bClose = TRUE;
-			ProxyProtocol_TunnelCore_SetInfo(lpszClientAddr, &st_ProxyClient, sizeof(PROXYPROTOCOL_CLIENTINFO));
-		}
+		ProxyProtocol_TunnelCore_Delete(lpszClientAddr);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("Tunnel客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);
 	}
 	else if (XENGINE_CLIENT_NETTYPE_FORWARD == nIPProto)
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_ServiceApp.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_ServiceApp.cpp
@@ -12,7 +12,7 @@ XHANDLE xhTunnelHeart = NULL;
 XHANDLE xhForwardSocket = NULL;
 XHANDLE xhForwardHeart = NULL;
 XHANDLE xhForwardPacket = NULL;
-XNETHANDLE xhForwardPool = 0;
+XHANDLE xhForwardPool = NULL;
 //配置文件
 XENGINE_SERVICECONFIG st_ServiceConfig;
 
@@ -245,7 +245,8 @@ int main(int argc, char** argv)
 			ppSt_ListParam[i]->lParam = pInt_Pos;
 			ppSt_ListParam[i]->fpCall_ThreadsTask = XEngine_Forward_Thread;
 		}
-		if (!ManagePool_Thread_NQCreate(&xhForwardPool, &ppSt_ListParam, st_ServiceConfig.st_XMax.nForwardThread))
+		xhForwardPool = ManagePool_Thread_NQCreate(&ppSt_ListParam, st_ServiceConfig.st_XMax.nForwardThread);
+		if (NULL == xhForwardPool)
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动Forward线程池服务失败，错误：%lX"), ManagePool_GetLastError());
 			goto XENGINE_SERVICEAPP_EXIT;
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_SocksTask.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_SocksTask.cpp
@@ -199,28 +199,26 @@ BOOL XEngine_SocksTask_Handle(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 XHTHREAD CALLBACK XEngine_SocksTask_Thread(LPCTSTR lpszClientAddr, SOCKET hSocket)
 {
 	TCHAR tszMsgBuffer[4096];
+	TCHAR tszClientAddr[128];
+
+	memset(tszClientAddr, '\0', sizeof(tszClientAddr));
+	_tcscpy(tszClientAddr, lpszClientAddr);
+
 	while (1)
 	{
 		int nMsgLen = 4096;
-		if (!XClient_TCPSelect_RecvMsg(hSocket, tszMsgBuffer, &nMsgLen, FALSE))
+		if (!XClient_TCPSelect_RecvMsg(hSocket, tszMsgBuffer, &nMsgLen))
 		{
 			break;
 		}
-		XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen, XENGINE_CLIENT_NETTYPE_SOCKS);
-	}
-	//退出处理
-	PROXYPROTOCOL_CLIENTINFO st_ProxyClient;
-	memset(&st_ProxyClient, '\0', sizeof(PROXYPROTOCOL_CLIENTINFO));
-	if (ProxyProtocol_SocksCore_GetInfo(lpszClientAddr, &st_ProxyClient))
-	{
-		ProxyProtocol_SocksCore_Delete(lpszClientAddr);
-		//是主动关闭的还是被动触发的
-		if (!st_ProxyClient.bClose)
+		if (!XEngine_Network_Send(tszClientAddr, tszMsgBuffer, nMsgLen, XENGINE_CLIENT_NETTYPE_SOCKS))
 		{
-			//主动关闭,需要调用
-			XClient_TCPSelect_Close(st_ProxyClient.hSocket);
-			XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_SOCKS, XENGINE_CLIENT_CLOSE_SERVICE);
+			break;
 		}
 	}
+	//退出处理
+	XClient_TCPSelect_Close(hSocket);
+	SocketOpt_HeartBeat_ForceOutAddrEx(xhSocksHeart, tszClientAddr);
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("Socks客户端:%s,离开服务器,客户端主动断开"), tszClientAddr);
 	return 0;
 }
diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_TunnelTask.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_TunnelTask.cpp
@@ -120,7 +120,7 @@ BOOL XEngine_TunnelTask_Handle(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 			//非代理协议直接发送数据
 			XClient_TCPSelect_SendMsg(st_ProxyClient.hSocket, lpszMsgBuffer, nMsgLen);
 		}
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("Tunnel客户端:%s,创建隧道代理服务成功,连接到服务器:%s:%d"), lpszClientAddr, tszConnectAddr, nIPPort);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("Tunnel客户端:%s,创建隧道代理服务成功,连接到服务器:%s:%d,代理模式:%s"), lpszClientAddr, tszConnectAddr, nIPPort, bProxy ? "代理" : "直连");
 	}
 	else
 	{
@@ -132,28 +132,26 @@ BOOL XEngine_TunnelTask_Handle(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 XHTHREAD CALLBACK XEngine_TunnelTask_Thread(LPCTSTR lpszClientAddr, SOCKET hSocket)
 {
 	TCHAR tszMsgBuffer[4096];
+	TCHAR tszClientAddr[128];
+
+	memset(tszClientAddr, '\0', sizeof(tszClientAddr));
+	_tcscpy(tszClientAddr, lpszClientAddr);
+
 	while (1)
 	{
 		int nMsgLen = 4096;
-		if (!XClient_TCPSelect_RecvMsg(hSocket, tszMsgBuffer, &nMsgLen, FALSE))
+		if (!XClient_TCPSelect_RecvMsg(hSocket, tszMsgBuffer, &nMsgLen))
 		{
 			break;
 		}
-		XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen, XENGINE_CLIENT_NETTYPE_TUNNEL);
-	}
-	//退出处理
-	PROXYPROTOCOL_CLIENTINFO st_ProxyClient;
-	memset(&st_ProxyClient, '\0', sizeof(PROXYPROTOCOL_CLIENTINFO));
-	if (ProxyProtocol_TunnelCore_GetInfo(lpszClientAddr, &st_ProxyClient))
-	{
-		ProxyProtocol_TunnelCore_Delete(lpszClientAddr);
-		//是主动关闭的还是被动触发的
-		if (!st_ProxyClient.bClose)
+		if (!XEngine_Network_Send(tszClientAddr, tszMsgBuffer, nMsgLen, XENGINE_CLIENT_NETTYPE_TUNNEL))
 		{
-			//主动关闭,需要调用
-			XClient_TCPSelect_Close(hSocket);
-			XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_TUNNEL, XENGINE_CLIENT_CLOSE_SERVICE);
+			break;
 		}
 	}
+	//退出处理
+	XClient_TCPSelect_Close(hSocket);
+	SocketOpt_HeartBeat_ForceOutAddrEx(xhTunnelHeart, tszClientAddr);
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("Tunnel客户端:%s,离开服务器,客户端主动断开"), tszClientAddr);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ int main(int argc, char** argv)`
`150`	`150`
`151`	`151`	`memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));`
`152`	`152`
`153`		`- if (XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))`
	`153`	`+ if (XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))`
`154`	`154`	`{`
`155`	`155`	`printf("%s\n", tszMsgBuffer);`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ int main(int argc, char** argv)`
`54`	`54`	`nMsgLen = 2048;`
`55`	`55`	`memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));`
`56`	`56`
`57`		`- if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))`
	`57`	`+ if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))`
`58`	`58`	`{`
`59`	`59`	`printf("接受数据失败！\n");`
`60`	`60`	`return 0;`
`@@ -72,7 +72,7 @@ int main(int argc, char** argv)`
`72`	`72`
`73`	`73`	`nMsgLen = 2048;`
`74`	`74`	`memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));`
`75`		`- if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))`
	`75`	`+ if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))`
`76`	`76`	`{`
`77`	`77`	`printf("接受数据失败！\n");`
`78`	`78`	`return 0;`
`@@ -94,7 +94,7 @@ int main(int argc, char** argv)`
`94`	`94`	`}`
`95`	`95`	`nMsgLen = 2048;`
`96`	`96`	`memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));`
`97`		`- if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))`
	`97`	`+ if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))`
`98`	`98`	`{`
`99`	`99`	`printf("接受数据失败！\n");`
`100`	`100`	`return 0;`
`@@ -112,7 +112,7 @@ int main(int argc, char** argv)`
`112`	`112`	`{`
`113`	`113`	`nMsgLen = 2048;`
`114`	`114`	`memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));`
`115`		`- if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))`
	`115`	`+ if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))`
`116`	`116`	`{`
`117`	`117`	`break;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ int main(int argc, char** argv)`
`31`	`31`	`#endif`
`32`	`32`	`SOCKET m_Socket;`
`33`	`33`	`LPCTSTR lpszServiceAddr = _T("127.0.0.1");`
	`34`	`+`
`34`	`35`	`if (!XClient_TCPSelect_Create(&m_Socket, lpszServiceAddr, 5401))`
`35`	`36`	`{`
`36`	`37`	`printf("连接失败！错误:%lX\n", XClient_GetLastError());`
`@@ -50,7 +51,7 @@ int main(int argc, char** argv)`
`50`	`51`	`nMsgLen = 2048;`
`51`	`52`	`memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));`
`52`	`53`
`53`		`- if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))`
	`54`	`+ if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))`
`54`	`55`	`{`
`55`	`56`	`printf("接受数据失败！\n");`
`56`	`57`	`return 0;`
`@@ -68,7 +69,7 @@ int main(int argc, char** argv)`
`68`	`69`	`{`
`69`	`70`	`nMsgLen = 2048;`
`70`	`71`	`memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));`
`71`		`- if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen, FALSE))`
	`72`	`+ if (!XClient_TCPSelect_RecvMsg(m_Socket, tszMsgBuffer, &nMsgLen))`
`72`	`73`	`{`
`73`	`74`	`break;`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,7 @@ void XEngine_Network_Close(LPCTSTR lpszClientAddr, int nIPProto, int nCloseType)`
`115`	`115`	`SocketOpt_HeartBeat_DeleteAddrEx(xhSocksHeart, lpszClientAddr);`
`116`	`116`	`NetCore_TCPXCore_CloseForClientEx(xhSocksSocket, lpszClientAddr);`
`117`	`117`	`}`
`118`		`- PROXYPROTOCOL_CLIENTINFO st_ProxyClient;`
`119`		`- memset(&st_ProxyClient, '\0', sizeof(PROXYPROTOCOL_CLIENTINFO));`
`120`		`- if (ProxyProtocol_SocksCore_GetInfo(lpszClientAddr, &st_ProxyClient))`
`121`		`- {`
`122`		`- st_ProxyClient.bClose = TRUE;`
`123`		`- ProxyProtocol_SocksCore_SetInfo(lpszClientAddr, &st_ProxyClient, sizeof(PROXYPROTOCOL_CLIENTINFO));`
`124`		`- }`
	`118`	`+ ProxyProtocol_SocksCore_Delete(lpszClientAddr);`
`125`	`119`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("SOCKS客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);`
`126`	`120`	`}`
`127`	`121`	`else if (XENGINE_CLIENT_NETTYPE_TUNNEL == nIPProto)`
`@@ -136,16 +130,10 @@ void XEngine_Network_Close(LPCTSTR lpszClientAddr, int nIPProto, int nCloseType)`
`136`	`130`	`}`
`137`	`131`	`else`
`138`	`132`	`{`
`139`		`- SocketOpt_HeartBeat_DeleteAddrEx(xhTunnelHeart, lpszClientAddr);`
`140`	`133`	`NetCore_TCPXCore_CloseForClientEx(xhTunnelSocket, lpszClientAddr);`
	`134`	`+ SocketOpt_HeartBeat_DeleteAddrEx(xhTunnelHeart, lpszClientAddr);`
`141`	`135`	`}`
`142`		`- PROXYPROTOCOL_CLIENTINFO st_ProxyClient;`
`143`		`- memset(&st_ProxyClient, '\0', sizeof(PROXYPROTOCOL_CLIENTINFO));`
`144`		`- if (ProxyProtocol_TunnelCore_GetInfo(lpszClientAddr, &st_ProxyClient))`
`145`		`- {`
`146`		`- st_ProxyClient.bClose = TRUE;`
`147`		`- ProxyProtocol_TunnelCore_SetInfo(lpszClientAddr, &st_ProxyClient, sizeof(PROXYPROTOCOL_CLIENTINFO));`
`148`		`- }`
	`136`	`+ ProxyProtocol_TunnelCore_Delete(lpszClientAddr);`
`149`	`137`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("Tunnel客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);`
`150`	`138`	`}`
`151`	`139`	`else if (XENGINE_CLIENT_NETTYPE_FORWARD == nIPProto)`
Original file line number	Diff line number	Diff line change
`@@ -199,28 +199,26 @@ BOOL XEngine_SocksTask_Handle(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int`
`199`	`199`	`XHTHREAD CALLBACK XEngine_SocksTask_Thread(LPCTSTR lpszClientAddr, SOCKET hSocket)`
`200`	`200`	`{`
`201`	`201`	`TCHAR tszMsgBuffer[4096];`
	`202`	`+ TCHAR tszClientAddr[128];`
	`203`	`+`
	`204`	`+ memset(tszClientAddr, '\0', sizeof(tszClientAddr));`
	`205`	`+ _tcscpy(tszClientAddr, lpszClientAddr);`
	`206`	`+`
`202`	`207`	`while (1)`
`203`	`208`	`{`
`204`	`209`	`int nMsgLen = 4096;`
`205`		`- if (!XClient_TCPSelect_RecvMsg(hSocket, tszMsgBuffer, &nMsgLen, FALSE))`
	`210`	`+ if (!XClient_TCPSelect_RecvMsg(hSocket, tszMsgBuffer, &nMsgLen))`
`206`	`211`	`{`
`207`	`212`	`break;`
`208`	`213`	`}`
`209`		`- XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nMsgLen, XENGINE_CLIENT_NETTYPE_SOCKS);`
`210`		`- }`
`211`		`- //退出处理`
`212`		`- PROXYPROTOCOL_CLIENTINFO st_ProxyClient;`
`213`		`- memset(&st_ProxyClient, '\0', sizeof(PROXYPROTOCOL_CLIENTINFO));`
`214`		`- if (ProxyProtocol_SocksCore_GetInfo(lpszClientAddr, &st_ProxyClient))`
`215`		`- {`
`216`		`- ProxyProtocol_SocksCore_Delete(lpszClientAddr);`
`217`		`- //是主动关闭的还是被动触发的`
`218`		`- if (!st_ProxyClient.bClose)`
	`214`	`+ if (!XEngine_Network_Send(tszClientAddr, tszMsgBuffer, nMsgLen, XENGINE_CLIENT_NETTYPE_SOCKS))`
`219`	`215`	`{`
`220`		`- //主动关闭,需要调用`
`221`		`- XClient_TCPSelect_Close(st_ProxyClient.hSocket);`
`222`		`- XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_SOCKS, XENGINE_CLIENT_CLOSE_SERVICE);`
	`216`	`+ break;`
`223`	`217`	`}`
`224`	`218`	`}`
	`219`	`+ //退出处理`
	`220`	`+ XClient_TCPSelect_Close(hSocket);`
	`221`	`+ SocketOpt_HeartBeat_ForceOutAddrEx(xhSocksHeart, tszClientAddr);`
	`222`	`+ XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("Socks客户端:%s,离开服务器,客户端主动断开"), tszClientAddr);`
`225`	`223`	`return 0;`
`226`	`224`	`}`