Skip to content

Commit b22c3e2

Browse files
committed
modify:some bug for upload limit
1 parent 94a1f64 commit b22c3e2

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

XEngine_Source/XEngine_StorageApp/StorageApp_Network.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ bool XEngine_Net_CloseClient(LPCXSTR lpszClientAddr, int nLeaveType, int nClient
206206
NetCore_TCPXCore_CloseForClientEx(xhNetUPLoader, lpszClientAddr);
207207
SocketOpt_HeartBeat_DeleteAddrEx(xhHBUPLoader, lpszClientAddr);
208208
}
209+
Algorithm_Calculation_PassiveClose(Session_UPStroage_GetSpeed(lpszClientAddr), true);
209210
Algorithm_Calculation_Close(Session_UPStroage_GetSpeed(lpszClientAddr));
210211
Session_UPStroage_Delete(lpszClientAddr);
211212
HttpProtocol_Server_CloseClinetEx(xhUPHttp, lpszClientAddr);

XEngine_Source/XEngine_StorageApp/StorageApp_UPLoader.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void CALLBACK XEngine_UPLoader_UPFlow(XHANDLE xhToken, bool bSDFlow, bool bRVFlo
5151
{
5252
NetCore_TCPXCore_PasueRecvEx(xhNetUPLoader, tszIPAddr, true);
5353
}
54-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("上传客户端:%s,接受数据标志:%d,当前平均流量:%llu"), tszIPAddr, bSDFlow, nSDFlow);
54+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("上传客户端:%s,接受数据标志:%d,当前平均流量:%llu"), tszIPAddr, bSDFlow, nSDFlow);
5555
}
5656
bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, RFCCOMPONENTS_HTTP_REQPARAM* pSt_HTTPParam, XCHAR** pptszListHdr, int nHdrCount)
5757
{
@@ -311,6 +311,16 @@ bool XEngine_Task_HttpUPLoader(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
311311
{
312312
//处理限速情况
313313
XCHAR* ptszIPClient = (XCHAR*)malloc(MAX_PATH);
314+
if (NULL == ptszIPClient)
315+
{
316+
st_HDRParam.bIsClose = true;
317+
st_HDRParam.nHttpCode = 500;
318+
319+
HttpProtocol_Server_SendMsgEx(xhUPHttp, tszSDBuffer, &nSDLen, &st_HDRParam);
320+
XEngine_Net_SendMsg(lpszClientAddr, tszSDBuffer, nSDLen, STORAGE_NETTYPE_HTTPUPLOADER);
321+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("上传客户端:%s,插入用户请求失败,文件:%s,内存申请失败,服务器错误"), lpszClientAddr, tszFileDir);
322+
return false;
323+
}
314324
memset(ptszIPClient, '\0', MAX_PATH);
315325
_tcsxcpy(ptszIPClient, lpszClientAddr);
316326

0 commit comments

Comments
 (0)