X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=f30cbf1259f9e354a9fc2b1d2cd4c3fbb883f678;hb=df316253862dc50e8e5a790d9634ef90be37badb;hp=398d8fa52990d1f64e04e81907aaa07d86c6517f;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 398d8fa..f30cbf1 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -8,7 +8,6 @@
 #include "../../include/freenet/introductionpuzzleinserter.h"
 #include "../../include/freenet/identityintroductionrequester.h"
 #include "../../include/freenet/introductionpuzzlerequester.h"
-#include "../../include/freenet/introductionpuzzleremover.h"
 #include "../../include/freenet/identityintroductioninserter.h"
 #include "../../include/freenet/trustlistinserter.h"
 #include "../../include/freenet/trustlistrequester.h"
@@ -16,6 +15,9 @@
 #include "../../include/freenet/messagerequester.h"
 #include "../../include/freenet/messageinserter.h"
 #include "../../include/freenet/messagelistinserter.h"
+#include "../../include/freenet/periodicdbmaintenance.h"
+#include "../../include/freenet/boardlistinserter.h"
+#include "../../include/freenet/boardlistrequester.h"
 
 //#include <zthread/Thread.h>
 #include "../../include/pthreadwrapper/thread.h"
@@ -167,6 +169,8 @@ void FreenetMasterThread::RegisterPeriodicProcessor(IPeriodicProcessor *obj)
 void FreenetMasterThread::Run()
 {
 
+	DateTime lastreceivedmessage;
+	DateTime now;
 	FCPMessage message;
 	bool done=false;
 
@@ -194,11 +198,15 @@ void FreenetMasterThread::Run()
 					done=true;
 				}
 				*/
-				for(int i=0; i<60,!IsCancelled(); i++)
+				for(int i=0; i<60 && !IsCancelled(); i++)
 				{
 					Sleep(1000);
 				}
 			}
+			else
+			{
+				lastreceivedmessage.SetToGMTime();
+			}
 		}
 		// fcp is connected
 		else
@@ -214,6 +222,7 @@ void FreenetMasterThread::Run()
 				if(message.GetName()!="")
 				{
 					HandleMessage(message);
+					lastreceivedmessage.SetToGMTime();
 				}
 			}
 
@@ -223,6 +232,14 @@ void FreenetMasterThread::Run()
 				(*i)->Process();
 			}
 
+			// if we haven't received any messages from the node in 10 minutes, something is wrong
+			now.SetToGMTime();
+			if(lastreceivedmessage<(now-(1.0/144.0)))
+			{
+				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::Run The Freenet node has not responded in 10 minutes.  Trying to reconnect.");
+				m_fcp.Disconnect();
+			}
+
 		}
 //	}while(!ZThread::Thread::interrupted() && done==false);
 	}while(!IsCancelled() && done==false);
@@ -231,6 +248,8 @@ void FreenetMasterThread::Run()
 
 	Shutdown();
 
+	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread exiting.");
+
 }
 
 void FreenetMasterThread::Setup()
@@ -245,14 +264,16 @@ void FreenetMasterThread::Setup()
 	m_registrables.push_back(new IntroductionPuzzleInserter(&m_fcp));
 	m_registrables.push_back(new IdentityIntroductionRequester(&m_fcp));
 	m_registrables.push_back(new IntroductionPuzzleRequester(&m_fcp));
-	m_registrables.push_back(new IntroductionPuzzleRemover());
 	m_registrables.push_back(new IdentityIntroductionInserter(&m_fcp));
 	m_registrables.push_back(new TrustListInserter(&m_fcp));
 	m_registrables.push_back(new TrustListRequester(&m_fcp));
+	m_registrables.push_back(new MessageListInserter(&m_fcp));
 	m_registrables.push_back(new MessageListRequester(&m_fcp));
 	m_registrables.push_back(new MessageRequester(&m_fcp));
 	m_registrables.push_back(new MessageInserter(&m_fcp));
-	m_registrables.push_back(new MessageListInserter(&m_fcp));
+	m_registrables.push_back(new BoardListInserter(&m_fcp));
+	m_registrables.push_back(new BoardListRequester(&m_fcp));
+	m_registrables.push_back(new PeriodicDBMaintenance());
 
 	for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
 	{