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

diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp
index eb95e91..21e82b7 100644
--- a/src/freenet/boardlistrequester.cpp
+++ b/src/freenet/boardlistrequester.cpp
@@ -13,7 +13,7 @@ BoardListRequester::BoardListRequester()
 	Initialize();
 }
 
-BoardListRequester::BoardListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
+BoardListRequester::BoardListRequester(FCPv2::Connection *fcp):IIndexRequester<long>(fcp)
 {
 	Initialize();
 }
@@ -48,7 +48,7 @@ std::string BoardListRequester::GetIdentityName(const long identityid)
 	}
 }
 
-const bool BoardListRequester::HandleAllData(FCPMessage &message)
+const bool BoardListRequester::HandleAllData(FCPv2::Message &message)
 {	
 	Poco::DateTime now;
 	SQLite3DB::Statement st;
@@ -68,23 +68,19 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
 	identityname=GetIdentityName(identityid);
 
 	// 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)
 	{
 
 		SQLite3DB::Statement brd=m_db->Prepare("SELECT BoardID,BoardName,BoardDescription FROM tblBoard WHERE BoardName=?;");
@@ -160,7 +156,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
 
 }
 
-const bool BoardListRequester::HandleGetFailed(FCPMessage &message)
+const bool BoardListRequester::HandleGetFailed(FCPv2::Message &message)
 {
 	SQLite3DB::Statement st;
 	std::vector<std::string> idparts;
@@ -261,7 +257,7 @@ void BoardListRequester::PopulateIDList()
 void BoardListRequester::StartRequest(const long &identityid)
 {
 	Poco::DateTime now;
-	FCPMessage message;
+	FCPv2::Message message;
 	std::string publickey;
 	std::string indexstr;
 	int index;
@@ -300,7 +296,7 @@ void BoardListRequester::StartRequest(const long &identityid)
 		message["ReturnType"]="direct";
 		message["MaxSize"]="100000";			// 100 KB
 
-		m_fcp->SendMessage(message);
+		m_fcp->Send(message);
 
 		m_requesting.push_back(identityid);