version 0.3.20

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

diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index f7d5317..88fd483 100644 (file)
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -66,10 +66,13 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
 \r
        // receive the file\r
        data.resize(datalength);\r
-       m_fcp->ReceiveRaw(&data[0],datalength);\r
+       if(data.size()>0)\r
+       {\r
+               m_fcp->ReceiveRaw(&data[0],datalength);\r
+       }\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
                // check if last part of UUID matches first part of public key of identity who inserted it\r
@@ -112,6 +115,7 @@ const bool IntroductionPuzzleRequester::HandleAllData(FCPMessage &message)
 \r
                // we can only validate bitmaps for now\r
                BitmapValidator val;\r
+               val.SetMax(200,200);\r
                std::vector<unsigned char> puzzledata;\r
                Base64::Decode(xml.GetPuzzleData(),puzzledata);\r
                if(xml.GetMimeType()!="image/bmp" || val.Validate(puzzledata)==false)\r
@@ -233,17 +237,16 @@ const bool IntroductionPuzzleRequester::HandleMessage(FCPMessage &message)
 \r
 void IntroductionPuzzleRequester::Initialize()\r
 {\r
-       std::string tempval="";\r
-       Option::Instance()->Get("MaxIntroductionPuzzleRequests",tempval);\r
-       StringFunctions::Convert(tempval,m_maxrequests);\r
+       m_maxrequests=0;\r
+       Option::Instance()->GetInt("MaxIntroductionPuzzleRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r
-               m_log->error("Option MaxIntroductionPuzzleRequests is currently set at "+tempval+".  It must be 1 or greater.");\r
+               m_log->error("Option MaxIntroductionPuzzleRequests is currently set at less than 1.  It must be 1 or greater.");\r
        }\r
        if(m_maxrequests>100)\r
        {\r
-               m_log->warning("Option MaxIntroductionPuzzleRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
+               m_log->warning("Option MaxIntroductionPuzzleRequests is currently set at more than 100.  This value might be incorrectly configured.");\r
        }\r
        Option::Instance()->Get("MessageBase",m_messagebase);\r
        m_tempdate=Poco::Timestamp();\r
@@ -265,7 +268,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 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")+"' ORDER BY LocalMessageTrust DESC LIMIT 0,"+limitnum+";");\r
        st.Step();\r
 \r
        m_ids.clear();\r