Merge pull request #26 from libxengine/develop

V2.8.0.1001 Merge

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "XEngine_Source/XEngine_Depend"]
+	path = XEngine_Source/XEngine_Depend
+	url = https://github.com/libxengine/XEngine_OPenSource.git

CHANGELOG

@@ -1,3 +1,45 @@
+XEngine_StreamMedia V2.8.0.1001
+
+增加:支持srtcp和srtp处理数据了
+增加:信息报告功能
+增加:SSRC会话设置
+更新:移除JSONCPP模块并使用GIT SUBMODULE替代
+修改:分离了版本列表配置从主配置中
+修改:配置文件支持日志设置
+修改:sdp的打包已经能够正常使用了
+修改:dtls握手处理已经能够正常使用
+修改:某些时候aac包过大问题提示
+修改:rtc和rtcp协议判断
+修改:srt有初始化和反初始化函数
+修改:srt和srtp默认关闭了
+修正:日志配置没有效果的问题
+修正:STUN的IP和端口不正确的问题
+修正:STUN协议处理不正确导致返回数据不正确的问题
+修正:某些时候av包缓冲溢出问题
+修正:dtls判断某些时候出错的问题
+修正:http api日志打印出错
+修正:关闭srtp和srt编译选项没有效果的问题
+
+added:srtcp and srtp process data
+added:info report
+added:ssrc set for session module
+update:remove jsoncpp and use git submodule instead
+modify:detach version list from main configure
+modify:set log file for configure
+modify:sdp packet work now
+modify:dtls handshakes is work now
+modify:sometime aac packet size is to big and tips
+modify:rtc rtcp judgment
+modify:have function for srt init and destory
+modify:srt and rtc off by default
+fixed:log configure is not work
+fixed:stun ip and port is incorrect
+fixed:stun message reply is incorrect
+fixed:sometimes av packet buffer is leak
+fixed:dtls judgment fails sometimes
+fixed:log print error that http api
+fixed:disable compile options not work for srt and rtc
+=======================================================
 XEngine_StreamMedia V2.7.0.1001
 
 增加:srtp核心代码文件

README.en.md

@@ -28,24 +28,24 @@ Publish Stream:
 | ProtocolName | VideoCodec  | AudioCodec | Status |
 | -------- | --------- | -------- | -------- |
 | RTMP     | H264      | AAC      | Completed   |
-| SRT      | H264,H265 | AAC      | Completed   |
+| SRT      | H264      | AAC      | Completed   |
 | WEBRTC   | H264      | OPUS     | Not Start   |
 | GB28181  | H264      | AAC      | Not Start   |
 | JT1078   | H264      | AAC      | Completed   |
-| XStream  | H264,H265 | AAC      | Completed   |
+| XStream  | H264      | AAC      | Completed   |
 
 Play Stream:
 
 | ProtocolName | VideoCodec  | AudioCodec | Status |
 | -------- | --------- | -------- | -------- |
 | RTMP     | H264      | AAC      | Completed   |
 | RTSP     | H264      | AAC      | Completed   |
-| M3U8     | H264,H265 | AAC      | Completed   |
-| SRT      | H264,H265 | AAC      | Completed   |
+| M3U8     | H264      | AAC      | Completed   |
+| SRT      | H264      | AAC      | Completed   |
 | WEBRTC   | H264      | OPUS     | Processing  |
 | HTTP-FLV | H264      | AAC      | Completed   |
-| XStream  | H264,H265 | AAC      | Completed   |
-| TS       | H264,H265 | AAC      | Completed   |
+| XStream  | H264      | AAC      | Completed   |
+| TS       | H264      | AAC      | Completed   |
 
 ## install
 
@@ -65,7 +65,7 @@ use vs open and complie,you need to install vcpkg and install depend library by
 vcpkg.exe install libsrt:x86-windows libsrt:x64-windows libsrtp:x86-windows libsrtp:x64-windows
 #### Linux
 install srt library after Configure Xengine to Completed  
-ubuntu:sudo apt install libsrt-openssl-dev libsrtp2-dev  
+ubuntu:sudo apt install libsrt-gnutls-dev libsrtp2-dev  
 Rockylinux:sudo dnf install srt-devel srtp2-devel  
 
 Linux use Makefile complie  

README.md

@@ -31,24 +31,24 @@ c c++ streammedia server
 | 协议名称 | 视频格式  | 音频格式 | 当前状态 |
 | -------- | --------- | -------- | -------- |
 | RTMP     | H264      | AAC      | 已完成   |
-| SRT      | H264,H265 | AAC      | 已完成   |
+| SRT      | H264      | AAC      | 已完成   |
 | WEBRTC   | H264      | OPUS     | 未开始   |
 | GB28181  | H264      | AAC      | 未开始   |
 | JT1078   | H264      | AAC      | 已完成   |
