fixed:broadcast processing error

Author: xengine-qyt

XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp

@@ -122,7 +122,7 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
 		{
 			st_HDRParam.bAuth = TRUE;
 		}
-		XEngine_Task_P2p(pSt_HTTPParam->tszHttpUri, lpszClientAddr, pSt_HTTPParam);
+		XEngine_Task_P2p(pSt_HTTPParam->tszHttpUri + 1, lpszClientAddr, pSt_HTTPParam);
 	}
 	else
 	{

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.cpp

@@ -4,38 +4,48 @@ XHTHREAD XEngine_Task_P2PThread()
 {
 	TCHAR tszMsgBuffer[2048];
 	TCHAR tszIPAddr[128];
+	TCHAR tszTimeStart[64];
+	TCHAR tszTimeEnd[64];
 	TCHAR tszFileName[MAX_PATH];
 	TCHAR tszFileHash[MAX_PATH];
 
 	while (bIsRun)
 	{
 		int nMsgLen = 2048;
 		memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
+		memset(tszIPAddr, '\0', sizeof(tszIPAddr));
+		memset(tszTimeStart, '\0', sizeof(tszTimeStart));
+		memset(tszTimeEnd, '\0', sizeof(tszTimeEnd));
 		memset(tszFileName, '\0', MAX_PATH);
 		memset(tszFileHash, '\0', MAX_PATH);
 
 		if (NetCore_BroadCast_Recv(hBroadSocket, tszMsgBuffer, &nMsgLen, tszIPAddr))
 		{
 			//收到文件查询请求
-			if (XStorageProtocol_Core_REQQueryFile(tszMsgBuffer, NULL, NULL, tszFileName, tszFileHash))
+			if (XStorageProtocol_Core_REQQueryFile(tszMsgBuffer, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash))
 			{
 				//查询文件是否存在数据库,不存在不关心
 				if (0 != st_ServiceCfg.st_XSql.nSQLType)
 				{
-					int nListCount;
+					int nListCount = 0;
 					XSTORAGECORE_DBFILE** pppSt_ListFile;
 					if (1 == st_ServiceCfg.st_XSql.nSQLType)
 					{
-						XStorageSQL_File_FileQuery(&pppSt_ListFile, &nListCount, NULL, NULL, tszFileName, tszFileHash);
+						XStorageSQL_File_FileQuery(&pppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash);
 					}
 					else
 					{
-						XStorage_SQLite_FileQuery(&pppSt_ListFile, &nListCount, NULL, NULL, tszFileName, tszFileHash);
+						XStorage_SQLite_FileQuery(&pppSt_ListFile, &nListCount, tszTimeStart, tszTimeEnd, tszFileName, tszFileHash);
 					}
 					if (nListCount > 0)
 					{
-						XStorageProtocol_Core_REPQueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount);
+						XStorageProtocol_Core_REPQueryFile(tszMsgBuffer, &nMsgLen, &pppSt_ListFile, nListCount, tszTimeStart, tszTimeEnd);
 						BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
+
+						SOCKET hSDSocket;
+						NetCore_BroadCast_SendInit(&hSDSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr);
+						NetCore_BroadCast_Send(hSDSocket, tszMsgBuffer, nMsgLen);
+						NetCore_BroadCast_Close(hSDSocket);
 						XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("广播端:%s,请求查询文件成功,列表个数:%d"), tszIPAddr, nListCount);
 					}
 				}
@@ -71,52 +81,42 @@ BOOL XEngine_Task_P2p(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPONENT
 	}
 	else
 	{
-		SOCKET hSDSocket;
 		TCHAR tszIPAddr[128];
-
 		memset(tszIPAddr, '\0', sizeof(tszIPAddr));
 		//开始广播请求文件
 		XStorageProtocol_Client_REQQueryFile(tszSDBuffer, &nSDLen, NULL, lpszFileHash);
-		if (!NetCore_BroadCast_SendInit(&hSDSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr))
-		{
-			st_HDRParam.bIsClose = TRUE;
-			st_HDRParam.nHttpCode = 500;
-
-			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
-			XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,初始化广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
-			return FALSE;
-		}
-		if (NetCore_BroadCast_Send(hSDSocket, tszSDBuffer, nSDLen))
+		if (!NetCore_BroadCast_Send(hBroadSocket, tszSDBuffer, nSDLen))
 		{
 			st_HDRParam.bIsClose = TRUE;
 			st_HDRParam.nHttpCode = 500;
 
 			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
 			XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
-			NetCore_BroadCast_Close(hSDSocket);
 			return FALSE;
 		}
-		if (!NetCore_BroadCast_Recv(hSDSocket, tszRVBuffer, &nRVLen, tszIPAddr, 2000))
+
+		SOCKET hRVSocket;
+		NetCore_BroadCast_RecvInit(&hRVSocket, st_ServiceCfg.st_P2xp.nSDPort);
+		if (!NetCore_BroadCast_Recv(hRVSocket, tszRVBuffer, &nRVLen, tszIPAddr, 2000))
 		{
 			st_HDRParam.bIsClose = TRUE;
 			st_HDRParam.nHttpCode = 404;
 
 			RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
 			XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
-			NetCore_BroadCast_Close(hSDSocket);
+			NetCore_BroadCast_Close(hRVSocket);
 			return FALSE;
 		}
+		NetCore_BroadCast_Close(hRVSocket);
+
 		st_HDRParam.bIsClose = TRUE;
 		st_HDRParam.nHttpCode = 200;
 
 		RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam, tszRVBuffer, nRVLen);
 		XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
-		NetCore_BroadCast_Close(hSDSocket);
 		printf("%s\n", tszRVBuffer);
 	}
-
 	return TRUE;
 }

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

@@ -375,7 +375,7 @@ int main(int argc, char** argv)
 	}
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("启动服务中，启动P2XP任务处理线程池成功,线程池个数:%d"), st_ServiceCfg.st_XMax.nP2XPThread);
 
-	if (!NetCore_BroadCast_RecvInit(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort))
+	if (!NetCore_BroadCast_SendInit(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort, st_ServiceCfg.tszIPAddr))
 	{
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动广播网络服务失败，错误：%d"), errno);
 		goto XENGINE_EXITAPP;

XEngine_Source/XEngine_StorageComponents/XStorage_Protocol/XStorageProtocol_Core/XStorageProtocol_Core.cpp

@@ -89,7 +89,7 @@ BOOL CXStorageProtocol_Core::XStorageProtocol_Core_REQQueryFile(LPCTSTR lpszMsgB
     }
     if (NULL != ptszTimeEnd)
     {
-		if (!st_JsonRoot["lpszTimeEnd"].asCString())
+		if (!st_JsonRoot["lpszTimeEnd"].isNull())
 		{
 			_tcscpy(ptszTimeEnd, st_JsonRoot["lpszTimeEnd"].asCString());
 		}