version 0.3.13

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

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 9ef9b61..be6bfc1 100644 (file)
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -33,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
@@ -71,6 +72,23 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
        {\r
                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
@@ -119,7 +137,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
@@ -183,7 +201,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