github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-05 20:41:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

DBMirrorSet wasn't passing along os/arch infof

Browse source
This commit is contained in:
Grant Limberg 2025-07-02 11:26:28 -07:00
parent 27021ff425
commit 08e0da7921
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controller/DBMirrorSet.cpp
View file

@ -209,7 +209,7 @@ void DBMirrorSet::eraseMember(const uint64_t networkId,const uint64_t memberId)
void DBMirrorSet::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress, const char *osArch) { void DBMirrorSet::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress, const char *osArch) {
std::shared_lock<std::shared_mutex> l(_dbs_l); std::shared_lock<std::shared_mutex> l(_dbs_l);
for(auto d=_dbs.begin();d!=_dbs.end();++d) { for(auto d=_dbs.begin();d!=_dbs.end();++d) {
(*d)->nodeIsOnline(networkId,memberId,physicalAddress); (*d)->nodeIsOnline(networkId,memberId,physicalAddress,osArch);
} }
} }

4
controller/EmbeddedNetworkController.cpp
View file

@ -1408,8 +1408,8 @@ void EmbeddedNetworkController::_request(
#endif #endif
char osArch[256]; char osArch[256];
metaData.get(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_OS_ARCH, osArch, sizeof(osArch)); metaData.get(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_OS_ARCH, osArch, sizeof(osArch));
fprintf(stderr, "Network Config Request: nwid=%.16llx, osArch=%s\n", fprintf(stderr, "Network Config Request: nwid=%.16llx, nodeid=%.10llx, osArch=%s\n",
nwid, osArch); nwid, identity.address().toInt(), osArch);
_db.nodeIsOnline(nwid,identity.address().toInt(),fromAddr, osArch); _db.nodeIsOnline(nwid,identity.address().toInt(),fromAddr, osArch);
#ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK #ifdef CENTRAL_CONTROLLER_REQUEST_BENCHMARK
b2.stop(); b2.stop();