Skip to content

Commit 66eab5c

Browse files
committed
fixed:crashed when p2p processing is complete
fixed:broadcast send failed but not to close
1 parent 7a32fb2 commit 66eab5c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

XEngine_Source/XEngine_StorageApp/StorageApp_Center.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ XHTHREAD CALLBACK XEngine_Center_HTTPThread(LPVOID lParam)
3030
{
3131
XEngine_Task_HttpCenter(ppSt_PKTClient[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, &st_HTTPParam, ppszListHdr, nHdrCount);
3232
}
33-
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&st_HTTPParam);
33+
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
3434
BaseLib_OperatorMemory_Free((XPPPMEM)&ppszListHdr, nHdrCount);
3535
}
3636
}
@@ -127,7 +127,7 @@ BOOL XEngine_Task_HttpCenter(LPCTSTR lpszClientAddr, LPCTSTR lpszMsgBuffer, int
127127
//用于心跳
128128
st_HDRParam.bIsClose = TRUE;
129129
st_HDRParam.nHttpCode = 200;
130-
LPCTSTR lpszHdrBuffer = _T("Allow: POST OPTIONS\r\n");
130+
LPCTSTR lpszHdrBuffer = _T("Allow: POST GET OPTIONS\r\n");
131131
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszSDBuffer, &nSDLen, &st_HDRParam, NULL, 0, lpszHdrBuffer);
132132
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPCENTER);
133133
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _T("业务客户端:%s,请求OPTIONS心跳方法成功"), lpszClientAddr);

XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskP2p.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ BOOL XEngine_Task_P2PGet(LPCTSTR lpszFileHash, LPCTSTR lpszClientAddr, RFCCOMPON
136136

137137
RfcComponents_HttpServer_SendMsgEx(xhCenterHttp, tszMsgBuffer, &nMsgLen, &st_HDRParam);
138138
XEngine_Net_SendMsg(lpszClientAddr, tszMsgBuffer, nMsgLen, STORAGE_NETTYPE_HTTPCENTER);
139+
NetCore_BroadCast_Close(hSDSocket);
140+
NetCore_BroadCast_Close(hRVSocket);
139141
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _T("广播端:%s,发送广播请求失败,错误:%lX"), lpszClientAddr, NetCore_GetLastError());
140142
return FALSE;
141143
}

0 commit comments

Comments
 (0)