version 0.3.29

[fms.git] / include / freenet / freenetmasterthread.h

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