fixed: p2p heartbeat not work

xengine-qyt · xengine-qyt · commit 5857ffa07c8f · 2021-08-23T10:20:10.000+08:00
added:center service heartbeat
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h b/XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h
@@ -84,6 +84,7 @@ extern XLOG xhLog;
 
 extern XNETHANDLE xhHBDownload;
 extern XNETHANDLE xhHBUPLoader;
+extern XNETHANDLE xhHBCenter;
 extern XNETHANDLE xhHBP2xp;
 
 extern XNETHANDLE xhNetDownload;
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Network.cpp b/XEngine_Source/XEngine_StorageApp/StorageApp_Network.cpp
@@ -48,6 +48,7 @@ void CALLBACK XEngine_Callback_UPLoaderLeave(LPCTSTR lpszClientAddr, SOCKET hSoc
 BOOL CALLBACK XEngine_Callback_CenterLogin(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)
 {
 	RfcComponents_HttpServer_CreateClientEx(xhCenterHttp, lpszClientAddr, 0);
+	SocketOpt_HeartBeat_InsertAddrEx(xhHBCenter, lpszClientAddr);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端：%s，进入了服务器"), lpszClientAddr);
 	return TRUE;
 }
@@ -58,6 +59,7 @@ void CALLBACK XEngine_Callback_CenterRecv(LPCTSTR lpszClientAddr, SOCKET hSocket
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端：%s，投递数据失败,大小:%d,错误;%lX"), lpszClientAddr, nMsgLen, HttpServer_GetLastError());
 		return;
 	}
+	SocketOpt_HeartBeat_ActiveAddrEx(xhHBCenter, lpszClientAddr);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("业务客户端：%s，投递包成功，大小：%d"), lpszClientAddr, nMsgLen);
 }
 void CALLBACK XEngine_Callback_CenterLeave(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)
@@ -68,6 +70,7 @@ void CALLBACK XEngine_Callback_CenterLeave(LPCTSTR lpszClientAddr, SOCKET hSocke
 BOOL CALLBACK XEngine_Callback_P2xpLogin(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)
 {
 	HelpComponents_Datas_CreateEx(xhP2XPPacket, lpszClientAddr, 0);
+	SocketOpt_HeartBeat_InsertAddrEx(xhHBP2xp, lpszClientAddr);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("P2XP客户端：%s，进入了服务器"), lpszClientAddr);
 	return TRUE;
 }
@@ -78,6 +81,7 @@ void CALLBACK XEngine_Callback_P2xpRecv(LPCTSTR lpszClientAddr, SOCKET hSocket,
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("P2XP客户端：%s，投递数据失败,大小:%d,错误;%lX"), lpszClientAddr, nMsgLen, HttpServer_GetLastError());
 		return;
 	}
+	SocketOpt_HeartBeat_ActiveAddrEx(xhHBP2xp, lpszClientAddr);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("P2XP客户端：%s，投递包成功，大小：%d"), lpszClientAddr, nMsgLen);
 }
 void CALLBACK XEngine_Callback_P2xpLeave(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)
@@ -93,6 +97,10 @@ void CALLBACK XEngine_Callback_HBUPLoader(LPCTSTR lpszClientAddr, SOCKET hSocket
 {
 	XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_HTTPUPLOADER);
 }
+void CALLBACK XEngine_Callback_HBCenter(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam)
+{
+	XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_HTTPCENTER);
+}
 void CALLBACK XEngine_Callback_HBP2xp(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam)
 {
 	XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_TCPP2XP);
