Skip to content

Commit 08ea34a

Browse files
committed
update:CHANGELOG
modify:configure file filed for proxy
1 parent 299e277 commit 08ea34a

File tree

7 files changed

+41
-12
lines changed

7 files changed

+41
-12
lines changed

CHANGELOG

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
XEngine_ProxyServer V1.12.0.1001
2+
3+
增加:windows arm64编译支持
4+
增加:更多发布构建支持
5+
更新:三方库
6+
优化:更多参数解析
7+
优化:转发协议代码
8+
修改:统一转发和隧道代理错误
9+
修改:匿名转发打印问题
10+
修改:全代理多后端支持
11+
修正:没有输出转发绑定错误信息的问题
12+
修正:转发网络的问题在接受数据时不会区分命名和匿名数据
13+
修正:匿名保存客户端地址丢失问题
14+
修正:隧道和SOCKS初始化协议没有响应
15+
16+
added:windows arm64 build support
17+
added:release and build more support
18+
update:depend library
19+
improved:parameter parse more support
20+
improved:forward protocol handle
21+
modify:unified forward and tunnel error code
22+
modify:print port for anny forward
23+
modify:multi back-end support for proxy full
24+
fixed:not print forward bind error
25+
fixed:issue with forwarding network not distinguishing between named and anonymized data when accepting data
26+
fixed:anony save client addr lost port
27+
fixed:tunnel and socks init protocol failed not response
28+
======================================================================================
129
XEngine_ProxyServer V1.11.0.1001
230

331
增加:全代理转发模式支持

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"XProxy": {
3434
"bEnable": false,
3535
"tszDefaultAddr": "10.0.4.69:5403",
36-
"tszIPAddr": [
36+
"tszRuleIPAddr": [
3737
"10.0.0.1-10.0.4.69:5403",
3838
"5000-10.0.4.69:5403"
3939
]

XEngine_Release/XEngine_Config/XEngine_Version.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"XVer": [
3+
"1.12.0.1001 Build20250325",
34
"1.11.0.1001 Build20250121",
45
"1.10.0.1001 Build20241115",
56
"1.9.0.1001 Build20240910",

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ typedef struct tag_XEngine_ServiceConfig
5353
struct
5454
{
5555
bool bEnable;
56-
XCHAR tszIPAddr[128];
57-
std::list<xstring>* pStl_ListIPAddr;
56+
XCHAR tszDefaultAddr[128];
57+
std::list<xstring>* pStl_ListRuleAddr;
5858
}st_XProxy;
5959
struct
6060
{

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
146146
}
147147
Json::Value st_JsonXProxy = st_JsonRoot["XProxy"];
148148

149-
pSt_ServerConfig->st_XProxy.pStl_ListIPAddr = new list<xstring>;
149+
pSt_ServerConfig->st_XProxy.pStl_ListRuleAddr = new list<xstring>;
150150
pSt_ServerConfig->st_XProxy.bEnable = st_JsonXProxy["bEnable"].asBool();
151-
_tcsxcpy(pSt_ServerConfig->st_XProxy.tszIPAddr, st_JsonXProxy["tszDefaultAddr"].asCString());
152-
if (!st_JsonXProxy["tszIPAddr"].isNull())
151+
_tcsxcpy(pSt_ServerConfig->st_XProxy.tszDefaultAddr, st_JsonXProxy["tszDefaultAddr"].asCString());
152+
if (!st_JsonXProxy["tszRuleIPAddr"].isNull())
153153
{
154-
for (unsigned int i = 0; i < st_JsonXProxy["tszIPAddr"].size(); i++)
154+
for (unsigned int i = 0; i < st_JsonXProxy["tszRuleIPAddr"].size(); i++)
155155
{
156-
pSt_ServerConfig->st_XProxy.pStl_ListIPAddr->push_back(st_JsonXProxy["tszIPAddr"][i].asCString());
156+
pSt_ServerConfig->st_XProxy.pStl_ListRuleAddr->push_back(st_JsonXProxy["tszRuleIPAddr"][i].asCString());
157157
}
158158
}
159159
return true;

XEngine_Source/XEngine_ServiceApp/XEngine_ProxyTask.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ bool XEngine_Proxy_Connect(LPCXSTR lpszClientAddr)
2323
APIAddr_IPAddr_SegAddr(tszSrcIPAddr, &nSrcPort);
2424

2525
bool bFound = false;
26-
auto stl_ListIterator = st_ServiceConfig.st_XProxy.pStl_ListIPAddr->begin();
27-
for (; stl_ListIterator != st_ServiceConfig.st_XProxy.pStl_ListIPAddr->end(); stl_ListIterator++)
26+
auto stl_ListIterator = st_ServiceConfig.st_XProxy.pStl_ListRuleAddr->begin();
27+
for (; stl_ListIterator != st_ServiceConfig.st_XProxy.pStl_ListRuleAddr->end(); stl_ListIterator++)
2828
{
2929
XCHAR tszTmpIPAddr[128] = {};
3030
_stxscanf(stl_ListIterator->c_str(), _X("%[^-]-%s"), tszTmpIPAddr, tszDstIPAddr);
@@ -54,7 +54,7 @@ bool XEngine_Proxy_Connect(LPCXSTR lpszClientAddr)
5454

5555
if (!bFound)
5656
{
57-
_tcsxcpy(tszDstIPAddr, st_ServiceConfig.st_XProxy.tszIPAddr);
57+
_tcsxcpy(tszDstIPAddr, st_ServiceConfig.st_XProxy.tszDefaultAddr);
5858
APIAddr_IPAddr_SegAddr(tszDstIPAddr, &nDstPort);
5959
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Proxy客户端:%s,代理转未命中,使用默认地址:%s:%d"), lpszClientAddr, tszDstIPAddr, nDstPort);
6060
}

XEngine_Source/XEngine_ServiceApp/XEngine_ServiceApp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ int main(int argc, char** argv)
334334
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动Proxy网络服务器失败,错误:%lX"), NetCore_GetLastError());
335335
goto XENGINE_SERVICEAPP_EXIT;
336336
}
337-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动Proxy网络服务器成功,Proxy端口:%d,配置个数:%d,IO:%d"), st_ServiceConfig.nProxyPort, st_ServiceConfig.st_XProxy.pStl_ListIPAddr->size(), st_ServiceConfig.st_XMax.nIOThread);
337+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动Proxy网络服务器成功,Proxy端口:%d,默认地址:%s 配置个数:%d,IO:%d"), st_ServiceConfig.nProxyPort, st_ServiceConfig.st_XProxy.tszDefaultAddr, st_ServiceConfig.st_XProxy.pStl_ListRuleAddr->size(), st_ServiceConfig.st_XMax.nIOThread);
338338
NetCore_TCPXCore_RegisterCallBackEx(xhProxySocket, Network_Callback_ProxyLogin, Network_Callback_ProxyRecv, Network_Callback_ProxyLeave);
339339
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册Proxy网络事件成功"));
340340
//客户端

0 commit comments

Comments
 (0)