Browse Source

DBMirrorSet wasn't passing along os/arch infof

Grant Limberg 1 month ago
parent
commit
08e0da7921
2 changed files with 3 additions and 3 deletions
  1. 1 1
      controller/DBMirrorSet.cpp
  2. 2 2
      controller/EmbeddedNetworkController.cpp

+ 1 - 1
controller/DBMirrorSet.cpp

@@ -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) {
 	std::shared_lock<std::shared_mutex> l(_dbs_l);
 	for(auto d=_dbs.begin();d!=_dbs.end();++d) {
-		(*d)->nodeIsOnline(networkId,memberId,physicalAddress);
+		(*d)->nodeIsOnline(networkId,memberId,physicalAddress,osArch);
 	}
 }
 

+ 2 - 2
controller/EmbeddedNetworkController.cpp

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