github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-22 06:14:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into dependabot/cargo/zeroidc/h2-0.3.17

Browse source
This commit is contained in:
Grant Limberg 2023-04-19 11:10:18 -07:00 • committed by GitHub
commit c4b7e925a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
node/Peer.hpp
View file

@ -504,7 +504,7 @@ public:
* @return The bonding policy used to reach this peer * @return The bonding policy used to reach this peer
*/ */
inline int8_t bondingPolicy() { inline int8_t bondingPolicy() {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_bond_m);
if (_bond) { if (_bond) {
return _bond->policy(); return _bond->policy();
} }

1
node/Switch.cpp
View file

@ -642,6 +642,7 @@ void Switch::aqm_enqueue(void *tPtr, const SharedPtr<Network> &network, Packet &
} }
} }
if (!selectedQueue) { if (!selectedQueue) {
_aqm_m.unlock();
return; return;
} }