version 0.3.29

[fms.git] / src / freenet / trustlistinserter.cpp

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