Merge branch 'dev' into jh-zerotier-multithreaded

This commit is contained in:
Adam Ierymenko 2024-09-10 13:10:45 -04:00
commit 6bc785e771
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
4 changed files with 29 additions and 17 deletions

View file

@ -2547,7 +2547,7 @@ public:
}
_node->bondController()->addCustomLink(customPolicyStr, new Link(linkNameStr,ipvPref,mtu,capacity,enabled,linkMode,failoverToStr));
}
std::string linkSelectMethodStr(OSUtils::jsonString(customPolicy["activeReselect"],"optimize"));
std::string linkSelectMethodStr(OSUtils::jsonString(customPolicy["activeReselect"],"always"));
if (linkSelectMethodStr == "always") {
newTemplateBond->setLinkSelectMethod(ZT_BOND_RESELECTION_POLICY_ALWAYS);
}