version 0.1.10

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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 980e688..d58494b 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -167,7 +167,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
                }\r
                else    // couldn't insert - was already in database\r
                {\r
-                       m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database.  "+message["Identifier"]);\r
+                       //m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database.  "+message["Identifier"]);\r
                }\r
 \r
        }\r
@@ -241,6 +241,17 @@ void MessageRequester::Initialize()
        {\r
                m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MessageDownloadMaxDaysBackward is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
+       Option::Instance()->Get("MaxPeerMessagesPerDay",tempval);\r
+       StringFunctions::Convert(tempval,m_maxpeermessages);\r
+       if(m_maxpeermessages<1)\r
+       {\r
+               m_maxpeermessages=1;\r
+               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxPeerMessagesPerDay is currently set at "+tempval+".  It must be 1 or greater.");\r
+       }\r
+       if(m_maxpeermessages<20 || m_maxpeermessages>1000)\r
+       {\r
+               m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxPeerMessagesPerDay is currently set at "+tempval+".  This value might be incorrectly configured.  The suggested value is 200.");\r
+       }\r
 }\r
 \r
 void MessageRequester::PopulateIDList()\r
@@ -250,6 +261,7 @@ void MessageRequester::PopulateIDList()
        std::string val2;\r
        std::string val3;\r
        std::string sql;\r
+       long requestindex;\r
 \r
        date.SetToGMTime();\r
        date.Add(0,0,0,-m_maxdaysbackward);\r
@@ -270,9 +282,17 @@ void MessageRequester::PopulateIDList()
                st.ResultText(0,val1);\r
                st.ResultText(1,val2);\r
                st.ResultText(2,val3);\r
-               if(m_ids.find(val1+"*"+val2+"*"+val3)==m_ids.end())\r
+\r
+               requestindex=0;\r
+               StringFunctions::Convert(val3,requestindex);\r
+\r
+               // only continue if index is < max messages we will accept from a peer\r
+               if(requestindex<m_maxpeermessages)\r
                {\r
-                       m_ids[val1+"*"+val2+"*"+val3]=false;\r
+                       if(m_ids.find(val1+"*"+val2+"*"+val3)==m_ids.end())\r
+                       {\r
+                               m_ids[val1+"*"+val2+"*"+val3]=false;\r
+                       }\r
                }\r
                st.Step();\r
        }\r
@@ -307,6 +327,7 @@ void MessageRequester::StartRequest(const std::string &requestid)
                message["Identifier"]=m_fcpuniquename+"|"+requestid+"|"+parts[0]+"|"+parts[1]+"|"+parts[2]+"|"+message["URI"];\r
                message["ReturnType"]="direct";\r
                message["MaxSize"]="1000000";           // 1 MB\r
+               message["MaxRetries"]="-1";                     // use new ULPR since we are fairly sure message exists since the author says it does\r
 \r
                m_fcp->SendMessage(message);\r
 \r