Skip to content

Commit 4205bd5

Browse files
xengine-qytxengine-qyt
committed
modify:Protocol_P2XPPacket_QueryFile function name to Protocol_StoragePacket_REQFile function name
1 parent 303df7b commit 4205bd5

File tree

7 files changed

+92
-13
lines changed

7 files changed

+92
-13
lines changed

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,4 +397,58 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_UPDown(TCHAR* ptszMsgBuffer
397397
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
398398
_tcscpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str());
399399
return TRUE;
400+
}
401+
/********************************************************************
402+
函数名称：Protocol_StoragePacket_REQFile
403+
函数功能：查询文件请求函数
404+
参数.一：ptszMsgBuffer
405+
In/Out：Out
406+
类型：字符指针
407+
可空：N
408+
意思：输出组好包的请求缓冲区
409+
参数.二：pInt_MsgLen
410+
In/Out：Out
411+
类型：整数型指针
412+
可空：N
413+
意思：输出缓冲区大小
414+
参数.三：lpszFileName
415+
In/Out：In
416+
类型：常量字符指针
417+
可空：Y
418+
意思：输入要查询的文件名
419+
参数.四：lpszFileHash
420+
In/Out：In
421+
类型：常量字符指针
422+
可空：Y
423+
意思：输入要查询的文件MD5
424+
返回值
425+
类型：逻辑型
426+
意思：是否成功
427+
备注：
428+
*********************************************************************/
429+
BOOL CProtocol_StoragePacket::Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName /* = NULL */, LPCTSTR lpszFileHash /* = NULL */)
430+
{
431+
Protocol_IsErrorOccur = FALSE;
432+
433+
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
434+
{
435+
Protocol_IsErrorOccur = TRUE;
436+
Protocol_dwErrorCode = ERROR_XENGINE_STORAGE_PROTOCOL_PARAMENT;
437+
return FALSE;
438+
}
439+
Json::Value st_JsonRoot;
440+
if (NULL != lpszFileName)
441+
{
442+
st_JsonRoot["lpszFileName"] = lpszFileName;
443+
}
444+
if (NULL != lpszFileHash)
445+
{
446+
st_JsonRoot["lpszFileHash"] = lpszFileHash;
447+
}
448+
st_JsonRoot["unOperatorType"] = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_STORAGE;
449+
st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_STORAGE_REQQUERY;
450+
//打包输出信息
451+
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
452+
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
453+
return TRUE;
400454
}

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ class CProtocol_StoragePacket
2222
BOOL Protocol_StoragePacket_DirOperator(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, TCHAR*** pppszListEnum, int nListCount);
2323
BOOL Protocol_StoragePacket_BasicAuth(LPCTSTR lpszMethod, LPCTSTR lpszPostUrl, LPCTSTR lpszClientAddr, LPCTSTR lpszUser, LPCTSTR lpszPass, TCHAR* ptszMsgBuffer, int* pInt_MsgLen);
2424
BOOL Protocol_StoragePacket_UPDown(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszBuckKey, LPCTSTR lpszFileName, LPCTSTR lpszClientAddr, __int64x nFileSize, BOOL bDown, LPCTSTR lpszFileHash = NULL);
25+
BOOL Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL);
2526
};

‎XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.def‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ EXPORTS
1313
Protocol_StoragePacket_UPDown
1414
Protocol_StoragePacket_QueryFile
1515
Protocol_StoragePacket_Info
16-
Protocol_StoragePacket_DirOperator
16+
Protocol_StoragePacket_DirOperator
17+
Protocol_StoragePacket_REQFile

