X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistrequester.cpp;h=3fd5d991bb88cd77dda7a533a1c5d55f88afe20a;hb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;hp=f5e4be9e9ee87c3d0b7de9097e148299819b6fc9;hpb=1b0c3b7f86935a772aad271bad4f3d1f37243c2d;p=fms.git

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index f5e4be9..3fd5d99 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -32,6 +32,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 {
 	DateTime now;
 	SQLite3DB::Statement st;
+	SQLite3DB::Statement trustst;
 	std::vector<std::string> idparts;
 	long datalength;
 	std::vector<char> data;
@@ -64,23 +65,45 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 	// parse file into xml and update the database
 	if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
 	{
+
+		// 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);
+		st.Step();
+		st.Finalize();
+
 		st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey=?;");
+		trustst=m_db->Prepare("INSERT INTO tblPeerTrust(IdentityID,TargetIdentityID,MessageTrust,TrustListTrust) VALUES(?,?,?,?);");
 		// 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;
 			std::string identity;
 			identity=xml.GetIdentity(i);
 
-			//TODO get the trust levels as well
-
 			st.Bind(0,identity);
 			st.Step();
 			if(st.RowReturned()==false)
 			{
-				m_db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('"+identity+"','"+now.Format("%Y-%m-%d %H:%M:%S")+"');");
+				m_db->ExecuteInsert("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('"+identity+"','"+now.Format("%Y-%m-%d %H:%M:%S")+"');",(long &)id);
+			}
+			else
+			{
+				st.ResultInt(0,id);
 			}
 			st.Reset();
+
+			//insert trust for this identity
+			trustst.Bind(0,identityid);
+			trustst.Bind(1,id);
+			trustst.Bind(2,xml.GetMessageTrust(i));
+			trustst.Bind(3,xml.GetTrustListTrust(i));
+			trustst.Step();
+			trustst.Reset();
+
 		}
+		trustst.Finalize();
+		st.Finalize();
 
 		st=m_db->Prepare("INSERT INTO tblTrustListRequests(IdentityID,Day,RequestIndex,Found) VALUES(?,?,?,'true');");
 		st.Bind(0,identityid);
@@ -89,7 +112,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,__FUNCTION__" parsed Identity XML file : "+message["Identifier"]);
+		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"TrustListRequester::HandleAllData parsed TrustList XML file : "+message["Identifier"]);
 	}
 	else
 	{
@@ -101,7 +124,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" error parsing TrustList XML file : "+message["Identifier"]);
+		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"TrustListRequester::HandleAllData error parsing TrustList XML file : "+message["Identifier"]);
 	}
 
 	// remove this identityid from request list
@@ -134,7 +157,7 @@ const bool TrustListRequester::HandleGetFailed(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" fatal error requesting "+message["Identifier"]);
+		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"TrustListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);
 	}
 
 	// remove this identityid from request list
@@ -182,7 +205,7 @@ const bool TrustListRequester::HandleMessage(FCPMessage &message)
 void TrustListRequester::Initialize()
 {
 	std::string tempval="";
-	Option::instance()->Get("MaxIdentityRequests",tempval);
+	Option::Instance()->Get("MaxIdentityRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -193,7 +216,7 @@ void TrustListRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxTrustListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageBase",m_messagebase);
+	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate.SetToGMTime();
 }
 
@@ -201,11 +224,16 @@ void TrustListRequester::PopulateIDList()
 {
 	DateTime date;
 	int id;
+	std::string sql;
 
 	date.SetToGMTime();
 
 	// select identities we want to query (we've seen them today and they are publishing trust list) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)
-	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	sql="SELECT IdentityID FROM tblIdentity ";
+	sql+="WHERE Name IS NOT NULL AND Name <> '' AND PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";
+	sql+="ORDER BY LocalTrustListTrust DESC, LastSeen;";
+
+	SQLite3DB::Statement st=m_db->Prepare(sql);
 	st.Step();
 
 	m_ids.clear();
@@ -246,7 +274,7 @@ void TrustListRequester::Process()
 	// this will recheck for ids every minute
 	DateTime now;
 	now.SetToGMTime();
-	if(m_tempdate<(now-(1.0/1440.0)))
+	if(m_ids.size()==0 && m_tempdate<(now-(1.0/1440.0)))
 	{
 		PopulateIDList();
 		m_tempdate=now;