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

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 01db50c..57541a4 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"
@@ -19,6 +21,9 @@
 #include "../../include/freenet/siteinserter.h"
 #include "../../include/freenet/fileinserter.h"
 #include "../../include/freenet/fmsversionrequester.h"
+#ifdef FROST_SUPPORT
+	#include "../../include/freenet/frostmessagerequester.h"
+#endif
 
 #include <Poco/UUID.h>
 #include <Poco/UUIDGenerator.h>
@@ -32,30 +37,9 @@
 	#include <xmem.h>
 #endif
 
-FreenetMasterThread::FreenetMasterThread()
+FreenetMasterThread::FreenetMasterThread():m_receivednodehello(false)
 {
 
-	if(Option::Instance()->Get("FCPHost",m_fcphost)==false)
-	{
-		m_fcphost="localhost";
-		Option::Instance()->Set("FCPHost",m_fcphost);
-	}
-	if(Option::Instance()->GetInt("FCPPort",m_fcpport)==false)
-	{
-		m_fcpport=9481;
-		Option::Instance()->Set("FCPPort",m_fcpport);
-	}
-	else
-	{
-		if(m_fcpport<1 || m_fcpport>65535)
-		{
-			m_fcpport=9481;
-			Option::Instance()->Set("FCPPort",m_fcpport);
-		}
-	}
-
-	m_receivednodehello=false;
-
 }
 
 FreenetMasterThread::~FreenetMasterThread()
@@ -93,7 +77,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 +90,7 @@ const bool FreenetMasterThread::FCPConnect()
 
 }
 
-const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
+const bool FreenetMasterThread::HandleMessage(FCPv2::Message &message)
 {
 	if(message.GetName()=="NodeHello")
 	{
@@ -134,7 +118,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 +129,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,20 +170,24 @@ 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);
 
 	m_log->debug("FreenetMasterThread::run thread started.");
 
+	LoadDatabase();
+
+
+
 	Setup();
 
 	do
 	{
 		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 +217,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 +246,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.");
 				}
@@ -290,27 +274,58 @@ void FreenetMasterThread::run()
 void FreenetMasterThread::Setup()
 {
 
+	std::string temp="";
+	Option option(m_db);
+	if(option.Get("FCPHost",m_fcphost)==false)
+	{
+		m_fcphost="localhost";
+		option.Set("FCPHost",m_fcphost);
+	}
+	if(option.GetInt("FCPPort",m_fcpport)==false)
+	{
+		m_fcpport=9481;
+		option.Set("FCPPort",m_fcpport);
+	}
+	else
+	{
+		if(m_fcpport<1 || m_fcpport>65535)
+		{
+			m_fcpport=9481;
+			option.Set("FCPPort",m_fcpport);
+		}
+	}
+
 	// seed random number generator
 	srand(time(NULL));
 
-	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 IntroductionPuzzleInserter(&m_fcp));
-	m_registrables.push_back(new IdentityIntroductionRequester(&m_fcp));
-	m_registrables.push_back(new IntroductionPuzzleRequester(&m_fcp));
-	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 MessageInserter(&m_fcp));
-	m_registrables.push_back(new MessageRequester(&m_fcp));
-	m_registrables.push_back(new BoardListInserter(&m_fcp));
-	m_registrables.push_back(new BoardListRequester(&m_fcp));
-	m_registrables.push_back(new SiteInserter(&m_fcp));
-	m_registrables.push_back(new FileInserter(&m_fcp));
-	m_registrables.push_back(new FMSVersionRequester(&m_fcp));
+	m_registrables.push_back(new UnkeyedIDCreator(m_db,&m_fcp));
+	m_registrables.push_back(new IdentityInserter(m_db,&m_fcp));
+	m_registrables.push_back(new IdentityRequester(m_db,&m_fcp));
+	m_registrables.push_back(new UnknownIdentityRequester(m_db,&m_fcp));
+	m_registrables.push_back(new IntroductionPuzzleInserter(m_db,&m_fcp));
+	m_registrables.push_back(new IdentityIntroductionRequester(m_db,&m_fcp));
+	m_registrables.push_back(new IntroductionPuzzleRequester(m_db,&m_fcp));
+	m_registrables.push_back(new IdentityIntroductionInserter(m_db,&m_fcp));
+	m_registrables.push_back(new TrustListInserter(m_db,&m_fcp));
+	m_registrables.push_back(new TrustListRequester(m_db,&m_fcp));
+	m_registrables.push_back(new MessageListInserter(m_db,&m_fcp));
+	m_registrables.push_back(new MessageListRequester(m_db,&m_fcp));
+	m_registrables.push_back(new InactiveMessageListRequester(m_db,&m_fcp));
+	m_registrables.push_back(new MessageInserter(m_db,&m_fcp));
+	m_registrables.push_back(new MessageRequester(m_db,&m_fcp));
+	m_registrables.push_back(new BoardListInserter(m_db,&m_fcp));
+	m_registrables.push_back(new BoardListRequester(m_db,&m_fcp));
+	m_registrables.push_back(new SiteInserter(m_db,&m_fcp));
+	m_registrables.push_back(new FileInserter(m_db,&m_fcp));
+	m_registrables.push_back(new FMSVersionRequester(m_db,&m_fcp));
+#ifdef FROST_SUPPORT
+	temp="";
+	option.Get("DownloadFrostMessages",temp);
+	if(temp=="true")
+	{
+		m_registrables.push_back(new FrostMessageRequester(m_db,&m_fcp));
+	}
+#endif
 
 	for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
 	{