X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=48903394d53ff496b326c18b40f01667c5d961a8;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hp=01db50c6b72006babdc13aecfd8d7a24b11f0808;hpb=c0ebc7b53a977885ebc2d3a679c586ae20c0bc4a;p=fms.git

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 01db50c..4890339 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -4,6 +4,7 @@
 #include "../../include/freenet/unkeyedidcreator.h"
 #include "../../include/freenet/identityinserter.h"
 #include "../../include/freenet/identityrequester.h"
+#include "../../include/freenet/unknownidentityrequester.h"
 #include "../../include/freenet/introductionpuzzleinserter.h"
 #include "../../include/freenet/identityintroductionrequester.h"
 #include "../../include/freenet/introductionpuzzlerequester.h"
@@ -11,6 +12,7 @@
 #include "../../include/freenet/trustlistinserter.h"
 #include "../../include/freenet/trustlistrequester.h"
 #include "../../include/freenet/messagelistrequester.h"
+#include "../../include/freenet/inactivemessagelistrequester.h"
 #include "../../include/freenet/messagelistinserter.h"
 #include "../../include/freenet/messagerequester.h"
 #include "../../include/freenet/messageinserter.h"
@@ -93,7 +95,7 @@ const bool FreenetMasterThread::FCPConnect()
 
 		std::string clientname="FMSClient-"+uuid.toString();
 		// send ClientHello message to node
-		m_fcp.SendMessage("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0");
+		m_fcp.Send(FCPv2::Message("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0"));
 
 		m_log->information("FreenetMasterThread::FCPConnect connected to node");
 
@@ -106,7 +108,7 @@ const bool FreenetMasterThread::FCPConnect()
 
 }
 
-const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
+const bool FreenetMasterThread::HandleMessage(FCPv2::Message &message)
 {
 	if(message.GetName()=="NodeHello")
 	{
@@ -134,7 +136,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 		if(handled==false)
 		{
 			std::string info("");
-			for(std::map<std::string,std::string>::iterator mi=message.begin(); mi!=message.end(); mi++)
+			for(std::map<std::string,std::string>::iterator mi=message.GetFields().begin(); mi!=message.GetFields().end(); mi++)
 			{
 				info+="\t\t\t\t"+(*mi).first+"="+(*mi).second+"\r\n";
 			}
@@ -145,15 +147,11 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 			{
 				long length;
 				StringFunctions::Convert(message["DataLength"],length);
-				while(m_fcp.Connected() && m_fcp.ReceiveBufferSize()<length)
-				{
-					m_fcp.Update(1);
-				}
-				if(m_fcp.Connected())
+				m_fcp.WaitForBytes(1000,length);
+
+				if(m_fcp.IsConnected() && length>0)
 				{
-					char *data=new char[length];
-					m_fcp.ReceiveRaw(data,length);
-					delete [] data;
+					m_fcp.ReceiveIgnore(length);
 				}
 			}
 		}
@@ -190,7 +188,7 @@ void FreenetMasterThread::run()
 	Poco::DateTime lastreceivedmessage;
 	Poco::DateTime lastconnected;
 	Poco::DateTime now;
-	FCPMessage message;
+	FCPv2::Message message;
 	bool done=false;
 
 	lastconnected-=Poco::Timespan(0,0,1,0,0);
@@ -203,7 +201,7 @@ void FreenetMasterThread::run()
 	{
 		try
 		{
-			if(m_fcp.Connected()==false)
+			if(m_fcp.IsConnected()==false)
 			{
 				// wait at least 1 minute since last successful connect
 				now=Poco::Timestamp();
@@ -233,13 +231,13 @@ void FreenetMasterThread::run()
 			// fcp is connected
 			else
 			{
-				m_fcp.Update(1);
+				m_fcp.Update(1000);
 
 				// check for message on receive buffer and handle it
-				if(m_fcp.ReceiveBufferSize()>0)
+				if(m_fcp.MessageReady()==true)
 				{
-					message.Reset();
-					message=m_fcp.ReceiveMessage();
+					message.Clear();
+					m_fcp.Receive(message);
 
 					if(message.GetName()!="")
 					{
@@ -262,7 +260,7 @@ void FreenetMasterThread::run()
 					m_fcp.Disconnect();
 				}
 
-				if(m_fcp.Connected()==false)
+				if(m_fcp.IsConnected()==false)
 				{
 					m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");
 				}
@@ -296,6 +294,7 @@ void FreenetMasterThread::Setup()
 	m_registrables.push_back(new UnkeyedIDCreator(&m_fcp));
 	m_registrables.push_back(new IdentityInserter(&m_fcp));
 	m_registrables.push_back(new IdentityRequester(&m_fcp));
+	m_registrables.push_back(new UnknownIdentityRequester(&m_fcp));
 	m_registrables.push_back(new IntroductionPuzzleInserter(&m_fcp));
 	m_registrables.push_back(new IdentityIntroductionRequester(&m_fcp));
 	m_registrables.push_back(new IntroductionPuzzleRequester(&m_fcp));
@@ -304,6 +303,7 @@ void FreenetMasterThread::Setup()
 	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 InactiveMessageListRequester(&m_fcp));
 	m_registrables.push_back(new MessageInserter(&m_fcp));
 	m_registrables.push_back(new MessageRequester(&m_fcp));
 	m_registrables.push_back(new BoardListInserter(&m_fcp));