X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=c0feb6a691789fea40f2e183bb22cf58aada445c;hb=e662ea47fba8715474851ceebacba400984ee433;hp=c23ee2719c4c5cf4ca3c3874b6e3984337f3024f;hpb=278ee758050cb7772cd95946688c5b40104f4d8b;p=fms.git

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index c23ee27..c0feb6a 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"
@@ -123,6 +125,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 	if(m_receivednodehello==true)
 	{
 		bool handled=false;
+
 		std::vector<IFCPMessageHandler *>::iterator i=m_fcpmessagehandlers.begin();
 		while(handled==false && i!=m_fcpmessagehandlers.end())
 		{
@@ -148,7 +151,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 				{
 					m_fcp.Update(1);
 				}
-				if(m_fcp.Connected())
+				if(m_fcp.Connected() && length>0)
 				{
 					char *data=new char[length];
 					m_fcp.ReceiveRaw(data,length);
@@ -295,6 +298,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));
@@ -303,6 +307,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));