Skip to content

Commit d1c50b4

Browse files
xengine-qytxengine-qyt
committed
update:match xengine v9.x support
1 parent 790805b commit d1c50b4

File tree

26 files changed

+137
-122
lines changed

26 files changed

+137
-122
lines changed

‎README.en.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ install srt library after Configure Xengine to Completed
7373
ubuntu:sudo apt install libsrt-gnutls-dev libsrtp2-dev
7474

7575
Linux use Makefile complie
76-
UBUNTU22.04 x64 or RockyLinux 9 x64
76+
UBUNTU22.04 or above
7777

7878
##### Compile Command
7979
execute command in XEngine_Source path

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ vcpkg.exe install libsrt:x86-windows libsrt:x64-windows libsrtp:x86-windows libs
8282
ubuntu:sudo apt install libsrt-gnutls-dev libsrtp2-dev
8383

8484
Linux使用Makefile编译
85-
UBUNTU22.04 或者 RockyLinux 9 x64均可
85+
UBUNTU22.04或者以上版本
8686

8787
###### 编译命令
8888

‎XEngine_Source/VSCopy_Debug.bat‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseLib.dll" "./"
22
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_BaseSafe.dll" "./"
33
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Algorithm.dll" "./"
4-
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Core.dll" "./"
4+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_Cryption.dll" "./"
55
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_ManagePool.dll" "./"
66
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_OPenSsl.dll" "./"
77

88
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_Stream.dll" "./"
99
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XClient_APIHelp.dll" "./"
1010

1111
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_XSocket.dll" "./"
12+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIHelp.dll" "./"
13+
copy /y "D:\XEngine\XEngine_SourceCode\Debug\NetHelp_APIAddr.dll" "./"
1214
copy /y "D:\XEngine\XEngine_SourceCode\Debug\XEngine_SystemApi.dll" "./"
1315

1416
copy /y "D:\XEngine\XEngine_SourceCode\Debug\HelpComponents_Packets.dll" "./"

‎XEngine_Source/VSCopy_x64.bat‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
33
copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
44
copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Core.dll" "./"
55
copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
6-
copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_OPenSsl.dll" "./"
6+
copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Cryption.dll" "./"
77

88
copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Stream.dll" "./"
99
copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
1010

1111
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
12+
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
13+
copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
1214
copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
1315

1416
copy /y "%XEngine_Lib64%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"

‎XEngine_Source/VSCopy_x86.bat‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
33
copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
44
copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Core.dll" "./"
55
copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"
6-
copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_OPenSsl.dll" "./"
6+
copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Cryption.dll" "./"
77

88
copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Stream.dll" "./"
99
copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
1010

1111
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
12+
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIHelp.dll" "./"
13+
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIAddr.dll" "./"
1214
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
1315

1416
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\HelpComponents_Packets.dll" "./"

