fixed:close client clear is incorrect when actively close client

xengine-qyt · xengine-qyt · commit 66fdc44ba3b7 · 2025-05-07T14:18:18.000+08:00
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_Client.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_Client.cpp
@@ -94,7 +94,7 @@ bool XEngine_AuthorizeHTTP_Client(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, L
 		}
 		for (int i = 0; i < nListCount; i++)
 		{
-			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);
+			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);
 		}
 		BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 		Protocol_Packet_HttpComm(m_MemoryPool.get(), &nSDLen);
@@ -139,7 +139,7 @@ bool XEngine_AuthorizeHTTP_Client(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, L
 		Session_Authorize_GetClient(&ppSt_ListClient, &nListCount, st_UserInfo.tszUserName);
 		for (int i = 0; i < nListCount; i++)
 		{
-			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);
+			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);
 		}
 		BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 		//删除数据库
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp
@@ -65,7 +65,7 @@ bool XEngine_AuthorizeHTTP_User(XNETHANDLE xhToken, LPCXSTR lpszClientAddr, LPCX
 		Session_Authorize_GetClient(&ppSt_ListClient, &nListCount, st_UserInfo.tszUserName);
 		for (int i = 0; i < nListCount; i++)
 		{
-			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);
+			XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);
 		}
 		BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.cpp
@@ -17,11 +17,11 @@ void CALLBACK XEngine_Client_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LP
 }
 void CALLBACK XEngine_Client_TCPClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr, false);
+	XEngine_CloseClient(lpszClientAddr, 1);
 }
 void CALLBACK XEngine_Client_TCPHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr, true);
+	XEngine_CloseClient(lpszClientAddr, 2);
 }
 //////////////////////////////////////////////////////////////////////////
 bool CALLBACK XEngine_Client_WSAccept(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
@@ -57,11 +57,11 @@ void CALLBACK XEngine_Client_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPC
 }
 void CALLBACK XEngine_Client_WSClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr, false);
+	XEngine_CloseClient(lpszClientAddr, 1);
 }
 void CALLBACK XEngine_Client_WSHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr, true);
+	XEngine_CloseClient(lpszClientAddr, 2);
 }
 //////////////////////////////////////////////////////////////////////////
 bool CALLBACK XEngine_Client_HttpAccept(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
@@ -81,30 +81,41 @@ void CALLBACK XEngine_Client_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 }
 void CALLBACK XEngine_Client_HttpClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr, false);
+	XEngine_CloseClient(lpszClientAddr, 1);
 }
 void CALLBACK XEngine_Client_HttpHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
 {
-	XEngine_CloseClient(lpszClientAddr, true);
+	XEngine_CloseClient(lpszClientAddr, 2);
 }
 //////////////////////////////////////////////////////////////////////////
-bool XEngine_CloseClient(LPCXSTR lpszClientAddr, bool bHeart)
+bool XEngine_CloseClient(LPCXSTR lpszClientAddr, int nLeaveType)
 {
 	xstring m_StrLeave;
-	if (bHeart)
+	if (0 == nLeaveType)
 	{
 		NetCore_TCPXCore_CloseForClientEx(xhTCPSocket, lpszClientAddr);
 		NetCore_TCPXCore_CloseForClientEx(xhWSSocket, lpszClientAddr);
 		NetCore_TCPXCore_CloseForClientEx(xhHttpSocket, lpszClientAddr);
-		m_StrLeave = _X("心跳断开");
+
+		SocketOpt_HeartBeat_DeleteAddrEx(xhTCPHeart, lpszClientAddr);
+		SocketOpt_HeartBeat_DeleteAddrEx(xhWSHeart, lpszClientAddr);
+		SocketOpt_HeartBeat_DeleteAddrEx(xhHTTPHeart, lpszClientAddr);
+		m_StrLeave = _X("主动断开");
 	}
-	else
+	else if (1 == nLeaveType)
 	{
 		SocketOpt_HeartBeat_DeleteAddrEx(xhTCPHeart, lpszClientAddr);
 		SocketOpt_HeartBeat_DeleteAddrEx(xhWSHeart, lpszClientAddr);
 		SocketOpt_HeartBeat_DeleteAddrEx(xhHTTPHeart, lpszClientAddr);
 		m_StrLeave = _X("正常断开");
 	}
+	else
+	{
+		NetCore_TCPXCore_CloseForClientEx(xhTCPSocket, lpszClientAddr);
+		NetCore_TCPXCore_CloseForClientEx(xhWSSocket, lpszClientAddr);
+		NetCore_TCPXCore_CloseForClientEx(xhHttpSocket, lpszClientAddr);
+		m_StrLeave = _X("心跳断开");
+	}
 	HelpComponents_Datas_DeleteEx(xhTCPPacket, lpszClientAddr);
 	RfcComponents_WSPacket_DeleteEx(xhWSPacket, lpszClientAddr);
 	HttpProtocol_Server_CloseClinetEx(xhHttpPacket, lpszClientAddr);
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.h b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.h
@@ -15,6 +15,6 @@ void CALLBACK XEngine_Client_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, L
 void CALLBACK XEngine_Client_HttpClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
 void CALLBACK XEngine_Client_HttpHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam);
 
