X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistrequester.cpp;h=bedc8457316dc2d44c6df17b10f1445fed556196;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hp=78ec556475184358ef82a34758fe9fdff23ac8e4;hpb=278ee758050cb7772cd95946688c5b40104f4d8b;p=fms.git

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 78ec556..bedc845 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -15,12 +15,12 @@ TrustListRequester::TrustListRequester()
 	Initialize();
 }
 
-TrustListRequester::TrustListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
+TrustListRequester::TrustListRequester(FCPv2::Connection *fcp):IIndexRequester<long>(fcp)
 {
 	Initialize();
 }
 
-const bool TrustListRequester::HandleAllData(FCPMessage &message)
+const bool TrustListRequester::HandleAllData(FCPv2::Message &message)
 {
 	Poco::DateTime now;
 	SQLite3DB::Statement st;
@@ -41,20 +41,16 @@ const bool TrustListRequester::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);
 
 	// get count of identities added in last 24 hours
 	st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded>=?;");
@@ -92,7 +88,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 	now=Poco::DateTime();
 
 	// 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)
 	{
 		// find the identity name and public key of the identity publishing the trust list
 		std::string publisherid="";
@@ -235,7 +231,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 
 }
 
-const bool TrustListRequester::HandleGetFailed(FCPMessage &message)
+const bool TrustListRequester::HandleGetFailed(FCPv2::Message &message)
 {
 	SQLite3DB::Statement st;
 	std::vector<std::string> idparts;
@@ -312,7 +308,7 @@ void TrustListRequester::PopulateIDList()
 void TrustListRequester::StartRequest(const long &identityid)
 {
 	Poco::DateTime now;
-	FCPMessage message;
+	FCPv2::Message message;
 	std::string publickey;
 	int index;
 	std::string indexstr;
@@ -351,7 +347,7 @@ void TrustListRequester::StartRequest(const long &identityid)
 		message["ReturnType"]="direct";
 		message["MaxSize"]="1000000";			// 1 MB
 
-		m_fcp->SendMessage(message);
+		m_fcp->Send(message);
 
 		m_requesting.push_back(identityid);
 	}