version 0.3.27

[fms.git] / src / freenet / freenetmasterthread.cpp

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 01db50c..c0feb6a 100644 (file)
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -4,6 +4,7 @@
 #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
@@ -11,6 +12,7 @@
 #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
@@ -149,7 +151,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
                                {\r
                                        m_fcp.Update(1);\r
                                }\r
-                               if(m_fcp.Connected())\r
+                               if(m_fcp.Connected() && length>0)\r
                                {\r
                                        char *data=new char[length];\r
                                        m_fcp.ReceiveRaw(data,length);\r
@@ -296,6 +298,7 @@ void FreenetMasterThread::Setup()
        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
@@ -304,6 +307,7 @@ void FreenetMasterThread::Setup()
        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