-| XStream  | H264,H265 | AAC      | 已完成   |
+| XStream  | H264      | AAC      | 已完成   |
 
 拉流协议:
 
 | 协议名称 | 视频格式  | 音频格式 | 当前状态 |
 | -------- | --------- | -------- | -------- |
 | RTMP     | H264      | AAC      | 已完成   |
 | RTSP     | H264      | AAC      | 已完成   |
-| M3U8     | H264,H265 | AAC      | 已完成   |
-| SRT      | H264,H265 | AAC      | 已完成   |
+| M3U8     | H264      | AAC      | 已完成   |
+| SRT      | H264      | AAC      | 已完成   |
 | WEBRTC   | H264      | OPUS     | 进行中   |
 | HTTP-FLV | H264      | AAC      | 已完成   |
-| XStream  | H264,H265 | AAC      | 已完成   |
-| TS       | H264,H265 | AAC      | 已完成   |
+| XStream  | H264      | AAC      | 已完成   |
+| TS       | H264      | AAC      | 已完成   |
 
 ## 安装教程
 
@@ -73,7 +73,7 @@ vcpkg.exe install libsrt:x86-windows libsrt:x64-windows libsrtp:x86-windows libs
 
 #### Linux
 配置完XEngine后需要安装srt库  
-ubuntu:sudo apt install libsrt-openssl-dev libsrtp2-dev  
+ubuntu:sudo apt install libsrt-gnutls-dev libsrtp2-dev  
 Rockylinux:sudo dnf install srt-devel srtp2-devel
 
 Linux使用Makefile编译  

XEngine_APPClient/APPClient_FLVPull/APPClient_FLVPull.cpp

@@ -2,7 +2,7 @@
 #include <windows.h>
 #include <tchar.h>
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
+#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
 #pragma comment(lib,"Ws2_32")
 #endif
 #include <list>
@@ -12,15 +12,14 @@
 #include <XEngine_Include/XEngine_ProtocolHdr.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
+#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
+#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
 #include "../../XEngine_Source/XEngine_UserProtocol.h"
 using namespace std;
 
 //需要优先配置XEngine
 //WINDOWS使用VS2022 x86 或者 x64 debug 编译
-//linux::g++ -std=c++17 -Wall -g APPClient_FLVPull.cpp -o APPClient_FLVPull.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
-//macos::g++ -std=c++17 -Wall -g APPClient_FLVPull.cpp -o APPClient_FLVPull.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
+//g++ -std=c++17 -Wall -g APPClient_FLVPull.cpp -o APPClient_FLVPull.exe -lXEngine_BaseLib -lXClient_APIHelp
 FILE* pSt_File;
 
 static void CALLBACK APPClient_FLVPull_Callback(XNETHANDLE xhToken, XPVOID lpszMsgBuffer, int nMsgLen, XPVOID lParam)

XEngine_APPClient/APPClient_JT1078/APPClient_JT1078.cpp

@@ -26,8 +26,7 @@ using namespace std;
 
 //需要优先配置XEngine
 //WINDOWS使用VS2022 x86 或者 x64 debug 编译
