#include "../../include/freenet/unkeyedidcreator.h"\r
#include "../../include/freenet/identityinserter.h"\r
#include "../../include/freenet/identityrequester.h"\r
+#include "../../include/freenet/unknownidentityrequester.h"\r
#include "../../include/freenet/introductionpuzzleinserter.h"\r
#include "../../include/freenet/identityintroductionrequester.h"\r
#include "../../include/freenet/introductionpuzzlerequester.h"\r
#include "../../include/freenet/trustlistinserter.h"\r
#include "../../include/freenet/trustlistrequester.h"\r
#include "../../include/freenet/messagelistrequester.h"\r
+#include "../../include/freenet/inactivemessagelistrequester.h"\r
#include "../../include/freenet/messagelistinserter.h"\r
#include "../../include/freenet/messagerequester.h"\r
#include "../../include/freenet/messageinserter.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
\r
FreenetMasterThread::FreenetMasterThread()\r
{\r
- std::string fcpport;\r
\r
if(Option::Instance()->Get("FCPHost",m_fcphost)==false)\r
{\r
m_fcphost="localhost";\r
Option::Instance()->Set("FCPHost",m_fcphost);\r
}\r
- if(Option::Instance()->Get("FCPPort",fcpport)==false)\r
+ if(Option::Instance()->GetInt("FCPPort",m_fcpport)==false)\r
{\r
- fcpport="9481";\r
- Option::Instance()->Set("FCPPort",fcpport);\r
+ m_fcpport=9481;\r
+ Option::Instance()->Set("FCPPort",m_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
+ else\r
{\r
- m_fcpport=9481;\r
- Option::Instance()->Set("FCPPort","9481");\r
+ if(m_fcpport<1 || m_fcpport>65535)\r
+ {\r
+ m_fcpport=9481;\r
+ Option::Instance()->Set("FCPPort",m_fcpport);\r
+ }\r
}\r
\r
m_receivednodehello=false;\r
\r
std::string clientname="FMSClient-"+uuid.toString();\r
// send ClientHello message to node\r
- m_fcp.SendMessage("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0");\r
+ m_fcp.Send(FCPv2::Message("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0"));\r
\r
m_log->information("FreenetMasterThread::FCPConnect connected to node");\r
\r
\r
}\r
\r
-const bool FreenetMasterThread::HandleMessage(FCPMessage &message)\r
+const bool FreenetMasterThread::HandleMessage(FCPv2::Message &message)\r
{\r
if(message.GetName()=="NodeHello")\r
{\r
if(m_receivednodehello==true)\r
{\r
bool handled=false;\r
+\r
std::vector<IFCPMessageHandler *>::iterator i=m_fcpmessagehandlers.begin();\r
while(handled==false && i!=m_fcpmessagehandlers.end())\r
{\r
if(handled==false)\r
{\r
std::string info("");\r
- for(std::map<std::string,std::string>::iterator mi=message.begin(); mi!=message.end(); mi++)\r
+ for(std::map<std::string,std::string>::iterator mi=message.GetFields().begin(); mi!=message.GetFields().end(); mi++)\r
{\r
info+="\t\t\t\t"+(*mi).first+"="+(*mi).second+"\r\n";\r
}\r
{\r
long length;\r
StringFunctions::Convert(message["DataLength"],length);\r
- while(m_fcp.Connected() && m_fcp.ReceiveBufferSize()<length)\r
- {\r
- m_fcp.Update(1);\r
- }\r
- if(m_fcp.Connected())\r
+ m_fcp.WaitForBytes(1000,length);\r
+\r
+ if(m_fcp.IsConnected() && length>0)\r
{\r
- char *data=new char[length];\r
- m_fcp.ReceiveRaw(data,length);\r
- delete [] data;\r
+ m_fcp.ReceiveIgnore(length);\r
}\r
}\r
}\r
Poco::DateTime lastreceivedmessage;\r
Poco::DateTime lastconnected;\r
Poco::DateTime now;\r
- FCPMessage message;\r
+ FCPv2::Message message;\r
bool done=false;\r
\r
lastconnected-=Poco::Timespan(0,0,1,0,0);\r
\r
do\r
{\r
- if(m_fcp.Connected()==false)\r
+ try\r
{\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
+ if(m_fcp.IsConnected()==false)\r
{\r
- if(FCPConnect()==false)\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
+ if(FCPConnect()==false)\r
+ {\r
\r
- m_log->error("FreenetMasterThread::run could not connect to node. Waiting 60 seconds.");\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
+ for(int i=0; i<60 && !IsCancelled(); i++)\r
+ {\r
+ Poco::Thread::sleep(1000);\r
+ }\r
+ }\r
+ else\r
{\r
- Poco::Thread::sleep(1000);\r
+ lastreceivedmessage=Poco::Timestamp();\r
+ lastconnected=Poco::Timestamp();\r
}\r
}\r
else\r
{\r
- lastreceivedmessage=Poco::Timestamp();\r
- lastconnected=Poco::Timestamp();\r
+ Poco::Thread::sleep(1000);\r
}\r
}\r
+ // fcp is connected\r
else\r
{\r
- Poco::Thread::sleep(1000);\r
- }\r
- }\r
- // fcp is connected\r
- else\r
- {\r
- m_fcp.Update(1);\r
+ m_fcp.Update(1000);\r
\r
- // check for message on receive buffer and handle it\r
- if(m_fcp.ReceiveBufferSize()>0)\r
- {\r
- message.Reset();\r
- message=m_fcp.ReceiveMessage();\r
+ // check for message on receive buffer and handle it\r
+ if(m_fcp.MessageReady()==true)\r
+ {\r
+ message.Clear();\r
+ m_fcp.Receive(message);\r
+\r
+ if(message.GetName()!="")\r
+ {\r
+ HandleMessage(message);\r
+ lastreceivedmessage=Poco::Timestamp();\r
+ }\r
+ }\r
\r
- if(message.GetName()!="")\r
+ // let objects do their processing\r
+ for(std::vector<IPeriodicProcessor *>::iterator i=m_processors.begin(); i!=m_processors.end(); i++)\r
{\r
- HandleMessage(message);\r
- lastreceivedmessage=Poco::Timestamp();\r
+ (*i)->Process();\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
+ // 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 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
+ if(m_fcp.IsConnected()==false)\r
+ {\r
+ m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\r
+ }\r
\r
- if(m_fcp.Connected()==false)\r
- {\r
- m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\r
}\r
-\r
+ }\r
+ catch(Poco::Exception &e)\r
+ {\r
+ m_log->error("FreenetMasterThread::run caught exception : "+e.displayText());\r
+ }\r
+ catch(...)\r
+ {\r
+ m_log->error("FreenetMasterThread::run caught unknown exception");\r
}\r
}while(!IsCancelled() && done==false);\r
\r
m_registrables.push_back(new UnkeyedIDCreator(&m_fcp));\r
m_registrables.push_back(new IdentityInserter(&m_fcp));\r
m_registrables.push_back(new IdentityRequester(&m_fcp));\r
+ m_registrables.push_back(new UnknownIdentityRequester(&m_fcp));\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 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 InactiveMessageListRequester(&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