Skip to content

Commit 59453db

Browse files
committed
fixed:tunnel and socks init protocol failed not response
1 parent 835f492 commit 59453db

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

XEngine_Source/XEngine_ServiceApp/XEngine_SocksTask.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ bool XEngine_SocksTask_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
1919
ENUM_PROXY_SESSION_SOCKS_STATUS enSocksStatus;
2020
if (!ModuleSession_Socks_GetStatus(lpszClientAddr, &enSocksStatus))
2121
{
22+
SocketOpt_HeartBeat_ForceOutAddrEx(xhSocksHeart, lpszClientAddr);
2223
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("SOCKS客户端:%s,获取状态失败,错误:%lX"), lpszClientAddr, ProxyProtocol_GetLastError());
2324
return false;
2425
}

XEngine_Source/XEngine_ServiceApp/XEngine_TunnelTask.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ bool XEngine_TunnelTask_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, in
3131
memset(tszMsgBuffer, '\0', MAX_PATH);
3232
if (!ModuleSession_Tunnel_Packet(lpszClientAddr, lpszMsgBuffer, nMsgLen, tszMsgBuffer, &nLen))
3333
{
34+
ProxyProtocol_TunnelCore_Packet(tszMsgBuffer, &nLen, 400);
35+
XEngine_Network_Send(lpszClientAddr, tszMsgBuffer, nLen, XENGINE_CLIENT_NETTYPE_TUNNEL);
3436
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("Tunnel客户端:%s,解析协议不成功,可能因为数据不完整,需要等待完整包,错误码:%lX"), lpszClientAddr, ProxyProtocol_GetLastError());
3537
return false;
3638
}

XEngine_Source/XEngine_UserProtocol.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ typedef enum en_XEngine_XUser_Protocol
2929
///////////////////////////////////////////////////////////////////////////
3030
// 导出的数据结构
3131
///////////////////////////////////////////////////////////////////////////
32+
#define ERROR_XENGINE_PROXY_PROTOCOL_FORMAT 0x01 //协议格式内容错误
33+
///////////////////////////////////////////////////////////////////////////
34+
// 导出的数据结构
35+
///////////////////////////////////////////////////////////////////////////
3236
#pragma pack(push)
3337
#pragma pack(1)
3438

0 commit comments

Comments
 (0)