Merge pull request #9 from libxengine/develop

V1.6.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,24 @@
+XEngine_ProxyServer V1.6.0.1001
+
+增加:数据转发解绑协议支持
+增加:数据转发为会话模块插入现在有用户信息了
+更新:匹配XEngine到V8.15版本
+修改:数据转发枚举用户信息现在有更多信息
+修正:数据转发枚举用户列表没有释放内存的问题
+修正:数据转发用户登录的时候没有创建包管理器的问题
+修正:数据转发用户退出没有释放包资源的问题
+删除:数据转发没有用的协议处理代码
+
+added:unbind protocol supported
+added:insert have user info for session module
+update:match xengine v8.15
+modify:Enumerating users now has more information
+fixed:does not free memory when enum user 
+fixed:forward does not create packet when client login
+fixed:does not delete packet res when client close
+modify:does not close bind client when client close
+delete:unused protocol code
+======================================================================================
 XEngine_ProxyServer V1.5.1.1001
 
 更新:匹配XEngine到V8.x版本

README.en.md

@@ -25,7 +25,7 @@ this software support following features
 ## install
 
 #### XEngine Evn
-you must install XEngine,need V8.10 or above,install XEngine can be refer to xengine Readme docment  
+you must install XEngine,need V8.15 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

@@ -25,7 +25,7 @@ c c++ Socks5 Proxy Service,HTTP Tunnel Proxy Service,tcp forward service
 ## 安装教程
 
 #### XEngine环境
-必须安装XEngine,版本需要V8.10或者以上版本,安装XEngine可以参考其Readme文档  
+必须安装XEngine,版本需要V8.15或者以上版本,安装XEngine可以参考其Readme文档  
 GITEE:https://gitee.com/xyry/libxengine  
 GITHUB:https://github.com/libxengine/xengine
 
@@ -89,6 +89,9 @@ make FLAGS=CleanAll 清理编译
 透传代理  
 转发代理支持权限和确认  
 支持加密代理  
+转发代理绑定解绑支持附加用户信息  
+转发代理绑定支持拒绝  
+转发代理支持用户验证  
 
 ## 关注我们
 如果你觉得这个软件对你有帮助,请你给我们一个START吧

XEngine_APPClient/APPClient_ForwardExample/APPClient_ForwardExample.cpp

@@ -45,20 +45,31 @@ int main(int argc, char** argv)
 
 	int nMsgLen = 0;
 	XENGINE_PROTOCOLHDR st_ProtocolHdr;
+	XENGINE_PROTOCOL_USERAUTH st_UserAuth;
+
 	memset(&st_ProtocolHdr, '\0', sizeof(XENGINE_PROTOCOLHDR));
+	memset(&st_UserAuth, '\0', sizeof(XENGINE_PROTOCOL_USERAUTH));
 	//登录
 	st_ProtocolHdr.wHeader = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_HEADER;
 	st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
 	st_ProtocolHdr.byIsReply = true;
 	st_ProtocolHdr.byVersion = 0;
+	st_ProtocolHdr.unPacketSize = sizeof(XENGINE_PROTOCOL_USERAUTH);
 	st_ProtocolHdr.unOperatorType = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
 	st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_FORWARD_LOGREQ;
 
+	_tcsxcpy(st_UserAuth.tszUserName, "test");
+
 	if (!XClient_TCPSelect_SendMsg(m_Socket, (LPCXSTR)&st_ProtocolHdr, sizeof(XENGINE_PROTOCOLHDR)))
 	{
 		printf("发送失败！\n");
 		return 0;
 	}
+	if (!XClient_TCPSelect_SendMsg(m_Socket, (LPCXSTR)&st_UserAuth, sizeof(XENGINE_PROTOCOL_USERAUTH)))
+	{
+		printf("发送失败！\n");
+		return 0;
+	}
 
 	nMsgLen = 0;
 	XCHAR* ptszMsgBuffer = NULL;
@@ -104,7 +115,7 @@ int main(int argc, char** argv)
 		//请求绑定
 		Json::Value st_JsonRoot;
 		Json::Value st_JsonArray = st_JsonAddr["Array"];
-		st_JsonRoot["tszDstAddr"] = st_JsonArray[0].asCString();
+		st_JsonRoot["tszDstAddr"] = st_JsonArray[0]["tszSrcAddr"].asCString();
 
 		st_ProtocolHdr.wHeader = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_HEADER;
 		st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
@@ -172,7 +183,7 @@ int main(int argc, char** argv)
 		}		
 	}
 
-	std::this_thread::sleep_for(std::chrono::seconds(5000));
+	std::this_thread::sleep_for(std::chrono::seconds(20000));
 	XClient_TCPSelect_Close(m_Socket);
 #ifdef _MSC_BUILD
 	WSACleanup();

