Pārlūkot izejas kodu

Potential fix fro deadlock bug

Joseph Henry 3 gadi atpakaļ
vecāks
revīzija
165757176a
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. 1 1
      node/Peer.cpp

+ 1 - 1
node/Peer.cpp

@@ -228,9 +228,9 @@ void Peer::received(
 
 
 SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired, int32_t flowId)
 SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired, int32_t flowId)
 {
 {
+	Mutex::Lock _l(_paths_m);
 	Mutex::Lock _l(_bond_m);
 	Mutex::Lock _l(_bond_m);
 	if (!_bond) {
 	if (!_bond) {
-		Mutex::Lock _l(_paths_m);
 		unsigned int bestPath = ZT_MAX_PEER_NETWORK_PATHS;
 		unsigned int bestPath = ZT_MAX_PEER_NETWORK_PATHS;
 		/**
 		/**
 		 * Send traffic across the highest quality path only. This algorithm will still
 		 * Send traffic across the highest quality path only. This algorithm will still