Skip to content

Commit 1454f74

Browse files
xengine-qytxengine-qyt
committed
update:match xengine v9.20
update:depend library
1 parent 0e584cd commit 1454f74

13 files changed

+56
-56
lines changed

‎XEngine_Source/XEngine_Depend

Submodule XEngine_Depend updated 61 files

‎XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef struct tag_XEngine_ServiceConfig
3838
}st_XTime; //次数*时间=超时
3939
struct
4040
{
41-
XCHAR tszLogFile[MAX_PATH]; //日志保存路径
41+
XCHAR tszLogFile[XPATH_MAX]; //日志保存路径
4242
int nMaxSize; //最大日志大小
4343
int nMaxCount; //最大日志个数
4444
int nLogLeave; //日志等级
@@ -47,7 +47,7 @@ typedef struct tag_XEngine_ServiceConfig
4747
struct
4848
{
4949
bool bEnable;
50-
XCHAR tszAPIUrl[MAX_PATH];
50+
XCHAR tszAPIUrl[XPATH_MAX];
5151
XCHAR tszServiceName[128];
5252
}st_XReport;
5353
struct

‎XEngine_Source/XEngine_ServiceApp/XEngine_ForwardTask.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Purpose: 代理转发协议
1111
// History:
1212
*********************************************************************/
13-
XHTHREAD CALLBACK XEngine_Forward_Thread(XPVOID lParam)
13+
XHTHREAD XCALLBACK XEngine_Forward_Thread(XPVOID lParam)
1414
{
1515
int nPoolIndex = *(int*)lParam;
1616
int nThreadPos = nPoolIndex + 1;
@@ -177,7 +177,7 @@ bool XEngine_Forward_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
177177
}
178178
return true;
179179
}
180-
void CALLBACK XEngine_Forward_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nLen, XPVOID lParam)
180+
void XCALLBACK XEngine_Forward_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nLen, XPVOID lParam)
181181
{
182182
int nListCount = 0;
183183
SESSION_FORWARD** ppSt_ClientList;

‎XEngine_Source/XEngine_ServiceApp/XEngine_ForwardTask.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
// History:
1212
*********************************************************************/
1313
//任务处理相关函数,处理包的内容
14-
XHTHREAD CALLBACK XEngine_Forward_Thread(XPVOID lParam);
14+
XHTHREAD XCALLBACK XEngine_Forward_Thread(XPVOID lParam);
1515
bool XEngine_Forward_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, XENGINE_PROTOCOLHDR* pSt_ProtocolHdr);
16-
void CALLBACK XEngine_Forward_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nLen, XPVOID lParam);
16+
void XCALLBACK XEngine_Forward_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nLen, XPVOID lParam);

