X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Ffreenet%2Ffreenetmasterthread.h;h=f7f176c3cd58ba0c59a4a56e0f768319a5516195;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=e1f2453792770c1b5132bf1ca6e379707feaf39b;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/include/freenet/freenetmasterthread.h b/include/freenet/freenetmasterthread.h
index e1f2453..f7f176c 100644
--- a/include/freenet/freenetmasterthread.h
+++ b/include/freenet/freenetmasterthread.h
@@ -2,28 +2,28 @@
 #define _freenetmasterthread_
 
 #include "../ilogger.h"
+#include "../ithreaddatabase.h"
 #include "ifreenetregistrable.h"
 #include "ifcpmessagehandler.h"
 #include "ifcpconnected.h"
 #include "iperiodicprocessor.h"
 
-//#include <zthread/Runnable.h>
-#include "../pthreadwrapper/runnable.h"
+#include "../threadwrapper/cancelablerunnable.h"
 
 // forward declaration
 class IFreenetRegistrable;
 
-class FreenetMasterThread:public PThread::Runnable,public ILogger, public IFCPMessageHandler
+class FreenetMasterThread:public CancelableRunnable,public ILogger, public IFCPMessageHandler, public IThreadDatabase
 {
 public:
 	FreenetMasterThread();
 	~FreenetMasterThread();
 	
-	const bool HandleMessage(FCPMessage &message);
+	const bool HandleMessage(FCPv2::Message &message);
 
-	void Run();
+	void run();
 
-	// registration methods for children objects
+	// registration methods for child objects
 	void RegisterPeriodicProcessor(IPeriodicProcessor *obj);
 	void RegisterFCPConnected(IFCPConnected *obj);
 	void RegisterFCPMessageHandler(IFCPMessageHandler *obj);
@@ -34,8 +34,8 @@ private:
 	void Shutdown();
 
 	std::string m_fcphost;
-	long m_fcpport;
-	FCPv2 m_fcp;
+	int m_fcpport;
+	FCPv2::Connection m_fcp;
 	std::vector<IFreenetRegistrable *> m_registrables;
 	std::vector<IPeriodicProcessor *> m_processors;
 	std::vector<IFCPConnected *> m_fcpconnected;