X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistrequester.cpp;h=ba2d4ffacda562817670a37eefb7b1f44460691c;hb=9a14c0d9f7f7c319e539583b93664953764e83b7;hp=763ba9fa682b76cb49d6fc12f5f2b94cca5f905b;hpb=868c533e84b3c81b6604b45b84efa32073aa20b4;p=fms.git

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 763ba9f..ba2d4ff 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -54,6 +54,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 	{
 
 		SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");
+		SQLite3DB::Statement spk=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey=?;");
 		SQLite3DB::Statement mst=m_db->Prepare("INSERT INTO tblMessageRequests(IdentityID,Day,RequestIndex,FromMessageList) VALUES(?,?,?,'true');");
 		for(long i=0; i<xml.MessageCount(); i++)
 		{
@@ -71,8 +72,24 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 			}
 			st.Reset();
 		}
-		mst.Finalize();
-		st.Finalize();
+
+		// insert external message indexes
+		for(long i=0; i<xml.ExternalMessageCount(); i++)
+		{
+			spk.Bind(0,xml.GetExternalIdentity(i));
+			spk.Step();
+			if(spk.RowReturned())
+			{
+				int thisidentityid=0;
+				spk.ResultInt(0,thisidentityid);
+				mst.Bind(0,thisidentityid);
+				mst.Bind(1,xml.GetExternalDate(i));
+				mst.Bind(2,xml.GetExternalIndex(i));
+				mst.Step();
+				mst.Reset();
+			}
+			spk.Reset();
+		}
 
 		st=m_db->Prepare("INSERT INTO tblMessageListRequests(IdentityID,Day,RequestIndex,Found) VALUES(?,?,?,'true');");
 		st.Bind(0,identityid);
@@ -81,7 +98,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListRequester::HandleAllData parsed TrustList XML file : "+message["Identifier"]);
+		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListRequester::HandleAllData parsed MessageList XML file : "+message["Identifier"]);
 	}
 	else
 	{
@@ -139,7 +156,7 @@ void MessageListRequester::Initialize()
 {
 	m_fcpuniquename="MessageListRequester";
 	std::string tempval;
-	Option::instance()->Get("MaxMessageListRequests",tempval);
+	Option::Instance()->Get("MaxMessageListRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -150,6 +167,17 @@ void MessageListRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
+
+	Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);
+	if(tempval=="true")
+	{
+		m_localtrustoverrides=true;
+	}
+	else
+	{
+		m_localtrustoverrides=false;
+	}
+
 }
 
 void MessageListRequester::PopulateIDList()
@@ -159,8 +187,17 @@ void MessageListRequester::PopulateIDList()
 
 	date.SetToGMTime();
 
+	SQLite3DB::Statement st;
+
 	// select identities we want to query (we've seen them today) - 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 LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	if(m_localtrustoverrides==false)
+	{
+		st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	}
+	else
+	{
+		st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	}
 	st.Step();
 
 	m_ids.clear();