#include "../../include/freenet/messagerequester.h"\r
#include "../../include/freenet/messagexml.h"\r
\r
+#include <algorithm>\r
+\r
#ifdef XMEM\r
#include <xmem.h>\r
#endif\r
if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
{\r
std::vector<std::string> boards=xml.GetBoards();\r
+ if(boards.size()>m_maxboardspermessage)\r
+ {\r
+ boards.resize(m_maxboardspermessage);\r
+ }\r
\r
if(boards.size()<=0)\r
{\r
m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain a reply board! "+message["Identifier"]);\r
return true;\r
}\r
+ \r
+ // make sure the reply board is on the board list - if not, replace the last element of boardswith the reply board\r
+ if(xml.GetReplyBoard()!="" && std::find(boards.begin(),boards.end(),xml.GetReplyBoard())==boards.end() && boards.size()>0)\r
+ {\r
+ boards[boards.size()-1]=xml.GetReplyBoard();\r
+ }\r
\r
st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body) VALUES(?,?,?,?,?,?,?,?);");\r
st.Bind(0,identityid);\r
}\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
{\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
+ Option::Instance()->Get("MaxBoardsPerMessage",tempval);\r
+ StringFunctions::Convert(tempval,m_maxboardspermessage);\r
+ if(m_maxboardspermessage<1)\r
+ {\r
+ m_maxboardspermessage=1;\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxBoardsPerMessage is currently set at "+tempval+". It must be 1 or greater.");\r
+ }\r
+ if(m_maxboardspermessage>20)\r
+ {\r
+ m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardsPerMessage is currently set at "+tempval+". This value might be incorrectly configured.");\r
+ }\r
}\r
\r
void MessageRequester::PopulateIDList()\r
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
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
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