‎XEngine_Source/XEngine_ServiceApp/XEngine_Network.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,62 @@
1111
// History:
1212
*********************************************************************/
1313
//////////////////////////////////////////////////////////////////////////下面是SOCKS网络IO相关代码处理函数
14-
bool CALLBACK Network_Callback_SocksLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
14+
bool XCALLBACK Network_Callback_SocksLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
1515
{
1616
//客户端连接后要把客户端插入心跳管理器中才有效
1717
ModuleSession_Socks_Create(lpszClientAddr);
1818
SocketOpt_HeartBeat_InsertAddrEx(xhSocksHeart, lpszClientAddr);
1919
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("SOCKS客户端:%s,连接到服务器"), lpszClientAddr);
2020
return true;
2121
}
22-
void CALLBACK Network_Callback_SocksRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
22+
void XCALLBACK Network_Callback_SocksRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
2323
{
2424
//需要激活一次
2525
XEngine_SocksTask_Handle(lpszClientAddr, lpszRecvMsg, nMsgLen);
2626
SocketOpt_HeartBeat_ActiveAddrEx(xhSocksHeart, lpszClientAddr);
2727
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("SOCKS客户端:%s,投递数据包到组包队列成功,大小:%d"), lpszClientAddr, nMsgLen);
2828
}
29-
void CALLBACK Network_Callback_SocksLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
29+
void XCALLBACK Network_Callback_SocksLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
3030
{
3131
//交给指定函数来处理客户端离开消息
3232
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_SOCKS, XENGINE_CLIENT_CLOSE_NETWORK);
3333
}
34-
void CALLBACK Network_Callback_SocksHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
34+
void XCALLBACK Network_Callback_SocksHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
3535
{
3636
//同上
3737
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_SOCKS, XENGINE_CLIENT_CLOSE_HEARTBEAT);
3838
}
3939
//////////////////////////////////////////////////////////////////////////下面是Tunnel网络IO相关代码处理函数
40-
bool CALLBACK Network_Callback_TunnelLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
40+
bool XCALLBACK Network_Callback_TunnelLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
4141
{
4242
ModuleSession_Tunnel_Create(lpszClientAddr);
4343
SocketOpt_HeartBeat_InsertAddrEx(xhTunnelHeart, lpszClientAddr);
4444
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Tunnel客户端:%s,连接到服务器"), lpszClientAddr);
4545
return true;
4646
}
47-
void CALLBACK Network_Callback_TunnelRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
47+
void XCALLBACK Network_Callback_TunnelRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
4848
{
4949
XEngine_TunnelTask_Handle(lpszClientAddr, lpszRecvMsg, nMsgLen);
5050
SocketOpt_HeartBeat_ActiveAddrEx(xhTunnelHeart, lpszClientAddr);
5151
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("Tunnel客户端:%s,投递数据包到组包队列成功,大小:%d"), lpszClientAddr, nMsgLen);
5252
}
53-
void CALLBACK Network_Callback_TunnelLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
53+
void XCALLBACK Network_Callback_TunnelLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
5454
{
5555
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_TUNNEL, XENGINE_CLIENT_CLOSE_NETWORK);
5656
}
57-
void CALLBACK Network_Callback_TunnelHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
57+
void XCALLBACK Network_Callback_TunnelHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
5858
{
5959
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_TUNNEL, XENGINE_CLIENT_CLOSE_HEARTBEAT);
6060
}
6161
//////////////////////////////////////////////////////////////////////////下面是Tunnel网络IO相关代码处理函数
62-
bool CALLBACK Network_Callback_ForwardLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
62+
bool XCALLBACK Network_Callback_ForwardLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
6363
{
6464
HelpComponents_Datas_CreateEx(xhForwardPacket, lpszClientAddr);
6565
SocketOpt_HeartBeat_InsertAddrEx(xhForwardHeart, lpszClientAddr);
6666
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Forward客户端:%s,连接到服务器"), lpszClientAddr);
6767
return true;
6868
}
69-
void CALLBACK Network_Callback_ForwardRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
69+
void XCALLBACK Network_Callback_ForwardRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
7070
{
7171
SESSION_FORWARD st_ForwardClinet = {};
7272
if (ModuleSession_Forward_Get(lpszClientAddr, &st_ForwardClinet))
@@ -111,28 +111,28 @@ void CALLBACK Network_Callback_ForwardRecv(LPCXSTR lpszClientAddr, XSOCKET hSock
111111
SocketOpt_HeartBeat_ActiveAddrEx(xhForwardHeart, lpszClientAddr);
112112
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("Forward客户端:%s,投递数据包到组包队列成功,大小:%d"), lpszClientAddr, nMsgLen);
113113
}
114-
void CALLBACK Network_Callback_ForwardLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
114+
void XCALLBACK Network_Callback_ForwardLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
115115
{
116116
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_FORWARD, XENGINE_CLIENT_CLOSE_NETWORK);
117117
}
118-
void CALLBACK Network_Callback_ForwardHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
118+
void XCALLBACK Network_Callback_ForwardHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
119119
{
120120
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_FORWARD, XENGINE_CLIENT_CLOSE_HEARTBEAT);
121121
}
122122
//////////////////////////////////////////////////////////////////////////Forward相关
123-
bool CALLBACK Network_Callback_ProxyLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
123+
bool XCALLBACK Network_Callback_ProxyLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
124124
{
125125
return XEngine_Proxy_Connect(lpszClientAddr);
126126
}
127-
void CALLBACK Network_Callback_ProxyRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
127+
void XCALLBACK Network_Callback_ProxyRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam)
128128
{
129129
XEngine_Proxy_Recvmsg(lpszClientAddr, lpszRecvMsg, nMsgLen);
130130
}
131-
void CALLBACK Network_Callback_ProxyLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
131+
void XCALLBACK Network_Callback_ProxyLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam)
132132
{
133133
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_PROXY, XENGINE_CLIENT_CLOSE_NETWORK);
134134
}
135-
void CALLBACK Network_Callback_ProxyHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
135+
void XCALLBACK Network_Callback_ProxyHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam)
136136
{
137137
XEngine_Network_Close(lpszClientAddr, XENGINE_CLIENT_NETTYPE_PROXY, XENGINE_CLIENT_CLOSE_HEARTBEAT);
138138
}

