Skip to content

Commit f88e0e7

Browse files
xengine-qytxengine-qyt
committed
added:bucket key parse and packet for protocol module
1 parent b25c6d5 commit f88e0e7

File tree

6 files changed

+48
-21
lines changed

6 files changed

+48
-21
lines changed

‎XEngine_Source/StorageModule_Protocol/Protocol_Packet/Protocol_StoragePacket.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ BOOL CProtocol_StoragePacket::Protocol_StoragePacket_QueryFile(TCHAR* ptszMsgBuf
7777
{
7878
Json::Value st_JsonObject;
7979

80+
st_JsonObject["tszPathKey"] = (*pppSt_DBFile)[i]->tszPathKey;
8081
st_JsonObject["tszFilePath"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFilePath;
8182
st_JsonObject["tszFileName"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileName;
8283
st_JsonObject["tszFileUser"] = (*pppSt_DBFile)[i]->st_ProtocolFile.tszFileUser;

‎XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_P2XPParse.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class CProtocol_P2XPParse
2121
BOOL Protocol_P2XPParse_List(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszPubAddr, TCHAR* ptszPriAddr);
2222
BOOL Protocol_P2XPParse_User(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszUserName);
2323
BOOL Protocol_P2XPParse_Connect(LPCTSTR lpszMsgBuffer, int nMsgLen, XENGINE_P2XPIO_PROTOCOL* pSt_IOProtocol);
24-
2524
protected:
2625
private:
2726
};

‎XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_StorageParse.cpp‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,27 @@ CProtocol_StorageParse::~CProtocol_StorageParse()
4040
类型：字符指针
4141
可空：N
4242
意思：查询结束时间
43-
参数.四：ptszFileName
43+
参数.四：ptszPathKey
4444
In/Out：Out
4545
类型：字符指针
46-
可空：N
46+
可空：Y
47+
意思：输出文件所属BUCKET
48+
参数.五：ptszFileName
49+
In/Out：Out
50+
类型：字符指针
51+
可空：Y
4752
意思：查询的文件名
48-
参数.五：ptszFileHash
53+
参数.六：ptszFileHash
4954
In/Out：Out
5055
类型：字符指针
51-
可空：N
56+
可空：Y
5257
意思：查询的文件HASH
5358
返回值
5459
类型：逻辑型
5560
意思：是否成功
5661
备注：
5762
*********************************************************************/
58-
BOOL CProtocol_StorageParse::Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR *ptszTimeStart, TCHAR *ptszTimeEnd, TCHAR *ptszFileName /* = NULL */, TCHAR * ptszFileHash /* = NULL */)
63+
BOOL CProtocol_StorageParse::Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR* ptszTimeStart, TCHAR* ptszTimeEnd, TCHAR* ptszPathKey /* = NULL */, TCHAR* ptszFileName /* = NULL */, TCHAR* ptszFileHash /* = NULL */)
5964
{
6065
Protocol_IsErrorOccur = FALSE;
6166

@@ -108,6 +113,13 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuff
108113
_tcscpy(ptszFileHash, st_JsonRoot["lpszFileHash"].asCString());
109114
}
110115
}
116+
if (NULL != ptszPathKey)
117+
{
118+
if (!st_JsonRoot["tszPathKey"].isNull())
119+
{
120+
_tcscpy(ptszPathKey, st_JsonRoot["tszPathKey"].asCString());
121+
}
122+
}
111123
return TRUE;
112124
}
113125
/********************************************************************
@@ -172,6 +184,10 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuf
172184
(*pppSt_DBFile)[i]->st_ProtocolFile.nFileSize = st_JsonArray[i]["nFileSize"].asInt64();
173185
}
174186

187+
if (!st_JsonArray[i]["tszPathKey"].isNull())
188+
{
189+
_tcscpy((*pppSt_DBFile)[i]->tszPathKey, st_JsonArray[i]["tszPathKey"].asCString());
190+
}
175191
if (!st_JsonArray[i]["tszFileName"].isNull())
176192
{
177193
_tcscpy((*pppSt_DBFile)[i]->st_ProtocolFile.tszFileName, st_JsonArray[i]["tszFileName"].asCString());
@@ -272,17 +288,22 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBu
272288
类型：字符指针
273289
可空：N
274290
意思：输出文件客户端地址
275-
参数.四：ptszFileName
291+
参数.四：ptszPathKey
292+
In/Out：Out
293+
类型：字符指针
294+
可空：N
295+
意思：输出路径的KEY
296+
参数.五：ptszFileName
276297
In/Out：Out
277298
类型：字符指针
278299
可空：N
279300
意思：输出文件名称
280-
参数.五：ptszFileHash
301+
参数.六：ptszFileHash
281302
In/Out：Out
282303
类型：字符指针
283304
可空：N
284305
意思：输出文件HASH
285-
参数.六：pInt_FileSize
306+
参数.七：pInt_FileSize
286307
In/Out：Out
287308
类型：整数型
288309
可空：N
@@ -292,7 +313,7 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_DirOperator(LPCTSTR lpszMsgBu
292313
意思：是否成功
293314
备注：
294315
*********************************************************************/
295-
BOOL CProtocol_StorageParse::Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize)
316+
BOOL CProtocol_StorageParse::Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszPathKey, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize)
296317
{
297318
Protocol_IsErrorOccur = FALSE;
298319

@@ -320,6 +341,7 @@ BOOL CProtocol_StorageParse::Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBu
320341
_tcscpy(ptszClientAddr, st_JsonRoot["lpszClientAddr"].asCString());
321342
_tcscpy(ptszFileName, st_JsonRoot["lpszFileName"].asCString());
322343
_tcscpy(ptszFileHash, st_JsonRoot["lpszFileHash"].asCString());
344+
_tcscpy(ptszPathKey, st_JsonRoot["lpszPathKey"].asCString());
323345
*pInt_FileSize = st_JsonRoot["nFileSize"].asInt64();
324346

325347
return TRUE;

‎XEngine_Source/StorageModule_Protocol/Protocol_Parse/Protocol_StorageParse.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class CProtocol_StorageParse
1717
CProtocol_StorageParse();
1818
~CProtocol_StorageParse();
1919
public:
20-
BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR *ptszTimeStart, TCHAR *ptszTimeEnd, TCHAR *ptszFileName = NULL, TCHAR * ptszFileHash = NULL);
20+
BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR* ptszTimeStart, TCHAR* ptszTimeEnd, TCHAR* ptszPathKey = NULL, TCHAR* ptszFileName = NULL, TCHAR* ptszFileHash = 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);
23-
BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize);
23+
BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR* ptszClientAddr, TCHAR* ptszPathKey, TCHAR* ptszFileName, TCHAR* ptszFileHash, __int64x* pInt_FileSize);
2424
};

