Skip to content

Commit fdf95d7

Browse files
xengine-qytxengine-qyt
committed
modify:p2p request can be distinguished
1 parent ce07f6f commit fdf95d7

File tree

10 files changed

+181
-30
lines changed

10 files changed

+181
-30
lines changed

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,17 @@ CProtocol_StoragePacket::~CProtocol_StoragePacket()
5555
类型：常量字符指针
5656
可空：Y
5757
意思：输入查询请求的结束时间
58+
参数.七：xhToken
59+
In/Out：In
60+
类型：句柄
61+
可空：Y
62+
意思：输入返回的TOKEN,如果需要的话
5863
返回值
5964
类型：逻辑型
6065
意思：是否成功
6166
备注：
6267
*********************************************************************/
63-
BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd)
68+
BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart /* = NULL */, LPCTSTR lpszTimeEnd /* = NULL */, XNETHANDLE xhToken /* = 0 */)
6469
{
6570
Protocol_IsErrorOccur = FALSE;
6671

@@ -101,6 +106,10 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuf
101106
{
102107
st_JsonRoot["lpszTimeEnd"] = lpszTimeEnd;
103108
}
109+
if (0 != xhToken)
110+
{
111+
st_JsonRoot["xhToken"] = xhToken;
112+
}
104113
st_JsonRoot["Code"] = 0;
105114
st_JsonRoot["Msg"] = _T("ok");
106115
//打包输出信息
@@ -421,12 +430,17 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_UPDown(TCHAR* ptszMsgBuffer
421430
类型：常量字符指针
422431
可空：Y
423432
意思：输入要查询的文件MD5
433+
参数.五：xhToken
434+
In/Out：In
435+
类型：句柄
436+
可空：Y
437+
意思：消息的TOKEN
424438
返回值
425439
类型：逻辑型
426440
意思：是否成功
427441
备注：
428442
*********************************************************************/
429-
BOOL CProtocol_StoragePacket::Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName /* = NULL */, LPCTSTR lpszFileHash /* = NULL */)
443+
BOOL CProtocol_StoragePacket::Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName /* = NULL */, LPCTSTR lpszFileHash /* = NULL */, XNETHANDLE xhToken /* = 0 */)
430444
{
431445
Protocol_IsErrorOccur = FALSE;
432446

@@ -445,6 +459,10 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffe
445459
{
446460
st_JsonRoot["lpszFileHash"] = lpszFileHash;
447461
}
462+
if (0 != xhToken)
463+
{
464+
st_JsonRoot["xhToken"] = xhToken;
465+
}
448466
st_JsonRoot["unOperatorType"] = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_STORAGE;
449467
st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_STORAGE_REQQUERY;
450468
//打包输出信息

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ class CProtocol_StoragePacket
1717
CProtocol_StoragePacket();
1818
~CProtocol_StoragePacket();
1919
public:
20-
BOOL Protocol_StoragePacket_QueryFile(TCHAR *ptszMsgBuffer, int *pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL);
20+
BOOL Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart = NULL, LPCTSTR lpszTimeEnd = NULL, XNETHANDLE xhToken = 0);
2121
BOOL Protocol_StoragePacket_Info(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO*** pppSt_DLInfo, SESSION_STORAGEINFO*** pppSt_UPInfo, int nDLCount, int nUPCount);
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);
25+
BOOL Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL, XNETHANDLE xhToken = 0);
2626
};

