void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-09-17 04:03:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

another fix
Some checks are pending
/ build_macos (push) Waiting to run
Details
/ build_windows (push) Waiting to run
Details
/ Central Controller Build (push) Waiting to run
Details
/ multi-arch-docker (push) Blocked by required conditions
Details
/ build_ubuntu (push) Waiting to run
Details

Browse source
This commit is contained in:
Grant Limberg 2025-09-04 17:45:38 -07:00
parent 48ff61b392
commit 282d7c7f9d
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nonfree/controller/CentralDB.cpp
View file

@ -1442,6 +1442,10 @@ void CentralDB::onlineNotificationThread()
std::string memberId(memTmp); std::string memberId(memTmp);
try { try {
// check if the member exists first.
//
// exec_params1 will throw pqxx::unexpected_rows if not exactly one row is returned. If that's the
// case, skip this record and move on.
pqxx::row r = w.exec_params1( pqxx::row r = w.exec_params1(
"SELECT device_id, network_id FROM network_memberships_ctl WHERE network_id = $1 AND device_id " "SELECT device_id, network_id FROM network_memberships_ctl WHERE network_id = $1 AND device_id "
"= $2", "= $2",

14
nonfree/controller/PostgresStatusWriter.cpp
View file

@ -57,20 +57,6 @@ void PostgresStatusWriter::writePending()
{ entry.address.toIpString(iptmp), entry.last_seen }, { entry.address.toIpString(iptmp), entry.last_seen },
}; };
try {
// check if the member exists first.
//
// exec_params1 will throw pqxx::unexpected_rows if not exactly one row is returned. If that's the
// case, skip this record and move on.
w.exec_params1(
"SELECT device_id, network_id FROM network_memberships_ctl WHERE network_id = $1 AND device_id = "
"$2",
entry.network_id, entry.node_id);
}
catch (pqxx::unexpected_rows& e) {
continue;
}
std::string insert_statement = std::string insert_statement =
"INSERT INTO network_memberships_ctl (device_id, network_id, last_seen, os, arch) " "INSERT INTO network_memberships_ctl (device_id, network_id, last_seen, os, arch) "
"VALUES ('" "VALUES ('"