X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistrequester.cpp;h=90606dd7403821c9e2130e640665bb37251f2774;hb=befd91205eff729a182f66de15374a577a8718f7;hp=1d208691596f172482cb26346db29fbcb60905b4;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 1d20869..90606dd 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -12,22 +12,11 @@ TrustListRequester::TrustListRequester()
 	Initialize();
 }
 
-TrustListRequester::TrustListRequester(FCPv2 *fcp):IFCPConnected(fcp)
+TrustListRequester::TrustListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
 {
 	Initialize();
 }
 
-void TrustListRequester::FCPConnected()
-{
-	m_requesting.clear();
-	PopulateIDList();
-}
-
-void TrustListRequester::FCPDisconnected()
-{
-	
-}
-
 const bool TrustListRequester::HandleAllData(FCPMessage &message)
 {
 	DateTime now;
@@ -96,8 +85,22 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 			//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));
+			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));
+			}
 			trustst.Step();
 			trustst.Reset();
 
@@ -167,44 +170,10 @@ const bool TrustListRequester::HandleGetFailed(FCPMessage &message)
 
 }
 
-const bool TrustListRequester::HandleMessage(FCPMessage &message)
-{
-
-	if(message["Identifier"].find("TrustListRequester")==0)
-	{
-		if(message.GetName()=="DataFound")
-		{
-			return true;
-		}
-
-		if(message.GetName()=="AllData")
-		{
-			return HandleAllData(message);
-		}
-
-		if(message.GetName()=="GetFailed")
-		{
-			return HandleGetFailed(message);
-		}
-
-		if(message.GetName()=="IdentifierCollision")
-		{
-			// remove one of the ids from the requesting list
-			long identityid=0;
-			std::vector<std::string> idparts;
-			StringFunctions::Split(message["Identifier"],"|",idparts);
-			StringFunctions::Convert(idparts[1],identityid);
-			RemoveFromRequestList(identityid);
-			return true;
-		}
-	}
-
-	return false;
-}
-
 void TrustListRequester::Initialize()
 {
 	std::string tempval="";
+	m_fcpuniquename="TrustListRequester";
 	Option::Instance()->Get("MaxIdentityRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
@@ -216,7 +185,6 @@ 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);
 	m_tempdate.SetToGMTime();
 }
 
@@ -230,8 +198,8 @@ void TrustListRequester::PopulateIDList()
 
 	// 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)
 	sql="SELECT IdentityID FROM tblIdentity ";
-	sql+="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') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";
-	sql+="ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;";
+	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();
@@ -246,63 +214,7 @@ void TrustListRequester::PopulateIDList()
 	}
 }
 
-void TrustListRequester::Process()
-{
-	// max is the smaller of the config value or the total number of identities we will request from
-	long max=m_maxrequests>m_ids.size() ? m_ids.size() : m_maxrequests;
-
-	// try to keep up to max requests going
-	if(m_requesting.size()<max)
-	{
-		std::map<long,bool>::iterator i=m_ids.begin();
-		while(i!=m_ids.end() && (*i).second==true)
-		{
-			i++;
-		}
-
-		if(i!=m_ids.end())
-		{
-			StartRequest((*i).first);
-		}
-		else
-		{
-			// we requested from all ids in the list, repopulate the list
-			PopulateIDList();
-		}
-	}
-	// special case - if there were 0 identities on the list when we started then we will never get a chance to repopulate the list
-	// this will recheck for ids every minute
-	DateTime now;
-	now.SetToGMTime();
-	if(m_tempdate<(now-(1.0/1440.0)))
-	{
-		PopulateIDList();
-		m_tempdate=now;
-	}
-
-}
-
-void TrustListRequester::RegisterWithThread(FreenetMasterThread *thread)
-{
-	thread->RegisterFCPConnected(this);
-	thread->RegisterFCPMessageHandler(this);
-	thread->RegisterPeriodicProcessor(this);
-}
-
-void TrustListRequester::RemoveFromRequestList(const long identityid)
-{
-	std::vector<long>::iterator i=m_requesting.begin();
-	while(i!=m_requesting.end() && (*i)!=identityid)
-	{
-		i++;
-	}
-	if(i!=m_requesting.end())
-	{
-		m_requesting.erase(i);
-	}
-}
-
-void TrustListRequester::StartRequest(const long identityid)
+void TrustListRequester::StartRequest(const long &identityid)
 {
 	DateTime now;
 	FCPMessage message;
@@ -342,7 +254,7 @@ void TrustListRequester::StartRequest(const long identityid)
 
 		message.SetName("ClientGet");
 		message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|TrustList|"+indexstr+".xml";
-		message["Identifier"]="TrustListRequester|"+identityidstr+"|"+indexstr+"|"+message["URI"];
+		message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"];
 		message["ReturnType"]="direct";
 		message["MaxSize"]="1000000";			// 1 MB