fixed:forward and proxy not free client token

modify:get client info for forward get function

Author: xengine-qyt

XEngine_Source/XEngine_ModuleSession/ModuleSession_Define.h

@@ -147,17 +147,17 @@ extern "C" bool ModuleSession_Forward_Delete(LPCXSTR lpszAddr, XCHAR * ptszDstAd
   类型：常量字符指针
   可空：N
   意思：输入要操作的客户端
- 参数.二：ptszDstAddr
+ 参数.二：pSt_ForwardClinet
   In/Out：Out
-  类型：字符指针
+  类型：数据结构指针
   可空：Y
-  意思：输出对端地址
+  意思：输出信息
 返回值
   类型：逻辑型
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" bool ModuleSession_Forward_Get(LPCXSTR lpszAddr, XCHAR* ptszDstAddr = NULL);
+extern "C" bool ModuleSession_Forward_Get(LPCXSTR lpszAddr, SESSION_FORWARD* pSt_ForwardClinet = NULL);
 /************************************************************************/
 /*                     SOCK代理服务器导出函数                           */
 /************************************************************************/

XEngine_Source/XEngine_ModuleSession/ModuleSession_Forward/ModuleSession_Forward.cpp

@@ -311,21 +311,21 @@ bool CModuleSession_Forward::ModuleSession_Forward_Delete(LPCXSTR lpszAddr, XCHA
   类型：常量字符指针
   可空：N
   意思：输入要操作的客户端
- 参数.二：ptszDstAddr
+ 参数.二：pSt_ForwardClinet
   In/Out：Out
-  类型：字符指针
+  类型：数据结构指针
   可空：Y
-  意思：输出对端地址
+  意思：输出信息
 返回值
   类型：逻辑型
   意思：是否成功
 备注：
 *********************************************************************/
-bool CModuleSession_Forward::ModuleSession_Forward_Get(LPCXSTR lpszAddr, XCHAR* ptszDstAddr)
+bool CModuleSession_Forward::ModuleSession_Forward_Get(LPCXSTR lpszAddr, SESSION_FORWARD* pSt_ForwardClinet)
 {
 	Session_IsErrorOccur = false;
 
-	if ((NULL == lpszAddr) || (NULL == ptszDstAddr))
+	if ((NULL == lpszAddr))
 	{
 		Session_IsErrorOccur = true;
 		Session_dwErrorCode = ERROR_MODULE_SESSION_FORWARD_PARAMENT;
@@ -341,7 +341,7 @@ bool CModuleSession_Forward::ModuleSession_Forward_Get(LPCXSTR lpszAddr, XCHAR*
 		st_Locker.unlock_shared();
 		return false;
 	}
-	if (NULL == ptszDstAddr)
+	if (NULL == pSt_ForwardClinet)
 	{
 		st_Locker.unlock_shared();
 		return true;
@@ -354,7 +354,7 @@ bool CModuleSession_Forward::ModuleSession_Forward_Get(LPCXSTR lpszAddr, XCHAR*
 		st_Locker.unlock_shared();
 		return false;
 	}
-	_tcsxcpy(ptszDstAddr, stl_MapIterator->second.tszDstAddr);
+	*pSt_ForwardClinet = stl_MapIterator->second;
 	st_Locker.unlock_shared();
 	return true;
 }

XEngine_Source/XEngine_ModuleSession/ModuleSession_Forward/ModuleSession_Forward.h

@@ -22,7 +22,7 @@ class CModuleSession_Forward
 	bool ModuleSession_Forward_BindNamed(LPCXSTR lpszSrcAddr, LPCXSTR lpszDstAddr);
 	bool ModuleSession_Forward_BindAnony(LPCXSTR lpszSrcAddr, LPCXSTR lpszDstAddr, XNETHANDLE xhClient);
 	bool ModuleSession_Forward_Delete(LPCXSTR lpszAddr, XCHAR* ptszDstAddr = NULL);
-	bool ModuleSession_Forward_Get(LPCXSTR lpszAddr, XCHAR* ptszDstAddr = NULL);
+	bool ModuleSession_Forward_Get(LPCXSTR lpszAddr, SESSION_FORWARD *pSt_ForwardClinet = NULL);
 private:
 	shared_mutex st_Locker;
 private:

XEngine_Source/XEngine_ModuleSession/pch.cpp

@@ -55,9 +55,9 @@ extern "C" bool ModuleSession_Forward_Delete(LPCXSTR lpszAddr, XCHAR * ptszDstAd
 {
 	return m_Forward.ModuleSession_Forward_Delete(lpszAddr, ptszDstAddr);
 }
-extern "C" bool ModuleSession_Forward_Get(LPCXSTR lpszAddr, XCHAR * ptszDstAddr)
+extern "C" bool ModuleSession_Forward_Get(LPCXSTR lpszAddr, SESSION_FORWARD* pSt_ForwardClinet)
 {
-	return m_Forward.ModuleSession_Forward_Get(lpszAddr, ptszDstAddr);
+	return m_Forward.ModuleSession_Forward_Get(lpszAddr, pSt_ForwardClinet);
 }
 /************************************************************************/
 /*                     SOCK代理服务器导出函数                           */

XEngine_Source/XEngine_ServiceApp/XEngine_Network.cpp

@@ -68,13 +68,11 @@ bool CALLBACK Network_Callback_ForwardLogin(LPCXSTR lpszClientAddr, XSOCKET hSoc
 }
 void CALLBACK Network_Callback_ForwardRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
 {
-	XCHAR tszDstAddr[128];
-	memset(tszDstAddr, '\0', sizeof(tszDstAddr));
-
-	if (ModuleSession_Forward_Get(lpszClientAddr, tszDstAddr))
+	SESSION_FORWARD st_ForwardClinet = {};
+	if (ModuleSession_Forward_Get(lpszClientAddr, &st_ForwardClinet))
 	{
 		//如果有转发,直接转发
-		XEngine_Network_Send(tszDstAddr, lpszRecvMsg, nMsgLen, XENGINE_CLIENT_NETTYPE_FORWARD);
+		XEngine_Network_Send(st_ForwardClinet.tszDstAddr, lpszRecvMsg, nMsgLen, XENGINE_CLIENT_NETTYPE_FORWARD);
 	}
 	else
 	{
@@ -195,6 +193,12 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, int nIPProto, int nCloseType)
 			SocketOpt_HeartBeat_DeleteAddrEx(xhForwardHeart, lpszClientAddr);
 			NetCore_TCPXCore_CloseForClientEx(xhForwardSocket, lpszClientAddr);
 		}
+		SESSION_FORWARD st_ForwardInfo = {};
+		if (ModuleSession_Forward_Get(lpszClientAddr, &st_ForwardInfo))
+		{
+			XClient_TCPSelect_DeleteEx(xhForwardClient, st_ForwardInfo.xhClient);
+		}
+		ModuleSession_Proxy_Delete(lpszClientAddr);
 		HelpComponents_Datas_DeleteEx(xhForwardPacket, lpszClientAddr);
 		ModuleSession_Forward_Delete(lpszClientAddr);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Forward客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);
@@ -214,6 +218,12 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, int nIPProto, int nCloseType)
 			SocketOpt_HeartBeat_DeleteAddrEx(xhProxyHeart, lpszClientAddr);
 			NetCore_TCPXCore_CloseForClientEx(xhProxySocket, lpszClientAddr);
 		}
+		SESSION_FORWARD st_ProxyInfo = {};
+		if (ModuleSession_Proxy_GetForAddr(lpszClientAddr, &st_ProxyInfo))
+		{
+			XClient_TCPSelect_DeleteEx(xhProxyClient, st_ProxyInfo.xhClient);
+		}
+		ModuleSession_Proxy_Delete(lpszClientAddr);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Proxy客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);
 	}
 	else