X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistrequester.cpp;h=d7dc27b92efad71018c0e1dcb4982dad0bc260f6;hp=668cdb9299a5be6819c1c8671227e499382dc025;hb=07319f767b4c4f0e06e9957f217d5107b196617b;hpb=cd75427de26fc2ebc9baad558b1c0a081faa3b43

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 668cdb9..d7dc27b 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -30,6 +30,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 +54,22 @@ 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>=?;");
+	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");
+	}
+
 	// parse file into xml and update the database
 	if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
 	{
@@ -98,13 +116,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
 			{
@@ -151,6 +173,15 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		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]);