Fixed: Can not receive broadcast messages on other machines

Author: xengine-qyt

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

@@ -192,7 +192,7 @@ BOOL XEngine_Task_HttpUPLoader(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, in
 	else
 	{
 		_stprintf(tszFileDir, _T("%s%s"), st_ServiceCfg.st_XStorage.tszFileDir, pSt_HTTPParam->tszHttpUri);
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("上传客户端:%s,请求上传文件中,文件名:%s,大小:%d"), lpszClientAddr, tszFileDir, nMsgLen);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _T("上传客户端:%s,请求上传文件中,文件名:%s,大小:%d"), lpszClientAddr, tszFileDir, nMsgLen);
 	}
 
 	return TRUE;

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

@@ -221,10 +221,10 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
 		int nListCount = 0;
 		CHAR** ppszListDir = NULL;
 		TCHAR tszUserDir[MAX_PATH];
-		TCHAR tszRealDir[MAX_PATH];
+		TCHAR tszRealDir[1024];
 
 		memset(tszUserDir, '\0', MAX_PATH);
-		memset(tszRealDir, '\0', MAX_PATH);
+		memset(tszRealDir, '\0', sizeof(tszRealDir));
 
 		st_HDRParam.bIsClose = TRUE;
 		st_HDRParam.nHttpCode = 200;

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.cpp

@@ -87,7 +87,7 @@ BOOL XEngine_Task_P2PGet(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPON
 			st_HDRParam.bIsClose = TRUE;
 			st_HDRParam.nHttpCode = 200;
 
-			_stprintf(pppSt_ListFile[0]->tszTableName, _T("127.0.0.1"));
+			_stprintf(pppSt_ListFile[0]->tszTableName, _T("127.0.0.1:%d"), st_ServiceCfg.nStorageDLPort);
 			XStorageProtocol_Core_REPQueryFile(tszRVBuffer, &nRVLen, &pppSt_ListFile, nListCount);
 			BaseLib_OperatorMemory_Free((XPPPMEM)&pppSt_ListFile, nListCount);
 
@@ -121,8 +121,15 @@ BOOL XEngine_Task_P2PGet(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPON
 	else
 	{
 		//开始广播请求文件
+		SOCKET hSDSocket;
+		SOCKET hRVSocket;
+		list<APIHELP_LBFILEINFO> stl_ListFile;
+
 		XStorageProtocol_Client_REQQueryFile(tszSDBuffer, &nSDLen, NULL, lpszFileHash);
-		if (!NetCore_BroadCast_Send(hBroadSocket, tszSDBuffer, nSDLen))
+		NetCore_BroadCast_SendInit(&hSDSocket, st_ServiceCfg.st_P2xp.nRVPort, st_ServiceCfg.tszIPAddr);
+		NetCore_BroadCast_RecvInit(&hRVSocket, st_ServiceCfg.st_P2xp.nSDPort);
+
+		if (!NetCore_BroadCast_Send(hSDSocket, tszSDBuffer, nSDLen))
 		{
 			st_HDRParam.bIsClose = TRUE;
 			st_HDRParam.nHttpCode = 500;
@@ -132,10 +139,8 @@ BOOL XEngine_Task_P2PGet(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPON
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
 			return FALSE;
 		}
-
-		SOCKET hRVSocket;
-		list<APIHELP_LBFILEINFO> stl_ListFile;
-		NetCore_BroadCast_RecvInit(&hRVSocket, st_ServiceCfg.st_P2xp.nSDPort);
+		NetCore_BroadCast_Close(hSDSocket);
+		
 		time_t nTimeStart = time(NULL);
 		while (1)
 		{

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

@@ -381,7 +381,7 @@ int main(int argc, char** argv)
 
 	if (st_ServiceCfg.st_P2xp.nMode > 0)
 	{
-		if (!NetCore_BroadCast_SendInit(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort, st_ServiceCfg.tszIPAddr))
+		if (!NetCore_BroadCast_RecvInit(&hBroadSocket, st_ServiceCfg.st_P2xp.nRVPort))
 		{
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("启动服务中，启动P2P存储广播服务失败，错误：%d"), errno);
 			goto XENGINE_EXITAPP;