version 0.3.29

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

diff --git a/src/freenet/identityintroductionrequester.cpp b/src/freenet/identityintroductionrequester.cpp
index 951e12d..b9532f3 100644 (file)
--- a/src/freenet/identityintroductionrequester.cpp
+++ b/src/freenet/identityintroductionrequester.cpp
@@ -14,12 +14,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-IdentityIntroductionRequester::IdentityIntroductionRequester()\r
+IdentityIntroductionRequester::IdentityIntroductionRequester(SQLite3DB::DB *db):IDatabase(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-IdentityIntroductionRequester::IdentityIntroductionRequester(FCPv2 *fcp):IFCPConnected(fcp)\r
+IdentityIntroductionRequester::IdentityIntroductionRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -35,7 +35,7 @@ void IdentityIntroductionRequester::FCPDisconnected()
        \r
 }\r
 \r
-const bool IdentityIntroductionRequester::HandleAllData(FCPMessage &message)\r
+const bool IdentityIntroductionRequester::HandleAllData(FCPv2::Message &message)\r
 {\r
        FreenetSSK ssk;\r
        Poco::DateTime date;\r
@@ -48,23 +48,16 @@ const bool IdentityIntroductionRequester::HandleAllData(FCPMessage &message)
        StringFunctions::Convert(message["DataLength"],datalength);\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
@@ -123,7 +116,7 @@ const bool IdentityIntroductionRequester::HandleAllData(FCPMessage &message)
        return true;\r
 }\r
 \r
-const bool IdentityIntroductionRequester::HandleGetFailed(FCPMessage &message)\r
+const bool IdentityIntroductionRequester::HandleGetFailed(FCPv2::Message &message)\r
 {\r
        std::vector<std::string> idparts;\r
 \r
@@ -146,7 +139,7 @@ const bool IdentityIntroductionRequester::HandleGetFailed(FCPMessage &message)
        return true;\r
 }\r
 \r
-const bool IdentityIntroductionRequester::HandleMessage(FCPMessage &message)\r
+const bool IdentityIntroductionRequester::HandleMessage(FCPv2::Message &message)\r
 {\r
 \r
        if(message["Identifier"].find("IdentityIntroductionRequester")==0)\r
@@ -185,7 +178,8 @@ const bool IdentityIntroductionRequester::HandleMessage(FCPMessage &message)
 void IdentityIntroductionRequester::Initialize()\r
 {\r
        m_maxrequests=0;\r
-       Option::Instance()->GetInt("MaxIdentityIntroductionRequests",m_maxrequests);\r
+       Option option(m_db);\r
+       option.GetInt("MaxIdentityIntroductionRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r
@@ -195,7 +189,7 @@ void IdentityIntroductionRequester::Initialize()
        {\r
                m_log->warning("Option MaxIdentityIntroductionRequests is currently set at more than 100.  This value might be incorrectly configured.");\r
        }\r
-       Option::Instance()->Get("MessageBase",m_messagebase);\r
+       option.Get("MessageBase",m_messagebase);\r
        m_tempdate=Poco::Timestamp();\r
 }\r
 \r
@@ -280,7 +274,7 @@ void IdentityIntroductionRequester::StartRequest(const std::string &UUID)
        std::string day;\r
        std::string solution;\r
        std::string encodedhash;\r
-       FCPMessage message;\r
+       FCPv2::Message message;\r
        SQLite3DB::Statement st=m_db->Prepare("SELECT Day, PuzzleSolution FROM tblIntroductionPuzzleInserts WHERE FoundSolution='false' AND UUID=?;");\r
        st.Bind(0,UUID);\r
        st.Step();\r
@@ -303,7 +297,7 @@ void IdentityIntroductionRequester::StartRequest(const std::string &UUID)
                message["ReturnType"]="direct";\r
                message["MaxSize"]="10000";\r
 \r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
 \r
                m_requesting.push_back(UUID);\r
 \r