‎XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_StorageParse.cpp‎

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,20 @@ CProtocol_StorageParse::~CProtocol_StorageParse()
5757
意思：查询的文件HASH
5858
参数.七：pInt_Mode
5959
In/Out：Out
60-
类型：整数型
60+
类型：整数型指针
6161
可空：Y
6262
意思：输出查询返回模式
63+
参数.八：pxhToken
64+
In/Out：Out
65+
类型：整数型指针
66+
可空：Y
67+
意思：输出TOKEN
6368
返回值
6469
类型：逻辑型
6570
意思：是否成功
6671
备注：
6772
*********************************************************************/
68-
BOOL CProtocol_StorageParse::Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR* ptszTimeStart, TCHAR* ptszTimeEnd, TCHAR* ptszBuckKey /* = NULL */, TCHAR* ptszFileName /* = NULL */, TCHAR* ptszFileHash /* = NULL */, int* pInt_Mode /* = NULL */)
73+
BOOL CProtocol_StorageParse::Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR* ptszTimeStart, TCHAR* ptszTimeEnd, TCHAR* ptszBuckKey /* = NULL */, TCHAR* ptszFileName /* = NULL */, TCHAR* ptszFileHash /* = NULL */, int* pInt_Mode /* = NULL */, XNETHANDLE* pxhToken /* = NULL */)
6974
{
7075
Protocol_IsErrorOccur = FALSE;
7176

@@ -132,6 +137,13 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuff
132137
*pInt_Mode = st_JsonRoot["nMode"].asInt();
133138
}
134139
}
140+
if (NULL != pxhToken)
141+
{
142+
if (!st_JsonRoot["xhToken"].isNull())
143+
{
144+
*pxhToken = st_JsonRoot["xhToken"].asUInt64();
145+
}
146+
}
135147
return TRUE;
136148
}
137149
/********************************************************************
@@ -363,7 +375,7 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBu
363375
}
364376
/********************************************************************
365377
函数名称：Protocol_StorageParse_SpeedLimit
366-
函数功能：
378+
函数功能：速度限制请求解析函数
367379
参数.一：lpszMsgBuffer
368380
In/Out：In
369381
类型：常量字符指针
@@ -417,4 +429,61 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_SpeedLimit(LPCTSTR lpszMsgBuf
417429
*pInt_Code = st_JsonRoot["code"].asInt();
418430
*pInt_Limit = st_JsonRoot["nLimitSpeed"].asInt();
419431
return TRUE;
432+
}
433+
/********************************************************************
434+
函数名称：Protocol_StorageParse_P2PToken
435+
函数功能：P2P查找文件TOKEN匹配函数
436+
参数.一：lpszMsgBuffer
437+
In/Out：In
438+
类型：常量字符指针
439+
可空：N
440+
意思：输入要解析的内容
441+
参数.二：nMsgLen
442+
In/Out：In
443+
类型：整数型
444+
可空：N
445+
意思：输入要解析的大小
446+
参数.三：pxhToken
447+
In/Out：Out
448+
类型：整数型指针
449+
可空：N
450+
意思：输出解析到的TOKEN
451+
返回值
452+
类型：逻辑型
453+
意思：是否成功
454+
备注：
455+
*********************************************************************/
456+
BOOL CProtocol_StorageParse::Protocol_StorageParse_P2PToken(LPCTSTR lpszMsgBuffer, int nMsgLen, XNETHANDLE *pxhToken)
457+
{
458+
Protocol_IsErrorOccur = FALSE;
459+
460+
if ((NULL == lpszMsgBuffer))
461+
{
462+
Protocol_IsErrorOccur = TRUE;
463+
Protocol_dwErrorCode = ERROR_XENGINE_STORAGE_PROTOCOL_PARAMENT;
464+
return FALSE;
465+
}
466+
Json::Value st_JsonRoot;
467+
Json::CharReaderBuilder st_JsonBuild;
468+
Json::CharReader* pSt_JsonReader(st_JsonBuild.newCharReader());
469+
470+
JSONCPP_STRING st_JsonError;
471+
//解析JSON
472+
if (!pSt_JsonReader->parse(lpszMsgBuffer, lpszMsgBuffer + _tcslen(lpszMsgBuffer), &st_JsonRoot, &st_JsonError))
473+
{
474+
Protocol_IsErrorOccur = TRUE;
475+
Protocol_dwErrorCode = ERROR_XENGINE_STORAGE_PROTOCOL_PARSE;
476+
return FALSE;
477+
}
478+
delete pSt_JsonReader;
479+
pSt_JsonReader = NULL;
480+
481+
if (st_JsonRoot["xhToken"].isNull())
482+
{
483+
Protocol_IsErrorOccur = TRUE;
484+
Protocol_dwErrorCode = ERROR_XENGINE_STORAGE_PROTOCOL_TOKEN;
485+
return FALSE;
486+
}
487+
*pxhToken = st_JsonRoot["xhToken"].asUInt64();
488+
return TRUE;
420489
}

