ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 04:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use network ID, not controller ID for looking up network data

Browse Source
This commit is contained in:
Grant Limberg 2021-07-06 14:15:01 -07:00
parent 10215af96d
commit 73ddea8864
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
controller/PostgreSQL.cpp
View File

@ -502,7 +502,7 @@ void PostgreSQL::initializeNetworks()
config["routes"] = json::array();
pqxx::result r2 = w.exec_params("SELECT host(ip_range_start), host(ip_range_end) FROM ztc_network_assignment_pool WHERE network_id = $1", _myAddressStr);
pqxx::result r2 = w.exec_params("SELECT host(ip_range_start), host(ip_range_end) FROM ztc_network_assignment_pool WHERE network_id = $1", nwid);
for (auto row2 = r2.begin(); row2 != r2.end(); row2++) {
json ip;
@ -512,24 +512,27 @@ void PostgreSQL::initializeNetworks()
config["ipAssignmentPools"].push_back(ip);
}
r2 = w.exec_params("SELECT host(address), bits, host(via) FROM ztc_network_route WHERE network_id = $1", _myAddressStr);
r2 = w.exec_params("SELECT host(address), bits, host(via) FROM ztc_network_route WHERE network_id = $1", nwid);
for (auto row2 = r2.begin(); row2 != r2.end(); row2++) {
std::string addr = row2[0].as<std::string>();
std::string bits = row2[1].as<std::string>();
std::string via = row2[2].as<std::string>();
json route;
route["target"] = addr + "/" + bits;
if (via == "NULL") {
if (row[2].is_null()) {
route["via"] = nullptr;
} else {
route["via"] = via;
route["via"] = row[2].as<std::string>();
}
config["routes"].push_back(route);
}
r2 = w.exec_params("SELECT domain, servers FROM ztc_network_dns WHERE network_id = $1", _myAddressStr);
r2 = w.exec_params("SELECT domain, servers FROM ztc_network_dns WHERE network_id = $1", nwid);
if (r2.size() > 1) {
fprintf(stderr, "ERROR: invalid number of DNS configurations for network %s. Must be 0 or 1\n", nwid.c_str());