version 0.3.28

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

diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index 99a96c7..0ae9fc5 100644 (file)
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -14,7 +14,7 @@ SiteInserter::SiteInserter()
        Initialize();\r
 }\r
 \r
-SiteInserter::SiteInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)\r
+SiteInserter::SiteInserter(FCPv2::Connection *fcp):IIndexInserter<long>(fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -354,7 +354,7 @@ const std::string SiteInserter::GetClassString(const std::string &trustlevel)
        }\r
 }\r
 \r
-const bool SiteInserter::HandlePutFailed(FCPMessage &message)\r
+const bool SiteInserter::HandlePutFailed(FCPv2::Message &message)\r
 {\r
        std::vector<std::string> idparts;\r
        long localidentityid;\r
@@ -369,7 +369,7 @@ const bool SiteInserter::HandlePutFailed(FCPMessage &message)
        return true;\r
 }\r
 \r
-const bool SiteInserter::HandlePutSuccessful(FCPMessage &message)\r
+const bool SiteInserter::HandlePutSuccessful(FCPv2::Message &message)\r
 {\r
        std::vector<std::string> idparts;\r
        std::vector<std::string> uriparts;\r
@@ -418,7 +418,7 @@ const std::string SiteInserter::SanitizeOutput(const std::string &input)
 \r
 const bool SiteInserter::StartInsert(const long &localidentityid)\r
 {\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        std::string localidentityidstr="";\r
        std::string sizestr="";\r
        std::string uskkey="";\r
@@ -450,12 +450,12 @@ const bool SiteInserter::StartInsert(const long &localidentityid)
                filenum++;\r
        }\r
 \r
-       m_fcp->SendMessage(message);\r
+       m_fcp->Send(message);\r
 \r
        // send data of each page\r
        for(std::map<std::string,std::string>::iterator pagei=pages.begin(); pagei!=pages.end(); pagei++)\r
        {\r
-               m_fcp->SendRaw(&(*pagei).second[0],(*pagei).second.size());\r
+               m_fcp->Send(std::vector<char>((*pagei).second.begin(),(*pagei).second.end()));\r
        }\r
 \r
        m_inserting.push_back(localidentityid);\r