‎XEngine_Source/XEngine_ModuleHelp/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RELEASE = 0
88
UNICODE = 0
99
LOADHDR = -I ./
1010
LOADSO =
11-
LIB = -lXEngine_BaseLib -lXEngine_OPenSsl
11+
LIB = -lXEngine_BaseLib -lXEngine_Cryption -lNetHelp_APIAddr
1212
LIBEX =
1313
OBJECTS = ModuleHelp_JT1078.o ModuleHelp_SrtCore.o ModuleHelp_Rtsp.o ModuleHelp_Rtmp.o ModuleHelp_SRTPCore.o pch.o
1414

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_JT1078/ModuleHelp_JT1078.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ bool CModuleHelp_JT1078::ModuleHelp_JT1078_BCDToString(XBYTE bySIMNumber[6], XCH
4646
}
4747
for (int i = 0, nPos = 0; i < 6; i++)
4848
{
49-
OPenSsl_Codec_BCDTo2Bytes(bySIMNumber[i], &ptszMsgBuffer[nPos]);
49+
Cryption_Codec_BCDTo2Bytes(bySIMNumber[i], &ptszMsgBuffer[nPos]);
5050
nPos += 2;
5151
}
5252
return true;
@@ -81,7 +81,7 @@ bool CModuleHelp_JT1078::ModuleHelp_JT1078_StringToBCD(LPCXSTR lpszMsgBuffer, XB
8181
}
8282
for (int i = 0, nPos = 0; i < 6; i++)
8383
{
84-
OPenSsl_Codec_2BytesToBCD(&lpszMsgBuffer[i], pbySIMNumber[nPos]);
84+
Cryption_Codec_2BytesToBCD(&lpszMsgBuffer[i], pbySIMNumber[nPos]);
8585
nPos += 2;
8686
}
8787
return true;

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Rtsp/ModuleHelp_Rtsp.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ bool CModuleHelp_Rtsp::ModuleHelp_Rtsp_GetRTPAddr(LPCXSTR lpszClientID, XCHAR* p
459459
XCHAR tszIPAddr[128] = {};
460460
_tcsxcpy(tszIPAddr, lpszClientID);
461461

462-
BaseLib_OperatorIPAddr_SegAddr(tszIPAddr, &nPort);
462+
APIAddr_IPAddr_SegAddr(tszIPAddr, &nPort);
463463
if (bVideo)
464464
{
465465
_xstprintf(ptszADDRStr, _X("%s:%d"), tszIPAddr, stl_MapIterator->second.nVideoRTPPort);
@@ -506,7 +506,7 @@ bool CModuleHelp_Rtsp::ModuleHelp_Rtsp_GetRTCPAddr(LPCXSTR lpszClientID, XCHAR*
506506
}
507507
int nPort = 0;
508508
XCHAR tszIPAddr[128] = {};
509-
BaseLib_OperatorIPAddr_SegAddr(tszIPAddr, &nPort);
509+
APIAddr_IPAddr_SegAddr(tszIPAddr, &nPort);
510510
if (bVideo)
511511
{
512512
_xstprintf(ptszADDRStr, _X("%s:%d"), tszIPAddr, stl_MapIterator->second.nVideoRTCPPort);

‎XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Srt/ModuleHelp_SrtCore.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_GetStreamID(XSOCKET hSocket, XCHAR*
295295
memset(tszSMSAddr, '\0', sizeof(tszSMSAddr));
296296
memset(tszSMSMode, '\0', sizeof(tszSMSMode));
297297

298-
BaseLib_OperatorString_GetKeyValue(stl_MapIterator->second.tszStreamBuffer + 4, _X(","), tszSMSAddr, tszSMSMode);
299-
BaseLib_OperatorString_GetKeyValue(tszSMSAddr, _X("="), tszTmpStr, ptszSMSAddr);
298+
BaseLib_String_GetKeyValue(stl_MapIterator->second.tszStreamBuffer + 4, _X(","), tszSMSAddr, tszSMSMode);
299+
BaseLib_String_GetKeyValue(tszSMSAddr, _X("="), tszTmpStr, ptszSMSAddr);
300300

301301
if (NULL != _tcsxstr(tszSMSMode, _X("publish")))
302302
{

‎XEngine_Source/XEngine_ModuleHelp/pch.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ using namespace std;
3737
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Define.h>
3838
#include <XEngine_Include/XEngine_BaseLib/BaseLib_Error.h>
3939
#include <XEngine_Include/XEngine_Core/NetCore_Define.h>
40-
#include <XEngine_Include/XEngine_Core/OPenSsl_Define.h>
41-
#include <XEngine_Include/XEngine_Core/OPenSsl_Error.h>
40+
#include <XEngine_Include/XEngine_Core/Cryption_Define.h>
41+
#include <XEngine_Include/XEngine_Core/Cryption_Error.h>
42+
#include <XEngine_Include/XEngine_NetHelp/APIAddr_Define.h>
43+
#include <XEngine_Include/XEngine_NetHelp/APIAddr_Error.h>
4244
#include "../XEngine_UserProtocol.h"
4345
#include "ModuleHelp_Define.h"
4446
#include "ModuleHelp_Error.h"
@@ -58,6 +60,7 @@ extern XLONG ModuleHelp_dwErrorCode;
5860

5961
#ifdef _MSC_BUILD
6062
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
61-
#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
63+
#pragma comment(lib,"XEngine_Core/XEngine_Cryption")
64+
#pragma comment(lib,"XEngine_NetHelp/NetHelp_APIAddr")
6265
#pragma comment(lib,"Ws2_32")
6366
#endif

0 commit comments

Comments
 (0)