X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fidentityrequester.cpp;h=18810d562a9845603ffabeb1c3be03d833172f0a;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=07386988dd84c8f75a826822ca49bdeb258406aa;hpb=e662ea47fba8715474851ceebacba400984ee433;p=fms.git

diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index 0738698..18810d5 100644
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -12,17 +12,17 @@
 	#include <xmem.h>
 #endif
 
-IdentityRequester::IdentityRequester()
+IdentityRequester::IdentityRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)
 {
 	Initialize();
 }
 
-IdentityRequester::IdentityRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
+IdentityRequester::IdentityRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)
 {
 	Initialize();
 }
 
-const bool IdentityRequester::HandleAllData(FCPMessage &message)
+const bool IdentityRequester::HandleAllData(FCPv2::Message &message)
 {
 	Poco::DateTime now;
 	SQLite3DB::Statement st;
@@ -41,23 +41,16 @@ 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);
-	if(data.size()>0)
-	{
-		m_fcp->ReceiveRaw(&data[0],datalength);
-	}
+	m_fcp->Receive(data,datalength);
 
 	// parse file into xml and update the database
 	if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)
@@ -136,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;
@@ -170,7 +163,8 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
 void IdentityRequester::Initialize()
 {
 	m_fcpuniquename="KnownIdentityRequester";
-	Option::Instance()->GetInt("MaxIdentityRequests",m_maxrequests);
+	Option option(m_db);
+	option.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);
@@ -210,7 +204,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;
@@ -251,7 +245,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);
 	}