‎XEngine_Source/XEngine_ServiceApp/XEngine_Network.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@
1111
// History:
1212
*********************************************************************/
1313
//SOCKS相关
14-
bool CALLBACK Network_Callback_SocksLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam); //用户连接
15-
void CALLBACK Network_Callback_SocksRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam); //接受到数据
16-
void CALLBACK Network_Callback_SocksLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam); //用户离开
17-
void CALLBACK Network_Callback_SocksHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam); //心跳超时
14+
bool XCALLBACK Network_Callback_SocksLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam); //用户连接
15+
void XCALLBACK Network_Callback_SocksRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam); //接受到数据
16+
void XCALLBACK Network_Callback_SocksLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam); //用户离开
17+
void XCALLBACK Network_Callback_SocksHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam); //心跳超时
1818
//Tunnel相关
19-
bool CALLBACK Network_Callback_TunnelLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
20-
void CALLBACK Network_Callback_TunnelRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
21-
void CALLBACK Network_Callback_TunnelLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
22-
void CALLBACK Network_Callback_TunnelHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam);
19+
bool XCALLBACK Network_Callback_TunnelLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
20+
void XCALLBACK Network_Callback_TunnelRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
21+
void XCALLBACK Network_Callback_TunnelLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
22+
void XCALLBACK Network_Callback_TunnelHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam);
2323
//Forward相关
24-
bool CALLBACK Network_Callback_ForwardLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
25-
void CALLBACK Network_Callback_ForwardRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
26-
void CALLBACK Network_Callback_ForwardLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
27-
void CALLBACK Network_Callback_ForwardHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam);
24+
bool XCALLBACK Network_Callback_ForwardLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
25+
void XCALLBACK Network_Callback_ForwardRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
26+
void XCALLBACK Network_Callback_ForwardLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
27+
void XCALLBACK Network_Callback_ForwardHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam);
2828
//Forward相关
29-
bool CALLBACK Network_Callback_ProxyLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
30-
void CALLBACK Network_Callback_ProxyRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
31-
void CALLBACK Network_Callback_ProxyLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
32-
void CALLBACK Network_Callback_ProxyHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam);
29+
bool XCALLBACK Network_Callback_ProxyLogin(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
30+
void XCALLBACK Network_Callback_ProxyRecv(LPCXSTR lpszClientAddr, XSOCKET hSocket, LPCXSTR lpszRecvMsg, int nMsgLen, XPVOID lParam);
31+
void XCALLBACK Network_Callback_ProxyLeave(LPCXSTR lpszClientAddr, XSOCKET hSocket, XPVOID lParam);
32+
void XCALLBACK Network_Callback_ProxyHeart(LPCXSTR lpszClientAddr, XSOCKET hSocket, int nStatus, XPVOID lParam);
3333
//关闭与发送
3434
void XEngine_Network_Close(LPCXSTR lpszClientAddr, int nIPProto, int nCloseType);
3535
bool XEngine_Network_Send(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen, int nIPProto);

‎XEngine_Source/XEngine_ServiceApp/XEngine_ProxyTask.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ bool XEngine_Proxy_Connect(LPCXSTR lpszClientAddr)
9090
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Proxy客户端:%s,连接到服务器:%s:%d 成功"), lpszClientAddr, tszDstIPAddr, nDstPort);
9191
return true;
9292
}
93-
void CALLBACK XEngine_Proxy_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nMsgLen, XPVOID lParam)
93+
void XCALLBACK XEngine_Proxy_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nMsgLen, XPVOID lParam)
9494
{
9595
SESSION_FORWARD st_ProxyInfo = {};
9696
if (!ModuleSession_Proxy_GetForToken(xhClient, &st_ProxyInfo))

‎XEngine_Source/XEngine_ServiceApp/XEngine_ProxyTask.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
// History:
1212
*********************************************************************/
1313
bool XEngine_Proxy_Connect(LPCXSTR lpszClientAddr);
14-
void CALLBACK XEngine_Proxy_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nMsgLen, XPVOID lParam);
14+
void XCALLBACK XEngine_Proxy_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nMsgLen, XPVOID lParam);
1515
bool XEngine_Proxy_Recvmsg(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int nMsgLen);

