delete:repeat code

Author: xengine-qyt

XEngine_Source/XEngine_ModuleSession/ModuleSession_Define.h

@@ -238,25 +238,6 @@ extern "C" bool ModuleSession_Socks_SetInfo(LPCXSTR lpszClientID, XNETHANDLE xhC
 *********************************************************************/
 extern "C" bool ModuleSession_Socks_GetInfo(LPCXSTR lpszClientID, XNETHANDLE* pxhClient);
 /********************************************************************
-函数名称：ModuleSession_Socks_GetHandleForAddr
-函数功能：通过客户端地址获取句柄
- 参数.一：lpszClientAddr
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入要获取的客户端地址
- 参数.二：pxhClient
-  In/Out：Out
-  类型：句柄
-  可空：N
-  意思：输出句柄
-返回值
-  类型：逻辑型
-  意思：是否成功
-备注：
-*********************************************************************/
-extern "C" bool ModuleSession_Socks_GetHandleForAddr(LPCXSTR lpszClientAddr, XNETHANDLE* pxhClient);
-/********************************************************************
 函数名称：ModuleSession_Socks_GetAddrForHandle
 函数功能：通过客户端句柄来获得对应的IP地址
  参数.一：pxhClient

XEngine_Source/XEngine_ModuleSession/ModuleSession_Socks/ModuleSession_Socks.cpp

@@ -174,56 +174,6 @@ bool CModuleSession_Socks::ModuleSession_Socks_GetInfo(LPCXSTR lpszClientID, XNE
 	return true;
 }
 /********************************************************************
-函数名称：ModuleSession_Socks_GetHandleForAddr
-函数功能：通过客户端地址获取句柄
- 参数.一：lpszClientAddr
-  In/Out：In
-  类型：常量字符指针
-  可空：N
-  意思：输入要获取的客户端地址
- 参数.二：pxhClient
-  In/Out：Out
-  类型：句柄
-  可空：N
-  意思：输出句柄
-返回值
-  类型：逻辑型
-  意思：是否成功
-备注：
-*********************************************************************/
-bool CModuleSession_Socks::ModuleSession_Socks_GetHandleForAddr(LPCXSTR lpszClientAddr, XNETHANDLE* pxhClient)
-{
-	Session_IsErrorOccur = false;
-
-	if ((NULL == lpszClientAddr))
-	{
-		Session_IsErrorOccur = true;
-		Session_dwErrorCode = ERROR_MODULE_SESSION_SOCKS_PARAMENT;
-		return false;
-	}
-	bool bFound = false;
-
-	st_Locker.lock_shared();
-	for (auto stl_MapIterator = stl_MapClients.begin(); stl_MapIterator != stl_MapClients.end(); stl_MapIterator++)
-	{
-		if (0 == _tcsxnicmp(lpszClientAddr, stl_MapIterator->second->tszClientAddr, _tcsxlen(lpszClientAddr)))
-		{
-			bFound = true;
-			*pxhClient = stl_MapIterator->second->xhClient;
-			break;
-		}
-	}
-	st_Locker.unlock_shared();
-
-	if (!bFound)
-	{
-		Session_IsErrorOccur = true;
-		Session_dwErrorCode = ERROR_MODULE_SESSION_SOCKS_NOTFOUND;
-		return false;
-	}
-	return true;
-}
-/********************************************************************
 函数名称：ModuleSession_Socks_GetAddrForHandle
 函数功能：通过客户端句柄来获得对应的IP地址
  参数.一：pxhClient

XEngine_Source/XEngine_ModuleSession/ModuleSession_Socks/ModuleSession_Socks.h

@@ -31,7 +31,6 @@ class CModuleSession_Socks
 	bool ModuleSession_Socks_Delete(LPCXSTR lpszClientID);
 	bool ModuleSession_Socks_SetInfo(LPCXSTR lpszClientID, XNETHANDLE xhClient, LPCXSTR lpszClientAddr);
 	bool ModuleSession_Socks_GetInfo(LPCXSTR lpszClientID, XNETHANDLE *pxhClient);
-	bool ModuleSession_Socks_GetHandleForAddr(LPCXSTR lpszClientAddr, XNETHANDLE* pxhClient);
 	bool ModuleSession_Socks_GetAddrForHandle(XNETHANDLE xhClient, XCHAR *ptszClientAddr);
 	bool ModuleSession_Socks_GetStatus(LPCXSTR lpszClientID, ENUM_PROXY_SESSION_CLIENT_STATUS* penSocks);
 	bool ModuleSession_Socks_SetStatus(LPCXSTR lpszClientID, ENUM_PROXY_SESSION_CLIENT_STATUS enStatus);

XEngine_Source/XEngine_ModuleSession/XEngine_ModuleSession.def

@@ -7,7 +7,6 @@ EXPORTS
 	ModuleSession_Socks_Delete
 	ModuleSession_Socks_SetInfo
 	ModuleSession_Socks_GetInfo
-	ModuleSession_Socks_GetHandleForAddr
 	ModuleSession_Socks_GetAddrForHandle
 	ModuleSession_Socks_GetStatus
 	ModuleSession_Socks_SetStatus

XEngine_Source/XEngine_ModuleSession/pch.cpp

@@ -80,10 +80,6 @@ extern "C" bool ModuleSession_Socks_GetInfo(LPCXSTR lpszClientID, XNETHANDLE* px
 {
 	return m_Socks.ModuleSession_Socks_GetInfo(lpszClientID, pxhClient);
 }
-extern "C" bool ModuleSession_Socks_GetHandleForAddr(LPCXSTR lpszClientAddr, XNETHANDLE* pxhClient)
-{
-	return m_Socks.ModuleSession_Socks_GetHandleForAddr(lpszClientAddr, pxhClient);
-}
 extern "C" bool ModuleSession_Socks_GetAddrForHandle(XNETHANDLE xhClient, XCHAR* ptszClientAddr)
 {
 	return m_Socks.ModuleSession_Socks_GetAddrForHandle(xhClient, ptszClientAddr);

XEngine_Source/XEngine_ServiceApp/XEngine_Network.cpp

@@ -159,7 +159,7 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, int nIPProto, int nCloseType)
 		}
 		//释放客户端
 		XNETHANDLE xhClient = 0;
-		if (ModuleSession_Socks_GetHandleForAddr(lpszClientAddr, &xhClient))
+		if (ModuleSession_Socks_GetInfo(lpszClientAddr, &xhClient))
 		{
 			XClient_TCPSelect_DeleteEx(xhSocksClient, xhClient);
 		}