void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix active-backup path selection bug

Browse source
This commit is contained in:
Joseph Henry 2021-12-09 13:43:52 -08:00
parent 05a0a20197
commit 1f43a736b2
No known key found for this signature in database
GPG key ID: C45B33FF5EBC9344
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
node/Bond.cpp
View file

@ -661,7 +661,7 @@ void Bond::processIncomingPathNegotiationRequest(uint64_t now, SharedPtr<Path>&
if (remoteUtility > _localUtility) { if (remoteUtility > _localUtility) {
_paths[pathIdx].p->address().toString(pathStr); _paths[pathIdx].p->address().toString(pathStr);
log("peer suggests alternate link %s/%s, remote utility (%d) greater than local utility (%d), switching to suggested link\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility); log("peer suggests alternate link %s/%s, remote utility (%d) greater than local utility (%d), switching to suggested link\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility);
negotiatedPathIdx = pathIdx; _negotiatedPathIdx = pathIdx;
} }
if (remoteUtility < _localUtility) { if (remoteUtility < _localUtility) {
log("peer suggests alternate link %s/%s, remote utility (%d) less than local utility (%d), not switching\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility); log("peer suggests alternate link %s/%s, remote utility (%d) less than local utility (%d), not switching\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility);
@ -670,7 +670,7 @@ void Bond::processIncomingPathNegotiationRequest(uint64_t now, SharedPtr<Path>&
log("peer suggests alternate link %s/%s, remote utility (%d) equal to local utility (%d)\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility); log("peer suggests alternate link %s/%s, remote utility (%d) equal to local utility (%d)\n", link->ifname().c_str(), pathStr, remoteUtility, _localUtility);
if (_peer->_id.address().toInt() > RR->node->identity().address().toInt()) { if (_peer->_id.address().toInt() > RR->node->identity().address().toInt()) {
log("agree with peer to use alternate link %s/%s\n", link->ifname().c_str(), pathStr); log("agree with peer to use alternate link %s/%s\n", link->ifname().c_str(), pathStr);
negotiatedPathIdx = pathIdx; _negotiatedPathIdx = pathIdx;
} }
else { else {
log("ignore petition from peer to use alternate link %s/%s\n", link->ifname().c_str(), pathStr); log("ignore petition from peer to use alternate link %s/%s\n", link->ifname().c_str(), pathStr);
@ -730,7 +730,7 @@ void Bond::pathNegotiationCheck(void* tPtr, int64_t now)
if (_localUtility == 0) { if (_localUtility == 0) {
// There's no loss to us, just switch without sending a another request // There's no loss to us, just switch without sending a another request
// fprintf(stderr, "BT: (sync) giving up, switching to remote peer's path.\n"); // fprintf(stderr, "BT: (sync) giving up, switching to remote peer's path.\n");
negotiatedPathIdx = maxInPathIdx; _negotiatedPathIdx = maxInPathIdx;
} }
} }
} }
@ -1478,13 +1478,15 @@ void Bond::processActiveBackupTasks(void* tPtr, int64_t now)
// If using "optimize" primary re-select mode, ignore user link designations // If using "optimize" primary re-select mode, ignore user link designations
failoverScoreHandicap = ZT_BOND_FAILOVER_HANDICAP_PRIMARY; failoverScoreHandicap = ZT_BOND_FAILOVER_HANDICAP_PRIMARY;
} }
if (_paths[i].p.ptr() == _paths[negotiatedPathIdx].p.ptr()) { /*
if (_paths[i].p.ptr() == _paths[_negotiatedPathIdx].p.ptr()) {
_paths[i].negotiated = true; _paths[i].negotiated = true;
failoverScoreHandicap = ZT_BOND_FAILOVER_HANDICAP_NEGOTIATED; failoverScoreHandicap = ZT_BOND_FAILOVER_HANDICAP_NEGOTIATED;
} }
else { else {
_paths[i].negotiated = false; _paths[i].negotiated = false;
} }
*/
_paths[i].failoverScore = _paths[i].allocation + failoverScoreHandicap; _paths[i].failoverScore = _paths[i].allocation + failoverScoreHandicap;
if (_paths[i].p.ptr() != _paths[_abPathIdx].p.ptr()) { if (_paths[i].p.ptr() != _paths[_abPathIdx].p.ptr()) {
bool bFoundPathInQueue = false; bool bFoundPathInQueue = false;
@ -1622,6 +1624,7 @@ void Bond::setBondParameters(int policy, SharedPtr<Bond> templateBond, bool useT
_pathNegotiationCutoffCount = 0; _pathNegotiationCutoffCount = 0;
_lastPathNegotiationReceived = 0; _lastPathNegotiationReceived = 0;
_localUtility = 0; _localUtility = 0;
_negotiatedPathIdx = 0;
// QOS Verb (and related checks) // QOS Verb (and related checks)

2
node/Bond.hpp
View file

@ -1428,7 +1428,7 @@ class Bond {
// path negotiation // path negotiation
int16_t _localUtility; int16_t _localUtility;
int negotiatedPathIdx; int _negotiatedPathIdx;
uint8_t _numSentPathNegotiationRequests; uint8_t _numSentPathNegotiationRequests;
bool _allowPathNegotiation; bool _allowPathNegotiation;