modfy:stun port remove rtc port

Author: xengine-qyt

XEngine_Source/XEngine_ModuleConfigure/ModuleConfig_Define.h

@@ -24,6 +24,7 @@ typedef struct tag_XEngine_ServiceConfig
 	int nXStreamPort;                         //X流协议服务
 	int nJT1078Port;                          //JT1078协议流支持
 	int nSrtPort;                             //srt协议端口
+	int nRTCPort;                             //webrtc推拉流端口
 	struct
 	{
 		int nMaxClient;                       //最大客户端个数
@@ -92,7 +93,6 @@ typedef struct tag_XEngine_ServiceConfig
 			XCHAR tszPrivateKey[MAX_PATH];
 			XCHAR tszPublicKey[MAX_PATH];
 			XCHAR tszRequestKey[MAX_PATH];
-			int nSTUNPort;
 			bool bEnable;
 		}st_PullWebRtc;
 	}st_XPull;

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -90,6 +90,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->nXStreamPort = st_JsonRoot["nXStreamPort"].asInt();
 	pSt_ServerConfig->nJT1078Port = st_JsonRoot["nJT1078Port"].asInt();
 	pSt_ServerConfig->nSrtPort = st_JsonRoot["nSrtPort"].asInt();
+	pSt_ServerConfig->nRTCPort = st_JsonRoot["nRTCPort"].asInt();
 	//最大配置
 	if (st_JsonRoot["XMax"].empty() || (8 != st_JsonRoot["XMax"].size()))
 	{
@@ -154,7 +155,6 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XPull.st_PullHls.nTime = st_PullHls["nTime"].asInt();
 	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullHls.tszHLSPath, st_PullHls["tszHLSPath"].asCString());
 
-	pSt_ServerConfig->st_XPull.st_PullWebRtc.nSTUNPort = st_PullWebRtc["nSTUNPort"].asInt();
 	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullWebRtc.tszPrivateKey, st_PullWebRtc["RSAPrivateKey"].asCString());
 	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullWebRtc.tszPublicKey, st_PullWebRtc["RSAPublicKey"].asCString());
 	_tcsxcpy(pSt_ServerConfig->st_XPull.st_PullWebRtc.tszRequestKey, st_PullWebRtc["RSARequestKey"].asCString());

XEngine_Source/XEngine_ModuleHelp/ModuleHelp_Srt/ModuleHelp_SrtCore.cpp

@@ -158,9 +158,6 @@ bool CModuleHelp_SrtCore::ModuleHelp_SrtCore_Send(LPCXSTR lpszClientAddr, LPCXST
 			bFound = true;
 			break;
 		}
-		else
-		{
-		}
 	}
 	if (!bFound)
 	{

XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.vcxproj

@@ -176,6 +176,7 @@
     <ClInclude Include="ModuleHelp_JT1078\ModuleHelp_JT1078.h" />
     <ClInclude Include="ModuleHelp_Rtmp\ModuleHelp_Rtmp.h" />
     <ClInclude Include="ModuleHelp_Rtsp\ModuleHelp_Rtsp.h" />
+    <ClInclude Include="ModuleHelp_SRtp\ModuleHelp_SRTPCore.h" />
     <ClInclude Include="ModuleHelp_Srt\ModuleHelp_SrtCore.h" />
     <ClInclude Include="pch.h" />
   </ItemGroup>
@@ -184,6 +185,7 @@
     <ClCompile Include="ModuleHelp_JT1078\ModuleHelp_JT1078.cpp" />
     <ClCompile Include="ModuleHelp_Rtmp\ModuleHelp_Rtmp.cpp" />
     <ClCompile Include="ModuleHelp_Rtsp\ModuleHelp_Rtsp.cpp" />
+    <ClCompile Include="ModuleHelp_SRtp\ModuleHelp_SRTPCore.cpp" />
     <ClCompile Include="ModuleHelp_Srt\ModuleHelp_SrtCore.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.vcxproj.filters

@@ -37,6 +37,12 @@
     <Filter Include="源文件\ModuleHelp_Rtmp">
       <UniqueIdentifier>{301461bf-f0c1-48b4-85e9-5424834f57e7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="头文件\ModuleHelp_SRtp">
+      <UniqueIdentifier>{3954caa5-b437-4d6d-abfa-6f6cd7354b9c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\ModuleHelp_SRtp">
+      <UniqueIdentifier>{ce029e9f-9497-4ec2-8882-8bedd40eb742}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="framework.h">
@@ -63,6 +69,9 @@
     <ClInclude Include="ModuleHelp_Rtmp\ModuleHelp_Rtmp.h">
       <Filter>头文件\ModuleHelp_Rtmp</Filter>
     </ClInclude>
+    <ClInclude Include="ModuleHelp_SRtp\ModuleHelp_SRTPCore.h">
+      <Filter>头文件\ModuleHelp_SRtp</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -83,6 +92,9 @@
     <ClCompile Include="ModuleHelp_Rtmp\ModuleHelp_Rtmp.cpp">
       <Filter>源文件\ModuleHelp_Rtmp</Filter>
     </ClCompile>
+    <ClCompile Include="ModuleHelp_SRtp\ModuleHelp_SRTPCore.cpp">
+      <Filter>源文件\ModuleHelp_SRtp</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="XEngine_ModuleHelp.def">

XEngine_Source/XEngine_ModuleHelp/pch.h

@@ -25,6 +25,9 @@
 #if 1 == _XENGINE_STREAMMEDIA_BUILDSWITCH_SRT
 #include <srt/srt.h>
 #endif
+#if 1 == _XENGINE_STREAMMEDIA_BUILDSWITCH_RTC
+#include <srtp2/srtp.h>
+#endif
 using namespace std;
 #include <XEngine_Include/XEngine_CommHdr.h>
 #include <XEngine_Include/XEngine_Types.h>

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

@@ -501,14 +501,14 @@ int main(int argc, char** argv)
 
 	if (st_ServiceConfig.st_XPull.st_PullWebRtc.bEnable)
 	{
-		xhSTUNSocket = NetCore_UDPXCore_StartEx(st_ServiceConfig.st_XPull.st_PullWebRtc.nSTUNPort, 1);
+		xhSTUNSocket = NetCore_UDPXCore_StartEx(st_ServiceConfig.nRTCPort, 1);
 		if (NULL == xhSTUNSocket)
 		{
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动WEBRTC的STUN网络端口:%d 失败,错误：%d"), st_ServiceConfig.st_XPull.st_PullWebRtc.nSTUNPort, errno);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("启动服务中,启动WEBRTC网络端口:%d 失败,错误：%d"), st_ServiceConfig.nRTCPort, errno);
 			goto XENGINE_SERVICEAPP_EXIT;
 		}
 		NetCore_UDPXCore_RegisterCallBackEx(xhSTUNSocket, Network_Callback_VideoRTPRecv);
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动WEBRTC的STUN端口:%d 成功"), st_ServiceConfig.st_XPull.st_PullWebRtc.nSTUNPort);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,启动WEBRTC端口:%d 成功"), st_ServiceConfig.nRTCPort);
 	}
 
 	if (st_ServiceConfig.st_XPull.st_PullHls.bEnable)