version 0.3.28

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

diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index 80aacb1..fd81f14 100644 (file)
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -19,12 +19,12 @@ IntroductionPuzzleRequester::IntroductionPuzzleRequester()
        Initialize();\r
 }\r
 \r
-IntroductionPuzzleRequester::IntroductionPuzzleRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
+IntroductionPuzzleRequester::IntroductionPuzzleRequester(FCPv2::Connection *fcp):IIndexRequester<long>(fcp)\r
 {\r
        Initialize();\r
 }\r
 \r
-const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)\r
+const bool IntroductionPuzzleRequester::HandleAllData(FCPv2::Message &message)\r
 {\r
        Poco::DateTime now;\r
        SQLite3DB::Statement st;\r
@@ -42,23 +42,16 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
        StringFunctions::Convert(idparts[2],index);\r
 \r
        // wait for all data to be received from connection\r
-       while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)\r
-       {\r
-               m_fcp->Update(1);\r
-       }\r
+       m_fcp->WaitForBytes(1000,datalength);\r
 \r
        // if we got disconnected- return immediately\r
-       if(m_fcp->Connected()==false)\r
+       if(m_fcp->IsConnected()==false)\r
        {\r
                return false;\r
        }\r
 \r
        // receive the file\r
-       data.resize(datalength);\r
-       if(data.size()>0)\r
-       {\r
-               m_fcp->ReceiveRaw(&data[0],datalength);\r
-       }\r
+       m_fcp->Receive(data,datalength);\r
 \r
        // parse file into xml and update the database\r
        if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
@@ -158,7 +151,7 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
 \r
 }\r
 \r
-const bool IntroductionPuzzleRequester::HandleGetFailed(FCPMessage &message)\r
+const bool IntroductionPuzzleRequester::HandleGetFailed(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -237,7 +230,7 @@ void IntroductionPuzzleRequester::PopulateIDList()
 void IntroductionPuzzleRequester::StartRequest(const long &identityid)\r
 {\r
        Poco::DateTime now;\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        std::string publickey;\r
        int index;\r
        std::string indexstr;\r
@@ -278,7 +271,7 @@ void IntroductionPuzzleRequester::StartRequest(const long &identityid)
                message["ReturnType"]="direct";\r
                message["MaxSize"]="1000000";           // 1 MB\r
 \r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
                \r
                m_requesting.push_back(identityid);\r
        }\r