version 0.3.29

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

diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp
index eb95e91..41df7d6 100644 (file)
--- a/src/freenet/boardlistrequester.cpp
+++ b/src/freenet/boardlistrequester.cpp
@@ -8,12 +8,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-BoardListRequester::BoardListRequester()\r
+BoardListRequester::BoardListRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-BoardListRequester::BoardListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
+BoardListRequester::BoardListRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -48,7 +48,7 @@ std::string BoardListRequester::GetIdentityName(const long identityid)
        }\r
 }\r
 \r
-const bool BoardListRequester::HandleAllData(FCPMessage &message)\r
+const bool BoardListRequester::HandleAllData(FCPv2::Message &message)\r
 {      \r
        Poco::DateTime now;\r
        SQLite3DB::Statement st;\r
@@ -68,23 +68,19 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
        identityname=GetIdentityName(identityid);\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
-       m_fcp->ReceiveRaw(&data[0],datalength);\r
+       m_fcp->Receive(data,datalength);\r
 \r
        // parse file into xml and update the database\r
-       if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
+       if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
        {\r
 \r
                SQLite3DB::Statement brd=m_db->Prepare("SELECT BoardID,BoardName,BoardDescription FROM tblBoard WHERE BoardName=?;");\r
@@ -160,7 +156,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
 \r
 }\r
 \r
-const bool BoardListRequester::HandleGetFailed(FCPMessage &message)\r
+const bool BoardListRequester::HandleGetFailed(FCPv2::Message &message)\r
 {\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
@@ -196,8 +192,9 @@ void BoardListRequester::Initialize()
 \r
        m_fcpuniquename="BoardListRequester";\r
        m_maxrequests=0;\r
+       Option option(m_db);\r
 \r
-       Option::Instance()->GetInt("MaxBoardListRequests",m_maxrequests);\r
+       option.GetInt("MaxBoardListRequests",m_maxrequests);\r
        if(m_maxrequests<0)\r
        {\r
                m_maxrequests=0;\r
@@ -208,7 +205,7 @@ void BoardListRequester::Initialize()
                m_log->warning("Option MaxBoardListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
 \r
-       Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+       option.Get("SaveMessagesFromNewBoards",tempval);\r
        if(tempval=="true")\r
        {\r
                m_savemessagesfromnewboards=true;\r
@@ -218,7 +215,7 @@ void BoardListRequester::Initialize()
                m_savemessagesfromnewboards=false;\r
        }\r
 \r
-       Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+       option.Get("LocalTrustOverridesPeerTrust",tempval);\r
        if(tempval=="true")\r
        {\r
                m_localtrustoverrides=true;\r
@@ -261,7 +258,7 @@ void BoardListRequester::PopulateIDList()
 void BoardListRequester::StartRequest(const long &identityid)\r
 {\r
        Poco::DateTime now;\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        std::string publickey;\r
        std::string indexstr;\r
        int index;\r
@@ -300,7 +297,7 @@ void BoardListRequester::StartRequest(const long &identityid)
                message["ReturnType"]="direct";\r
                message["MaxSize"]="100000";                    // 100 KB\r
 \r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
 \r
                m_requesting.push_back(identityid);\r
 \r