-bool XEngine_CloseClient(LPCXSTR lpszClientAddr, bool bHeart);
+bool XEngine_CloseClient(LPCXSTR lpszClientAddr, int nLeaveType = 0);
 bool XEngine_Client_TaskSend(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nNetType);
 bool XEngine_SendMsg(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nNetType, LPCXSTR lpszPass = NULL);
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Task.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Task.cpp
@@ -38,7 +38,7 @@ void CALLBACK XEngine_TaskEvent_Client(LPCXSTR lpszUserAddr, LPCXSTR lpszUserNam
 		XEngine_Client_TaskSend(lpszUserAddr, tszMsgBuffer, nMsgLen, nNetType);
 		if (!st_AuthConfig.bTimeNotify)
 		{
-			XEngine_CloseClient(lpszUserAddr, true);
+			XEngine_CloseClient(lpszUserAddr);
 		}
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("地址:%s,用户:%s,网络类型:%d,没有剩余时间,已经通知客户单超时,三方通知设置:%d"), lpszUserName, lpszUserAddr, nNetType, st_AuthConfig.st_XLogin.bPassAuth);
 	}

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ bool XEngine_AuthorizeHTTP_Client(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, L`
`94`	`94`	`}`
`95`	`95`	`for (int i = 0; i < nListCount; i++)`
`96`	`96`	`{`
`97`		`- XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);`
	`97`	`+ XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);`
`98`	`98`	`}`
`99`	`99`	`BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);`
`100`	`100`	`Protocol_Packet_HttpComm(m_MemoryPool.get(), &nSDLen);`
`@@ -139,7 +139,7 @@ bool XEngine_AuthorizeHTTP_Client(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, L`
`139`	`139`	`Session_Authorize_GetClient(&ppSt_ListClient, &nListCount, st_UserInfo.tszUserName);`
`140`	`140`	`for (int i = 0; i < nListCount; i++)`
`141`	`141`	`{`
`142`		`- XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);`
	`142`	`+ XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);`
`143`	`143`	`}`
`144`	`144`	`BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);`
`145`	`145`	`//删除数据库`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ bool XEngine_AuthorizeHTTP_User(XNETHANDLE xhToken, LPCXSTR lpszClientAddr, LPCX`
`65`	`65`	`Session_Authorize_GetClient(&ppSt_ListClient, &nListCount, st_UserInfo.tszUserName);`
`66`	`66`	`for (int i = 0; i < nListCount; i++)`
`67`	`67`	`{`
`68`		`- XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr, true);`
	`68`	`+ XEngine_CloseClient(ppSt_ListClient[i]->tszClientAddr);`
`69`	`69`	`}`
`70`	`70`	`BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ void CALLBACK XEngine_Client_TCPRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LP`
`17`	`17`	`}`
`18`	`18`	`void CALLBACK XEngine_Client_TCPClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)`
`19`	`19`	`{`
`20`		`- XEngine_CloseClient(lpszClientAddr, false);`
	`20`	`+ XEngine_CloseClient(lpszClientAddr, 1);`
`21`	`21`	`}`
`22`	`22`	`void CALLBACK XEngine_Client_TCPHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)`
`23`	`23`	`{`
`24`		`- XEngine_CloseClient(lpszClientAddr, true);`
	`24`	`+ XEngine_CloseClient(lpszClientAddr, 2);`
`25`	`25`	`}`
`26`	`26`	`//////////////////////////////////////////////////////////////////////////`
`27`	`27`	`bool CALLBACK XEngine_Client_WSAccept(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)`
`@@ -57,11 +57,11 @@ void CALLBACK XEngine_Client_WSRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPC`
`57`	`57`	`}`
`58`	`58`	`void CALLBACK XEngine_Client_WSClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)`
`59`	`59`	`{`
`60`		`- XEngine_CloseClient(lpszClientAddr, false);`
	`60`	`+ XEngine_CloseClient(lpszClientAddr, 1);`
`61`	`61`	`}`
`62`	`62`	`void CALLBACK XEngine_Client_WSHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)`
`63`	`63`	`{`
`64`		`- XEngine_CloseClient(lpszClientAddr, true);`
	`64`	`+ XEngine_CloseClient(lpszClientAddr, 2);`
