#include "../../include/freenet/introductionpuzzleinserter.h"\r
#include "../../include/freenet/identityintroductionrequester.h"\r
#include "../../include/freenet/introductionpuzzlerequester.h"\r
-#include "../../include/freenet/introductionpuzzleremover.h"\r
#include "../../include/freenet/identityintroductioninserter.h"\r
#include "../../include/freenet/trustlistinserter.h"\r
#include "../../include/freenet/trustlistrequester.h"\r
#include "../../include/freenet/messagerequester.h"\r
#include "../../include/freenet/messageinserter.h"\r
#include "../../include/freenet/messagelistinserter.h"\r
+#include "../../include/freenet/periodicdbmaintenance.h"\r
+#include "../../include/freenet/boardlistinserter.h"\r
+#include "../../include/freenet/boardlistrequester.h"\r
+#include "../../include/freenet/siteinserter.h"\r
\r
//#include <zthread/Thread.h>\r
#include "../../include/pthreadwrapper/thread.h"\r
void FreenetMasterThread::Run()\r
{\r
\r
+ DateTime lastreceivedmessage;\r
+ DateTime now;\r
FCPMessage message;\r
bool done=false;\r
\r
Sleep(1000);\r
}\r
}\r
+ else\r
+ {\r
+ lastreceivedmessage.SetToGMTime();\r
+ }\r
}\r
// fcp is connected\r
else\r
if(message.GetName()!="")\r
{\r
HandleMessage(message);\r
+ lastreceivedmessage.SetToGMTime();\r
}\r
}\r
\r
(*i)->Process();\r
}\r
\r
+ // if we haven't received any messages from the node in 10 minutes, something is wrong\r
+ now.SetToGMTime();\r
+ if(lastreceivedmessage<(now-(1.0/144.0)))\r
+ {\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::Run The Freenet node has not responded in 10 minutes. Trying to reconnect.");\r
+ m_fcp.Disconnect();\r
+ }\r
+\r
}\r
// }while(!ZThread::Thread::interrupted() && done==false);\r
}while(!IsCancelled() && done==false);\r
m_registrables.push_back(new IntroductionPuzzleInserter(&m_fcp));\r
m_registrables.push_back(new IdentityIntroductionRequester(&m_fcp));\r
m_registrables.push_back(new IntroductionPuzzleRequester(&m_fcp));\r
- m_registrables.push_back(new IntroductionPuzzleRemover());\r
m_registrables.push_back(new IdentityIntroductionInserter(&m_fcp));\r
m_registrables.push_back(new TrustListInserter(&m_fcp));\r
m_registrables.push_back(new TrustListRequester(&m_fcp));\r
+ m_registrables.push_back(new MessageListInserter(&m_fcp));\r
m_registrables.push_back(new MessageListRequester(&m_fcp));\r
m_registrables.push_back(new MessageRequester(&m_fcp));\r
m_registrables.push_back(new MessageInserter(&m_fcp));\r
- m_registrables.push_back(new MessageListInserter(&m_fcp));\r
+ m_registrables.push_back(new BoardListInserter(&m_fcp));\r
+ m_registrables.push_back(new BoardListRequester(&m_fcp));\r
+ m_registrables.push_back(new SiteInserter(&m_fcp));\r
+ m_registrables.push_back(new PeriodicDBMaintenance());\r
\r
for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)\r
{\r