@@ -126,24 +134,28 @@ BOOL XEngine_Net_CloseClient(LPCTSTR lpszClientAddr, int nLeaveType, int nClient
 		lpszLeaveMsg = _T("心跳超时");
 		NetCore_TCPXCore_CloseForClientEx(xhNetDownload, lpszClientAddr);
 		NetCore_TCPXCore_CloseForClientEx(xhNetUPLoader, lpszClientAddr);
+		NetCore_TCPXCore_CloseForClientEx(xhNetCenter, lpszClientAddr);
 		NetCore_TCPXCore_CloseForClientEx(xhNetP2xp, lpszClientAddr);
 	}
 	else if (STORAGE_LEAVETYPE_BYSELF == nLeaveType)
 	{
 		lpszLeaveMsg = _T("主动断开");
 		SocketOpt_HeartBeat_DeleteAddrEx(xhHBDownload, lpszClientAddr);
 		SocketOpt_HeartBeat_DeleteAddrEx(xhHBUPLoader, lpszClientAddr);
+		SocketOpt_HeartBeat_DeleteAddrEx(xhHBCenter, lpszClientAddr);
 		SocketOpt_HeartBeat_DeleteAddrEx(xhHBP2xp, lpszClientAddr);
 	}
 	else 
 	{
 		lpszLeaveMsg = _T("主动关闭");
 		NetCore_TCPXCore_CloseForClientEx(xhNetDownload, lpszClientAddr);
 		NetCore_TCPXCore_CloseForClientEx(xhNetUPLoader, lpszClientAddr);
+		NetCore_TCPXCore_CloseForClientEx(xhNetCenter, lpszClientAddr);
 		NetCore_TCPXCore_CloseForClientEx(xhNetP2xp, lpszClientAddr);
 
 		SocketOpt_HeartBeat_DeleteAddrEx(xhHBDownload, lpszClientAddr);
 		SocketOpt_HeartBeat_DeleteAddrEx(xhHBUPLoader, lpszClientAddr);
+		SocketOpt_HeartBeat_DeleteAddrEx(xhHBCenter, lpszClientAddr);
 		SocketOpt_HeartBeat_DeleteAddrEx(xhHBP2xp, lpszClientAddr);
 	}
 
