ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-22 06:17:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly initialize active-backup path index as partial fix for #1587

Browse Source
This commit is contained in:
Joseph Henry 2022-05-04 09:51:48 -07:00
parent 48852e8cb4
commit e9f8ecbf7e
No known key found for this signature in database
GPG Key ID: C45B33FF5EBC9344
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
node/Bond.cpp
View File

@ -1224,7 +1224,7 @@ bool Bond::abForciblyRotateLink()
void Bond::processActiveBackupTasks(void* tPtr, int64_t now) void Bond::processActiveBackupTasks(void* tPtr, int64_t now)
{ {
int prevActiveBackupPathIdx = _abPathIdx; int prevActiveBackupPathIdx = _abPathIdx;
int nonPreferredPathIdx; int nonPreferredPathIdx = ZT_MAX_PEER_NETWORK_PATHS;
bool bFoundPrimaryLink = false; bool bFoundPrimaryLink = false;
if (_abPathIdx != ZT_MAX_PEER_NETWORK_PATHS && ! _paths[_abPathIdx].p) { if (_abPathIdx != ZT_MAX_PEER_NETWORK_PATHS && ! _paths[_abPathIdx].p) {
@ -1247,7 +1247,6 @@ void Bond::processActiveBackupTasks(void* tPtr, int64_t now)
log("failover queue is empty, bond is no longer fault-tolerant"); log("failover queue is empty, bond is no longer fault-tolerant");
} }
} }
/** /**
* Select initial "active" active-backup link * Select initial "active" active-backup link
*/ */
@ -1272,6 +1271,7 @@ void Bond::processActiveBackupTasks(void* tPtr, int64_t now)
} }
} }
} }
/** /**
* [Manual mode] * [Manual mode]
* The user has specified links or failover rules that the bonding policy should adhere to. * The user has specified links or failover rules that the bonding policy should adhere to.
@ -1302,7 +1302,7 @@ void Bond::processActiveBackupTasks(void* tPtr, int64_t now)
} }
} }
} }
if (bFoundPrimaryLink && nonPreferredPathIdx) { if (bFoundPrimaryLink && (nonPreferredPathIdx != ZT_MAX_PEER_NETWORK_PATHS)) {
log("found non-preferred primary link"); log("found non-preferred primary link");
_abPathIdx = nonPreferredPathIdx; _abPathIdx = nonPreferredPathIdx;
} }
@ -1311,6 +1311,7 @@ void Bond::processActiveBackupTasks(void* tPtr, int64_t now)
// TODO: Should wait for some time (failover interval?) and then switch to spare link // TODO: Should wait for some time (failover interval?) and then switch to spare link
} }
} }
else if (! userHasSpecifiedPrimaryLink()) { else if (! userHasSpecifiedPrimaryLink()) {
log("user did not specify a primary link, select first available link"); log("user did not specify a primary link, select first available link");
for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) { for (int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {