version 0.3.29

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

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index f22b25a..96d24df 100644 (file)
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -4,22 +4,23 @@
 #include "../../include/freenet/trustlistxml.h"\r
 \r
 #include <Poco/DateTimeFormatter.h>\r
+#include <Poco/Timespan.h>\r
 \r
 #ifdef XMEM\r
        #include <xmem.h>\r
 #endif\r
 \r
-TrustListRequester::TrustListRequester()\r
+TrustListRequester::TrustListRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-TrustListRequester::TrustListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
+TrustListRequester::TrustListRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)\r
 {\r
        Initialize();\r
 }\r
 \r
-const bool TrustListRequester::HandleAllData(FCPMessage &message)\r
+const bool TrustListRequester::HandleAllData(FCPv2::Message &message)\r
 {\r
        Poco::DateTime now;\r
        SQLite3DB::Statement st;\r
@@ -32,6 +33,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
        long index;\r
        int insertcount=0;\r
        int dayinsertcount=0;\r
+       int previnsertcount=0;\r
 \r
        StringFunctions::Split(message["Identifier"],"|",idparts);\r
        StringFunctions::Convert(message["DataLength"],datalength);\r
@@ -39,23 +41,20 @@ const bool TrustListRequester::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
-       m_fcp->ReceiveRaw(&data[0],datalength);\r
+       m_fcp->Receive(data,datalength);\r
 \r
        // get count of identities added in last 24 hours\r
        st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded>=?;");\r
+       now-=Poco::Timespan(1,0,0,0,0);\r
        st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
        st.Step();\r
        if(st.RowReturned())\r
@@ -70,8 +69,26 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added in last 24 hours");\r
        }\r
 \r
+       // get count of identities added more than 24 hours ago - if 0 then we will accept more than 100 identities now\r
+       st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded<?;");\r
+       st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
+       st.Step();\r
+       if(st.RowReturned())\r
+       {\r
+               if(st.ResultNull(0)==false)\r
+               {\r
+                       st.ResultInt(0,previnsertcount);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added more than 24 hours ago");\r
+       }\r
+\r
+       now=Poco::DateTime();\r
+\r
        // parse file into xml and update the database\r
-       if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
+       if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
        {\r
                // find the identity name and public key of the identity publishing the trust list\r
                std::string publisherid="";\r
@@ -92,6 +109,8 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                }\r
                st.Finalize();\r
 \r
+               m_db->Execute("BEGIN;");\r
+\r
                // drop all existing peer trust from this identity - we will rebuild it when we go through each trust in the xml file\r
                st=m_db->Prepare("DELETE FROM tblPeerTrust WHERE IdentityID=?;");\r
                st.Bind(0,identityid);\r
@@ -116,7 +135,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                        st.Step();\r
                        if(st.RowReturned()==false)\r
                        {\r
-                               if(insertcount<50 && dayinsertcount<100)\r
+                               if(insertcount<50 && (dayinsertcount<100 || previnsertcount==0))\r
                                {\r
                                        idinsert.Bind(0,identity);\r
                                        idinsert.Bind(1,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
@@ -180,7 +199,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                {\r
                        m_log->warning("TrustListRequester::HandleAllData TrustList contained more than 50 new identities : "+message["Identifier"]);\r
                }\r
-               if(dayinsertcount>=100)\r
+               if(dayinsertcount>=100 && previnsertcount>0)\r
                {\r
                        m_log->warning("TrustListRequester::HandleAllData TrustList would have inserted more than 100 new identities in the last 24 hours : "+message["Identifier"]);\r
                }\r
@@ -192,6 +211,8 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
+               m_db->Execute("COMMIT;");\r
+\r
                m_log->debug("TrustListRequester::HandleAllData parsed TrustList XML file : "+message["Identifier"]);\r
        }\r
        else\r
@@ -214,7 +235,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 \r
 }\r
 \r
-const bool TrustListRequester::HandleGetFailed(FCPMessage &message)\r
+const bool TrustListRequester::HandleGetFailed(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -249,8 +270,10 @@ void TrustListRequester::Initialize()
 {\r
        std::string tempval="";\r
        m_fcpuniquename="TrustListRequester";\r
-       Option::Instance()->Get("MaxIdentityRequests",tempval);\r
-       StringFunctions::Convert(tempval,m_maxrequests);\r
+       m_maxrequests=0;\r
+       Option option(m_db);\r
+\r
+       option.GetInt("MaxIdentityRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r
@@ -290,7 +313,7 @@ void TrustListRequester::PopulateIDList()
 void TrustListRequester::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
@@ -329,7 +352,7 @@ void TrustListRequester::StartRequest(const long &identityid)
                message["ReturnType"]="direct";\r
                message["MaxSize"]="1000000";                   // 1 MB\r
 \r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
 \r
                m_requesting.push_back(identityid);\r
        }\r