dtls环境自动初始化，支持多线程

webrtc/DtlsTransport.hpp

@@ -14,7 +14,7 @@ using namespace toolkit;
 
 
 namespace RTC
 namespace RTC
 {
 {
-class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
+    class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
 	{
 	{
 	public:
 	public:
 		enum class DtlsState
 		enum class DtlsState
@@ -60,6 +60,27 @@ class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
 			const char* name;
 			const char* name;
 		};
 		};
 
 
+        class DtlsEnvironment : public std::enable_shared_from_this<DtlsEnvironment>
+        {
+        public:
+            using Ptr = std::shared_ptr<DtlsEnvironment>;
+            ~DtlsEnvironment();
+            static DtlsEnvironment& Instance();
+
+        private:
+            DtlsEnvironment();
+            void GenerateCertificateAndPrivateKey();
+            void ReadCertificateAndPrivateKeyFromFiles();
+            void CreateSslCtx();
+            void GenerateFingerprints();
+
+        public:
+            X509* certificate{ nullptr };
+            EVP_PKEY* privateKey{ nullptr };
+            SSL_CTX* sslCtx{ nullptr };
+            std::vector<Fingerprint> localFingerprints;
+        };
+
 	public:
 	public:
 		class Listener
 		class Listener
 		{
 		{
@@ -93,8 +114,6 @@ class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
 		};
 		};
 
 
 	public:
 	public:
-		static void ClassInit();
-		static void ClassDestroy();
 		static Role StringToRole(const std::string& role)
 		static Role StringToRole(const std::string& role)
 		{
 		{
 			auto it = DtlsTransport::string2Role.find(role);
 			auto it = DtlsTransport::string2Role.find(role);
@@ -132,20 +151,9 @@ class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
 		}
 		}
 
 
 	private:
 	private:
-		static void GenerateCertificateAndPrivateKey();
-		static void ReadCertificateAndPrivateKeyFromFiles();
-		static void CreateSslCtx();
-		static void GenerateFingerprints();
-
-	private:
-		static X509* certificate;
-		static EVP_PKEY* privateKey;
-		static SSL_CTX* sslCtx;
-		static uint8_t sslReadBuffer[];
 		static std::map<std::string, Role> string2Role;
 		static std::map<std::string, Role> string2Role;
 		static std::map<std::string, FingerprintAlgorithm> string2FingerprintAlgorithm;
 		static std::map<std::string, FingerprintAlgorithm> string2FingerprintAlgorithm;
 		static std::map<FingerprintAlgorithm, std::string> fingerprintAlgorithm2String;
 		static std::map<FingerprintAlgorithm, std::string> fingerprintAlgorithm2String;
-		static std::vector<Fingerprint> localFingerprints;
 		static std::vector<SrtpCryptoSuiteMapEntry> srtpCryptoSuites;
 		static std::vector<SrtpCryptoSuiteMapEntry> srtpCryptoSuites;
 
 
 	public:
 	public:
@@ -157,7 +165,7 @@ class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
 		void Run(Role localRole);
 		void Run(Role localRole);
 		std::vector<Fingerprint>& GetLocalFingerprints() const
 		std::vector<Fingerprint>& GetLocalFingerprints() const
 		{
 		{
-			return DtlsTransport::localFingerprints;
+			return env->localFingerprints;
 		}
 		}
 		bool SetRemoteFingerprint(Fingerprint fingerprint);
 		bool SetRemoteFingerprint(Fingerprint fingerprint);
 		void ProcessDtlsData(const uint8_t* data, size_t len);
 		void ProcessDtlsData(const uint8_t* data, size_t len);
@@ -203,6 +211,7 @@ class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
 		void OnTimer();
 		void OnTimer();
 
 
 	private:
 	private:
+        DtlsEnvironment::Ptr env;
         EventPoller::Ptr poller;
         EventPoller::Ptr poller;
         // Passed by argument.
         // Passed by argument.
 		Listener* listener{ nullptr };
 		Listener* listener{ nullptr };
@@ -218,7 +227,9 @@ class DtlsTransport : public std::enable_shared_from_this<DtlsTransport>
 		bool handshakeDone{ false };
 		bool handshakeDone{ false };
 		bool handshakeDoneNow{ false };
 		bool handshakeDoneNow{ false };
 		std::string remoteCert;
 		std::string remoteCert;
-	};
+		static constexpr int SslReadBufferSize{ 65536 };
+        uint8_t sslReadBuffer[SslReadBufferSize];
+};
 } // namespace RTC
 } // namespace RTC
 
 
 #endif
 #endif

webrtc/WebRtcTransport.cpp

@@ -3,10 +3,6 @@
 #include "Rtcp/Rtcp.h"
 #include "Rtcp/Rtcp.h"
 
 
 WebRtcTransport::WebRtcTransport() {
 WebRtcTransport::WebRtcTransport() {
-    static onceToken token([](){
-        RTC::DtlsTransport::ClassInit();
-    });
-
     dtls_transport_ = std::make_shared<RTC::DtlsTransport>(EventPollerPool::Instance().getFirstPoller(), this);
     dtls_transport_ = std::make_shared<RTC::DtlsTransport>(EventPollerPool::Instance().getFirstPoller(), this);
     ice_server_ = std::make_shared<RTC::IceServer>(this, makeRandStr(4), makeRandStr(24));
     ice_server_ = std::make_shared<RTC::IceServer>(this, makeRandStr(4), makeRandStr(24));
 }
 }