Merge pull request #19 from libxengine/develop

V1.9.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,23 @@
+XEngine_ProxyServer V1.9.0.1001
+
+增加:XENGINE版本处理和退出等待功能
+更新:匹配XEngineV8.38版本
+修改:从XEngine中移动SOCKS管理代码到会话模块中
+修改:从XEngine中移动tunnel管理代码到会话模块中
+修正:SOCKS连接完成后客户端客户端状态不正确的的问题
+修正:tunnel保持连接数据处理不正确的问题
+修正:tunnel数据未完成处理失败导致的问题
+删除:多余的第三方库jsoncpp
+
+added:xengine version process and getchar with error exit
+update:xengine V8.38 match
+modify:move socks to session module from xengine.
+modify:move tunnel to session module from xengine.
+fixed:socks connect complete client status is incorrect
+fixed:tunnel keep-live connect data process is incorrect
+fixed:is not complete data handle failed when tunnel proxy packet
+delete:json of third-part
+======================================================================================
 XEngine_ProxyServer V1.8.0.1001
 
 增加:信息报告支持

README.md

@@ -37,7 +37,8 @@ macos执行:./XEngine_LINEnv.sh -i 3
 #### sub module
 由于依赖的子模块,在你checkout仓库后,在仓库目录下执行下面的命令拉取子模块  
 git submodule init  
-git submodule update
+git submodule update  
+如果github访问失败,你也可以clone该项目,在主目录下使用命令:git clone https://gitee.com/xengine/XEngine_OPenSource.git XEngine_Source/XEngine_Depend
 
 #### Windows
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
@@ -92,14 +93,6 @@ make FLAGS=CleanAll 清理编译
 3.  提交代码
 4.  新建 Pull Request  
 
-## 开发计划
-透传代理  
-支持加密代理  
-转发代理绑定解绑支持附加用户信息  
-转发代理绑定支持拒绝  
-支持UDP转发代理  
-性能优化  
-
 ## 关注我们
 如果你觉得这个软件对你有帮助,请你给我们一个START吧
 

XEngine_APPClient/APPClient_SocksExample/APPClient_SocksExample.cpp

@@ -90,7 +90,7 @@ int main(int argc, char** argv)
 		}
 	}
 	//////////////////////////////////////////////////////////////////////////连接
-	ProxyProtocol_SocksClient_ConnectPacket(tszMsgBuffer, &nMsgLen, "www.xyry.org", 80, ENUM_RFCCOMPONENTS_PROXYSOCKS_COMMAND_CONNECT, ENUM_RFCCOMPONENTS_PROXYSOCKS_IPADDR_DOMAIN);
+	ProxyProtocol_SocksClient_ConnectPacket(tszMsgBuffer, &nMsgLen, "www.libxengine.com", 80, ENUM_RFCCOMPONENTS_PROXYSOCKS_COMMAND_CONNECT, ENUM_RFCCOMPONENTS_PROXYSOCKS_IPADDR_DOMAIN);
 	if (!XClient_TCPSelect_SendMsg(m_Socket, tszMsgBuffer, nMsgLen))
 	{
 		printf("发送投递失败！\n");
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
 	int nCode = 0;
 	ProxyProtocol_SocksClient_ConnectParse(tszMsgBuffer, &nCode);
 	//请求
-	LPCXSTR lpszGetHttp = _X("GET / HTTP/1.1\r\nHost: www.xyry.org\r\nUser-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36\r\nAccept: text/html\r\n\r\n");
+	LPCXSTR lpszGetHttp = _X("GET / HTTP/1.1\r\nHost: www.libxengine.com\r\nUser-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36\r\nAccept: text/html\r\n\r\n");
 	if (!XClient_TCPSelect_SendMsg(m_Socket, lpszGetHttp, _tcsxlen(lpszGetHttp)))
 	{
 		printf("发送投递失败！\n");

XEngine_APPClient/APPClient_TunnelExample/APPClient_TunnelExample.cpp

@@ -43,7 +43,7 @@ int main(int argc, char** argv)
 	XCHAR tszMsgBuffer[2048];
 	memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
 
-	ProxyProtocol_TunnelClient_Packet(tszMsgBuffer, &nMsgLen, "www.xyry.org:80", "MTIzMTIzYWE6MTIzMTIz");
+	ProxyProtocol_TunnelClient_Packet(tszMsgBuffer, &nMsgLen, "www.libxengine.com:80", "MTIzMTIzYWE6MTIzMTIz");
 	if (!XClient_TCPSelect_SendMsg(m_Socket, tszMsgBuffer, nMsgLen))
 	{
 		printf("发送投递失败！\n");
@@ -59,7 +59,7 @@ int main(int argc, char** argv)
 	}
 	printf("接受服务器返回数据,内容:%s\n", tszMsgBuffer);
 
-	LPCXSTR lpszGetHttp = _X("GET / HTTP/1.1\r\nHost: www.xyry.org\r\nUser-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36\r\nAccept: text/html\r\n\r\n");
+	LPCXSTR lpszGetHttp = _X("GET / HTTP/1.1\r\nHost: www.libxengine.com\r\nUser-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.45 Safari/537.36\r\nAccept: text/html\r\n\r\n");
 	if (!XClient_TCPSelect_SendMsg(m_Socket, lpszGetHttp, _tcsxlen(lpszGetHttp)))
 	{
 		printf("发送投递失败！\n");

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -19,7 +19,7 @@
   "XLog": {
     "MaxSize": 1024000,
     "MaxCount": 10,
-    "LogLeave": 32,
+    "LogLeave": 17,
     "tszLogFile": "./XEngine_Log/XEngine_ProxyServiceApp.log"
   },
   "XReport":{

XEngine_Release/XEngine_Config/XEngine_Version.json

@@ -1,5 +1,6 @@
 {
   "XVer": [
+    "1.9.0.1001 Build20240910",
     "1.8.0.1001 Build20240522",
     "1.7.1.1001 Build20240305",
     "1.7.0.1001 Build20240104",

XEngine_Source/XEngine_Depend

@@ -10,7 +10,7 @@ LOADHDR = -I ./ -I ../XEngine_ThirdPart/jsoncpp
 LOADSO = 
 LIB = -lXEngine_BaseLib
 LIBEX = 
-OBJECTS = ModuleSession_Forward.o pch.o
+OBJECTS = ModuleSession_Forward.o ModuleSession_Socks.o ModuleSession_Tunnel.o pch.o
 
 ifeq ($(RELEASE),1)
 FLAGS = -c 
@@ -54,7 +54,11 @@ all:$(OBJECTS)
 
 ModuleSession_Forward.o:./ModuleSession_Forward/ModuleSession_Forward.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ModuleSession_Forward/ModuleSession_Forward.cpp 
-						              
+ModuleSession_Socks.o:./ModuleSession_Socks/ModuleSession_Socks.cpp             
+	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ModuleSession_Socks/ModuleSession_Socks.cpp
+ModuleSession_Tunnel.o:./ModuleSession_Tunnel/ModuleSession_Tunnel.cpp             
+	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ModuleSession_Tunnel/ModuleSession_Tunnel.cpp 	
+
 pch.o:./pch.cpp                 		       	    
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp