Skip to content

Commit 2729220

Browse files
xengine-qytxengine-qyt
committed
modify:proxy forward mode 0 support
1 parent ffc60a7 commit 2729220

9 files changed

Lines changed: 14 additions & 41 deletions

File tree

‎XEngine_Source/XEngine_ModuleHelp/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FILEEXT =
44
LIBFLAG =
55
LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
66
LOADSO =
7-
LIB = -lXEngine_BaseLib -lXEngine_Algorithm
7+
LIB = -lXEngine_BaseLib
88
LIBEX =
99
OBJECTS = ModuleHelp_APIHelp.o pch.o
1010

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_APIHelp/ModuleHelp_APIHelp.cpp‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,6 @@ CModuleHelp_APIHelp::~CModuleHelp_APIHelp()
2323
// 公用函数
2424
//////////////////////////////////////////////////////////////////////////
2525
/********************************************************************
26-
函数名称：ModuleSession_Forward_Insert
27-
函数功能：插入一条记录到会话中
28-
参数.一：lpszAddr
29-
In/Out：In
30-
类型：常量字符指针
31-
可空：N
32-
意思：输入要插入的客户端
33-
参数.二：pSt_UserAuth
34-
In/Out：In
35-
类型：数据结构指针
36-
可空：N
37-
意思：输入要保存的客户端附加数据
38-
返回值
39-
类型：逻辑型
40-
意思：是否成功
41-
备注：
42-
*********************************************************************/
43-
bool CModuleHelp_APIHelp::ModuleHelp_APIHelp_RuleIPSelect(SESSION_IPCONUT*** pppSt_IPCount, int nIPCount)
44-
{
45-
APIHelp_IsErrorOccur = false;
46-
47-
ModuleHelp_APIHelp_QSort(pppSt_IPCount, nIPCount, sizeof(SESSION_IPCONUT));
48-
for (int i = 0; i < nIPCount; i++)
49-
{
50-
51-
}
52-
return true;
53-
}
54-
/********************************************************************
5526
函数名称：ModuleHelp_APIHelp_QSort
5627
函数功能：快速排序算法
5728
参数.一：lPBase

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_APIHelp/ModuleHelp_APIHelp.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class CModuleHelp_APIHelp
1717
CModuleHelp_APIHelp();
1818
~CModuleHelp_APIHelp();
1919
public:
20-
bool ModuleHelp_APIHelp_RuleIPSelect(SESSION_IPCONUT*** pppSt_IPCount, int nIPCount);
2120
bool ModuleHelp_APIHelp_QSort(XPVOID lPBase, int nNumber, int nSize);
2221
private:
2322
static int ModuleHelp_APIHelp_QSortCmp(const void* lParam, const void* WParam);

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Define.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern "C" XLONG ModuleHelp_GetLastError(int* pInt_SysError = NULL);
1717
/************************************************************************/
1818
/* 帮助函数 */
1919
/************************************************************************/
20-
extern "C" bool ModuleHelp_APIHelp_RuleIPSelect(SESSION_IPCONUT*** pppSt_IPCount, int nIPCount);
2120
/********************************************************************
2221
函数名称：ModuleHelp_APIHelp_QSort
2322
函数功能：快速排序算法

‎XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ LIBRARY
33
EXPORTS
44
ModuleHelp_GetLastError
55

6-
ModuleHelp_APIHelp_RuleIPSelect
76
ModuleHelp_APIHelp_QSort

‎XEngine_Source/XEngine_ModuleHelp/pch.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ extern "C" XLONG ModuleHelp_GetLastError(int* pInt_SysError)
2929
/************************************************************************/
3030
/* 帮助函数 */
3131
/************************************************************************/
32-
extern "C" bool ModuleHelp_APIHelp_RuleIPSelect(SESSION_IPCONUT*** pppSt_IPCount, int nIPCount)
33-
{
34-
return m_APIHelp.ModuleHelp_APIHelp_RuleIPSelect(pppSt_IPCount, nIPCount);
35-
}
3632
extern "C" bool ModuleHelp_APIHelp_QSort(XPVOID lPBase, int nNumber, int nSize)
3733
{
3834
return m_APIHelp.ModuleHelp_APIHelp_QSort(lPBase, nNumber, nSize);

‎XEngine_Source/XEngine_ModuleHelp/pch.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ using namespace std;
2424
#include <XEngine_Include/XEngine_ProtocolHdr.h>
2525
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
2626
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
27-
#include <XEngine_Include/XEngine_BaseLib/Algorithm_Define.h>
28-
#include <XEngine_Include/XEngine_BaseLib/Algorithm_Error.h>
2927
#include "../XEngine_ModuleSession/ModuleSession_Define.h"
3028
#include "../XEngine_ModuleSession/ModuleSession_Error.h"
3129
#include "ModuleHelp_Define.h"
@@ -46,5 +44,4 @@ extern XLONG APIHelp_dwErrorCode;
4644

4745
#ifdef _MSC_BUILD
4846
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
49-
#pragma comment(lib,"XEngine_BaseLib/XEngine_Algorithm")
5047
#endif

‎XEngine_Source/XEngine_ServiceApp/XEngine_Hdr.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ using namespace std;
5858
#include "../XEngine_ModuleSession/ModuleSession_Error.h"
5959
#include "../XEngine_ModuleProtocol/ModuleProtocol_Define.h"
6060
#include "../XEngine_ModuleProtocol/ModuleProtocol_Error.h"
61+
#include "../XEngine_ModuleHelp/ModuleHelp_Define.h"
62+
#include "../XEngine_ModuleHelp/ModuleHelp_Error.h"
6163
//加载自己的头文件
6264
#include "XEngine_Configure.h"
6365
#include "XEngine_Network.h"
@@ -138,33 +140,39 @@ typedef struct
138140
#pragma comment(lib,"../x64/Debug/XEngine_ModuleConfigure.lib")
139141
#pragma comment(lib,"../x64/Debug/XEngine_ModuleSession.lib")
140142
#pragma comment(lib,"../x64/Debug/XEngine_ModuleProtocol.lib")
143+
#pragma comment(lib,"../x64/Debug/XEngine_ModuleHelp.lib")
141144
#elif _M_ARM64
142145
#pragma comment(lib,"../ARM64/Debug/XEngine_InfoReport.lib")
143146
#pragma comment(lib,"../ARM64/Debug/XEngine_ModuleConfigure.lib")
144147
#pragma comment(lib,"../ARM64/Debug/XEngine_ModuleSession.lib")
145148
#pragma comment(lib,"../ARM64/Debug/XEngine_ModuleProtocol.lib")
149+
#pragma comment(lib,"../ARM64/Debug/XEngine_ModuleHelp.lib")
146150
#elif _M_IX86
147151
#pragma comment(lib,"../Debug/XEngine_InfoReport.lib")
148152
#pragma comment(lib,"../Debug/XEngine_ModuleConfigure.lib")
149153
#pragma comment(lib,"../Debug/XEngine_ModuleSession.lib")
150154
#pragma comment(lib,"../Debug/XEngine_ModuleProtocol.lib")
155+
#pragma comment(lib,"../Debug/XEngine_ModuleHelp.lib")
151156
#endif
152157
#else
153158
#ifdef _M_X64
154159
#pragma comment(lib,"../x64/Release/XEngine_InfoReport.lib")
155160
#pragma comment(lib,"../x64/Release/XEngine_ModuleConfigure.lib")
156161
#pragma comment(lib,"../x64/Release/XEngine_ModuleSession.lib")
157162
#pragma comment(lib,"../x64/Release/XEngine_ModuleProtocol.lib")
163+
#pragma comment(lib,"../x64/Release/XEngine_ModuleHelp.lib")
158164
#elif _M_ARM64
159165
#pragma comment(lib,"../ARM64/Release/XEngine_InfoReport.lib")
160166
#pragma comment(lib,"../ARM64/Release/XEngine_ModuleConfigure.lib")
161167
#pragma comment(lib,"../ARM64/Release/XEngine_ModuleSession.lib")
162168
#pragma comment(lib,"../ARM64/Release/XEngine_ModuleProtocol.lib")
169+
#pragma comment(lib,"../ARM64/Release/XEngine_ModuleHelp.lib")
163170
#elif _M_IX86
164171
#pragma comment(lib,"../Release/XEngine_InfoReport.lib")
165172
#pragma comment(lib,"../Release/XEngine_ModuleConfigure.lib")
166173
#pragma comment(lib,"../Release/XEngine_ModuleSession.lib")
167174
#pragma comment(lib,"../Release/XEngine_ModuleProtocol.lib")
175+
#pragma comment(lib,"../Release/XEngine_ModuleHelp.lib")
168176
#endif
169177
#endif
170178
#endif

‎XEngine_Source/XEngine_ServiceApp/XEngine_ProxyTask.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@ bool XEngine_Proxy_Connect(LPCXSTR lpszClientAddr)
4949
int nIPCount = 0;
5050
SESSION_IPCONUT** ppSt_IPCount;
5151
ModuleSession_Proxy_GetIPCount(&ppSt_IPCount, &nIPCount);
52+
//排序
53+
ModuleHelp_APIHelp_QSort(ppSt_IPCount, nIPCount, sizeof(SESSION_IPCONUT));
5254

55+
_tcsxcpy(tszIPAddr, ppSt_IPCount[0]->tszIPAddr);
56+
_tcsxcpy(tszDstIPAddr, ppSt_IPCount[0]->tszIPAddr);
5357
APIAddr_IPAddr_SegAddr(tszDstIPAddr, &nDstPort);
5458
}
55-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Proxy客户端:%s,代理转未命中,使用默认地址:%s:%d"), lpszClientAddr, tszDstIPAddr, nDstPort);
59+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Proxy客户端:%s,代理转发规则地址未命中,使用系统规则地址:%s:%d"), lpszClientAddr, tszDstIPAddr, nDstPort);
5660
}
5761
if (!XClient_TCPSelect_InsertEx(xhProxyClient, &xhClient, tszDstIPAddr, nDstPort, false))
5862
{

0 commit comments

Comments
 (0)