X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fidentityrequester.cpp;h=b12fe0854865aa2e78ffdb6dda37f1da476dec20;hb=175f098e7e712b839db433b93fe8649a402c6784;hp=9dc58e17a94e0c0eac8c7b795cd62b55d52c1873;hpb=8adfd604a97d385869b0ce763b35d014d7aa2cca;p=fms.git

diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index 9dc58e1..b12fe08 100644
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -13,22 +13,11 @@ IdentityRequester::IdentityRequester()
 	Initialize();
 }
 
-IdentityRequester::IdentityRequester(FCPv2 *fcp):IFCPConnected(fcp)
+IdentityRequester::IdentityRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
 {
 	Initialize();
 }
 
-void IdentityRequester::FCPConnected()
-{
-	m_requesting.clear();
-	PopulateIDList();
-}
-
-void IdentityRequester::FCPDisconnected()
-{
-	
-}
-
 const bool IdentityRequester::HandleAllData(FCPMessage &message)
 {
 	DateTime now;
@@ -159,45 +148,11 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
 
 }
 
-const bool IdentityRequester::HandleMessage(FCPMessage &message)
-{
-
-	if(message["Identifier"].find("IdentityRequester")==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 IdentityRequester::Initialize()
 {
 	std::string tempval="";
-	Option::instance()->Get("MaxIdentityRequests",tempval);
+	m_fcpuniquename="IdentityRequester";
+	Option::Instance()->Get("MaxIdentityRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -208,8 +163,6 @@ void IdentityRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIdentityRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageBase",m_messagebase);
-	m_tempdate.SetToGMTime();
 }
 
 void IdentityRequester::PopulateIDList()
@@ -218,10 +171,12 @@ void IdentityRequester::PopulateIDList()
 	int id;
 
 	date.SetToGMTime();
-	date.Add(0,0,-1);
+	date.SetHour(0);
+	date.SetMinute(0);
+	date.SetSecond(0);
 
-	// select identities we want to query (haven't seen in last hour) - 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 IS NULL OR LastSeen<='"+date.Format("%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	// select identities we want to query (haven't seen yet 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 IS NULL OR LastSeen<'"+date.Format("%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
 	st.Step();
 
 	m_ids.clear();
@@ -234,63 +189,7 @@ void IdentityRequester::PopulateIDList()
 	}
 }
 
-void IdentityRequester::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 IdentityRequester::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 IdentityRequester::RegisterWithThread(FreenetMasterThread *thread)
-{
-	thread->RegisterFCPConnected(this);
-	thread->RegisterFCPMessageHandler(this);
-	thread->RegisterPeriodicProcessor(this);
-}
-
-void IdentityRequester::StartRequest(const long identityid)
+void IdentityRequester::StartRequest(const long &identityid)
 {
 	DateTime now;
 	FCPMessage message;
@@ -330,7 +229,7 @@ void IdentityRequester::StartRequest(const long identityid)
 
 		message.SetName("ClientGet");
 		message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|Identity|"+indexstr+".xml";
-		message["Identifier"]="IdentityRequester|"+identityidstr+"|"+indexstr+"|"+message["URI"];
+		message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"];
 		message["ReturnType"]="direct";
 		message["MaxSize"]="10000";			// 10 KB