From 86dbce8f1500c629f10b196016024a88e874e507 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Mon, 3 Apr 2023 10:49:01 -0700
Subject: [PATCH] renamed several items in dht value data

---
 reflector/Reflector.cpp     | 12 ++++++------
 reflector/urfd-dht-values.h | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/reflector/Reflector.cpp b/reflector/Reflector.cpp
index da5cb0b..2c1e30b 100644
--- a/reflector/Reflector.cpp
+++ b/reflector/Reflector.cpp
@@ -544,7 +544,7 @@ void CReflector::PutDHTPeers()
 {
 	const std::string cs(g_Configure.GetString(g_Keys.names.callsign));
 	// load it up
-	SUrfdPeers0 p;
+	SUrfdPeers1 p;
 	time(&p.timestamp);
 	p.sequence = peers_put_count++;
 	auto peers = GetPeers();
@@ -555,7 +555,7 @@ void CReflector::PutDHTPeers()
 	ReleasePeers();
 
 	auto nv = std::make_shared<dht::Value>(p);
-	nv->user_type.assign("urfd-peers-0");
+	nv->user_type.assign("urfd-peers-1");
 	nv->id = toUType(EUrfdValueID::Peers);
 
 	node.putSigned(
@@ -569,7 +569,7 @@ void CReflector::PutDHTPeers()
 void CReflector::PutDHTClients()
 {
 	const std::string cs(g_Configure.GetString(g_Keys.names.callsign));
-	SUrfdClients0 c;
+	SUrfdClients1 c;
 	time(&c.timestamp);
 	c.sequence = clients_put_count++;
 	auto clients = GetClients();
@@ -580,7 +580,7 @@ void CReflector::PutDHTClients()
 	ReleaseClients();
 
 	auto nv = std::make_shared<dht::Value>(c);
-	nv->user_type.assign("urfd-clients-0");
+	nv->user_type.assign("urfd-clients-1");
 	nv->id = toUType(EUrfdValueID::Clients);
 
 	node.putSigned(
@@ -594,7 +594,7 @@ void CReflector::PutDHTClients()
 void CReflector::PutDHTUsers()
 {
 	const std::string cs(g_Configure.GetString(g_Keys.names.callsign));
-	SUrfdUsers0 u;
+	SUrfdUsers1 u;
 	time(&u.timestamp);
 	u.sequence = users_put_count++;
 	auto users = GetUsers();
@@ -605,7 +605,7 @@ void CReflector::PutDHTUsers()
 	ReleaseUsers();
 
 	auto nv = std::make_shared<dht::Value>(u);
-	nv->user_type.assign("urfd-users-0");
+	nv->user_type.assign("urfd-users-1");
 	nv->id = toUType(EUrfdValueID::Users);
 
 	node.putSigned(
diff --git a/reflector/urfd-dht-values.h b/reflector/urfd-dht-values.h
index 210c391..7c79bab 100644
--- a/reflector/urfd-dht-values.h
+++ b/reflector/urfd-dht-values.h
@@ -22,45 +22,48 @@
 #include <opendht.h>
 
 /* HELPERS */
+#ifndef TO_U_TYPE_DEF
+#define TO_U_TYPE_DEF
 template<typename E> constexpr auto toUType(E enumerator) noexcept
 {
 	return static_cast<std::underlying_type_t<E>>(enumerator);
 } // Item #10 in "Effective Modern C++", by Scott Meyers, O'REILLY
+#endif
 
 enum class EUrfdValueID : uint64_t { Config=1, Peers=2, Clients=3, Users=4 };
 
 /* PEERS */
-using PeerTuple = std::tuple<std::string, std::string, std::time_t>;
+using UrfdPeerTuple = std::tuple<std::string, std::string, std::time_t>;
 enum class EUrfdPeerFields { Callsign, Modules, ConnectTime };
-struct SUrfdPeers0
+struct SUrfdPeers1
 {
 	std::time_t timestamp;
 	unsigned int sequence;
-	std::list<PeerTuple> list;
+	std::list<UrfdPeerTuple> list;
 
 	MSGPACK_DEFINE(timestamp, sequence, list)
 };
 
 /* CLIENTS */
-using ClientTuple = std::tuple<std::string, std::string, char, std::time_t, std::time_t>;
+using UrfdClientTuple = std::tuple<std::string, std::string, char, std::time_t, std::time_t>;
 enum class EUrfdClientFields { Callsign, Ip, Module, ConnectTime, LastHeardTime };
-struct SUrfdClients0
+struct SUrfdClients1
 {
 	std::time_t timestamp;
 	unsigned int sequence;
-	std::list<ClientTuple> list;
+	std::list<UrfdClientTuple> list;
 
 	MSGPACK_DEFINE(timestamp, sequence, list)
 };
 
 /* USERS */
-using UserTuple = std::tuple<std::string, std::string, char, std::string, std::time_t>;
+using UrfdUserTuple = std::tuple<std::string, std::string, char, std::string, std::time_t>;
 enum class EUrfdUserFields { Callsign, ViaNode, OnModule, ViaPeer, LastHeardTime };
-struct SUrfdUsers0
+struct SUrfdUsers1
 {
 	std::time_t timestamp;
 	unsigned int sequence;
-	std::list<UserTuple> list;
+	std::list<UrfdUserTuple> list;
 
 	MSGPACK_DEFINE(timestamp, sequence, list)
 };