#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
\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(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() && length>0)\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
try\r
{\r
- if(m_fcp.Connected()==false)\r
+ if(m_fcp.IsConnected()==false)\r
{\r
// wait at least 1 minute since last successful connect\r
now=Poco::Timestamp();\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
+ if(m_fcp.MessageReady()==true)\r
{\r
- message.Reset();\r
- message=m_fcp.ReceiveMessage();\r
+ message.Clear();\r
+ m_fcp.Receive(message);\r
\r
if(message.GetName()!="")\r
{\r
m_fcp.Disconnect();\r
}\r
\r
- if(m_fcp.Connected()==false)\r
+ if(m_fcp.IsConnected()==false)\r
{\r
m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\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