‎XEngine_Source/XEngine_ServiceApp/XEngine_ServiceApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static int ServiceApp_Deamon()
9090
LONG WINAPI Coredump_ExceptionFilter(EXCEPTION_POINTERS* pExceptionPointers)
9191
{
9292
static int i = 0;
93-
XCHAR tszFileStr[MAX_PATH] = {};
93+
XCHAR tszFileStr[XPATH_MAX] = {};
9494
XCHAR tszTimeStr[128] = {};
9595
BaseLib_Time_TimeToStr(tszTimeStr);
9696
_xstprintf(tszFileStr, _X("./XEngine_Coredump/dumpfile_%s_%d.dmp"), tszTimeStr, i++);

‎XEngine_Source/XEngine_ServiceApp/XEngine_SocksTask.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ bool XEngine_SocksTask_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
3636
return false;
3737
}
3838
bool bFoundAuth = false;
39-
XCHAR tszAuthBuffer[MAX_PATH];
40-
memset(tszAuthBuffer, '\0', MAX_PATH);
39+
XCHAR tszAuthBuffer[XPATH_MAX];
40+
memset(tszAuthBuffer, '\0', XPATH_MAX);
4141

4242
//客户端支持的验证类型
4343
for (int i = 0; i < nListCount; i++)
@@ -69,12 +69,12 @@ bool XEngine_SocksTask_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
6969
}
7070
else if (ENUM_PROXY_SESSION_SOCKS_STATUS_AUTH == enSocksStatus)
7171
{
72-
XCHAR tszUserName[MAX_PATH];
73-
XCHAR tszUserPass[MAX_PATH];
72+
XCHAR tszUserName[XPATH_MAX];
73+
XCHAR tszUserPass[XPATH_MAX];
7474
ENUM_RFCCOMPONENTS_PROXYSOCKS_AUTH enProxyAuth;
7575

76-
memset(tszUserName, '\0', MAX_PATH);
77-
memset(tszUserPass, '\0', MAX_PATH);
76+
memset(tszUserName, '\0', XPATH_MAX);
77+
memset(tszUserPass, '\0', XPATH_MAX);
7878

7979
if (!ProxyProtocol_SocksCore_ParseUser(lpszMsgBuffer, nMsgLen, &enProxyAuth, tszUserName, tszUserPass))
8080
{
@@ -187,7 +187,7 @@ bool XEngine_SocksTask_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
187187
return true;
188188
}
189189

190-
void CALLBACK XEngine_Socks_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nLen, XPVOID lParam)
190+
void XCALLBACK XEngine_Socks_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET hSocket, ENUM_XCLIENT_SOCKET_EVENTS enTCPClientEvents, LPCXSTR lpszMsgBuffer, int nLen, XPVOID lParam)
191191
{
192192
int nListCount = 0;
193193
PROXYPROTOCOL_CLIENTINFO** ppSt_ClientList;

0 commit comments

Comments
 (0)