update:match xengine v9

Author: xengine-qyt

README.en.md

@@ -7,7 +7,7 @@ c c++ SOCKS5代理服务 HTTP Tunnel隧道代理服务 tcp转发服务
 c c++ Socks5 Proxy Service,HTTP Tunnel Proxy Service,tcp forward service  
 
 ## Notice
-Starting from 2024.11.15, the compiled release version will only be released on github.
+the compiled release version will only be released on github.
 
 #### Software Architecture
 the software developed based on xengine,using c/c++ development  
@@ -27,7 +27,7 @@ this software support following features
 ## install
 
 #### XEngine Evn
-you must install XEngine,need V8.15 or above,install XEngine can be refer to xengine Readme docment  
+you must install XEngine,need V9.x or above,install XEngine can be refer to xengine Readme docment  
 GITEE:https://gitee.com/xyry/libxengine  
 GITHUB:https://github.com/libxengine/xengine
 

README.md

@@ -4,7 +4,7 @@
 只要仓库不是在暂停状态,那么就会有人一直维护和开发,请放心使用  
 
 ## 注意
-自2024.11.15起.编译发布版本将只在github上面发布.
+编译发布版本将只在github上面发布.
 
 ## 介绍
 c c++ SOCKS5代理服务 HTTP Tunnel隧道代理服务 tcp转发服务  
@@ -27,7 +27,7 @@ c c++ Socks5 Proxy Service,HTTP Tunnel Proxy Service,tcp forward service
 ## 安装教程
 
 #### XEngine环境
-必须安装XEngine,版本需要V8.15或者以上版本,安装XEngine可以参考其Readme文档  
+必须安装XEngine,版本需要V9.x或者以上版本,安装XEngine可以参考其Readme文档  
 GITEE:https://gitee.com/xyry/libxengine  
 GITHUB:https://github.com/libxengine/xengine
 

XEngine_Source/XEngine_ModuleSession/ModuleSession_Forward/ModuleSession_Forward.cpp