‎XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_StorageParse.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ class CProtocol_StorageParse
1717
CProtocol_StorageParse();
1818
~CProtocol_StorageParse();
1919
public:
20-
BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR* ptszTimeStart, TCHAR* ptszTimeEnd, TCHAR* ptszBuckKey = NULL, TCHAR* ptszFileName = NULL, TCHAR* ptszFileHash = NULL, int* pInt_Mode = NULL);
20+
BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR* ptszTimeStart, TCHAR* ptszTimeEnd, TCHAR* ptszBuckKey = NULL, TCHAR* ptszFileName = NULL, TCHAR* ptszFileHash = NULL, int* pInt_Mode = NULL, XNETHANDLE* pxhToken = NULL);
2121
BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE*** pppSt_DBFile, int* pInt_ListCount);
2222
BOOL Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBuffer, TCHAR* ptszUserDir, TCHAR* ptszBuckKey, int* pInt_Operator);
2323
BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszBuckKey, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize);
2424
BOOL Protocol_StorageParse_SpeedLimit(LPCTSTR lpszMsgBuffer, int nMsgLen, int* pInt_Code, int* pInt_Limit);
25+
BOOL Protocol_StorageParse_P2PToken(LPCTSTR lpszMsgBuffer, int nMsgLen, XNETHANDLE* pxhToken);
2526
};

‎XEngine_Source/StorageModule_Protocol/StorageModule_Protocol.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ EXPORTS
99
Protocol_StorageParse_ReportFile
1010
Protocol_StorageParse_DirOperator
1111
Protocol_StorageParse_SpeedLimit
12+
Protocol_StorageParse_P2PToken
1213

1314
Protocol_StoragePacket_BasicAuth
1415
Protocol_StoragePacket_UPDown

‎XEngine_Source/StorageModule_Protocol/StorageProtocol_Define.h‎

