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

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index d7dc27b..96d24df 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -4,22 +4,23 @@
 #include "../../include/freenet/trustlistxml.h"
 
 #include <Poco/DateTimeFormatter.h>
+#include <Poco/Timespan.h>
 
 #ifdef XMEM
 	#include <xmem.h>
 #endif
 
-TrustListRequester::TrustListRequester()
+TrustListRequester::TrustListRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)
 {
 	Initialize();
 }
 
-TrustListRequester::TrustListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
+TrustListRequester::TrustListRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)
 {
 	Initialize();
 }
 
-const bool TrustListRequester::HandleAllData(FCPMessage &message)
+const bool TrustListRequester::HandleAllData(FCPv2::Message &message)
 {
 	Poco::DateTime now;
 	SQLite3DB::Statement st;
@@ -32,6 +33,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 	long index;
 	int insertcount=0;
 	int dayinsertcount=0;
+	int previnsertcount=0;
 
 	StringFunctions::Split(message["Identifier"],"|",idparts);
 	StringFunctions::Convert(message["DataLength"],datalength);
@@ -39,23 +41,20 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 	StringFunctions::Convert(idparts[2],index);
 
 	// wait for all data to be received from connection
-	while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)
-	{
-		m_fcp->Update(1);
-	}
+	m_fcp->WaitForBytes(1000,datalength);
 
 	// if we got disconnected- return immediately
-	if(m_fcp->Connected()==false)
+	if(m_fcp->IsConnected()==false)
 	{
 		return false;
 	}
 
 	// receive the file
-	data.resize(datalength);
-	m_fcp->ReceiveRaw(&data[0],datalength);
+	m_fcp->Receive(data,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())
@@ -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");
 	}
 
+	// get count of identities added more than 24 hours ago - if 0 then we will accept more than 100 identities now
+	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,previnsertcount);
+		}
+	}
+	else
+	{
+		m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added more than 24 hours ago");
+	}
+
+	now=Poco::DateTime();
+
 	// parse file into xml and update the database
-	if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
+	if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)
 	{
 		// find the identity name and public key of the identity publishing the trust list
 		std::string publisherid="";
@@ -92,6 +109,8 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		}
 		st.Finalize();
 
+		m_db->Execute("BEGIN;");
+
 		// drop all existing peer trust from this identity - we will rebuild it when we go through each trust in the xml file
 		st=m_db->Prepare("DELETE FROM tblPeerTrust WHERE IdentityID=?;");
 		st.Bind(0,identityid);
@@ -106,7 +125,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="";
@@ -116,7 +135,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 			st.Step();
 			if(st.RowReturned()==false)
 			{
-				if(insertcount<50 && dayinsertcount<100)
+				if(insertcount<50 && (dayinsertcount<100 || previnsertcount==0))
 				{
 					idinsert.Bind(0,identity);
 					idinsert.Bind(1,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
@@ -135,41 +154,44 @@ 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)
-			{
-				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)
+			if(id!=-1)
 			{
-				trustlisttrustcomment.erase(50);
+				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();
 			}
-			trustst.Bind(4,messagetrustcomment);
-			trustst.Bind(5,trustlisttrustcomment);
-			trustst.Step();
-			trustst.Reset();
-
 		}
+
 		trustst.Finalize();
 		st.Finalize();
 
@@ -177,7 +199,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		{
 			m_log->warning("TrustListRequester::HandleAllData TrustList contained more than 50 new identities : "+message["Identifier"]);
 		}
-		if(dayinsertcount>=100)
+		if(dayinsertcount>=100 && previnsertcount>0)
 		{
 			m_log->warning("TrustListRequester::HandleAllData TrustList would have inserted more than 100 new identities in the last 24 hours : "+message["Identifier"]);
 		}
@@ -189,6 +211,8 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
+		m_db->Execute("COMMIT;");
+
 		m_log->debug("TrustListRequester::HandleAllData parsed TrustList XML file : "+message["Identifier"]);
 	}
 	else
@@ -211,7 +235,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 
 }
 
-const bool TrustListRequester::HandleGetFailed(FCPMessage &message)
+const bool TrustListRequester::HandleGetFailed(FCPv2::Message &message)
 {
 	SQLite3DB::Statement st;
 	std::vector<std::string> idparts;
@@ -246,8 +270,10 @@ void TrustListRequester::Initialize()
 {
 	std::string tempval="";
 	m_fcpuniquename="TrustListRequester";
-	Option::Instance()->Get("MaxIdentityRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	m_maxrequests=0;
+	Option option(m_db);
+
+	option.GetInt("MaxIdentityRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
@@ -287,7 +313,7 @@ void TrustListRequester::PopulateIDList()
 void TrustListRequester::StartRequest(const long &identityid)
 {
 	Poco::DateTime now;
-	FCPMessage message;
+	FCPv2::Message message;
 	std::string publickey;
 	int index;
 	std::string indexstr;
@@ -326,7 +352,7 @@ void TrustListRequester::StartRequest(const long &identityid)
 		message["ReturnType"]="direct";
 		message["MaxSize"]="1000000";			// 1 MB
 
-		m_fcp->SendMessage(message);
+		m_fcp->Send(message);
 
 		m_requesting.push_back(identityid);
 	}