‎XEngine_Source/StorageModule_Protocol/StorageProtocol_Define.h‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,4 +360,33 @@ extern "C" BOOL Protocol_StoragePacket_Info(TCHAR * ptszMsgBuffer, int* pInt_Msg
360360
意思：是否成功
361361
备注：
362362
*********************************************************************/
363-
extern "C" BOOL Protocol_StoragePacket_DirOperator(CHAR * ptszMsgBuffer, int* pInt_MsgLen, CHAR * **pppszListEnum, int nListCount);
363+
extern "C" BOOL Protocol_StoragePacket_DirOperator(CHAR * ptszMsgBuffer, int* pInt_MsgLen, CHAR * **pppszListEnum, int nListCount);
364+
/********************************************************************
365+
函数名称：Protocol_StoragePacket_REQFile
366+
函数功能：查询文件请求函数
367+
参数.一：ptszMsgBuffer
368+
In/Out：Out
369+
类型：字符指针
370+
可空：N
371+
意思：输出组好包的请求缓冲区
372+
参数.二：pInt_MsgLen
373+
In/Out：Out
374+
类型：整数型指针
375+
可空：N
376+
意思：输出缓冲区大小
377+
参数.三：lpszFileName
378+
In/Out：In
379+
类型：常量字符指针
380+
可空：Y
381+
意思：输入要查询的文件名
382+
参数.四：lpszFileHash
383+
In/Out：In
384+
类型：常量字符指针
385+
可空：Y
386+
意思：输入要查询的文件MD5
387+
返回值
388+
类型：逻辑型
389+
意思：是否成功
390+
备注：
391+
*********************************************************************/
392+
extern "C" BOOL Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL);

‎XEngine_Source/StorageModule_Protocol/pch.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,8 @@ extern "C" BOOL Protocol_StoragePacket_Info(TCHAR * ptszMsgBuffer, int* pInt_Msg
6767
extern "C" BOOL Protocol_StoragePacket_DirOperator(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, TCHAR * **pppszListEnum, int nListCount)
6868
{
6969
return m_StoragePacket.Protocol_StoragePacket_DirOperator(ptszMsgBuffer, pInt_MsgLen, pppszListEnum, nListCount);
70+
}
71+
extern "C" BOOL Protocol_StoragePacket_REQFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName, LPCTSTR lpszFileHash)
72+
{
73+
return m_StoragePacket.Protocol_StoragePacket_REQFile(ptszMsgBuffer, pInt_MsgLen, lpszFileName, lpszFileHash);
7074
}

‎XEngine_Source/XEngine_StorageApp.sln‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsoncpp", "XEngine_ThirdPar
2424
EndProject
2525
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StorageModule_Database", "StorageModule_Database\StorageModule_Database.vcxproj", "{8B90FA35-1D93-4174-BF1C-926D52F0C67F}"
2626
EndProject
27-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StorageModule_P2XPPeer", "StorageModule_P2XPPeer\StorageModule_P2XPPeer.vcxproj", "{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}"
28-
EndProject
2927
Global
3028
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3129
Debug|x64 = Debug|x64
@@ -90,14 +88,6 @@ Global
9088
{8B90FA35-1D93-4174-BF1C-926D52F0C67F}.Release|x64.Build.0 = Release|x64
9189
{8B90FA35-1D93-4174-BF1C-926D52F0C67F}.Release|x86.ActiveCfg = Release|Win32
9290
{8B90FA35-1D93-4174-BF1C-926D52F0C67F}.Release|x86.Build.0 = Release|Win32
93-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Debug|x64.ActiveCfg = Debug|x64
94-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Debug|x64.Build.0 = Debug|x64
95-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Debug|x86.ActiveCfg = Debug|Win32
96-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Debug|x86.Build.0 = Debug|Win32
97-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Release|x64.ActiveCfg = Release|x64
98-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Release|x64.Build.0 = Release|x64
99-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Release|x86.ActiveCfg = Release|Win32
100-
{91BB60C1-34B4-4D1F-92EB-53F8CC8B51C3}.Release|x86.Build.0 = Release|Win32
10191
EndGlobalSection
10292
GlobalSection(SolutionProperties) = preSolution
10393
HideSolutionNode = FALSE

‎XEngine_Source/XEngine_StorageApp/Storage_APPTask/Storage_TaskManage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ BOOL XEngine_Task_Manage(LPCTSTR lpszAPIName, LPCTSTR lpszClientAddr, LPCTSTR lp
8383
SOCKET hRVSocket;
8484
list<APIHELP_LBFILEINFO> stl_ListFile;
8585

86-
Protocol_P2XPPacket_QueryFile(tszSDBuffer, &nSDLen, NULL, tszFileHash);
86+
Protocol_StoragePacket_REQFile(tszSDBuffer, &nSDLen, NULL, tszFileHash);
8787
NetCore_BroadCast_SendInit(&hSDSocket, st_ServiceCfg.st_P2xp.nRVPort, st_ServiceCfg.tszIPAddr);
8888
NetCore_BroadCast_RecvInit(&hRVSocket, st_ServiceCfg.st_P2xp.nSDPort);
8989

0 commit comments

Comments
 (0)