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

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 9ef9b61..77f4f4e 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -33,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);
@@ -53,7 +54,10 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 
 	// receive the file
 	data.resize(datalength);
-	m_fcp->ReceiveRaw(&data[0],datalength);
+	if(data.size()>0)
+	{
+		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>=?;");
@@ -71,10 +75,27 @@ 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="";
@@ -119,7 +140,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"));
@@ -183,7 +204,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"]);
 		}
@@ -252,8 +273,9 @@ void TrustListRequester::Initialize()
 {
 	std::string tempval="";
 	m_fcpuniquename="TrustListRequester";
-	Option::Instance()->Get("MaxIdentityRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+
+	m_maxrequests=0;
+	Option::Instance()->GetInt("MaxIdentityRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;