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

forgot a couple queries in postgres. trying to pull dns of member not network in embedded network controller

Browse Source 
also some debug logging
This commit is contained in:
Grant Limberg
2020-08-04 09:45:45 -07:00
parent d098a99d09
commit 2e52a1eebf
3 changed files with 107 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controller/EmbeddedNetworkController.cpp
View File

@ -1416,7 +1416,9 @@ void EmbeddedNetworkController::_request(
json &tags = network["tags"];
json &memberCapabilities = member["capabilities"];
json &memberTags = member["tags"];
json &dns = member["dns"];
json &dns = network["dns"];
fprintf(stderr, "DNS Config for Network ID %.16llx: %s\n", nwid, OSUtils::jsonDump(dns, 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.
@ -1727,6 +1729,8 @@ void EmbeddedNetworkController::_request(
++nc->dnsCount;
}
}
} else {
dns = json::array();
}
// Issue a certificate of ownership for all static IPs