@@ -112,7 +112,7 @@ bool CModuleSession_Forward::ModuleSession_Forward_List(SESSION_FORWARD*** pppSt
 	{
 		*pInt_Count = stl_MapSession.size() - 1;   //减去自己
 	}
-	BaseLib_OperatorMemory_Malloc((XPPPMEM)pppSt_ListUser, *pInt_Count, sizeof(SESSION_FORWARD));
+	BaseLib_Memory_Malloc((XPPPMEM)pppSt_ListUser, *pInt_Count, sizeof(SESSION_FORWARD));
 	//遍历
 	auto stl_MapIterator = stl_MapSession.begin();
 	for (int i = 0; stl_MapIterator != stl_MapSession.end(); stl_MapIterator++, i++)

XEngine_Source/XEngine_ModuleSession/ModuleSession_Socks/ModuleSession_Socks.cpp

@@ -249,7 +249,7 @@ bool CModuleSession_Socks::ModuleSession_Socks_GetList(XPPPMEM xpppMem, int* pIn
 	st_Locker.lock_shared();
 
 	*pInt_Count = stl_MapClients.size();
-	BaseLib_OperatorMemory_Malloc(xpppMem, *pInt_Count, nSize);
+	BaseLib_Memory_Malloc(xpppMem, *pInt_Count, nSize);
 
 	unordered_map<tstring, RFCPROTOCOL_SOCKS5CLIENT*>::const_iterator stl_MapIterator = stl_MapClients.begin();
 	for (int i = 0; stl_MapIterator != stl_MapClients.end(); stl_MapIterator++, i++)
@@ -379,7 +379,7 @@ bool CModuleSession_Socks::ModuleSession_Socks_List(XCHAR*** ppptszClientList, i
 	*pInt_ListCount = stl_MapClients.size();
 	if (NULL != ppptszClientList)
 	{
-		BaseLib_OperatorMemory_Malloc((XPPPMEM)ppptszClientList, stl_MapClients.size(), 128);
+		BaseLib_Memory_Malloc((XPPPMEM)ppptszClientList, stl_MapClients.size(), 128);
 		auto stl_MapIterator = stl_MapClients.begin();
 		for (int i = 0; stl_MapIterator != stl_MapClients.end(); stl_MapIterator++)
 		{

XEngine_Source/XEngine_ModuleSession/ModuleSession_Tunnel/ModuleSession_Tunnel.cpp

@@ -261,7 +261,7 @@ bool CModuleSession_Tunnel::ModuleSession_Tunnel_GetList(XPPPMEM xpppMem, int* p
 	st_Locker.lock_shared();
 
 	*pInt_Count = stl_MapClient.size();
-	BaseLib_OperatorMemory_Malloc(xpppMem, *pInt_Count, nSize);
+	BaseLib_Memory_Malloc(xpppMem, *pInt_Count, nSize);
 	unordered_map<tstring, PROXYTUNNEL_CLIENTINFO*>::const_iterator stl_MapIterator = stl_MapClient.begin();
     for (int i = 0; stl_MapIterator != stl_MapClient.end(); stl_MapIterator++, i++)
 	{
@@ -375,7 +375,7 @@ bool CModuleSession_Tunnel::ModuleSession_Tunnel_List(XCHAR*** ppptszClientList,
 	*pInt_ListCount = stl_MapClient.size();
 	if (NULL != ppptszClientList)
 	{
-		BaseLib_OperatorMemory_Malloc((XPPPMEM)ppptszClientList, stl_MapClient.size(), 128);
+		BaseLib_Memory_Malloc((XPPPMEM)ppptszClientList, stl_MapClient.size(), 128);
 		auto stl_MapIterator = stl_MapClient.begin();
 		for (int i = 0; stl_MapIterator != stl_MapClient.end(); stl_MapIterator++)
 		{

XEngine_Source/XEngine_ServiceApp/XEngine_ForwardTask.cpp

@@ -34,10 +34,10 @@ XHTHREAD CALLBACK XEngine_Forward_Thread(XPVOID lParam)
 			if (HelpComponents_Datas_GetMemoryEx(xhForwardPacket, ppSt_ListClient[i]->tszClientAddr, &ptszMsgBuffer, &nMsgLen, &st_ProtocolHdr))
 			{
 				XEngine_Forward_Handle(ppSt_ListClient[i]->tszClientAddr, ptszMsgBuffer, nMsgLen, &st_ProtocolHdr);
-				BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
+				BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);
 			}
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSt_ListClient, nListCount);
 	}
 	return 0;
 }
@@ -87,7 +87,7 @@ bool XEngine_Forward_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
 			pSt_ProtocolHdr->unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_FORWARD_LISTREP;
 			ModuleSession_Forward_List(&ppSt_ListUser, &nListCount, lpszClientAddr);
 			ModuleProtocol_Packet_ForwardList(tszSDBuffer, &nSDLen, pSt_ProtocolHdr, &ppSt_ListUser, nListCount);
-			BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ListUser, nListCount);
+			BaseLib_Memory_Free((XPPPMEM)&ppSt_ListUser, nListCount);
 			XEngine_Network_Send(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_CLIENT_NETTYPE_FORWARD);
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Forward客户端：%s，请求可用转发列表成功"), lpszClientAddr);
 		}
@@ -130,7 +130,7 @@ bool XEngine_Forward_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
 			//匿名绑定,请求连接
 			int nPort = 0;
 			XNETHANDLE xhClient = 0;
-			BaseLib_OperatorIPAddr_SegAddr(tszDstAddr, &nPort);
+			APIAddr_IPAddr_SegAddr(tszDstAddr, &nPort);
 			if (!XClient_TCPSelect_InsertEx(xhForwardClient, &xhClient, tszDstAddr, nPort))
 			{
 				pSt_ProtocolHdr->wReserve = 500;
@@ -183,5 +183,5 @@ void CALLBACK XEngine_Forward_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCK
 			break;
 		}
 	}
-	BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
+	BaseLib_Memory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
 }

XEngine_Source/XEngine_ServiceApp/XEngine_Hdr.h

@@ -31,12 +31,14 @@ using namespace std;
 #include <XEngine_Include/XEngine_Core/NetCore_Error.h>
 #include <XEngine_Include/XEngine_Core/ManagePool_Define.h>
 #include <XEngine_Include/XEngine_Core/ManagePool_Error.h>
-#include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
-#include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Define.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Error.h>
 #include <XEngine_Include/XEngine_NetHelp/XSocket_Define.h>
 #include <XEngine_Include/XEngine_NetHelp/XSocket_Error.h>
 #include <XEngine_Include/XEngine_NetHelp/APIHelp_Define.h>
 #include <XEngine_Include/XEngine_NetHelp/APIHelp_Error.h>
+#include <XEngine_Include/XEngine_NetHelp/APIAddr_Define.h>
+#include <XEngine_Include/XEngine_NetHelp/APIAddr_Error.h>
 #include <XEngine_Include/XEngine_HelpComponents/XLog_Define.h>
 #include <XEngine_Include/XEngine_HelpComponents/XLog_Error.h>
 #include <XEngine_Include/XEngine_HelpComponents/Packets_Define.h>
@@ -138,9 +140,10 @@ typedef struct
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
 #pragma comment(lib,"XEngine_Core/XEngine_Core.lib")
 #pragma comment(lib,"XEngine_Core/XEngine_ManagePool.lib")
-#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl.lib")
+#pragma comment(lib,"XEngine_Core/XEngine_Cryption.lib")
 #pragma comment(lib,"XEngine_Client/XClient_Socket.lib")
 #pragma comment(lib,"XEngine_NetHelp/NetHelp_APIHelp.lib")
+#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIAddr.lib")
 #pragma comment(lib,"XEngine_NetHelp/NetHelp_XSocket.lib")
 #pragma comment(lib,"XEngine_HelpComponents/HelpComponents_XLog.lib")
 #pragma comment(lib,"XEngine_HelpComponents/HelpComponents_Packets.lib")

XEngine_Source/XEngine_ServiceApp/XEngine_Network.cpp

@@ -128,7 +128,7 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, int nIPProto, int nCloseType)
 				break;
 			}
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
 		ModuleSession_Socks_Delete(lpszClientAddr);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("SOCKS客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);
 	}
