Skip to content

Commit d7cc6c7

Browse files
xengine-qytxengine-qyt
committed
modify:p2pcomm function to comm
modify:Unify the json field names of msg and code
1 parent 00adfa4 commit d7cc6c7

File tree

5 files changed

+89
-89
lines changed

5 files changed

+89
-89
lines changed

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Define.h‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,35 @@ extern "C" DWORD ModuleProtocol_GetLastError(int *pInt_SysError = NULL);
1818
/* 导出的协议打包函数 */
1919
/************************************************************************/
2020
/********************************************************************
21+
函数名称：ModuleProtocol_Packet_Common
22+
函数功能：公用协议打包函数
23+
参数.一：ptszMsgBuffer
24+
In/Out：Out
25+
类型：字符指针
26+
可空：N
27+
意思：输出打好包的缓冲区
28+
参数.二：pInt_MsgLen
29+
In/Out：Out
30+
类型：整数型指针
31+
可空：N
32+
意思：输出缓冲区大小
33+
参数.三：nCode
34+
In/Out：In
35+
类型：整数型
36+
可空：Y
37+
意思：输入返回的值
38+
参数.四：lpszMsgBuffer
39+
In/Out：In
40+
类型：常量字符指针
41+
可空：Y
42+
意思：输入要打包的后续内容
43+
返回值
44+
类型：逻辑型
45+
意思：是否成功
46+
备注：
47+
*********************************************************************/
48+
extern "C" BOOL ModuleProtocol_Packet_Common(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, int nCode = 0, LPCTSTR lpszMsgBuffer = NULL);
49+
/********************************************************************
2150
函数名称：ModuleProtocol_Packet_IPQuery
2251
函数功能：IP地址查询打包协议
2352
参数.一：ptszMsgBuffer
@@ -343,35 +372,6 @@ extern "C" BOOL ModuleProtocol_Packet_LanguageQuery(TCHAR* ptszMsgBuffer, int* p
343372
*********************************************************************/
344373
extern "C" BOOL ModuleProtocol_Packet_LanguageQuery2(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_LANGUAGEINFO* pSt_LanguageInfo, int nCode = 0);
345374
/********************************************************************
346-
函数名称：ModuleProtocol_Packet_P2PCommon
347-
函数功能：P2XP公用协议打包函数
348-
参数.一：ptszMsgBuffer
349-
In/Out：Out
350-
类型：字符指针
351-
可空：N
352-
意思：输出打好包的缓冲区
353-
参数.二：pInt_MsgLen
354-
In/Out：Out
355-
类型：整数型指针
356-
可空：N
357-
意思：输出缓冲区大小
358-
参数.三：nCode
359-
In/Out：In
360-
类型：整数型
361-
可空：Y
362-
意思：输入返回的值
363-
参数.四：lpszMsgBuffer
364-
In/Out：In
365-
类型：常量字符指针
366-
可空：Y
367-
意思：输入要打包的后续内容
368-
返回值
369-
类型：逻辑型
370-
意思：是否成功
371-
备注：
372-
*********************************************************************/
373-
extern "C" BOOL ModuleProtocol_Packet_P2PCommon(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode = 0, LPCTSTR lpszMsgBuffer = NULL);
374-
/********************************************************************
375375
函数名称：ModuleProtocol_Packet_P2PLan
376376
函数功能：响应同步局域网地址列表
377377
参数.一：ptszMsgBuffer

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Packet/ModuleProtocol_Packet.cpp‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,55 @@ CModuleProtocol_Packet::~CModuleProtocol_Packet()
2222
// 公有函数
2323
//////////////////////////////////////////////////////////////////////////
2424
/********************************************************************
25+
函数名称：ModuleProtocol_Packet_Common
26+
函数功能：公用协议打包函数
27+
参数.一：ptszMsgBuffer
28+
In/Out：Out
29+
类型：字符指针
30+
可空：N
31+
意思：输出打好包的缓冲区
32+
参数.二：pInt_MsgLen
33+
In/Out：Out
34+
类型：整数型指针
35+
可空：N
36+
意思：输出缓冲区大小
37+
参数.三：nCode
38+
In/Out：In
39+
类型：整数型
40+
可空：Y
41+
意思：输入返回的值
42+
参数.四：lpszMsgBuffer
43+
In/Out：In
44+
类型：常量字符指针
45+
可空：Y
46+
意思：输入要打包的后续内容
47+
返回值
48+
类型：逻辑型
49+
意思：是否成功
50+
备注：
51+
*********************************************************************/
52+
BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_Common(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode /* = 0 */, LPCTSTR lpszMsgBuffer /* = NULL */)
53+
{
54+
ModuleProtocol_IsErrorOccur = FALSE;
55+
56+
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
57+
{
58+
ModuleProtocol_IsErrorOccur = TRUE;
59+
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
60+
return FALSE;
61+
}
62+
Json::Value st_JsonRoot;
63+
64+
st_JsonRoot["code"] = 0;
65+
if (NULL != lpszMsgBuffer)
66+
{
67+
st_JsonRoot["msg"] = lpszMsgBuffer;
68+
}
69+
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
70+
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
71+
return TRUE;
72+
}
73+
/********************************************************************
2574
函数名称：ModuleProtocol_Packet_IPQuery
2675
函数功能：IP地址查询打包协议
2776
参数.一：ptszMsgBuffer
@@ -636,55 +685,6 @@ BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_LanguageQuery2(TCHAR* ptszMsg
636685
return TRUE;
637686
}
638687
/********************************************************************
639-
函数名称：ModuleProtocol_Packet_P2PCommon
640-
函数功能：P2XP公用协议打包函数
641-
参数.一：ptszMsgBuffer
642-
In/Out：Out
643-
类型：字符指针
644-
可空：N
645-
意思：输出打好包的缓冲区
646-
参数.二：pInt_MsgLen
647-
In/Out：Out
648-
类型：整数型指针
649-
可空：N
650-
意思：输出缓冲区大小
651-
参数.三：nCode
652-
In/Out：In
653-
类型：整数型
654-
可空：Y
655-
意思：输入返回的值
656-
参数.四：lpszMsgBuffer
657-
In/Out：In
658-
类型：常量字符指针
659-
可空：Y
660-
意思：输入要打包的后续内容
661-
返回值
662-
类型：逻辑型
663-
意思：是否成功
664-
备注：
665-
*********************************************************************/
666-
BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PCommon(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode /* = 0 */, LPCTSTR lpszMsgBuffer /* = NULL */)
667-
{
668-
ModuleProtocol_IsErrorOccur = FALSE;
669-
670-
if ((NULL == ptszMsgBuffer) || (NULL == pInt_MsgLen))
671-
{
672-
ModuleProtocol_IsErrorOccur = TRUE;
673-
ModuleProtocol_dwErrorCode = ERROR_XENGINE_APISERVICE_MODULE_PROTOCOL_PACKET_PARAMENT;
674-
return FALSE;
675-
}
676-
Json::Value st_JsonRoot;
677-
678-
st_JsonRoot["nCode"] = 0;
679-
if (NULL != lpszMsgBuffer)
680-
{
681-
st_JsonRoot["lpszMsgBuffer"] = lpszMsgBuffer;
682-
}
683-
*pInt_MsgLen = st_JsonRoot.toStyledString().length();
684-
memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);
685-
return TRUE;
686-
}
687-
/********************************************************************
688688
函数名称：ModuleProtocol_Packet_P2PLan
689689
函数功能：响应同步局域网地址列表
690690
参数.一：ptszMsgBuffer
@@ -731,8 +731,8 @@ BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PLan(TCHAR* ptszMsgBuffer,
731731
st_JsonObject["ClientAddr"] = (*pppSt_ListClients)[i]->tszPrivateAddr;
732732
st_JsonArray.append(st_JsonObject);
733733
}
734-
st_JsonRoot["nCode"] = 0;
735-
st_JsonRoot["lpszMsgBuffer"] = "sucess";
734+
st_JsonRoot["code"] = 0;
735+
st_JsonRoot["msg"] = "sucess";
736736
st_JsonRoot["ClientArray"] = st_JsonArray;
737737
st_JsonRoot["ClientCount"] = nListCount;
738738

@@ -824,8 +824,8 @@ BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PWLan(TCHAR* ptszMsgBuffer,
824824
st_JsonArray["tszLANAddr"] = stl_MapIterator->first.c_str();
825825
st_JsonArray["tszLANList"] = st_JsonList;
826826
}
827-
st_JsonRoot["nCode"] = 0;
828-
st_JsonRoot["lpszMsgBuffer"] = "sucess";
827+
st_JsonRoot["code"] = 0;
828+
st_JsonRoot["msg"] = "sucess";
829829
st_JsonRoot["ClientArray"] = st_JsonArray;
830830
st_JsonRoot["ClientCount"] = nCount;
831831

@@ -876,7 +876,7 @@ BOOL CModuleProtocol_Packet::ModuleProtocol_Packet_P2PUser(TCHAR* ptszMsgBuffer,
876876
Json::StreamWriterBuilder st_JsonBuilder;
877877

878878
st_JsonRoot["Code"] = 0;
879-
st_JsonRoot["lpszMsgBuffer"] = "sucess";
879+
st_JsonRoot["msg"] = "sucess";
880880
st_JsonRoot["dwConnectType"] = (Json::Value::UInt)pSt_PeerInfo->dwConnectType;
881881
st_JsonRoot["dwPeerType"] = pSt_PeerInfo->dwPeerType;
882882
st_JsonRoot["tszConnectAddr"] = pSt_PeerInfo->tszConnectAddr;

‎XEngine_Source/XEngine_ModuleProtocol/ModuleProtocol_Packet/ModuleProtocol_Packet.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class CModuleProtocol_Packet
2222
CModuleProtocol_Packet();
2323
~CModuleProtocol_Packet();
2424
public:
25+
BOOL ModuleProtocol_Packet_Common(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode = 0, LPCTSTR lpszMsgBuffer = NULL);
2526
BOOL ModuleProtocol_Packet_IPQuery(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_IPADDRINFO* pSt_IPAddrInfo, int nCode = 0, LPCTSTR lpszMsgBuffer = NULL);
2627
BOOL ModuleProtocol_Packet_IPQuery2(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_IPADDRINFO* pSt_IPAddrInfo, int nCode = 0);
2728
BOOL ModuleProtocol_Packet_IDQuery(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_IDCARDINFO* pSt_IDInfo, XENGINE_IDREGION* pSt_IDRegion, int nCode = 0, LPCTSTR lpszMsgBuffer = NULL);
@@ -33,7 +34,6 @@ class CModuleProtocol_Packet
3334
BOOL ModuleProtocol_Packet_LanguageQuery(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_LANGUAGEINFO* pSt_LanguageInfo, int nCode = 0, LPCTSTR lpszMsgBuffer = NULL);
3435
BOOL ModuleProtocol_Packet_LanguageQuery2(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_LANGUAGEINFO* pSt_LanguageInfo, int nCode = 0);
3536
public:
36-
BOOL ModuleProtocol_Packet_P2PCommon(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, int nCode = 0, LPCTSTR lpszMsgBuffer = NULL);
3737
BOOL ModuleProtocol_Packet_P2PLan(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_P2XPPEER_PROTOCOL*** pppSt_ListClients, int nListCount);
3838
BOOL ModuleProtocol_Packet_P2PWLan(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, list<XENGINE_P2XPPEER_PROTOCOL>* pStl_ListClients);
3939
BOOL ModuleProtocol_Packet_P2PUser(TCHAR* ptszMsgBuffer, int* pInt_MsgLen, XENGINE_P2XPPEER_PROTOCOL* pSt_PeerInfo, XENGINE_IPADDRINFO* pSt_AddrInfo);

‎XEngine_Source/XEngine_ModuleProtocol/XEngine_ModuleProtocol.def‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ LIBRARY
33
EXPORTS
44
ModuleProtocol_GetLastError
55

6+
ModuleProtocol_Packet_Common
67
ModuleProtocol_Packet_IPQuery
78
ModuleProtocol_Packet_IPQuery2
89
ModuleProtocol_Packet_IDQuery
@@ -13,7 +14,6 @@ EXPORTS
1314
ModuleProtocol_Packet_BankQuery2
1415
ModuleProtocol_Packet_LanguageQuery
1516
ModuleProtocol_Packet_LanguageQuery2
16-
ModuleProtocol_Packet_P2PCommon
1717
ModuleProtocol_Packet_P2PLan
1818
ModuleProtocol_Packet_P2PWLan
1919
ModuleProtocol_Packet_P2PUser

‎XEngine_Source/XEngine_ModuleProtocol/pch.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ extern "C" DWORD ModuleProtocol_GetLastError(int* pInt_SysError)
3131
/************************************************************************/
3232
/* 导出的协议打包函数 */
3333
/************************************************************************/
34+
extern "C" BOOL ModuleProtocol_Packet_Common(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, int nCode, LPCTSTR lpszMsgBuffer)
35+
{
36+
return m_ProtocolPacket.ModuleProtocol_Packet_Common(ptszMsgBuffer, pInt_MsgLen, nCode, lpszMsgBuffer);
37+
}
3438
extern "C" BOOL ModuleProtocol_Packet_IPQuery(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, XENGINE_IPADDRINFO * pSt_IPAddrInfo, int nCode, LPCTSTR lpszMsgBuffer)
3539
{
3640
return m_ProtocolPacket.ModuleProtocol_Packet_IPQuery(ptszMsgBuffer, pInt_MsgLen, pSt_IPAddrInfo, nCode, lpszMsgBuffer);
@@ -71,10 +75,6 @@ extern "C" BOOL ModuleProtocol_Packet_LanguageQuery2(TCHAR * ptszMsgBuffer, int*
7175
{
7276
return m_ProtocolPacket.ModuleProtocol_Packet_LanguageQuery2(ptszMsgBuffer, pInt_MsgLen, pSt_LanguageInfo, nCode);
7377
}
74-
extern "C" BOOL ModuleProtocol_Packet_P2PCommon(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, int nCode, LPCTSTR lpszMsgBuffer)
75-
{
76-
return m_ProtocolPacket.ModuleProtocol_Packet_P2PCommon(ptszMsgBuffer, pInt_MsgLen, nCode, lpszMsgBuffer);
77-
}
7878
extern "C" BOOL ModuleProtocol_Packet_P2PLan(TCHAR * ptszMsgBuffer, int* pInt_MsgLen, XENGINE_P2XPPEER_PROTOCOL * **pppSt_ListClients, int nListCount)
7979
{
8080
return m_ProtocolPacket.ModuleProtocol_Packet_P2PLan(ptszMsgBuffer, pInt_MsgLen, pppSt_ListClients, nListCount);

0 commit comments

Comments
 (0)