version 0.1.15

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

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 77b03b1..90606dd 100644 (file)
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -12,22 +12,11 @@ TrustListRequester::TrustListRequester()
        Initialize();\r
 }\r
 \r
-TrustListRequester::TrustListRequester(FCPv2 *fcp):IFCPConnected(fcp)\r
+TrustListRequester::TrustListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
 {\r
        Initialize();\r
 }\r
 \r
-void TrustListRequester::FCPConnected()\r
-{\r
-       m_requesting.clear();\r
-       PopulateIDList();\r
-}\r
-\r
-void TrustListRequester::FCPDisconnected()\r
-{\r
-       \r
-}\r
-\r
 const bool TrustListRequester::HandleAllData(FCPMessage &message)\r
 {\r
        DateTime now;\r
@@ -181,44 +170,10 @@ const bool TrustListRequester::HandleGetFailed(FCPMessage &message)
 \r
 }\r
 \r
-const bool TrustListRequester::HandleMessage(FCPMessage &message)\r
-{\r
-\r
-       if(message["Identifier"].find("TrustListRequester")==0)\r
-       {\r
-               if(message.GetName()=="DataFound")\r
-               {\r
-                       return true;\r
-               }\r
-\r
-               if(message.GetName()=="AllData")\r
-               {\r
-                       return HandleAllData(message);\r
-               }\r
-\r
-               if(message.GetName()=="GetFailed")\r
-               {\r
-                       return HandleGetFailed(message);\r
-               }\r
-\r
-               if(message.GetName()=="IdentifierCollision")\r
-               {\r
-                       // remove one of the ids from the requesting list\r
-                       long identityid=0;\r
-                       std::vector<std::string> idparts;\r
-                       StringFunctions::Split(message["Identifier"],"|",idparts);\r
-                       StringFunctions::Convert(idparts[1],identityid);\r
-                       RemoveFromRequestList(identityid);\r
-                       return true;\r
-               }\r
-       }\r
-\r
-       return false;\r
-}\r
-\r
 void TrustListRequester::Initialize()\r
 {\r
        std::string tempval="";\r
+       m_fcpuniquename="TrustListRequester";\r
        Option::Instance()->Get("MaxIdentityRequests",tempval);\r
        StringFunctions::Convert(tempval,m_maxrequests);\r
        if(m_maxrequests<1)\r
@@ -230,7 +185,6 @@ void TrustListRequester::Initialize()
        {\r
                m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxTrustListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
-       Option::Instance()->Get("MessageBase",m_messagebase);\r
        m_tempdate.SetToGMTime();\r
 }\r
 \r
@@ -260,63 +214,7 @@ void TrustListRequester::PopulateIDList()
        }\r
 }\r
 \r
-void TrustListRequester::Process()\r
-{\r
-       // max is the smaller of the config value or the total number of identities we will request from\r
-       long max=m_maxrequests>m_ids.size() ? m_ids.size() : m_maxrequests;\r
-\r
-       // try to keep up to max requests going\r
-       if(m_requesting.size()<max)\r
-       {\r
-               std::map<long,bool>::iterator i=m_ids.begin();\r
-               while(i!=m_ids.end() && (*i).second==true)\r
-               {\r
-                       i++;\r
-               }\r
-\r
-               if(i!=m_ids.end())\r
-               {\r
-                       StartRequest((*i).first);\r
-               }\r
-               else\r
-               {\r
-                       // we requested from all ids in the list, repopulate the list\r
-                       PopulateIDList();\r
-               }\r
-       }\r
-       // special case - if there were 0 identities on the list when we started then we will never get a chance to repopulate the list\r
-       // this will recheck for ids every minute\r
-       DateTime now;\r
-       now.SetToGMTime();\r
-       if(m_ids.size()==0 && m_tempdate<(now-(1.0/1440.0)))\r
-       {\r
-               PopulateIDList();\r
-               m_tempdate=now;\r
-       }\r
-\r
-}\r
-\r
-void TrustListRequester::RegisterWithThread(FreenetMasterThread *thread)\r
-{\r
-       thread->RegisterFCPConnected(this);\r
-       thread->RegisterFCPMessageHandler(this);\r
-       thread->RegisterPeriodicProcessor(this);\r
-}\r
-\r
-void TrustListRequester::RemoveFromRequestList(const long identityid)\r
-{\r
-       std::vector<long>::iterator i=m_requesting.begin();\r
-       while(i!=m_requesting.end() && (*i)!=identityid)\r
-       {\r
-               i++;\r
-       }\r
-       if(i!=m_requesting.end())\r
-       {\r
-               m_requesting.erase(i);\r
-       }\r
-}\r
-\r
-void TrustListRequester::StartRequest(const long identityid)\r
+void TrustListRequester::StartRequest(const long &identityid)\r
 {\r
        DateTime now;\r
        FCPMessage message;\r
@@ -356,7 +254,7 @@ void TrustListRequester::StartRequest(const long identityid)
 \r
                message.SetName("ClientGet");\r
                message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|TrustList|"+indexstr+".xml";\r
-               message["Identifier"]="TrustListRequester|"+identityidstr+"|"+indexstr+"|"+message["URI"];\r
+               message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"];\r
                message["ReturnType"]="direct";\r
                message["MaxSize"]="1000000";                   // 1 MB\r
 \r