X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=689641fd8575d888e2a03ce5899a95998b269a37;hb=6b896a9e1dc143bba86795be1e9336549db9b85f;hp=e0db51c9ff7f7c8fda97143cb389061856c7a8c0;hpb=1b0c3b7f86935a772aad271bad4f3d1f37243c2d;p=fms.git

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index e0db51c..689641f 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -11,6 +11,11 @@
 #include "../../include/freenet/introductionpuzzleremover.h"
 #include "../../include/freenet/identityintroductioninserter.h"
 #include "../../include/freenet/trustlistinserter.h"
+#include "../../include/freenet/trustlistrequester.h"
+#include "../../include/freenet/messagelistrequester.h"
+#include "../../include/freenet/messagerequester.h"
+#include "../../include/freenet/messageinserter.h"
+#include "../../include/freenet/messagelistinserter.h"
 
 #include <zthread/Thread.h>
 
@@ -61,7 +66,7 @@ const bool FreenetMasterThread::FCPConnect()
 		m_receivednodehello=false;
 	}
 
-	m_log->WriteLog(LogFile::LOGLEVEL_INFO,__FUNCTION__" trying to connect to node "+m_fcphost);
+	m_log->WriteLog(LogFile::LOGLEVEL_INFO,"FreenetMasterThread::FCPConnect trying to connect to node "+m_fcphost);
 
 	if(m_fcp.Connect(m_fcphost.c_str(),m_fcpport)==true)
 	{
@@ -70,7 +75,7 @@ const bool FreenetMasterThread::FCPConnect()
 		// send ClientHello message to node
 		m_fcp.SendMessage("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0");
 
-		m_log->WriteLog(LogFile::LOGLEVEL_INFO,__FUNCTION__" connected to node");
+		m_log->WriteLog(LogFile::LOGLEVEL_INFO,"FreenetMasterThread::FCPConnect connected to node");
 
 		return true;
 	}
@@ -112,7 +117,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 			{
 				info+="\t\t\t\t"+(*mi).first+"="+(*mi).second+"\r\n";
 			}
-			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,__FUNCTION__" received unhandled "+message.GetName()+" message.  Message content :\r\n"+info);
+			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::HandleMessage received unhandled "+message.GetName()+" message.  Message content :\r\n"+info);
 
 			// if unhandled message was alldata - we must retrieve the data
 			if(message.GetName()=="AllData")
@@ -137,7 +142,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 	}
 	else
 	{
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" received "+message.GetName()+" message before NodeHello");
+		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::HandleMessage received "+message.GetName()+" message before NodeHello");
 	}
 
 	return false;
@@ -173,7 +178,7 @@ void FreenetMasterThread::run()
 			if(FCPConnect()==false)
 			{
 
-				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" could not connect to node.  Waiting 60 seconds.");
+				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");
 
 				// wait 60 seconds - will then try to connect again
 				try
@@ -233,6 +238,11 @@ void FreenetMasterThread::Setup()
 	m_registrables.push_back(new IntroductionPuzzleRemover());
 	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 MessageListRequester(&m_fcp));
+	m_registrables.push_back(new MessageRequester(&m_fcp));
+	m_registrables.push_back(new MessageInserter(&m_fcp));
+	m_registrables.push_back(new MessageListInserter(&m_fcp));
 
 	for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
 	{
@@ -243,9 +253,9 @@ void FreenetMasterThread::Setup()
 
 void FreenetMasterThread::Shutdown()
 {
-	// delete each registerable object
+	// delete each registrable object
 	for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
 	{
 		delete (*i);
 	}
-}
\ No newline at end of file
+}