#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
-\r
-#include <zthread/Thread.h>\r
+#include "../../include/freenet/trustlistinserter.h"\r
+#include "../../include/freenet/trustlistrequester.h"\r
+#include "../../include/freenet/messagelistrequester.h"\r
+#include "../../include/freenet/messagelistinserter.h"\r
+#include "../../include/freenet/messagerequester.h"\r
+#include "../../include/freenet/messageinserter.h"\r
+#include "../../include/freenet/boardlistinserter.h"\r
+#include "../../include/freenet/boardlistrequester.h"\r
+#include "../../include/freenet/siteinserter.h"\r
+#include "../../include/freenet/fileinserter.h"\r
+#include "../../include/freenet/fmsversionrequester.h"\r
+\r
+#include <Poco/UUID.h>\r
+#include <Poco/UUIDGenerator.h>\r
+#include <Poco/DateTime.h>\r
+#include <Poco/Timespan.h>\r
+#include <Poco/Thread.h>\r
+\r
+#include <cstdlib>\r
\r
#ifdef XMEM\r
#include <xmem.h>\r
{\r
std::string fcpport;\r
\r
- if(Option::instance()->Get("FCPHost",m_fcphost)==false)\r
+ if(Option::Instance()->Get("FCPHost",m_fcphost)==false)\r
{\r
m_fcphost="localhost";\r
- Option::instance()->Set("FCPHost",m_fcphost);\r
+ Option::Instance()->Set("FCPHost",m_fcphost);\r
}\r
- if(Option::instance()->Get("FCPPort",fcpport)==false)\r
+ if(Option::Instance()->Get("FCPPort",fcpport)==false)\r
{\r
fcpport="9481";\r
- Option::instance()->Set("FCPPort",fcpport);\r
+ Option::Instance()->Set("FCPPort",fcpport);\r
}\r
\r
// convert fcp port to long, and make sure it's within the valid port range\r
if(StringFunctions::Convert(fcpport,m_fcpport)==false)\r
{\r
m_fcpport=9481;\r
- Option::instance()->Set("FCPPort","9481");\r
+ Option::Instance()->Set("FCPPort","9481");\r
}\r
\r
m_receivednodehello=false;\r
m_receivednodehello=false;\r
}\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_INFO,__FUNCTION__" trying to connect to node "+m_fcphost);\r
+ m_log->information("FreenetMasterThread::FCPConnect trying to connect to node "+m_fcphost);\r
\r
if(m_fcp.Connect(m_fcphost.c_str(),m_fcpport)==true)\r
{\r
+ Poco::UUIDGenerator uuidgen;\r
+ Poco::UUID uuid;\r
+\r
+ try\r
+ {\r
+ uuid=uuidgen.createRandom();\r
+ }\r
+ catch(...)\r
+ {\r
+ m_log->fatal("FreenetMasterThread::FCPConnect could not generate UUID");\r
+ }\r
+\r
+ std::string clientname="FMSClient-"+uuid.toString();\r
// send ClientHello message to node\r
- m_fcp.SendMessage("ClientHello",2,"Name","FMSClient","ExpectedVersion","2.0");\r
+ m_fcp.SendMessage("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0");\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_INFO,__FUNCTION__" connected to node");\r
+ m_log->information("FreenetMasterThread::FCPConnect connected to node");\r
\r
return true;\r
}\r
{\r
info+="\t\t\t\t"+(*mi).first+"="+(*mi).second+"\r\n";\r
}\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,__FUNCTION__" received unhandled "+message.GetName()+" message. Message content :\r\n"+info);\r
+ m_log->debug("FreenetMasterThread::HandleMessage received unhandled "+message.GetName()+" message. Message content :\r\n"+info);\r
\r
// if unhandled message was alldata - we must retrieve the data\r
if(message.GetName()=="AllData")\r
}\r
else\r
{\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" received "+message.GetName()+" message before NodeHello");\r
+ m_log->error("FreenetMasterThread::HandleMessage received "+message.GetName()+" message before NodeHello");\r
}\r
\r
return false;\r
void FreenetMasterThread::run()\r
{\r
\r
+ Poco::DateTime lastreceivedmessage;\r
+ Poco::DateTime lastconnected;\r
+ Poco::DateTime now;\r
FCPMessage message;\r
bool done=false;\r
\r
+ lastconnected-=Poco::Timespan(0,0,1,0,0);\r
+\r
+ m_log->debug("FreenetMasterThread::run thread started.");\r
+\r
Setup();\r
\r
do\r
{\r
- if(m_fcp.Connected()==false)\r
+ try\r
{\r
- if(FCPConnect()==false)\r
+ if(m_fcp.Connected()==false)\r
{\r
-\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" could not connect to node. Waiting 60 seconds.");\r
-\r
- // wait 60 seconds - will then try to connect again\r
- try\r
+ // wait at least 1 minute since last successful connect\r
+ now=Poco::Timestamp();\r
+ if(lastconnected<=(now-Poco::Timespan(0,0,1,0,0)))\r
{\r
- ZThread::Thread::sleep(60000);\r
+ if(FCPConnect()==false)\r
+ {\r
+\r
+ m_log->error("FreenetMasterThread::run could not connect to node. Waiting 60 seconds.");\r
+\r
+ for(int i=0; i<60 && !IsCancelled(); i++)\r
+ {\r
+ Poco::Thread::sleep(1000);\r
+ }\r
+ }\r
+ else\r
+ {\r
+ lastreceivedmessage=Poco::Timestamp();\r
+ lastconnected=Poco::Timestamp();\r
+ }\r
}\r
- catch(...)\r
+ else\r
{\r
- done=true;\r
+ Poco::Thread::sleep(1000);\r
}\r
}\r
- }\r
- // fcp is connected\r
- else\r
- {\r
- m_fcp.Update(1);\r
-\r
- // check for message on receive buffer and handle it\r
- if(m_fcp.ReceiveBufferSize()>0)\r
+ // fcp is connected\r
+ else\r
{\r
- message.Reset();\r
- message=m_fcp.ReceiveMessage();\r
+ m_fcp.Update(1);\r
\r
- if(message.GetName()!="")\r
+ // check for message on receive buffer and handle it\r
+ if(m_fcp.ReceiveBufferSize()>0)\r
{\r
- HandleMessage(message);\r
+ message.Reset();\r
+ message=m_fcp.ReceiveMessage();\r
+\r
+ if(message.GetName()!="")\r
+ {\r
+ HandleMessage(message);\r
+ lastreceivedmessage=Poco::Timestamp();\r
+ }\r
}\r
- }\r
\r
- // let objects do their processing\r
- for(std::vector<IPeriodicProcessor *>::iterator i=m_processors.begin(); i!=m_processors.end(); i++)\r
- {\r
- (*i)->Process();\r
- }\r
+ // let objects do their processing\r
+ for(std::vector<IPeriodicProcessor *>::iterator i=m_processors.begin(); i!=m_processors.end(); i++)\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=Poco::Timestamp();\r
+ if(lastreceivedmessage<(now-Poco::Timespan(0,0,10,0,0)))\r
+ {\r
+ m_log->error("FreenetMasterThread::Run The Freenet node has not responded in 10 minutes. Trying to reconnect.");\r
+ m_fcp.Disconnect();\r
+ }\r
+\r
+ if(m_fcp.Connected()==false)\r
+ {\r
+ m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\r
+ }\r
\r
+ }\r
+ }\r
+ catch(Poco::Exception &e)\r
+ {\r
+ m_log->error("FreenetMasterThread::run caught exception : "+e.displayText());\r
}\r
- }while(!ZThread::Thread::interrupted() && done==false);\r
+ catch(...)\r
+ {\r
+ m_log->error("FreenetMasterThread::run caught unknown exception");\r
+ }\r
+ }while(!IsCancelled() && done==false);\r
\r
m_fcp.Disconnect();\r
\r
Shutdown();\r
\r
+ m_log->debug("FreenetMasterThread::run thread exiting.");\r
+\r
}\r
\r
void FreenetMasterThread::Setup()\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 MessageInserter(&m_fcp));\r
+ m_registrables.push_back(new MessageRequester(&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 FileInserter(&m_fcp));\r
+ m_registrables.push_back(new FMSVersionRequester(&m_fcp));\r
\r
for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)\r
{\r
\r
void FreenetMasterThread::Shutdown()\r
{\r
- // delete each registerable object\r
+ // delete each registrable object\r
for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)\r
{\r
delete (*i);\r
}\r
-}
\ No newline at end of file
+}\r