From 069d7c1862009e8f0a7512a4abd063819b7f310f Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Thu, 25 Sep 2025 15:14:30 -0700
Subject: [PATCH] set objtype on messages received via PubSub

---
 nonfree/controller/CentralDB.cpp      | 10 +++++-----
 nonfree/controller/PubSubListener.cpp |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nonfree/controller/CentralDB.cpp b/nonfree/controller/CentralDB.cpp
index 5d85de441..a05d9bb37 100644
--- a/nonfree/controller/CentralDB.cpp
+++ b/nonfree/controller/CentralDB.cpp
@@ -351,10 +351,10 @@ bool CentralDB::save(nlohmann::json& record, bool notifyListeners)
 		}
 	}
 	catch (std::exception& e) {
-		fprintf(stderr, "Error on PostgreSQL::save: %s\n", e.what());
+		fprintf(stderr, "Error on CentralDB::save: %s\n", e.what());
 	}
 	catch (...) {
-		fprintf(stderr, "Unknown error on PostgreSQL::save\n");
+		fprintf(stderr, "Unknown error on CentralDB::save\n");
 	}
 	return modified;
 }
@@ -368,7 +368,7 @@ void CentralDB::eraseNetwork(const uint64_t networkId)
 	char networkIdStr[17];
 	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
 
-	fprintf(stderr, "PostgreSQL::eraseNetwork\n");
+	fprintf(stderr, "CentralDB::eraseNetwork\n");
 	char tmp2[24];
 	waitForReady();
 	Utils::hex(networkId, tmp2);
@@ -392,7 +392,7 @@ void CentralDB::eraseMember(const uint64_t networkId, const uint64_t memberId)
 	span->SetAttribute("network_id", Utils::hex(networkId, networkIdStr));
 	span->SetAttribute("member_id", Utils::hex10(memberId, memberIdStr));
 
-	fprintf(stderr, "PostgreSQL::eraseMember\n");
+	fprintf(stderr, "CentralDB::eraseMember\n");
 	char tmp2[24];
 	waitForReady();
 	std::pair<nlohmann::json, bool> tmp, nw;
@@ -467,7 +467,7 @@ AuthInfo CentralDB::getSSOAuthInfo(const nlohmann::json& member, const std::stri
 		//	info.version=1;
 		//	return info;
 		// }
-		//  fprintf(stderr, "PostgreSQL::updateMemberOnLoad: %s-%s\n", networkId.c_str(), memberId.c_str());
+		//  fprintf(stderr, "CentralDB::updateMemberOnLoad: %s-%s\n", networkId.c_str(), memberId.c_str());
 		std::shared_ptr<PostgresConnection> c;
 		try {
 			c = _pool->borrow();
diff --git a/nonfree/controller/PubSubListener.cpp b/nonfree/controller/PubSubListener.cpp
index 8e727e8d5..250bf00c9 100644
--- a/nonfree/controller/PubSubListener.cpp
+++ b/nonfree/controller/PubSubListener.cpp
@@ -277,6 +277,7 @@ nlohmann::json toJson(const pbmessages::NetworkChange_Network& nc, pbmessages::N
 {
 	nlohmann::json out;
 
+	out["objtype"] = "network";
 	out["id"] = nc.network_id();
 	out["name"] = nc.name();
 	out["capabilities"] = OSUtils::jsonParse(nc.capabilities());
@@ -387,6 +388,7 @@ nlohmann::json toJson(const pbmessages::NetworkChange_Network& nc, pbmessages::N
 nlohmann::json toJson(const pbmessages::MemberChange_Member& mc, pbmessages::MemberChange_ChangeSource source)
 {
 	nlohmann::json out;
+	out["objtype"] = "member";
 	out["id"] = mc.device_id();
 	out["nwid"] = mc.network_id();
 	if (mc.has_remote_trace_target()) {