-//linux::g++ -std=c++17 -Wall -g APPClient_JT1078.cpp -o APPClient_JT1078.exe -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
-//macos::g++ -std=c++17 -Wall -g APPClient_JT1078.cpp -o APPClient_JT1078.exe -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
+//g++ -std=c++17 -Wall -g APPClient_JT1078.cpp -o APPClient_JT1078.exe -lXEngine_BaseLib -lXEngine_OPenSsl -lXClient_Socket -lXEngine_AVHelp
 
 void XEngine_Device_StrtoBCD(LPCXSTR lpszPhoneCode, XBYTE* ptszBCD)
 {

XEngine_APPClient/APPClient_SRTPull/APPClient_SRTPull.cpp

@@ -10,12 +10,12 @@
 #include <XEngine_Include/XEngine_Types.h>
 //需要优先配置XEngine
 //WINDOWS使用VS2022 x86 或者 x64 debug 编译
-//linux::g++ -std=c++17 -Wall -g APPClient_SRTPull.cpp -o APPClient_SRTPull.exe -lsrt
-//macos::g++ -std=c++17 -Wall -g APPClient_SRTPull.cpp -o APPClient_SRTPull.exe -lsrt
+//g++ -std=c++17 -Wall -g APPClient_SRTPull.cpp -o APPClient_SRTPull.exe -lsrt
+
 FILE* pSt_File;
 
 int nPort = 10080;
-LPCXSTR lpszServiceAddr = _X("10.0.3.155");
+LPCXSTR lpszServiceAddr = _X("127.0.0.1");
 
 int main()
 {
@@ -71,7 +71,7 @@ int main()
 		{
 			fwrite(tszMsgBuffer, 1, ret, pSt_File);
 		}
-
+		printf("%d\n", ret);
 		if (nTimeEnd - nTimeStart > 20)
 		{
 			break;

XEngine_APPClient/APPClient_XStream/APPClient_XStream.cpp

@@ -3,9 +3,9 @@
 #include <tchar.h>
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
 #pragma comment(lib,"XEngine_Client/XClient_Socket")
+#pragma comment(lib,"XEngine_Client/XClient_APIHelp")
 #pragma comment(lib,"XEngine_AVCodec/XEngine_AVCollect")
 #pragma comment(lib,"XEngine_AVCodec/XEngine_VideoCodec")
-#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIClient")
 #pragma comment(lib,"Ws2_32")
 #endif
 #include <list>
@@ -17,25 +17,25 @@
 #include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
 #include <XEngine_Include/XEngine_Client/XClient_Define.h>
 #include <XEngine_Include/XEngine_Client/XClient_Error.h>
+#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
+#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
 #include <XEngine_Include/XEngine_AVCodec/AVCollect_Define.h>
 #include <XEngine_Include/XEngine_AVCodec/AVCollect_Error.h>
 #include <XEngine_Include/XEngine_AVCodec/VideoCodec_Define.h>
 #include <XEngine_Include/XEngine_AVCodec/VideoCodec_Error.h>
-#include <XEngine_Include/XEngine_NetHelp/APIClient_Define.h>
-#include <XEngine_Include/XEngine_NetHelp/APIClient_Error.h>
 #include "../../XEngine_Source/XEngine_UserProtocol.h"
 using namespace std;
 
 //需要优先配置XEngine
 //WINDOWS使用VS2022 x86 或者 x64 debug 编译
-//linux::g++ -std=c++17 -Wall -g APPClient_XStream.cpp -o APPClient_XStream.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_NetHelp -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
-//macos::g++ -std=c++17 -Wall -g APPClient_XStream.cpp -o APPClient_XStream.exe -I ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -L ../../XEngine_Source/XEngine_ThirdPart/jsoncpp -lXEngine_BaseLib -lNetHelp_APIClient -lXEngine_SystemApi -ljsoncpp
+//g++ -std=c++17 -Wall -g APPClient_XStream.cpp -o APPClient_XStream.exe -lXEngine_BaseLib -lXClient_Socket -lXClient_APIHelp -lXEngine_AVCollect -lXEngine_VideoCodec
+
 XSOCKET hSocket = 0;
 XNETHANDLE xhVideo = 0;
 __int64u nTimeVideo = 0;
 FILE* pSt_File = NULL;
 
-void CALLBACK XEngine_AVCollect_CBVideo(uint8_t* punStringY, int nYLen, uint8_t* punStringU, int nULen, uint8_t* punStringV, int nVLen, XPVOID lParam)
+void CALLBACK XEngine_AVCollect_CBVideo(uint8_t* punStringY, int nYLen, uint8_t* punStringU, int nULen, uint8_t* punStringV, int nVLen, AVCOLLECT_TIMEINFO* pSt_TimeInfo, XPVOID lParam)
 {
 	XCHAR* ptszMsgBuffer = (XCHAR*)malloc(XENGINE_MEMORY_SIZE_MAX);
 	XENGINE_PROTOCOLHDR st_ProtocolHdr;
@@ -75,7 +75,7 @@ void CALLBACK XEngine_AVCollect_CBVideo(uint8_t* punStringY, int nYLen, uint8_t*
 	free(ptszMsgBuffer);
 	ptszMsgBuffer = NULL;
 }
-void CALLBACK XEngine_AVCollect_CBAudio(uint8_t* punStringAudio, int nVLen, XPVOID lParam)
+void CALLBACK XEngine_AVCollect_CBAudio(uint8_t* punStringAudio, int nVLen, AVCOLLECT_TIMEINFO* pSt_TimeInfo, XPVOID lParam)
 {
 
 }

XEngine_APPClient/VSCopy-x86.bat

@@ -1,10 +1,10 @@
 copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_OPenSsl.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Socket.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_AVCodec\XEngine_AVHelp.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_AVCodec\XEngine_AVCollect.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_AVCodec\XEngine_VideoCodec.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avcodec-59.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avdevice-59.dll" "./"
@@ -13,10 +13,4 @@ copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avformat-59.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avutil-57.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\postproc-56.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\swresample-4.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\swscale-6.dll" "./"
-
-copy /y "%XEngine_Lib32%\XEngine_LibEx\libcrypto-3.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_LibEx\libssl-3.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_NetHelp\libcurl.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_NetHelp\nghttp2.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_HelpComponents\zlib1.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\swscale-6.dll" "./"

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -45,7 +45,7 @@
         "RTC": {
             "bEnable": true,
             "tszICEUser": "xengine",
-            "tszICEPass": "123456789abcd",
+            "tszICEPass": "3321308h8i6vt3769r6638l1409d50jz",
             "tszCertStr": "./XEngine_Key/server.crt",
             "tszKeyStr": "./XEngine_Key/server.key",
             "tszCsrStr": "./XEngine_Key/server.csr"
@@ -64,24 +64,14 @@
         }
     },
     "XLog": {
+        "LogFile": "./XEngine_XLog/XEngine_StreamMediaApp.Log",
         "MaxSize": 1024000,
         "MaxCount": 10,
-        "LogLeave": 32
+        "LogLeave": 17
     },
-    "XVer": [
-        "V2.7.0.1001 Build20240415",
-        "V2.6.0.1001 Build20240201",
-        "V2.5.0.1001 Build20231222",
-        "V2.4.0.1001 Build20231026",
-        "V2.3.0.1001 Build20231007",
-        "V2.2.0.1001 Build20230804",
-        "V2.1.0.1001 Build20230726",
-        "V2.0.0.1001 Build20230615",
-        "V1.4.1.1001 Build20230515",
-        "V1.4.0.1001 Build20221202",
-        "V1.3.0.1001 Build20221025",
-        "V1.2.0.1001 Build20221014",
-        "V1.1.0.1001 Build20220805",
-        "V1.0.0.1001 Build20220715"
-    ]
+    "XReport":{
+        "bEnable":true,
+        "tszServiceName":"XEngine_StreamMedia",
+        "tszAPIUrl":"http://app.xyry.org:5501/api?function=machine"
+    }
 }

XEngine_Release/XEngine_Config/XEngine_Version.json

@@ -0,0 +1,19 @@
+{
+    "XVer": [
+        "V2.8.0.1001 Build20240531",
+        "V2.7.0.1001 Build20240415",
+        "V2.6.0.1001 Build20240201",
+        "V2.5.0.1001 Build20231222",
+        "V2.4.0.1001 Build20231026",
+        "V2.3.0.1001 Build20231007",
+        "V2.2.0.1001 Build20230804",
+        "V2.1.0.1001 Build20230726",
+        "V2.0.0.1001 Build20230615",
+        "V1.4.1.1001 Build20230515",
+        "V1.4.0.1001 Build20221202",
+        "V1.3.0.1001 Build20221025",
+        "V1.2.0.1001 Build20221014",
+        "V1.1.0.1001 Build20220805",
+        "V1.0.0.1001 Build20220715"
+    ]
+}

XEngine_Source/Makefile

@@ -3,7 +3,8 @@ UNICODE = 0
 PLATFORM=linux
 FLAGS= 
 #要编译的模块
-THIRDPART_MODULE_JSONCPP = ./XEngine_ThirdPart/jsoncpp
+THIRDPART_MODULE_JSONCPP = ./XEngine_Depend/XEngine_Module/jsoncpp
+THIRDPART_MODULE_REPORT = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
 
 MODULE_CONFIGURE_PATH = ./XEngine_ModuleConfigure
 MODULE_HELP_PATH = ./XEngine_ModuleHelp
@@ -13,7 +14,7 @@ MODULE_QUEUE_PATH = ./XEngine_ModuleQueue
 
 APP_STREAMMEDIA_PATH = ./XEngine_ServiceApp/XEngine_StreamMediaApp
 
-XENGINE_MODULES = libjsoncpp.so                                   \
+XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so                           \
                   libXEngine_ModuleConfigure.so libXEngine_ModuleHelp.so libXEngine_ModuleProtocol.so libXEngine_ModuleSession.so libXEngine_ModuleQueue.so       \
 				  XEngine_StreamMediaApp.exe
 
@@ -22,6 +23,8 @@ MakeAll:$(XENGINE_MODULES)
 
 libjsoncpp.so:
 	make -C $(THIRDPART_MODULE_JSONCPP) PLATFORM=$(PLATFORM) $(FLAGS)
+libXEngine_InfoReport.so:
+	make -C $(THIRDPART_MODULE_REPORT) PLATFORM=$(PLATFORM) $(FLAGS)
 
 libXEngine_ModuleConfigure.so:
 	make -C $(MODULE_CONFIGURE_PATH) PLATFORM=$(PLATFORM) $(FLAGS)

XEngine_Source/VSCopy-Debug.bat

@@ -5,9 +5,9 @@ copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_OPenSsl.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_Stream.dll" "./"
+copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_APIHelp.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_XSocket.dll" "./"
-copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
 
 copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"

XEngine_Source/VSCopy-x64.bat

@@ -5,9 +5,9 @@ copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_OPenSsl.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Stream.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
-copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 
 copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"

XEngine_Source/VSCopy-x86.bat

@@ -5,9 +5,9 @@ copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_OPenSsl.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Stream.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 
 copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"