X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fsiteinserter.cpp;h=7ffee2553f3953c9a1029d06b44cb14ef98fece7;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=99a96c754bdebc55e17373d49473d9cc4307b3f7;hpb=30c26abc85a6331fecdcb6b03813710bfbc63d3f;p=fms.git

diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index 99a96c7..7ffee25 100644
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -4,17 +4,18 @@
 #include <Poco/DateTime.h>
 #include <Poco/Timespan.h>
 #include <Poco/DateTimeFormatter.h>
+#include <cstdio>
 
 #ifdef XMEM
 	#include <xmem.h>
 #endif
 
-SiteInserter::SiteInserter()
+SiteInserter::SiteInserter(SQLite3DB::DB *db):IIndexInserter<long>(db)
 {
 	Initialize();
 }
 
-SiteInserter::SiteInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)
+SiteInserter::SiteInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<long>(db,fcp)
 {
 	Initialize();
 }
@@ -354,7 +355,7 @@ const std::string SiteInserter::GetClassString(const std::string &trustlevel)
 	}
 }
 
-const bool SiteInserter::HandlePutFailed(FCPMessage &message)
+const bool SiteInserter::HandlePutFailed(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 	long localidentityid;
@@ -369,7 +370,7 @@ const bool SiteInserter::HandlePutFailed(FCPMessage &message)
 	return true;
 }
 
-const bool SiteInserter::HandlePutSuccessful(FCPMessage &message)
+const bool SiteInserter::HandlePutSuccessful(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 	std::vector<std::string> uriparts;
@@ -418,7 +419,7 @@ const std::string SiteInserter::SanitizeOutput(const std::string &input)
 
 const bool SiteInserter::StartInsert(const long &localidentityid)
 {
-	FCPMessage message;
+	FCPv2::Message message;
 	std::string localidentityidstr="";
 	std::string sizestr="";
 	std::string uskkey="";
@@ -450,12 +451,12 @@ const bool SiteInserter::StartInsert(const long &localidentityid)
 		filenum++;
 	}
 
-	m_fcp->SendMessage(message);
+	m_fcp->Send(message);
 
 	// send data of each page
 	for(std::map<std::string,std::string>::iterator pagei=pages.begin(); pagei!=pages.end(); pagei++)
 	{
-		m_fcp->SendRaw(&(*pagei).second[0],(*pagei).second.size());
+		m_fcp->Send(std::vector<char>((*pagei).second.begin(),(*pagei).second.end()));
 	}
 
 	m_inserting.push_back(localidentityid);