Skip to content

Commit 2016d77

Browse files
committed
fixed:broadcast query file is incorrent
1 parent e27a170 commit 2016d77

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
7676
else
7777
{
7878
//开始广播请求文件
79-
SOCKET hSocket;
79+
SOCKET hRVSocket;
80+
SOCKET hSDSocket;
8081
XNETHANDLE xhToken = 0;
8182
list<APIHELP_LBFILEINFO> stl_ListFile;
8283

@@ -92,28 +93,30 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
9293
}
9394
BaseLib_OperatorHandle_Create(&xhToken);
9495
Protocol_StoragePacket_REQFile(tszSDBuffer, &nSDLen, NULL, tszFileHash, xhToken);
95-
NetCore_BroadCast_Create(&hSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr);
96+
97+
NetCore_BroadCast_Create(&hSDSocket, st_ServiceCfg.st_P2xp.nRVPort, st_ServiceCfg.tszIPAddr);
98+
NetCore_BroadCast_Create(&hRVSocket, st_ServiceCfg.st_P2xp.nSDPort, st_ServiceCfg.tszIPAddr);
9699

97-
if (!NetCore_BroadCast_Send(hSocket, tszSDBuffer, nSDLen))
100+
if (!NetCore_BroadCast_Send(hSDSocket, tszSDBuffer, nSDLen))
98101
{
99102
st_HDRParam.bIsClose = TRUE;
100103
st_HDRParam.nHttpCode = 500;
101104

102105
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
103106
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
104-
NetCore_BroadCast_Close(hSocket);
107+
NetCore_BroadCast_Close(hSDSocket);
108+
NetCore_BroadCast_Close(hRVSocket);
105109
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("业务客户端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
106110
return FALSE;
107111
}
108-
109112
time_t nTimeStart = time(NULL);
110113
while (1)
111114
{
112115
APIHELP_LBFILEINFO st_FileInfo;
113116
memset(&st_FileInfo, '\0', sizeof(APIHELP_LBFILEINFO));
114117

115118
st_FileInfo.nMsgLen = sizeof(st_FileInfo.tszMsgBuffer);
116-
if (NetCore_BroadCast_Recv(hSocket, st_FileInfo.tszMsgBuffer, &st_FileInfo.nMsgLen))
119+
if (NetCore_BroadCast_Recv(hRVSocket, st_FileInfo.tszMsgBuffer, &st_FileInfo.nMsgLen))
117120
{
118121
XNETHANDLE xhP2PToken = 0;
119122
Protocol_StorageParse_P2PToken(st_FileInfo.tszMsgBuffer, st_FileInfo.nMsgLen, &xhP2PToken);
@@ -134,7 +137,8 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
134137
break;
135138
}
136139
}
137-
NetCore_BroadCast_Close(hSocket);
140+
NetCore_BroadCast_Close(hRVSocket);
141+
NetCore_BroadCast_Close(hSDSocket);
138142

139143
if (stl_ListFile.empty())
140144
{

0 commit comments

Comments
 (0)