version 0.3.29

[fms.git] / include / freenet / identityrequester.h

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