Mash -> MeshTracker

3 files changed, 19 insertions, 13 deletions

diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp
index a2666ac02..0570dd316 100644
--- a/zenserver/upstream/zen.cpp
+++ b/zenserver/upstream/zen.cpp
@@ -66,17 +66,17 @@ namespace detail {
 
 // Note that currently this just implements an UDP echo service for testing purposes
 
-Mesh::Mesh(asio::io_context& IoContext) : m_Log(logging::Get("mesh")), m_IoContext(IoContext), m_SessionId(GetSessionId())
+MeshTracker::MeshTracker(asio::io_context& IoContext) : m_Log(logging::Get("mesh")), m_IoContext(IoContext), m_SessionId(GetSessionId())
 {
 }
 
-Mesh::~Mesh()
+MeshTracker::~MeshTracker()
 {
 	Stop();
 }
 
 void
-Mesh::Start(uint16_t Port)
+MeshTracker::Start(uint16_t Port)
 {
 	ZEN_ASSERT(Port);
 	ZEN_ASSERT(m_Port == 0);
@@ -87,7 +87,7 @@ Mesh::Start(uint16_t Port)
 };
 
 void
-Mesh::Stop()
+MeshTracker::Stop()
 {
 	using namespace std::literals;
 
@@ -118,7 +118,7 @@ Mesh::Stop()
 }
 
 void
-Mesh::EnqueueTick()
+MeshTracker::EnqueueTick()
 {
 	m_Timer.expires_after(std::chrono::seconds(10));
 
@@ -138,7 +138,7 @@ Mesh::EnqueueTick()
 }
 
 void
-Mesh::OnTick()
+MeshTracker::OnTick()
 {
 	using namespace std::literals;
 
@@ -156,7 +156,7 @@ Mesh::OnTick()
 }
 
 void
-Mesh::BroadcastPacket(CbObjectWriter& Obj)
+MeshTracker::BroadcastPacket(CbObjectWriter& Obj)
 {
 	std::error_code ErrorCode;
 
@@ -201,7 +201,7 @@ Mesh::BroadcastPacket(CbObjectWriter& Obj)
 }
 
 void
-Mesh::Run()
+MeshTracker::Run()
 {
 	m_State = kRunning;
 
@@ -212,7 +212,7 @@ Mesh::Run()
 }
 
 void
-Mesh::IssueReceive()
+MeshTracker::IssueReceive()
 {
 	using namespace std::literals;
 
diff --git a/zenserver/upstream/zen.h b/zenserver/upstream/zen.h
index 8cc4c121d..bc8fd3c56 100644
--- a/zenserver/upstream/zen.h
+++ b/zenserver/upstream/zen.h
@@ -34,12 +34,16 @@ class ZenStructuredCacheClient;
 /** Zen mesh tracker
  *
  * Discovers and tracks local peers
+ *
+ * NOTE: This is currently experimental, and not very useful yet
+ *
  */
-class Mesh
+
+class MeshTracker
 {
 public:
-	Mesh(asio::io_context& IoContext);
-	~Mesh();
+	MeshTracker(asio::io_context& IoContext);
+	~MeshTracker();
 
 	void Start(uint16_t Port);
 	void Stop();
@@ -86,6 +90,8 @@ private:
 	tsl::robin_map<Oid, PeerInfo, Oid::Hasher> m_KnownPeers;
 };
 
+//////////////////////////////////////////////////////////////////////////
+
 namespace detail {
 	struct ZenCacheSessionState;
 }
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index e246afc34..224376e81 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -549,7 +549,7 @@ private:
 	std::unique_ptr<zen::HttpStructuredCacheService> m_StructuredCacheService;
 	zen::HttpAdminService							 m_AdminService{m_GcScheduler};
 	zen::HttpHealthService							 m_HealthService;
-	zen::Mesh										 m_ZenMesh{m_IoContext};
+	zen::MeshTracker								 m_ZenMesh{m_IoContext};
 #if ZEN_WITH_COMPUTE_SERVICES
 	std::unique_ptr<zen::HttpLaunchService>	  m_HttpLaunchService;
 	std::unique_ptr<zen::HttpFunctionService> m_HttpFunctionService;