version 0.3.29

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

diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index af52a59..18810d5 100644 (file)
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -12,17 +12,17 @@
        #include <xmem.h>\r
 #endif\r
 \r
-IdentityRequester::IdentityRequester()\r
+IdentityRequester::IdentityRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-IdentityRequester::IdentityRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
+IdentityRequester::IdentityRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)\r
 {\r
        Initialize();\r
 }\r
 \r
-const bool IdentityRequester::HandleAllData(FCPMessage &message)\r
+const bool IdentityRequester::HandleAllData(FCPv2::Message &message)\r
 {\r
        Poco::DateTime now;\r
        SQLite3DB::Statement st;\r
@@ -41,23 +41,16 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
        StringFunctions::Convert(idparts[2],index);\r
 \r
        // wait for all data to be received from connection\r
-       while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)\r
-       {\r
-               m_fcp->Update(1);\r
-       }\r
+       m_fcp->WaitForBytes(1000,datalength);\r
 \r
        // if we got disconnected- return immediately\r
-       if(m_fcp->Connected()==false)\r
+       if(m_fcp->IsConnected()==false)\r
        {\r
                return false;\r
        }\r
 \r
        // receive the file\r
-       data.resize(datalength);\r
-       if(data.size()>0)\r
-       {\r
-               m_fcp->ReceiveRaw(&data[0],datalength);\r
-       }\r
+       m_fcp->Receive(data,datalength);\r
 \r
        // parse file into xml and update the database\r
        if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
@@ -114,7 +107,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->debug("IdentityRequester::HandleAllData parsed Identity XML file : "+message["Identifier"]);\r
+               m_log->debug(m_fcpuniquename+"::HandleAllData parsed Identity XML file : "+message["Identifier"]);\r
        }\r
        else\r
        {\r
@@ -126,7 +119,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->error("IdentityRequester::HandleAllData error parsing Identity XML file : "+message["Identifier"]);\r
+               m_log->error(m_fcpuniquename+"::HandleAllData error parsing Identity XML file : "+message["Identifier"]);\r
        }\r
 \r
        // remove this identityid from request list\r
@@ -136,7 +129,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
 \r
 }\r
 \r
-const bool IdentityRequester::HandleGetFailed(FCPMessage &message)\r
+const bool IdentityRequester::HandleGetFailed(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -157,7 +150,7 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->error("IdentityRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
+               m_log->error(m_fcpuniquename+"::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
        }\r
 \r
        // remove this identityid from request list\r
@@ -169,8 +162,13 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
 \r
 void IdentityRequester::Initialize()\r
 {\r
-       m_fcpuniquename="IdentityRequester";\r
-       Option::Instance()->GetInt("MaxIdentityRequests",m_maxrequests);\r
+       m_fcpuniquename="KnownIdentityRequester";\r
+       Option option(m_db);\r
+       option.GetInt("MaxIdentityRequests",m_maxrequests);\r
+\r
+       // known identities get 4/5 + any remaining if not evenly divisible - unknown identities get 1/5 of the max requests option\r
+       m_maxrequests=((m_maxrequests*4)/5)+(m_maxrequests%5);\r
+\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r
@@ -190,7 +188,7 @@ void IdentityRequester::PopulateIDList()
        date.assign(date.year(),date.month(),date.day(),0,0,0);\r
 \r
        // select identities we want to query (haven't seen yet today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)\r
-       SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND (LastSeen IS NULL OR LastSeen<'"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+       SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen IS NOT NULL AND LastSeen<'"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S")+"' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
        st.Step();\r
 \r
        m_ids.clear();\r
@@ -206,7 +204,7 @@ void IdentityRequester::PopulateIDList()
 void IdentityRequester::StartRequest(const long &identityid)\r
 {\r
        Poco::DateTime now;\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        std::string publickey;\r
        int index;\r
        std::string indexstr;\r
@@ -247,7 +245,7 @@ void IdentityRequester::StartRequest(const long &identityid)
                message["ReturnType"]="direct";\r
                message["MaxSize"]="10000";                     // 10 KB\r
 \r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
 \r
                m_requesting.push_back(identityid);\r
        }\r