@@ -159,7 +159,7 @@ void XEngine_Network_Close(LPCXSTR lpszClientAddr, int nIPProto, int nCloseType)
 				break;
 			}
 		}
-		BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
+		BaseLib_Memory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
 		ModuleSession_Tunnel_Delete(lpszClientAddr);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Tunnel客户端:%s,离开服务器,离开类型;%d"), lpszClientAddr, nCloseType);
 	}

XEngine_Source/XEngine_ServiceApp/XEngine_ServiceApp.cpp

@@ -83,7 +83,7 @@ LONG WINAPI Coredump_ExceptionFilter(EXCEPTION_POINTERS* pExceptionPointers)
 	static int i = 0;
 	XCHAR tszFileStr[MAX_PATH] = {};
 	XCHAR tszTimeStr[128] = {};
-	BaseLib_OperatorTime_TimeToStr(tszTimeStr);
+	BaseLib_Time_TimeToStr(tszTimeStr);
 	_xstprintf(tszFileStr, _X("./XEngine_Coredump/dumpfile_%s_%d.dmp"), tszTimeStr, i++);
 
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_FATAL, _X("主程序:软件崩溃,写入dump:%s"), tszFileStr);
@@ -139,10 +139,10 @@ int main(int argc, char** argv)
 	HelpComponents_XLog_SetLogPriority(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO);
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,初始化日志系统成功"));
 
