X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistinserter.cpp;h=10bfbceca8f65541bd8f167e94dac6738adcdbfe;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=fc02e8bfbbddf4ce4e9edc4133bb49063fb9164b;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/trustlistinserter.cpp b/src/freenet/trustlistinserter.cpp
index fc02e8b..10bfbce 100644
--- a/src/freenet/trustlistinserter.cpp
+++ b/src/freenet/trustlistinserter.cpp
@@ -11,12 +11,12 @@
 	#include <xmem.h>
 #endif
 
-TrustListInserter::TrustListInserter()
+TrustListInserter::TrustListInserter(SQLite3DB::DB *db):IDatabase(db)
 {
 	Initialize();
 }
 
-TrustListInserter::TrustListInserter(FCPv2 *fcp):IFCPConnected(fcp)
+TrustListInserter::TrustListInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)
 {
 	Initialize();
 }
@@ -49,7 +49,7 @@ void TrustListInserter::FCPDisconnected()
 
 }
 
-const bool TrustListInserter::HandleMessage(FCPMessage &message)
+const bool TrustListInserter::HandleMessage(FCPv2::Message &message)
 {
 
 	if(message["Identifier"].find("TrustListInserter")==0)
@@ -108,7 +108,8 @@ const bool TrustListInserter::HandleMessage(FCPMessage &message)
 
 void TrustListInserter::Initialize()
 {
-	Option::Instance()->Get("MessageBase",m_messagebase);
+	Option option(m_db);
+	option.Get("MessageBase",m_messagebase);
 	m_lastchecked=Poco::Timestamp();
 }
 
@@ -133,7 +134,7 @@ void TrustListInserter::RegisterWithThread(FreenetMasterThread *thread)
 
 void TrustListInserter::StartInsert(const long localidentityid, const std::string &privatekey)
 {
-	FCPMessage message;
+	FCPv2::Message message;
 	TrustListXML xml;
 	std::string data;
 	std::string datasizestr;
@@ -257,11 +258,11 @@ void TrustListInserter::StartInsert(const long localidentityid, const std::strin
 	message["Identifier"]="TrustListInserter|"+localidentityidstr+"|"+indexstr+"|"+message["URI"];
 	message["UploadFrom"]="direct";
 	message["DataLength"]=datasizestr;
-	m_fcp->SendMessage(message);
-	m_fcp->SendRaw(data.c_str(),data.size());
+	m_fcp->Send(message);
+	m_fcp->Send(std::vector<char>(data.begin(),data.end()));
 
 	// insert to USK
-	message.Reset();
+	message.Clear();
 	message.SetName("ClientPutComplexDir");
 	message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y.%m.%d")+"|TrustList/0/";
 	message["Identifier"]="TrustListInserterUSK|"+message["URI"];
@@ -269,8 +270,8 @@ void TrustListInserter::StartInsert(const long localidentityid, const std::strin
 	message["Files.0.Name"]="TrustList.xml";
 	message["Files.0.UplaodFrom"]="direct";
 	message["Files.0.DataLength"]=datasizestr;
-	m_fcp->SendMessage(message);
-	m_fcp->SendRaw(data.c_str(),data.size());
+	m_fcp->Send(message);
+	m_fcp->Send(std::vector<char>(data.begin(),data.end()));
 
 	m_db->Execute("UPDATE tblLocalIdentity SET InsertingTrustList='true' WHERE LocalIdentityID="+localidentityidstr+";");