X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Ffreenet%2Fintroductionpuzzlerequester.h;h=e2ca0764b058826e841c541e272d1e0f98c6b15a;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hp=a345d3de1eaafa33e7087c667f1955578ae1f4f1;hpb=278ee758050cb7772cd95946688c5b40104f4d8b;p=fms.git

diff --git a/include/freenet/introductionpuzzlerequester.h b/include/freenet/introductionpuzzlerequester.h
index a345d3d..e2ca076 100644
--- a/include/freenet/introductionpuzzlerequester.h
+++ b/include/freenet/introductionpuzzlerequester.h
@@ -1,44 +1,23 @@
 #ifndef _introductionpuzzlerequester_
 #define _introductionpuzzlerequester_
 
-#include "../idatabase.h"
-#include "../ilogger.h"
-#include "ifreenetregistrable.h"
-#include "ifcpconnected.h"
-#include "ifcpmessagehandler.h"
-#include "iperiodicprocessor.h"
+#include "iindexrequester.h"
 
 #include <Poco/DateTime.h>
 
-class IntroductionPuzzleRequester:public IFreenetRegistrable,public IFCPConnected,public IFCPMessageHandler,public IPeriodicProcessor,public IDatabase,public ILogger
+class IntroductionPuzzleRequester:public IIndexRequester<long>
 {
 public:
 	IntroductionPuzzleRequester();
-	IntroductionPuzzleRequester(FCPv2 *fcp);
-
-	void FCPDisconnected();
-	void FCPConnected();
-
-	const bool HandleMessage(FCPMessage &message);
-
-	void RegisterWithThread(FreenetMasterThread *thread);
-
-	void Process();
+	IntroductionPuzzleRequester(FCPv2::Connection *fcp);
 
 private:
 	void Initialize();
-	void RemoveFromRequestList(const long identityid);
-	void StartRequest(const long identityid);
+	void StartRequest(const long &identityid);
 	void PopulateIDList();				// clear and re-populate m_ids with identities we want to query
-	const bool HandleAllData(FCPMessage &message);
-	const bool HandleGetFailed(FCPMessage &message);
+	const bool HandleAllData(FCPv2::Message &message);
+	const bool HandleGetFailed(FCPv2::Message &message);
 
-	Poco::DateTime m_tempdate;
-	std::string m_messagebase;
-	int m_maxrequests;
-	std::vector<long> m_requesting;		// list of ids we are currently requesting from
-	std::map<long,bool> m_ids;			// map of all ids we know and whether we have requested file from them yet
-	
 };
 
 #endif	// _introductionpuzzlerequester_