X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistrequester.cpp;h=9ef9b61e2b7ebde2c52a29a13ee0b9bf70eee443;hb=a558b16c8034966d14e1d63db44dcb952d849618;hp=668cdb9299a5be6819c1c8671227e499382dc025;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

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