void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-25 06:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

"relayed" as ip addr for unknown IP in last_seen

Browse source
This commit is contained in:
Grant Limberg 2025-05-21 07:24:35 -07:00
parent af0a9118c1
commit 08b1ceb9a1
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controller/CV2.cpp
View file

@ -987,6 +987,12 @@ void CV2::onlineNotificationThread() {
std::string timestamp = std::to_string(ts); std::string timestamp = std::to_string(ts);
std::string osArch = i->second.osArch; std::string osArch = i->second.osArch;
std::vector<std::string> osArchSplit = split(osArch, '/'); std::vector<std::string> osArchSplit = split(osArch, '/');
std::string os = osArchSplit[0];
std::string arch = osArchSplit[1];
if (ipAddr.empty()) {
ipAddr = "relayed";
}
json record = { json record = {
{ipAddr, ts}, {ipAddr, ts},
@ -994,7 +1000,7 @@ void CV2::onlineNotificationThread() {
std::string device_network_insert = "INSERT INTO network_memberships_ctl (device_id, network_id, last_seen, os, arch) " std::string device_network_insert = "INSERT INTO network_memberships_ctl (device_id, network_id, last_seen, os, arch) "
"VALUES ('"+w2.esc(memberId)+"', '"+w2.esc(networkId)+"', '"+w2.esc(record.dump())+"'::JSONB, " "VALUES ('"+w2.esc(memberId)+"', '"+w2.esc(networkId)+"', '"+w2.esc(record.dump())+"'::JSONB, "
"'"+w2.esc(osArchSplit[0])+"', '"+w2.esc(osArchSplit[1])+"') " "'"+w2.esc(os)+"', '"+w2.esc(arch)+"') "
"ON CONFLICT (device_id, network_id) DO UPDATE SET os = EXCLUDED.os, arch = EXCLUDED.arch, " "ON CONFLICT (device_id, network_id) DO UPDATE SET os = EXCLUDED.os, arch = EXCLUDED.arch, "
"last_seen = network_memberships_ctl.last_seen || EXCLUDED.last_seen"; "last_seen = network_memberships_ctl.last_seen || EXCLUDED.last_seen";
pipe.insert(device_network_insert); pipe.insert(device_network_insert);