Lines changed: 54 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,27 +79,37 @@ extern "C" BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMs
7979
类型：字符指针
8080
可空：N
8181
意思：查询结束时间
82-
参数.四：ptszFileName
82+
参数.四：ptszBuckKey
8383
In/Out：Out
8484
类型：字符指针
85-
可空：N
85+
可空：Y
86+
意思：输出文件所属BUCKET
87+
参数.五：ptszFileName
88+
In/Out：Out
89+
类型：字符指针
90+
可空：Y
8691
意思：查询的文件名
87-
参数.五：ptszFileMD5
92+
参数.六：ptszFileHash
8893
In/Out：Out
8994
类型：字符指针
90-
可空：N
91-
意思：查询的文件MD5
95+
可空：Y
96+
意思：查询的文件HASH
9297
参数.七：pInt_Mode
9398
In/Out：Out
94-
类型：整数型
99+
类型：整数型指针
95100
可空：Y
96101
意思：输出查询返回模式
102+
参数.八：pxhToken
103+
In/Out：Out
104+
类型：整数型指针
105+
可空：Y
106+
意思：输出TOKEN
97107
返回值
98108
类型：逻辑型
99109
意思：是否成功
100110
备注：
101111
*********************************************************************/
102-
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCSTR lpszMsgBuffer, CHAR * ptszTimeStart, CHAR * ptszTimeEnd, CHAR * ptszBuckKey = NULL, CHAR * ptszFileName = NULL, CHAR * ptszFileHash = NULL, int* pInt_Mode = NULL);
112+
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCSTR lpszMsgBuffer, CHAR * ptszTimeStart, CHAR * ptszTimeEnd, CHAR * ptszBuckKey = NULL, CHAR * ptszFileName = NULL, CHAR * ptszFileHash = NULL, int* pInt_Mode = NULL, XNETHANDLE * pxhToken = NULL);
103113
/********************************************************************
104114
函数名称：Protocol_StorageParse_ReportFile
105115
函数功能：解析文件报告协议
@@ -160,7 +170,7 @@ extern "C" BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsg
160170
extern "C" BOOL Protocol_StorageParse_DirOperator(LPCSTR lpszMsgBuffer, CHAR * ptszUserDir, TCHAR * ptszBuckKey, int* pInt_Operator);
161171
/********************************************************************
162172
函数名称：Protocol_StorageParse_SpeedLimit
163-
函数功能：
173+
函数功能：速度限制请求解析函数
164174
参数.一：lpszMsgBuffer
165175
In/Out：In
166176
类型：常量字符指针
@@ -187,6 +197,30 @@ extern "C" BOOL Protocol_StorageParse_DirOperator(LPCSTR lpszMsgBuffer, CHAR * p
187197
备注：
188198
*********************************************************************/
189199
extern "C" BOOL Protocol_StorageParse_SpeedLimit(LPCTSTR lpszMsgBuffer, int nMsgLen, int* pInt_Code, int* pInt_Limit);
200+
/********************************************************************
201+
函数名称：Protocol_StorageParse_P2PToken
202+
函数功能：P2P查找文件TOKEN匹配函数
203+
参数.一：lpszMsgBuffer
204+
In/Out：In
205+
类型：常量字符指针
206+
可空：N
207+
意思：输入要解析的内容
208+
参数.二：nMsgLen
209+
In/Out：In
210+
类型：整数型
211+
可空：N
212+
意思：输入要解析的大小
213+
参数.三：pxhToken
214+
In/Out：Out
215+
类型：整数型指针
216+
可空：N
217+
意思：输出解析到的TOKEN
218+
返回值
219+
类型：逻辑型
220+
意思：是否成功
221+
备注：
222+
*********************************************************************/
223+
extern "C" BOOL Protocol_StorageParse_P2PToken(LPCTSTR lpszMsgBuffer, int nMsgLen, XNETHANDLE* pxhToken);
190224
/************************************************************************/
191225
/* 打包协议导出 */
192226
/************************************************************************/
@@ -316,12 +350,17 @@ extern "C" BOOL Protocol_StoragePacket_UPDown(TCHAR * ptszMsgBuffer, int* pInt_M
316350
类型：常量字符指针
317351
可空：Y
318352
意思：输入查询请求的结束时间
353+
参数.七：xhToken
354+
In/Out：In
355+
类型：句柄
356+
可空：Y
357+
意思：输入返回的TOKEN,如果需要的话
319358
返回值
320359
类型：逻辑型
321360
意思：是否成功
322361
备注：
323362
*********************************************************************/
324-
extern "C" BOOL Protocol_StoragePacket_QueryFile(CHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCSTR lpszTimeStart = NULL, LPCSTR lpszTimeEnd = NULL);
363+
extern "C" BOOL Protocol_StoragePacket_QueryFile(CHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCSTR lpszTimeStart = NULL, LPCSTR lpszTimeEnd = NULL, XNETHANDLE xhToken = 0);
325364
/********************************************************************
326365
函数名称：Protocol_StoragePacket_Info
327366
函数功能：返回信息获取请求打包函数
@@ -413,9 +452,14 @@ extern "C" BOOL Protocol_StoragePacket_DirOperator(CHAR * ptszMsgBuffer, int* pI
413452
类型：常量字符指针
414453
可空：Y
415454
意思：输入要查询的文件MD5
455+
参数.五：xhToken
456+
In/Out：In
457+
类型：句柄
458+
可空：Y
459+
意思：消息的TOKEN
416460
返回值
417461
类型：逻辑型
418462
意思：是否成功
419463
备注：
420464
*********************************************************************/
421-
extern "C" BOOL Protocol_StoragePacket_REQFile(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL);
465+
extern "C" BOOL Protocol_StoragePacket_REQFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName = NULL, LPCTSTR lpszFileHash = NULL, XNETHANDLE xhToken = 0);

‎XEngine_Source/StorageModule_Protocol/StorageProtocol_Error.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
// History:
1212
*********************************************************************/
1313
#define ERROR_XENGINE_STORAGE_PROTOCOL_PARAMENT 0xB0F1001
14-
#define ERROR_XENGINE_STORAGE_PROTOCOL_PARSE 0xB0F1002
14+
#define ERROR_XENGINE_STORAGE_PROTOCOL_PARSE 0xB0F1002
15+
#define ERROR_XENGINE_STORAGE_PROTOCOL_TOKEN 0xB0F1003

