X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistinserter.cpp;h=0851c61b07a621fb456678af005efc4888d200c1;hp=fc02e8bfbbddf4ce4e9edc4133bb49063fb9164b;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hpb=e662ea47fba8715474851ceebacba400984ee433

diff --git a/src/freenet/trustlistinserter.cpp b/src/freenet/trustlistinserter.cpp
index fc02e8b..0851c61 100644
--- a/src/freenet/trustlistinserter.cpp
+++ b/src/freenet/trustlistinserter.cpp
@@ -16,7 +16,7 @@ TrustListInserter::TrustListInserter()
 	Initialize();
 }
 
-TrustListInserter::TrustListInserter(FCPv2 *fcp):IFCPConnected(fcp)
+TrustListInserter::TrustListInserter(FCPv2::Connection *fcp):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)
@@ -133,7 +133,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 +257,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 +269,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+";");