소스 검색

Merge pull request #1351 from paullouisageneau/fix-mbedtls-double-lock

Fix double mutex lock with MbedTLS
Paul-Louis Ageneau 6 달 전
부모
커밋
05913402ac
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/impl/dtlstransport.hpp
  2. 1 1
      src/impl/tlstransport.hpp

+ 1 - 1
src/impl/dtlstransport.hpp

@@ -78,7 +78,7 @@ protected:
 	mbedtls_ssl_config mConf;
 	mbedtls_ssl_context mSsl;
 
-	std::mutex mSslMutex;
+	std::recursive_mutex mSslMutex;
 
 	uint32_t mFinMs = 0, mIntMs = 0;
 	std::chrono::time_point<std::chrono::steady_clock> mTimerSetAt;

+ 1 - 1
src/impl/tlstransport.hpp

@@ -72,7 +72,7 @@ protected:
 	mbedtls_ssl_config mConf;
 	mbedtls_ssl_context mSsl;
 
-	std::mutex mSslMutex;
+	std::recursive_mutex mSslMutex;
 	std::atomic<bool> mOutgoingResult = true;
 
 	message_ptr mIncomingMessage;