X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Ffreenet%2Fintroductionpuzzlerequester.h;h=46108df598d3fac0fde8df52fdedfa55c924cf6c;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=8dcec3f76757a77f66b8f5d1330475561e03d8fc;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/include/freenet/introductionpuzzlerequester.h b/include/freenet/introductionpuzzlerequester.h
index 8dcec3f..46108df 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(SQLite3DB::DB *db);
+	IntroductionPuzzleRequester(SQLite3DB::DB *db, 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;
-	long 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_