3 files changed, 18 insertions, 8 deletions
diff --git a/src/message.cpp b/src/message.cpp
index 354703e..601bc39 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -202,10 +202,10 @@ const Identity & DirectMessageThread::peer() const
 }
 
 
-vector<DirectMessageService::ThreadWatcher> DirectMessageService::Priv::watchers;
-mutex DirectMessageService::Priv::watcherLock;
+DirectMessageService::DirectMessageService():
+	p(new Priv)
+{}
 
-DirectMessageService::DirectMessageService() = default;
 DirectMessageService::~DirectMessageService() = default;
 
 UUID DirectMessageService::uuid() const
@@ -229,14 +229,14 @@ void DirectMessageService::handle(Context & ctx) const
 
 	lock.unlock();
 
-	for (const auto & w : Priv::watchers)
+	for (const auto & w : p->watchers)
 		w(dmt, -1, -1);
 }
 
 void DirectMessageService::onUpdate(ThreadWatcher w)
 {
-	scoped_lock l(Priv::watcherLock);
-	Priv::watchers.push_back(w);
+	scoped_lock l(p->watcherLock);
+	p->watchers.push_back(w);
 }
 
 DirectMessageThread DirectMessageService::thread(const Identity & peer)
diff --git a/src/message.h b/src/message.h
index c4a3549..efdec8f 100644
--- a/src/message.h
+++ b/src/message.h
@@ -51,8 +51,8 @@ struct DirectMessageThread::Iterator::Priv
 
 struct DirectMessageService::Priv
 {
-	static vector<ThreadWatcher> watchers;
-	static mutex watcherLock;
+	vector<ThreadWatcher> watchers;
+	mutex watcherLock;
 };
 
 }
diff --git a/src/network.cpp b/src/network.cpp
index 91f1923..4b79dcb 100644
--- a/src/network.cpp
+++ b/src/network.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cstring>
 #include <iostream>
+#include <stdexcept>
 
 #include <arpa/inet.h>
 #include <ifaddrs.h>
@@ -13,6 +14,7 @@
 #include <unistd.h>
 
 using std::holds_alternative;
+using std::runtime_error;
 using std::scoped_lock;
 using std::to_string;
 using std::unique_lock;
@@ -26,6 +28,14 @@ Server::Server(const Identity & self, vector<unique_ptr<Service>> && svcs):
 
 Server::~Server() = default;
 
+Service & Server::svcHelper(const std::type_info & tinfo)
+{
+	for (auto & s : p->services)
+		if (typeid(*s) == tinfo)
+			return *s;
+	throw runtime_error("service not found");
+}
+
 PeerList & Server::peerList() const
 {
 	return p->plist;