X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fidentityrequester.cpp;h=9e7a769c07a519a73d3b5b61c7b1de3fcb803f89;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hp=3375f1d0ef7edc759c8056394a03f47cb0daf697;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index 3375f1d..9e7a769 100644
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -17,12 +17,12 @@ IdentityRequester::IdentityRequester()
 	Initialize();
 }
 
-IdentityRequester::IdentityRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
+IdentityRequester::IdentityRequester(FCPv2::Connection *fcp):IIndexRequester<long>(fcp)
 {
 	Initialize();
 }
 
-const bool IdentityRequester::HandleAllData(FCPMessage &message)
+const bool IdentityRequester::HandleAllData(FCPv2::Message &message)
 {
 	Poco::DateTime now;
 	SQLite3DB::Statement st;
@@ -41,23 +41,19 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
 	StringFunctions::Convert(idparts[2],index);
 
 	// wait for all data to be received from connection
-	while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)
-	{
-		m_fcp->Update(1);
-	}
+	m_fcp->WaitForBytes(1000,datalength);
 
 	// if we got disconnected- return immediately
-	if(m_fcp->Connected()==false)
+	if(m_fcp->IsConnected()==false)
 	{
 		return false;
 	}
 
 	// receive the file
-	data.resize(datalength);
-	m_fcp->ReceiveRaw(&data[0],datalength);
+	m_fcp->Receive(data,datalength);
 
 	// 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)
 	{
 
 		st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=?, FreesiteEdition=? WHERE IdentityID=?");
@@ -111,7 +107,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->debug("IdentityRequester::HandleAllData parsed Identity XML file : "+message["Identifier"]);
+		m_log->debug(m_fcpuniquename+"::HandleAllData parsed Identity XML file : "+message["Identifier"]);
 	}
 	else
 	{
@@ -123,7 +119,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->error("IdentityRequester::HandleAllData error parsing Identity XML file : "+message["Identifier"]);
+		m_log->error(m_fcpuniquename+"::HandleAllData error parsing Identity XML file : "+message["Identifier"]);
 	}
 
 	// remove this identityid from request list
@@ -133,7 +129,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
 
 }
 
-const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
+const bool IdentityRequester::HandleGetFailed(FCPv2::Message &message)
 {
 	SQLite3DB::Statement st;
 	std::vector<std::string> idparts;
@@ -154,7 +150,7 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->error("IdentityRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);
+		m_log->error(m_fcpuniquename+"::HandleGetFailed fatal error requesting "+message["Identifier"]);
 	}
 
 	// remove this identityid from request list
@@ -166,18 +162,20 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
 
 void IdentityRequester::Initialize()
 {
-	std::string tempval="";
-	m_fcpuniquename="IdentityRequester";
-	Option::Instance()->Get("MaxIdentityRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	m_fcpuniquename="KnownIdentityRequester";
+	Option::Instance()->GetInt("MaxIdentityRequests",m_maxrequests);
+
+	// known identities get 4/5 + any remaining if not evenly divisible - unknown identities get 1/5 of the max requests option
+	m_maxrequests=((m_maxrequests*4)/5)+(m_maxrequests%5);
+
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
-		m_log->error("Option MaxIdentityRequests is currently set at "+tempval+".  It must be 1 or greater.");
+		m_log->error("Option MaxIdentityRequests is currently set at less than 1.  It must be 1 or greater.");
 	}
 	if(m_maxrequests>100)
 	{
-		m_log->warning("Option MaxIdentityRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
+		m_log->warning("Option MaxIdentityRequests is currently set at more than 100.  This value might be incorrectly configured.");
 	}
 }
 
@@ -189,7 +187,7 @@ void IdentityRequester::PopulateIDList()
 	date.assign(date.year(),date.month(),date.day(),0,0,0);
 
 	// 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<'"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S")+"') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen IS NOT NULL AND LastSeen<'"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S")+"' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
 	st.Step();
 
 	m_ids.clear();
@@ -205,7 +203,7 @@ void IdentityRequester::PopulateIDList()
 void IdentityRequester::StartRequest(const long &identityid)
 {
 	Poco::DateTime now;
-	FCPMessage message;
+	FCPv2::Message message;
 	std::string publickey;
 	int index;
 	std::string indexstr;
@@ -246,7 +244,7 @@ void IdentityRequester::StartRequest(const long &identityid)
 		message["ReturnType"]="direct";
 		message["MaxSize"]="10000";			// 10 KB
 
-		m_fcp->SendMessage(message);
+		m_fcp->Send(message);
 
 		m_requesting.push_back(identityid);
 	}