ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-14 21:28:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko
2021-07-23 18:49:05 -04:00
parent 34de579c91 0ed9db05d2
commit 5c7e51feaf
4 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controller/EmbeddedNetworkController.cpp
View File

@ -1477,6 +1477,8 @@ void EmbeddedNetworkController::_request(
json &memberTags = member["tags"];
json &dns = network["dns"];
fprintf(stderr, "IP Assignment Pools for Network %s: %s\n", nwids, OSUtils::jsonDump(ipAssignmentPools, 2).c_str());
if (metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_RULES_ENGINE_REV,0) <= 0) {
// Old versions with no rules engine support get an allow everything rule.
// Since rules are enforced bidirectionally, newer versions *will* still