‎XEngine_Source/StorageModule_Protocol/StorageProtocol_Define.h‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,22 @@ extern "C" BOOL Protocol_P2XPParse_Connect(LPCTSTR lpszMsgBuffer, int nMsgLen, X
136136
类型：字符指针
137137
可空：N
138138
意思：输出文件客户端地址
139-
参数.四：ptszFileName
139+
参数.四：ptszPathKey
140+
In/Out：Out
141+
类型：字符指针
142+
可空：N
143+
意思：输出路径的KEY
144+
参数.五：ptszFileName
140145
In/Out：Out
141146
类型：字符指针
142147
可空：N
143148
意思：输出文件名称
144-
参数.五：ptszFileHash
149+
参数.六：ptszFileHash
145150
In/Out：Out
146151
类型：字符指针
147152
可空：N
148153
意思：输出文件HASH
149-
参数.六：pInt_FileSize
154+
参数.七：pInt_FileSize
150155
In/Out：Out
151156
类型：整数型
152157
可空：N
@@ -156,7 +161,7 @@ extern "C" BOOL Protocol_P2XPParse_Connect(LPCTSTR lpszMsgBuffer, int nMsgLen, X
156161
意思：是否成功
157162
备注：
158163
*********************************************************************/
159-
extern "C" BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR * ptszClientAddr, TCHAR * ptszFileName, TCHAR * ptszFileHash, __int64x * pInt_FileSize);
164+
extern "C" BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR * ptszClientAddr, TCHAR * ptszPathKey, TCHAR * ptszFileName, TCHAR * ptszFileHash, __int64x * pInt_FileSize);
160165
/********************************************************************
161166
函数名称：Protocol_StorageParse_QueryFile
162167
函数功能：文件查询请求解析函数
@@ -190,7 +195,7 @@ extern "C" BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMs
190195
意思：是否成功
191196
备注：
192197
*********************************************************************/
193-
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCSTR lpszMsgBuffer, CHAR * ptszTimeStart, CHAR * ptszTimeEnd, CHAR * ptszFileName = NULL, CHAR * ptszFileHash = NULL);
198+
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCSTR lpszMsgBuffer, CHAR * ptszTimeStart, CHAR * ptszTimeEnd, CHAR * ptszPathKey = NULL, CHAR * ptszFileName = NULL, CHAR * ptszFileHash = NULL);
194199
/********************************************************************
195200
函数名称：Protocol_StorageParse_ReportFile
196201
函数功能：解析文件报告协议

‎XEngine_Source/StorageModule_Protocol/pch.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ extern "C" BOOL Protocol_P2XPParse_Connect(LPCTSTR lpszMsgBuffer, int nMsgLen, X
5050
return m_P2XPParse.Protocol_P2XPParse_Connect(lpszMsgBuffer, nMsgLen, pSt_IOProtocol);
5151
}
5252
//////////////////////////////////////////////////////////////////////////
53-
extern "C" BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR * ptszClientAddr, TCHAR * ptszFileName, TCHAR * ptszFileHash, __int64x * pInt_FileSize)
53+
extern "C" BOOL Protocol_StorageParse_ProxyNotify(LPCTSTR lpszMsgBuffer, int nMsgLen, TCHAR * ptszClientAddr, TCHAR * ptszPathKey, TCHAR * ptszFileName, TCHAR * ptszFileHash, __int64x * pInt_FileSize)
5454
{
55-
return m_StorageParse.Protocol_StorageParse_ProxyNotify(lpszMsgBuffer, nMsgLen, ptszClientAddr, ptszFileName, ptszFileHash, pInt_FileSize);
55+
return m_StorageParse.Protocol_StorageParse_ProxyNotify(lpszMsgBuffer, nMsgLen, ptszClientAddr, ptszPathKey, ptszFileName, ptszFileHash, pInt_FileSize);
5656
}
57-
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR * ptszTimeStart, TCHAR * ptszTimeEnd, TCHAR * ptszFileName, TCHAR * ptszFileHash)
57+
extern "C" BOOL Protocol_StorageParse_QueryFile(LPCTSTR lpszMsgBuffer, TCHAR * ptszTimeStart, TCHAR * ptszTimeEnd, CHAR * ptszPathKey, TCHAR * ptszFileName, TCHAR * ptszFileHash)
5858
{
59-
return m_StorageParse.Protocol_StorageParse_QueryFile(lpszMsgBuffer, ptszTimeStart, ptszTimeEnd, ptszFileName, ptszFileHash);
59+
return m_StorageParse.Protocol_StorageParse_QueryFile(lpszMsgBuffer, ptszTimeStart, ptszTimeEnd, ptszPathKey, ptszFileName, ptszFileHash);
6060
}
6161
extern "C" BOOL Protocol_StorageParse_ReportFile(LPCTSTR lpszMsgBuffer, int nMsgLen, XSTORAGECORE_DBFILE * **pppSt_DBFile, int* pInt_ListCount)
6262
{

0 commit comments

Comments
 (0)