XEngine_APPClient/APPClient_ForwardExample/APPClient_ForwardExample.vcxproj

@@ -78,7 +78,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>

XEngine_Docment/Docment_en.docx

@@ -14,19 +14,20 @@
     "nTimeCheck": 3,
     "nSocksTimeOut": 5,
     "nTunnelTimeOut": 5,
-    "nForwardTimeOut": 5
+    "nForwardTimeOut": 0
   },
   "XLog": {
     "MaxSize": 1024000,
     "MaxCount": 10,
     "LogLeave": 32,
-    "tszLogFile": "./XEngine_Log/XEngine_ServiceApp.log"
+    "tszLogFile": "./XEngine_Log/XEngine_ProxyServiceApp.log"
   },
   "XAuth": {
     "bAuth": 0,
     "tszAuthFile": "./XEngine_Config/UserList.txt"
   },
   "XVer": [
+    "1.6.0.1001 Build20230817",
     "1.5.1.1001 Build20230426",
     "1.5.0.1001 Build20230202",
     "1.4.0.1001 Build20221111",

XEngine_Docment/Docment_zh.docx

@@ -35,7 +35,7 @@ extern "C" XLONG ModuleProtocol_GetLastError(int* pInt_SysError = NULL);
   类型：协议头
   可空：N
   意思：输入请求的头
- 参数.四：ppptszListAddr
+ 参数.四：pppSt_ListUser
   In/Out：In
   类型：三级指针
   可空：N
@@ -50,7 +50,7 @@ extern "C" XLONG ModuleProtocol_GetLastError(int* pInt_SysError = NULL);
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" bool ModuleProtocol_Packet_ForwardList(XCHAR* ptszMsgBuffer, int* pInt_Len, XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, XCHAR*** ppptszListAddr, int nCount);
+extern "C" bool ModuleProtocol_Packet_ForwardList(XCHAR* ptszMsgBuffer, int* pInt_Len, XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, SESSION_FORWARD * **pppSt_ListUser, int nCount);
 /************************************************************************/
 /*                        解析导出函数                                  */
 /************************************************************************/

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -40,7 +40,7 @@ CModuleProtocol_Packet::~CModuleProtocol_Packet()
   类型：协议头
   可空：N
   意思：输入请求的头
- 参数.四：ppptszListAddr
+ 参数.四：pppSt_ListUser
   In/Out：In
   类型：三级指针
   可空：N
@@ -55,7 +55,7 @@ CModuleProtocol_Packet::~CModuleProtocol_Packet()
   意思：是否成功
 备注：
 *********************************************************************/
-bool CModuleProtocol_Packet::ModuleProtocol_Packet_ForwardList(XCHAR* ptszMsgBuffer, int* pInt_Len, XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, XCHAR*** ppptszListAddr, int nCount)
+bool CModuleProtocol_Packet::ModuleProtocol_Packet_ForwardList(XCHAR* ptszMsgBuffer, int* pInt_Len, XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, SESSION_FORWARD*** pppSt_ListUser, int nCount)
 {
 	Protocol_IsErrorOccur = false;
 
@@ -70,7 +70,20 @@ bool CModuleProtocol_Packet::ModuleProtocol_Packet_ForwardList(XCHAR* ptszMsgBuf
 
 	for (int i = 0; i < nCount; i++)
 	{
-		st_JsonArray[i] = (*ppptszListAddr)[i];
+		Json::Value st_JsonObject;
+		Json::Value st_JsonSub;
+		st_JsonObject["bForward"] = (*pppSt_ListUser)[i]->bForward;
+		st_JsonObject["tszSrcAddr"] = (*pppSt_ListUser)[i]->tszSrcAddr;
+		st_JsonObject["tszDstAddr"] = (*pppSt_ListUser)[i]->tszDstAddr;
+
+		st_JsonSub["tszUserName"] = (*pppSt_ListUser)[i]->st_UserAuth.tszUserName;
+		st_JsonSub["tszUserPass"] = (*pppSt_ListUser)[i]->st_UserAuth.tszUserPass;
+		st_JsonSub["tszDCode"] = (*pppSt_ListUser)[i]->st_UserAuth.tszDCode;
+		st_JsonSub["enClientType"] = (*pppSt_ListUser)[i]->st_UserAuth.enClientType;
+		st_JsonSub["enDeviceType"] = (*pppSt_ListUser)[i]->st_UserAuth.enDeviceType;
+
+		st_JsonObject["st_UserAuth"] = st_JsonSub;
+		st_JsonArray.append(st_JsonObject);
 	}
 	st_JsonRoot["Count"] = nCount;
 	st_JsonRoot["Array"] = st_JsonArray;