modify:match xengine v7.45

Author: xengine-qyt

XEngine_Source/StorageModule_Config/Config_Define.h

@@ -88,8 +88,7 @@ typedef struct tag_XEngine_ServerConfig
     struct  
     {
         int nTime;
-        int nSDPort;
-        int nRVPort;
+        int nPort;
     }st_P2xp;
     struct  
     {

XEngine_Source/StorageModule_Config/Config_Json/Config_Json.cpp

@@ -180,16 +180,15 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile, XENGINE_SERVERCONFIG
 	pSt_ServerConfig->st_XLimit.nMaxDNLoader = st_JsonXLimit["nMaxDNLoad"].asInt64();
 	pSt_ServerConfig->st_XLimit.nMaxUPLoader = st_JsonXLimit["nMaxUPLoad"].asInt64();
 
-	if (st_JsonRoot["XP2xp"].empty() || (3 != st_JsonRoot["XP2xp"].size()))
+	if (st_JsonRoot["XP2xp"].empty() || (2 != st_JsonRoot["XP2xp"].size()))
 	{
 		Config_IsErrorOccur = TRUE;
 		Config_dwErrorCode = ERROR_XENGINE_BLOGIC_CONFIG_JSON_P2XP;
 		return FALSE;
 	}
 	Json::Value st_JsonP2xp = st_JsonRoot["XP2xp"];
 	pSt_ServerConfig->st_P2xp.nTime = st_JsonP2xp["nTime"].asInt();
-	pSt_ServerConfig->st_P2xp.nRVPort = st_JsonP2xp["nRVPort"].asInt();
-	pSt_ServerConfig->st_P2xp.nSDPort = st_JsonP2xp["nSDPort"].asInt();
+	pSt_ServerConfig->st_P2xp.nPort = st_JsonP2xp["nPort"].asInt();
 
 	if (st_JsonRoot["XCert"].empty() || (6 != st_JsonRoot["XCert"].size()))
 	{

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

@@ -76,8 +76,7 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 		else
 		{
 			//开始广播请求文件
-			SOCKET hSDSocket;
-			SOCKET hRVSocket;
+			SOCKET hSocket;
 			list<APIHELP_LBFILEINFO> stl_ListFile;
 
 			if (_tcslen(tszFileHash) <= 0)
@@ -91,18 +90,16 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 				return FALSE;
 			}
 			Protocol_StoragePacket_REQFile(tszSDBuffer, &nSDLen, NULL, tszFileHash);
-			NetCore_BroadCast_SDCreate(&hSDSocket, st_ServiceCfg.st_P2xp.nRVPort, st_ServiceCfg.tszIPAddr);
-			NetCore_BroadCast_RVCreate(&hRVSocket, st_ServiceCfg.st_P2xp.nSDPort);
+			NetCore_BroadCast_Create(&hSocket, st_ServiceCfg.st_P2xp.nPort, st_ServiceCfg.tszIPAddr);
 
-			if (!NetCore_BroadCast_Send(hSDSocket, tszSDBuffer, nSDLen))
+			if (!NetCore_BroadCast_Send(hSocket, tszSDBuffer, nSDLen))
 			{
 				st_HDRParam.bIsClose = TRUE;
 				st_HDRParam.nHttpCode = 500;
 
 				RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
 				XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
-				NetCore_BroadCast_Close(hSDSocket);
-				NetCore_BroadCast_Close(hRVSocket);
+				NetCore_BroadCast_Close(hSocket);
 				XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
 				return FALSE;
 			}
@@ -114,7 +111,7 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 				memset(&st_FileInfo, '\0', sizeof(APIHELP_LBFILEINFO));
 
 				st_FileInfo.nMsgLen = sizeof(st_FileInfo.tszMsgBuffer);
-				if (NetCore_BroadCast_Recv(hRVSocket, st_FileInfo.tszMsgBuffer, &st_FileInfo.nMsgLen))
+				if (NetCore_BroadCast_Recv(hSocket, st_FileInfo.tszMsgBuffer, &st_FileInfo.nMsgLen))
 				{
 					stl_ListFile.push_back(st_FileInfo);
 				}
@@ -125,8 +122,7 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 					break;
 				}
 			}
-			NetCore_BroadCast_Close(hSDSocket);
-			NetCore_BroadCast_Close(hRVSocket);
+			NetCore_BroadCast_Close(hSocket);
 
 			if (stl_ListFile.empty())
 			{

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.cpp

@@ -36,10 +36,10 @@ XHTHREAD XEngine_Task_P2PThread()
 					Protocol_StoragePacket_QueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
 					BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
 
-					SOCKET hSDSocket;
-					NetCore_BroadCast_SDCreate(&hSDSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr);
-					NetCore_BroadCast_Send(hSDSocket, tszMsgBuffer, nMsgLen);
-					NetCore_BroadCast_Close(hSDSocket);
+					SOCKET hSocket;
+					NetCore_BroadCast_Create(&hSocket, st_ServiceCfg.st_P2xp.nPort, st_ServiceCfg.tszIPAddr);
+					NetCore_BroadCast_Send(hSocket, tszMsgBuffer, nMsgLen);
+					NetCore_BroadCast_Close(hSocket);
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("广播端:%s,请求查询文件成功,列表个数:%d"), tszIPAddr, nListCount);
 				}
 			}

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

@@ -399,12 +399,12 @@ int main(int argc, char** argv)
 	//只有使用了数据库,才启用P2P
 	if (st_ServiceCfg.st_XSql.bEnable)
 	{
-		if (!NetCore_BroadCast_RVCreate(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort))
+		if (!NetCore_BroadCast_Create(&hBroadSocket, st_ServiceCfg.st_P2xp.nPort))
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2P存储广播服务失败，错误：%d"), errno);
 			goto XENGINE_EXITAPP;
 		}
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2P存储广播服务成功,端口:%d"), st_ServiceCfg.st_P2xp.nRVPort);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2P存储广播服务成功,端口:%d"), st_ServiceCfg.st_P2xp.nPort);
 		pSTDThread = make_shared<std::thread>(XEngine_Task_P2PThread);
 		if (!pSTDThread->joinable())
 		{