Skip to content

Commit f1866d2

Browse files
committed
update:docment and configure file
Modify:modify p2xp member of struct
1 parent 4f8e89c commit f1866d2

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

XEngine_Docment/Docment_en.docx

10.1 KB
Binary file not shown.

XEngine_Docment/Docment_zh.docx

10.3 KB
Binary file not shown.

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@
44
"nCenterPort": 5100,
55
"nStorageDLPort": 5101,
66
"nStorageUPPort": 5102,
7+
"nP2XPPort": 5103,
78
"XMax": {
89
"MaxClient": 10000,
910
"MaxQueue": 10000,
1011
"IOThread": 2,
1112
"CenterThread": 2,
1213
"nStorageUPThread": 2,
13-
"nStorageDLThread": 2
14+
"nStorageDLThread": 2,
15+
"nP2XPThread": 2
1416
},
1517
"XTime": {
1618
"bHBTime": 0,
1719
"nDBMonth": 3,
1820
"nTimeCheck": 3,
1921
"nCenterTimeOut": 5,
20-
"nStorageTimeOut": 5
22+
"nStorageTimeOut": 5,
23+
"nP2XPTimeOut": 5
2124
},
2225
"XLog": {
2326
"MaxSize": 1024000,
@@ -54,6 +57,9 @@
5457
"nMaxUPLoad": 0,
5558
"nMaxDNLoad": 1024000
5659
},
60+
"XP2xp": {
61+
"tszQQWryFile": "./XEngine_SQL/qqwry.dat"
62+
},
5763
"XVer": {
5864
"StorageVersion": [
5965
"1.5.0.1001 Build20210716",

XEngine_Source/XEngine_P2XPComponents/XEngine_P2XPProtocol/P2XPProtocol_Packet/P2XPProtocol_Packet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ BOOL CP2XPProtocol_Packet::P2XPProtocol_Packet_User(XENGINE_PROTOCOLHDR* pSt_Pro
186186
st_JsonRoot["tszConnectAddr"] = pSt_PeerInfo->tszConnectAddr;
187187
st_JsonRoot["tszPrivateAddr"] = pSt_PeerInfo->tszPrivateAddr;
188188
st_JsonRoot["tszPublicAddr"] = pSt_PeerInfo->tszPublicAddr;
189-
st_JsonRoot["tszUserArea"] = pSt_PeerInfo->tszUserArea;
189+
st_JsonRoot["tszUserISP"] = pSt_PeerInfo->tszUserISP;
190190
st_JsonRoot["tszUserLocation"] = pSt_PeerInfo->tszUserLocation;
191191
st_JsonRoot["tszUserName"] = pSt_PeerInfo->tszUserName;
192192

XEngine_Source/XEngine_StorageApp/StorageApp_P2XPNet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ BOOL XEngine_Task_TCPP2xp(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCTSTR lpszClie
7373
NetXApi_Address_IPtoAddr(st_ClientPeer.st_PeerAddr.tszPublicAddr, tszLocation, tszISPInfo);
7474
int nLen = _tcslen(tszISPInfo);
7575
BaseLib_OperatorString_UTFToAnsi(tszLocation, st_ClientPeer.st_PeerAddr.tszUserLocation, &nLen);
76-
BaseLib_OperatorString_UTFToAnsi(tszISPInfo, st_ClientPeer.st_PeerAddr.tszUserArea, &nLen);
76+
BaseLib_OperatorString_UTFToAnsi(tszISPInfo, st_ClientPeer.st_PeerAddr.tszUserISP, &nLen);
7777
#else
7878
NetXApi_Address_IPtoAddr(st_ClientPeer.st_PeerAddr.tszPublicAddr, st_ClientPeer.st_PeerAddr.tszUserLocation, st_ClientPeer.st_PeerAddr.tszUserArea);
7979
#endif

XEngine_Source/XStorage_Protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ typedef struct tag_XEngine_P2XPPeer_Protocol
3939
CHAR tszPublicAddr[32]; //外网地址
4040
CHAR tszConnectAddr[32]; //链接地址
4141
CHAR tszUserLocation[32]; //位置信息
42-
CHAR tszUserArea[20]; //用户ISP
42+
CHAR tszUserISP[20]; //用户ISP
4343
WORD dwConnectType; //连接类型
4444
WORD dwPeerType; //节点类型
4545
}XENGINE_P2XPPEER_PROTOCOL, * LPXENGINE_P2XPPEER_PROTOCOL;

0 commit comments

Comments
 (0)