version 0.3.12

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

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 668cdb9..9ef9b61 100644 (file)
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -4,6 +4,7 @@
 #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
@@ -30,6 +31,8 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
        TrustListXML xml;\r
        long identityid;\r
        long index;\r
+       int insertcount=0;\r
+       int dayinsertcount=0;\r
 \r
        StringFunctions::Split(message["Identifier"],"|",idparts);\r
        StringFunctions::Convert(message["DataLength"],datalength);\r
@@ -52,6 +55,24 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
        data.resize(datalength);\r
        m_fcp->ReceiveRaw(&data[0],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
+       {\r
+               if(st.ResultNull(0)==false)\r
+               {\r
+                       st.ResultInt(0,dayinsertcount);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added in last 24 hours");\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
        {\r
@@ -88,7 +109,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                // loop through all trust entries in xml and add to database if we don't already know them\r
                for(long i=0; i<xml.TrustCount(); i++)\r
                {\r
-                       int id;\r
+                       int id=-1;\r
                        std::string identity;\r
                        std::string messagetrustcomment="";\r
                        std::string trustlisttrustcomment="";\r
@@ -98,13 +119,17 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                        st.Step();\r
                        if(st.RowReturned()==false)\r
                        {\r
-                               idinsert.Bind(0,identity);\r
-                               idinsert.Bind(1,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
-                               idinsert.Bind(2,"trust list of "+publisherid);\r
-                               idinsert.Step(true);\r
-                               id=idinsert.GetLastInsertRowID();\r
-                               idinsert.Reset();\r
-                       //      m_db->ExecuteInsert("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('"+identity+"','"+now.Format("%Y-%m-%d %H:%M:%S")+"');",(long &)id);\r
+                               if(insertcount<50 && dayinsertcount<100)\r
+                               {\r
+                                       idinsert.Bind(0,identity);\r
+                                       idinsert.Bind(1,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
+                                       idinsert.Bind(2,"trust list of "+publisherid);\r
+                                       idinsert.Step(true);\r
+                                       id=idinsert.GetLastInsertRowID();\r
+                                       idinsert.Reset();\r
+                               }\r
+                               insertcount++;\r
+                               dayinsertcount++;\r
                        }\r
                        else\r
                        {\r
@@ -113,44 +138,56 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                        st.Reset();\r
 \r
                        //insert trust for this identity\r
-                       trustst.Bind(0,identityid);\r
-                       trustst.Bind(1,id);\r
-                       if(xml.GetMessageTrust(i)==-1)\r
-                       {\r
-                               trustst.Bind(2);\r
-                       }\r
-                       else\r
-                       {\r
-                               trustst.Bind(2,xml.GetMessageTrust(i));\r
-                       }\r
-                       if(xml.GetTrustListTrust(i)==-1)\r
+                       if(id!=-1)\r
                        {\r
-                               trustst.Bind(3);\r
+                               trustst.Bind(0,identityid);\r
+                               trustst.Bind(1,id);\r
+                               if(xml.GetMessageTrust(i)==-1)\r
+                               {\r
+                                       trustst.Bind(2);\r
+                               }\r
+                               else\r
+                               {\r
+                                       trustst.Bind(2,xml.GetMessageTrust(i));\r
+                               }\r
+                               if(xml.GetTrustListTrust(i)==-1)\r
+                               {\r
+                                       trustst.Bind(3);\r
+                               }\r
+                               else\r
+                               {\r
+                                       trustst.Bind(3,xml.GetTrustListTrust(i));\r
+                               }\r
+                               messagetrustcomment=xml.GetMessageTrustComment(i);\r
+                               trustlisttrustcomment=xml.GetTrustListTrustComment(i);\r
+                               // limit comments to 50 characters each\r
+                               if(messagetrustcomment.size()>50)\r
+                               {\r
+                                       messagetrustcomment.erase(50);\r
+                               }\r
+                               if(trustlisttrustcomment.size()>50)\r
+                               {\r
+                                       trustlisttrustcomment.erase(50);\r
+                               }\r
+                               trustst.Bind(4,messagetrustcomment);\r
+                               trustst.Bind(5,trustlisttrustcomment);\r
+                               trustst.Step();\r
+                               trustst.Reset();\r
                        }\r
-                       else\r
-                       {\r
-                               trustst.Bind(3,xml.GetTrustListTrust(i));\r
-                       }\r
-                       messagetrustcomment=xml.GetMessageTrustComment(i);\r
-                       trustlisttrustcomment=xml.GetTrustListTrustComment(i);\r
-                       // limit comments to 50 characters each\r
-                       if(messagetrustcomment.size()>50)\r
-                       {\r
-                               messagetrustcomment.erase(50);\r
-                       }\r
-                       if(trustlisttrustcomment.size()>50)\r
-                       {\r
-                               trustlisttrustcomment.erase(50);\r
-                       }\r
-                       trustst.Bind(4,messagetrustcomment);\r
-                       trustst.Bind(5,trustlisttrustcomment);\r
-                       trustst.Step();\r
-                       trustst.Reset();\r
-\r
                }\r
+\r
                trustst.Finalize();\r
                st.Finalize();\r
 \r
+               if(insertcount>=50)\r
+               {\r
+                       m_log->warning("TrustListRequester::HandleAllData TrustList contained more than 50 new identities : "+message["Identifier"]);\r
+               }\r
+               if(dayinsertcount>=100)\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
+\r
                st=m_db->Prepare("INSERT INTO tblTrustListRequests(IdentityID,Day,RequestIndex,Found) VALUES(?,?,?,'true');");\r
                st.Bind(0,identityid);\r
                st.Bind(1,idparts[4]);\r