X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fsiteinserter.cpp;h=0ae9fc5a4dba74d97af6b1891900ef24b3d79892;hp=99a96c754bdebc55e17373d49473d9cc4307b3f7;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hpb=e662ea47fba8715474851ceebacba400984ee433 diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp index 99a96c7..0ae9fc5 100644 --- a/src/freenet/siteinserter.cpp +++ b/src/freenet/siteinserter.cpp @@ -14,7 +14,7 @@ SiteInserter::SiteInserter() Initialize(); } -SiteInserter::SiteInserter(FCPv2 *fcp):IIndexInserter(fcp) +SiteInserter::SiteInserter(FCPv2::Connection *fcp):IIndexInserter(fcp) { Initialize(); } @@ -354,7 +354,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 idparts; long localidentityid; @@ -369,7 +369,7 @@ const bool SiteInserter::HandlePutFailed(FCPMessage &message) return true; } -const bool SiteInserter::HandlePutSuccessful(FCPMessage &message) +const bool SiteInserter::HandlePutSuccessful(FCPv2::Message &message) { std::vector idparts; std::vector uriparts; @@ -418,7 +418,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 +450,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::iterator pagei=pages.begin(); pagei!=pages.end(); pagei++) { - m_fcp->SendRaw(&(*pagei).second[0],(*pagei).second.size()); + m_fcp->Send(std::vector((*pagei).second.begin(),(*pagei).second.end())); } m_inserting.push_back(localidentityid);