version 0.3.32

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

diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index c1efe0f..1b5c166 100644 (file)
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -14,28 +14,19 @@
        #include <xmem.h>\r
 #endif\r
 \r
-IntroductionPuzzleRequester::IntroductionPuzzleRequester()\r
-{\r
-       Initialize();\r
-}\r
+std::string IntroductionPuzzleRequester::m_validuuidchars="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~@_-";\r
 \r
-IntroductionPuzzleRequester::IntroductionPuzzleRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
+IntroductionPuzzleRequester::IntroductionPuzzleRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-void IntroductionPuzzleRequester::FCPConnected()\r
-{\r
-       m_requesting.clear();\r
-       PopulateIDList();\r
-}\r
-\r
-void IntroductionPuzzleRequester::FCPDisconnected()\r
+IntroductionPuzzleRequester::IntroductionPuzzleRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)\r
 {\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
@@ -53,23 +44,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
@@ -91,7 +75,7 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
                        StringFunctions::SplitMultiple(publickey,"@,",keyparts);\r
                        StringFunctions::SplitMultiple(xml.GetUUID(),"@",uuidparts);\r
 \r
-                       if(uuidparts.size()>1 && keyparts.size()>1)\r
+                       if(uuidparts.size()>1 && keyparts.size()>1 && xml.GetUUID().find_first_not_of(m_validuuidchars)==std::string::npos)\r
                        {\r
                                keypart=StringFunctions::Replace(StringFunctions::Replace(keyparts[1],"-",""),"~","");\r
                                if(keypart!=uuidparts[1])\r
@@ -169,7 +153,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
@@ -204,7 +188,8 @@ void IntroductionPuzzleRequester::Initialize()
 {\r
        m_fcpuniquename="IntroductionPuzzleRequester";\r
        m_maxrequests=0;\r
-       Option::Instance()->GetInt("MaxIntroductionPuzzleRequests",m_maxrequests);\r
+       Option option(m_db);\r
+       option.GetInt("MaxIntroductionPuzzleRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r
@@ -232,7 +217,7 @@ void IntroductionPuzzleRequester::PopulateIDList()
        st.Finalize();\r
 \r
        // select identities that aren't single use, are publishing a trust list, and have been seen today ( order by trust DESC and limit to limitnum )\r
-       st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublishTrustList='true' AND PublicKey IS NOT NULL AND PublicKey <> '' AND SingleUse='false' AND (LocalTrustListTrust IS NULL OR LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust')) AND LastSeen>='"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"' ORDER BY LocalMessageTrust DESC LIMIT 0,"+limitnum+";");\r
+       st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublishTrustList='true' AND PublicKey IS NOT NULL AND PublicKey <> '' AND SingleUse='false' AND (LocalTrustListTrust IS NULL OR LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust')) AND LastSeen>='"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"' AND FailureCount<=(SELECT OptionValue FROM tblOption WHERE Option='MaxFailureCount') ORDER BY LocalMessageTrust DESC LIMIT 0,"+limitnum+";");\r
        st.Step();\r
 \r
        m_ids.clear();\r
@@ -248,7 +233,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
@@ -289,7 +274,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