@@ -190,6 +202,10 @@ BOOL XEngine_Net_SendMsg(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsg
 		else if (STORAGE_NETTYPE_HTTPCENTER == nType)
 		{
 			bRet = NetCore_TCPXCore_SendEx(xhNetCenter, lpszClientAddr, lpszMsgBuffer, nMsgLen);
+			if (bRet && st_ServiceCfg.st_XTime.bHBTime)
+			{
+				SocketOpt_HeartBeat_ActiveAddrEx(xhHBCenter, lpszClientAddr);
+			}
 		}
 		else if (STORAGE_NETTYPE_TCPP2XP == nType)
 		{
diff --git a/XEngine_Source/XEngine_StorageApp/StorageApp_Network.h b/XEngine_Source/XEngine_StorageApp/StorageApp_Network.h
@@ -15,6 +15,7 @@ void CALLBACK XEngine_Callback_P2xpLeave(LPCTSTR lpszClientAddr, SOCKET hSocket,
 
 void CALLBACK XEngine_Callback_HBDownload(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
 void CALLBACK XEngine_Callback_HBUPLoader(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
+void CALLBACK XEngine_Callback_HBCenter(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
 void CALLBACK XEngine_Callback_HBP2xp(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam);
 
 BOOL XEngine_Net_CloseClient(LPCTSTR lpszClientAddr, int nLeaveType, int nClientType = STORAGE_NETTYPE_HTTPDOWNLOAD);
diff --git a/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp b/XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp
@@ -5,6 +5,7 @@ XLOG xhLog = NULL;
 
 XNETHANDLE xhHBDownload = 0;
 XNETHANDLE xhHBUPLoader = 0;
+XNETHANDLE xhHBCenter = 0;
 XNETHANDLE xhHBP2xp = 0;
 
 XNETHANDLE xhNetDownload = 0;
@@ -48,6 +49,7 @@ void ServiceApp_Stop(int signo)
 
 		SocketOpt_HeartBeat_DestoryEx(xhHBDownload);
 		SocketOpt_HeartBeat_DestoryEx(xhHBUPLoader);
+		SocketOpt_HeartBeat_DestoryEx(xhHBCenter);
 		SocketOpt_HeartBeat_DestoryEx(xhHBP2xp);
 
 		ManagePool_Thread_NQDestroy(xhUPPool);
@@ -189,6 +191,13 @@ int main(int argc, char** argv)
 		}
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化上传心跳管理服务成功，句柄：%llu,时间:%d,次数:%d"), xhHBUPLoader, st_ServiceCfg.st_XTime.nStorageTimeOut, st_ServiceCfg.st_XTime.nTimeCheck);
 
+		if (!SocketOpt_HeartBeat_InitEx(&xhHBCenter, st_ServiceCfg.st_XTime.nCenterTimeOut, st_ServiceCfg.st_XTime.nTimeCheck, XEngine_Callback_HBCenter))
+		{
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化业务管理服务失败，错误：%lX"), NetCore_GetLastError());
+			goto XENGINE_EXITAPP;
+		}
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，初始化业务管理服务成功，句柄：%llu,时间:%d,次数:%d"), xhHBUPLoader, st_ServiceCfg.st_XTime.nCenterTimeOut, st_ServiceCfg.st_XTime.nTimeCheck);
+
 		if (!SocketOpt_HeartBeat_InitEx(&xhHBP2xp, st_ServiceCfg.st_XTime.nP2XPTimeOut, st_ServiceCfg.st_XTime.nTimeCheck, XEngine_Callback_HBP2xp))
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，初始化P2XP心跳管理服务失败，错误：%lX"), NetCore_GetLastError());
@@ -430,6 +439,7 @@ int main(int argc, char** argv)
 
 		SocketOpt_HeartBeat_DestoryEx(xhHBDownload);
 		SocketOpt_HeartBeat_DestoryEx(xhHBUPLoader);
+		SocketOpt_HeartBeat_DestoryEx(xhHBCenter);
 		SocketOpt_HeartBeat_DestoryEx(xhHBP2xp);
 
 		ManagePool_Thread_NQDestroy(xhUPPool);

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ void CALLBACK XEngine_Callback_UPLoaderLeave(LPCTSTR lpszClientAddr, SOCKET hSoc`
`48`	`48`	`BOOL CALLBACK XEngine_Callback_CenterLogin(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)`
`49`	`49`	`{`
`50`	`50`	`RfcComponents_HttpServer_CreateClientEx(xhCenterHttp, lpszClientAddr, 0);`
	`51`	`+ SocketOpt_HeartBeat_InsertAddrEx(xhHBCenter, lpszClientAddr);`
`51`	`52`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端：%s，进入了服务器"), lpszClientAddr);`
`52`	`53`	`return TRUE;`
`53`	`54`	`}`
`@@ -58,6 +59,7 @@ void CALLBACK XEngine_Callback_CenterRecv(LPCTSTR lpszClientAddr, SOCKET hSocket`
`58`	`59`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端：%s，投递数据失败,大小:%d,错误;%lX"), lpszClientAddr, nMsgLen, HttpServer_GetLastError());`
`59`	`60`	`return;`
`60`	`61`	`}`
	`62`	`+ SocketOpt_HeartBeat_ActiveAddrEx(xhHBCenter, lpszClientAddr);`
`61`	`63`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("业务客户端：%s，投递包成功，大小：%d"), lpszClientAddr, nMsgLen);`
`62`	`64`	`}`
`63`	`65`	`void CALLBACK XEngine_Callback_CenterLeave(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)`
`@@ -68,6 +70,7 @@ void CALLBACK XEngine_Callback_CenterLeave(LPCTSTR lpszClientAddr, SOCKET hSocke`
`68`	`70`	`BOOL CALLBACK XEngine_Callback_P2xpLogin(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)`
`69`	`71`	`{`
`70`	`72`	`HelpComponents_Datas_CreateEx(xhP2XPPacket, lpszClientAddr, 0);`
	`73`	`+ SocketOpt_HeartBeat_InsertAddrEx(xhHBP2xp, lpszClientAddr);`
`71`	`74`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("P2XP客户端：%s，进入了服务器"), lpszClientAddr);`
`72`	`75`	`return TRUE;`
`73`	`76`	`}`
`@@ -78,6 +81,7 @@ void CALLBACK XEngine_Callback_P2xpRecv(LPCTSTR lpszClientAddr, SOCKET hSocket,`
`78`	`81`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("P2XP客户端：%s，投递数据失败,大小:%d,错误;%lX"), lpszClientAddr, nMsgLen, HttpServer_GetLastError());`
`79`	`82`	`return;`
`80`	`83`	`}`
	`84`	`+ SocketOpt_HeartBeat_ActiveAddrEx(xhHBP2xp, lpszClientAddr);`
`81`	`85`	`XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("P2XP客户端：%s，投递包成功，大小：%d"), lpszClientAddr, nMsgLen);`
`82`	`86`	`}`
`83`	`87`	`void CALLBACK XEngine_Callback_P2xpLeave(LPCTSTR lpszClientAddr, SOCKET hSocket, LPVOID lParam)`
`@@ -93,6 +97,10 @@ void CALLBACK XEngine_Callback_HBUPLoader(LPCTSTR lpszClientAddr, SOCKET hSocket`
`93`	`97`	`{`
`94`	`98`	`XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_HTTPUPLOADER);`
`95`	`99`	`}`
	`100`	`+void CALLBACK XEngine_Callback_HBCenter(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam)`
	`101`	`+{`
	`102`	`+ XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_HTTPCENTER);`
	`103`	`+}`
`96`	`104`	`void CALLBACK XEngine_Callback_HBP2xp(LPCTSTR lpszClientAddr, SOCKET hSocket, int nStatus, LPVOID lParam)`
`97`	`105`	`{`
`98`	`106`	`XEngine_Net_CloseClient(lpszClientAddr, STORAGE_LEAVETYPE_HEARTBEAT, STORAGE_NETTYPE_TCPP2XP);`
`@@ -126,24 +134,28 @@ BOOL XEngine_Net_CloseClient(LPCTSTR lpszClientAddr, int nLeaveType, int nClient`
`126`	`134`	`lpszLeaveMsg = _T("心跳超时");`
`127`	`135`	`NetCore_TCPXCore_CloseForClientEx(xhNetDownload, lpszClientAddr);`
`128`	`136`	`NetCore_TCPXCore_CloseForClientEx(xhNetUPLoader, lpszClientAddr);`
	`137`	`+ NetCore_TCPXCore_CloseForClientEx(xhNetCenter, lpszClientAddr);`
`129`	`138`	`NetCore_TCPXCore_CloseForClientEx(xhNetP2xp, lpszClientAddr);`
`130`	`139`	`}`
`131`	`140`	`else if (STORAGE_LEAVETYPE_BYSELF == nLeaveType)`
`132`	`141`	`{`
`133`	`142`	`lpszLeaveMsg = _T("主动断开");`
`134`	`143`	`SocketOpt_HeartBeat_DeleteAddrEx(xhHBDownload, lpszClientAddr);`
`135`	`144`	`SocketOpt_HeartBeat_DeleteAddrEx(xhHBUPLoader, lpszClientAddr);`
	`145`	`+ SocketOpt_HeartBeat_DeleteAddrEx(xhHBCenter, lpszClientAddr);`
`136`	`146`	`SocketOpt_HeartBeat_DeleteAddrEx(xhHBP2xp, lpszClientAddr);`
`137`	`147`	`}`
`138`	`148`	`else`
`139`	`149`	`{`
`140`	`150`	`lpszLeaveMsg = _T("主动关闭");`
`141`	`151`	`NetCore_TCPXCore_CloseForClientEx(xhNetDownload, lpszClientAddr);`
`142`	`152`	`NetCore_TCPXCore_CloseForClientEx(xhNetUPLoader, lpszClientAddr);`
	`153`	`+ NetCore_TCPXCore_CloseForClientEx(xhNetCenter, lpszClientAddr);`
`143`	`154`	`NetCore_TCPXCore_CloseForClientEx(xhNetP2xp, lpszClientAddr);`
`144`	`155`
`145`	`156`	`SocketOpt_HeartBeat_DeleteAddrEx(xhHBDownload, lpszClientAddr);`
`146`	`157`	`SocketOpt_HeartBeat_DeleteAddrEx(xhHBUPLoader, lpszClientAddr);`
	`158`	`+ SocketOpt_HeartBeat_DeleteAddrEx(xhHBCenter, lpszClientAddr);`
`147`	`159`	`SocketOpt_HeartBeat_DeleteAddrEx(xhHBP2xp, lpszClientAddr);`
`148`	`160`	`}`
`149`	`161`
`@@ -190,6 +202,10 @@ BOOL XEngine_Net_SendMsg(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int nMsg`
`190`	`202`	`else if (STORAGE_NETTYPE_HTTPCENTER == nType)`
`191`	`203`	`{`
`192`	`204`	`bRet = NetCore_TCPXCore_SendEx(xhNetCenter, lpszClientAddr, lpszMsgBuffer, nMsgLen);`
	`205`	`+ if (bRet && st_ServiceCfg.st_XTime.bHBTime)`
	`206`	`+ {`
	`207`	`+ SocketOpt_HeartBeat_ActiveAddrEx(xhHBCenter, lpszClientAddr);`
	`208`	`+ }`
`193`	`209`	`}`
`194`	`210`	`else if (STORAGE_NETTYPE_TCPP2XP == nType)`
`195`	`211`	`{`