‎XEngine_Source/StorageModule_Protocol/pch.cpp‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ extern "C" BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMs
3333
{
3434
return m_StorageParse.Protocol_StorageParse_ProxyNotify(lpszMsgBuffer, nMsgLen, ptszClientAddr, ptszBuckKey, ptszFileName, ptszFileHash, pInt_FileSize);
3535
}
36-
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR * ptszTimeStart, TCHAR * ptszTimeEnd, CHAR * ptszBuckKey, TCHAR * ptszFileName, TCHAR * ptszFileHash, int* pInt_Mode)
36+
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR * ptszTimeStart, TCHAR * ptszTimeEnd, CHAR * ptszBuckKey, TCHAR * ptszFileName, TCHAR * ptszFileHash, int* pInt_Mode, XNETHANDLE * pxhToken)
3737
{
38-
return m_StorageParse.Protocol_StorageParse_QueryFile(lpszMsgBuffer, ptszTimeStart, ptszTimeEnd, ptszBuckKey, ptszFileName, ptszFileHash, pInt_Mode);
38+
return m_StorageParse.Protocol_StorageParse_QueryFile(lpszMsgBuffer, ptszTimeStart, ptszTimeEnd, ptszBuckKey, ptszFileName, ptszFileHash, pInt_Mode, pxhToken);
3939
}
4040
extern "C" BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int* pInt_ListCount)
4141
{
@@ -49,6 +49,10 @@ extern "C" BOOL Protocol_StorageParse_SpeedLimit(LPCTSTR lpszMsgBuffer, int nMsg
4949
{
5050
return m_StorageParse.Protocol_StorageParse_SpeedLimit(lpszMsgBuffer, nMsgLen, pInt_Code, pInt_Limit);
5151
}
52+
extern "C" BOOL Protocol_StorageParse_P2PToken(LPCTSTR lpszMsgBuffer, int nMsgLen, XNETHANDLE * pxhToken)
53+
{
54+
return m_StorageParse.Protocol_StorageParse_P2PToken(lpszMsgBuffer, nMsgLen, pxhToken);
55+
}
5256
/************************************************************************/
5357
/* 打包协议导出 */
5458
/************************************************************************/
@@ -60,9 +64,9 @@ extern "C" BOOL Protocol_StoragePacket_UPDown(TCHAR * ptszMsgBuffer, int* pInt_M
6064
{
6165
return m_StoragePacket.Protocol_StoragePacket_UPDown(ptszMsgBuffer, pInt_MsgLen, lpszBuckKey, lpszFileName, lpszClientAddr, nFileSize, bDown, lpszFileHash);
6266
}
63-
extern "C" BOOL Protocol_StoragePacket_QueryFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd)
67+
extern "C" BOOL Protocol_StoragePacket_QueryFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int nListCount, LPCTSTR lpszTimeStart, LPCTSTR lpszTimeEnd, XNETHANDLE xhToken)
6468
{
65-
return m_StoragePacket.Protocol_StoragePacket_QueryFile(ptszMsgBuffer, pInt_MsgLen, pppSt_DBFile, nListCount, lpszTimeStart, lpszTimeEnd);
69+
return m_StoragePacket.Protocol_StoragePacket_QueryFile(ptszMsgBuffer, pInt_MsgLen, pppSt_DBFile, nListCount, lpszTimeStart, lpszTimeEnd, xhToken);
6670
}
6771
extern "C" BOOL Protocol_StoragePacket_Info(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, SESSION_STORAGEINFO * **pppSt_DLInfo, SESSION_STORAGEINFO * **pppSt_UPInfo, int nDLCount, int nUPCount)
6872
{
@@ -72,7 +76,7 @@ extern "C" BOOL Protocol_StoragePacket_DirOperator(TCHAR * ptszMsgBuffer, int* p
7276
{
7377
return m_StoragePacket.Protocol_StoragePacket_DirOperator(ptszMsgBuffer, pInt_MsgLen, pppszListEnum, nListCount);
7478
}
75-
extern "C" BOOL Protocol_StoragePacket_REQFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName, LPCTSTR lpszFileHash)
79+
extern "C" BOOL Protocol_StoragePacket_REQFile(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, LPCTSTR lpszFileName, LPCTSTR lpszFileHash, XNETHANDLE xhToken)
7680
{
77-
return m_StoragePacket.Protocol_StoragePacket_REQFile(ptszMsgBuffer, pInt_MsgLen, lpszFileName, lpszFileHash);
81+
return m_StoragePacket.Protocol_StoragePacket_REQFile(ptszMsgBuffer, pInt_MsgLen, lpszFileName, lpszFileHash, xhToken);
7882
}

0 commit comments

Comments
 (0)