version 0.3.28

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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index c5361ec..fbd767c 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -16,7 +16,7 @@ MessageRequester::MessageRequester()
        Initialize();\r
 }\r
 \r
-MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)\r
+MessageRequester::MessageRequester(FCPv2::Connection *fcp):IIndexRequester<std::string>(fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -85,7 +85,7 @@ const std::string MessageRequester::GetIdentityName(const long identityid)
        }\r
 }\r
 \r
-const bool MessageRequester::HandleAllData(FCPMessage &message)\r
+const bool MessageRequester::HandleAllData(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -104,23 +104,16 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
        StringFunctions::Convert(idparts[4],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
        // mark this index as received\r
        st=m_db->Prepare("UPDATE tblMessageRequests SET Found='true' WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
@@ -291,7 +284,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
        return true;\r
 }\r
 \r
-const bool MessageRequester::HandleGetFailed(FCPMessage &message)\r
+const bool MessageRequester::HandleGetFailed(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -479,7 +472,7 @@ const bool MessageRequester::SaveToBoard(const std::string &boardname)
 \r
 void MessageRequester::StartRequest(const std::string &requestid)\r
 {\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        std::vector<std::string> parts;\r
        std::string tempval;\r
        long identityid;\r
@@ -507,7 +500,7 @@ void MessageRequester::StartRequest(const std::string &requestid)
                message["MaxSize"]="1000000";           // 1 MB\r
                message["MaxRetries"]="-1";                     // use ULPR since we are fairly sure message exists since the author says it does\r
 \r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
 \r
                m_requesting.push_back(requestid);\r
 \r