-	BaseLib_OperatorVer_XGetStu(&st_VERXEngine);
+	BaseLib_Version_XGetStu(&st_VERXEngine);
 	if (st_VERXEngine.nVerCore < 8 || st_VERXEngine.nVerMain < 39)
 	{
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,当前XEngine:%s 版本过低,无法正常使用"), BaseLib_OperatorVer_XNumberStr());
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,当前XEngine:%s 版本过低,无法正常使用"), BaseLib_Version_XNumberStr());
 		goto XENGINE_SERVICEAPP_EXIT;
 	}
 
@@ -271,7 +271,7 @@ int main(int argc, char** argv)
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,注册Forward网络事件成功"));
 		//任务池
 		THREADPOOL_PARAMENT** ppSt_ListParam;
-		BaseLib_OperatorMemory_Malloc((XPPPMEM)&ppSt_ListParam, st_ServiceConfig.st_XMax.nForwardThread, sizeof(THREADPOOL_PARAMENT));
+		BaseLib_Memory_Malloc((XPPPMEM)&ppSt_ListParam, st_ServiceConfig.st_XMax.nForwardThread, sizeof(THREADPOOL_PARAMENT));
 		for (int i = 0; i < st_ServiceConfig.st_XMax.nForwardThread; i++)
 		{
 			int* pInt_Pos = new int;
@@ -319,7 +319,7 @@ int main(int argc, char** argv)
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，信息报告给API服务器没有启用"));
 	}
 
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数:%d。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动,服务运行中,XEngine版本:%s%s,服务版本:%s,发行次数:%d。。。"), BaseLib_Version_XNumberStr(), BaseLib_Version_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str(), st_ServiceConfig.st_XVer.pStl_ListVer->size());
 
 	while (true)
 	{

XEngine_Source/XEngine_ServiceApp/XEngine_SocksTask.cpp

@@ -127,12 +127,12 @@ bool XEngine_SocksTask_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 			{
 				int nListCount = 0;
 				XCHAR** ppszListAddr;
-				ENUM_APIHELP_DOMAINTYPE enDomainType;
-				APIHELP_DOMAIN st_APIUrl;
+				ENUM_NETHELP_APIADDR_DOMAIN_TYPE enDomainType;
+				APIADDR_DOMAIN st_APIUrl;
 
-				memset(&st_APIUrl, '\0', sizeof(APIHELP_DOMAIN));
+				memset(&st_APIUrl, '\0', sizeof(APIADDR_DOMAIN));
 
-				APIHelp_Domain_GetInfo(tszClientAddr, &st_APIUrl, &enDomainType);
+				APIAddr_Domain_GetInfo(tszClientAddr, &st_APIUrl, &enDomainType);
 				memset(tszClientAddr, '\0', sizeof(tszClientAddr));
 				if (_tcsxlen(st_APIUrl.tszSubDomain) > 0)
 				{
@@ -150,7 +150,7 @@ bool XEngine_SocksTask_Handle(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 				}
 				memset(tszClientAddr, '\0', sizeof(tszClientAddr));
 				_tcsxcpy(tszClientAddr, ppszListAddr[0]);   //随便选择一个IP地址
-				BaseLib_OperatorMemory_Free((XPPPMEM)&ppszListAddr, nListCount);
+				BaseLib_Memory_Free((XPPPMEM)&ppszListAddr, nListCount);
 				if (!XClient_TCPSelect_InsertEx(xhSocksClient, &st_ProxyClient.xhClient, tszClientAddr, nPort))
 				{
 					XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("SOCKS客户端:%s,创建客户端连接失败,连接到服务器:%s:%d,错误:%lX"), lpszClientAddr, tszClientAddr, nPort, XClient_GetLastError());
@@ -211,5 +211,5 @@ void CALLBACK XEngine_Socks_CBRecv(XHANDLE xhToken, XNETHANDLE xhClient, XSOCKET
 			break;
 		}
 	}
-	BaseLib_OperatorMemory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
+	BaseLib_Memory_Free((XPPPMEM)&ppSt_ClientList, nListCount);
 }