`65`	`65`	`}`
`66`	`66`	`//////////////////////////////////////////////////////////////////////////`
`67`	`67`	`bool CALLBACK XEngine_Client_HttpAccept(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)`
`@@ -81,30 +81,41 @@ void CALLBACK XEngine_Client_HttpRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, L`
`81`	`81`	`}`
`82`	`82`	`void CALLBACK XEngine_Client_HttpClose(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)`
`83`	`83`	`{`
`84`		`- XEngine_CloseClient(lpszClientAddr, false);`
	`84`	`+ XEngine_CloseClient(lpszClientAddr, 1);`
`85`	`85`	`}`
`86`	`86`	`void CALLBACK XEngine_Client_HttpHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)`
`87`	`87`	`{`
`88`		`- XEngine_CloseClient(lpszClientAddr, true);`
	`88`	`+ XEngine_CloseClient(lpszClientAddr, 2);`
`89`	`89`	`}`
`90`	`90`	`//////////////////////////////////////////////////////////////////////////`
`91`		`-bool XEngine_CloseClient(LPCXSTR lpszClientAddr, bool bHeart)`
	`91`	`+bool XEngine_CloseClient(LPCXSTR lpszClientAddr, int nLeaveType)`
`92`	`92`	`{`
`93`	`93`	`xstring m_StrLeave;`
`94`		`- if (bHeart)`
	`94`	`+ if (0 == nLeaveType)`
`95`	`95`	`{`
`96`	`96`	`NetCore_TCPXCore_CloseForClientEx(xhTCPSocket, lpszClientAddr);`
`97`	`97`	`NetCore_TCPXCore_CloseForClientEx(xhWSSocket, lpszClientAddr);`
`98`	`98`	`NetCore_TCPXCore_CloseForClientEx(xhHttpSocket, lpszClientAddr);`
`99`		`- m_StrLeave = _X("心跳断开");`
	`99`	`+`
	`100`	`+ SocketOpt_HeartBeat_DeleteAddrEx(xhTCPHeart, lpszClientAddr);`
	`101`	`+ SocketOpt_HeartBeat_DeleteAddrEx(xhWSHeart, lpszClientAddr);`
	`102`	`+ SocketOpt_HeartBeat_DeleteAddrEx(xhHTTPHeart, lpszClientAddr);`
	`103`	`+ m_StrLeave = _X("主动断开");`
`100`	`104`	`}`
`101`		`- else`
	`105`	`+ else if (1 == nLeaveType)`
`102`	`106`	`{`
`103`	`107`	`SocketOpt_HeartBeat_DeleteAddrEx(xhTCPHeart, lpszClientAddr);`
`104`	`108`	`SocketOpt_HeartBeat_DeleteAddrEx(xhWSHeart, lpszClientAddr);`
`105`	`109`	`SocketOpt_HeartBeat_DeleteAddrEx(xhHTTPHeart, lpszClientAddr);`
`106`	`110`	`m_StrLeave = _X("正常断开");`
`107`	`111`	`}`
	`112`	`+ else`
	`113`	`+ {`
	`114`	`+ NetCore_TCPXCore_CloseForClientEx(xhTCPSocket, lpszClientAddr);`
	`115`	`+ NetCore_TCPXCore_CloseForClientEx(xhWSSocket, lpszClientAddr);`
	`116`	`+ NetCore_TCPXCore_CloseForClientEx(xhHttpSocket, lpszClientAddr);`
	`117`	`+ m_StrLeave = _X("心跳断开");`
	`118`	`+ }`
`108`	`119`	`HelpComponents_Datas_DeleteEx(xhTCPPacket, lpszClientAddr);`
`109`	`120`	`RfcComponents_WSPacket_DeleteEx(xhWSPacket, lpszClientAddr);`
`110`	`121`	`HttpProtocol_Server_CloseClinetEx(xhHttpPacket, lpszClientAddr);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ void CALLBACK XEngine_TaskEvent_Client(LPCXSTR lpszUserAddr, LPCXSTR lpszUserNam`
`38`	`38`	`XEngine_Client_TaskSend(lpszUserAddr, tszMsgBuffer, nMsgLen, nNetType);`
`39`	`39`	`if (!st_AuthConfig.bTimeNotify)`
`40`	`40`	`{`
`41`		`- XEngine_CloseClient(lpszUserAddr, true);`
	`41`	`+ XEngine_CloseClient(lpszUserAddr);`
`42`	`42`	`}`
`43`	`43`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("地址:%s,用户:%s,网络类型:%d,没有剩余时间,已经通知客户单超时,三方通知设置:%d"), lpszUserName, lpszUserAddr, nNetType, st_AuthConfig.st_XLogin.bPassAuth);`
`44`	`44`	`}`