X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistrequester.cpp;h=17aba0a2e9f5235899eb6ff1bdbde80d58a0d58b;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hp=41f7d8584056ce9dfce695be8b2404842f4227ae;hpb=c0ebc7b53a977885ebc2d3a679c586ae20c0bc4a;p=fms.git diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp index 41f7d85..17aba0a 100644 --- a/src/freenet/messagelistrequester.cpp +++ b/src/freenet/messagelistrequester.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #ifdef XMEM @@ -14,7 +15,7 @@ MessageListRequester::MessageListRequester() Initialize(); } -MessageListRequester::MessageListRequester(FCPv2 *fcp):IIndexRequester(fcp) +MessageListRequester::MessageListRequester(FCPv2::Connection *fcp):IIndexRequester(fcp) { Initialize(); } @@ -49,6 +50,29 @@ const bool MessageListRequester::CheckDateNotFuture(const std::string &datestr) } +const bool MessageListRequester::CheckDateWithinMaxDays(const std::string &datestr) const +{ + Poco::DateTime checkdate; + Poco::DateTime date; + int tzdiff=0; + if(Poco::DateTimeParser::tryParse(datestr,date,tzdiff)) + { + checkdate-=Poco::Timespan(m_messagedownloadmaxdaysbackward,0,0,0,0); + if(checkdate<=date) + { + return true; + } + else + { + return false; + } + } + else + { + return false; + } +} + void MessageListRequester::GetBoardList(std::map &boards) { SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, SaveReceivedMessages FROM tblBoard;"); @@ -73,7 +97,7 @@ void MessageListRequester::GetBoardList(std::map &boards) } } -const bool MessageListRequester::HandleAllData(FCPMessage &message) +const bool MessageListRequester::HandleAllData(FCPv2::Message &message) { SQLite3DB::Statement st; SQLite3DB::Statement trustst; @@ -97,23 +121,16 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) StringFunctions::Convert(idparts[2],index); // wait for all data to be received from connection - while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()Update(1); - } + m_fcp->WaitForBytes(1000,datalength); // if we got disconnected- return immediately - if(m_fcp->Connected()==false) + if(m_fcp->IsConnected()==false) { return false; } // receive the file - data.resize(datalength); - if(data.size()>0) - { - m_fcp->ReceiveRaw(&data[0],datalength); - } + m_fcp->Receive(data,datalength); // parse file into xml and update the database if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true) @@ -153,7 +170,12 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) if(CheckDateNotFuture(xml.GetDate(i))==false) { addmessage=false; - m_log->error("MessageListRequester::HandleAllData date for message is in future! "+xml.GetDate(i)); + m_log->error(m_fcpuniquename+"::HandleAllData date for message is in future! "+xml.GetDate(i)); + } + + if(addmessage==true && CheckDateWithinMaxDays(xml.GetDate(i))==false) + { + addmessage=false; } if(addmessage==true) @@ -174,7 +196,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) } else { - m_log->trace("MessageListRequester::HandleAllData will not download message posted to "+boardsstr); + //m_log->trace("MessageListRequester::HandleAllData will not download message posted to "+boardsstr+" on "+xml.GetDate(i)); } } @@ -211,7 +233,12 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) if(CheckDateNotFuture(xml.GetExternalDate(i))==false) { addmessage=false; - m_log->error("MessageListRequester::HandleAllData date for external message is in future! "+xml.GetExternalDate(i)); + m_log->error(m_fcpuniquename+"::HandleAllData date for external message is in future! "+xml.GetExternalDate(i)); + } + + if(addmessage==true && CheckDateWithinMaxDays(xml.GetExternalDate(i))==false) + { + addmessage=false; } if(addmessage==true) @@ -232,7 +259,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) } else { - m_log->trace("MessageListRequester::HandleAllData will not download external message posted to "+boardsstr+" from " + xml.GetExternalIdentity(i)); + //m_log->trace("MessageListRequester::HandleAllData will not download external message posted to "+boardsstr+" from " + xml.GetExternalIdentity(i) + " on " + xml.GetExternalDate(i)); } } } @@ -244,7 +271,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) st.Step(); st.Finalize(); - m_log->debug("MessageListRequester::HandleAllData parsed MessageList XML file : "+message["Identifier"]); + m_log->debug(m_fcpuniquename+"::HandleAllData parsed MessageList XML file : "+message["Identifier"]); } else { @@ -256,7 +283,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) st.Step(); st.Finalize(); - m_log->error("MessageListRequester::HandleAllData error parsing MessageList XML file : "+message["Identifier"]); + m_log->error(m_fcpuniquename+"::HandleAllData error parsing MessageList XML file : "+message["Identifier"]); } // remove this identityid from request list @@ -266,7 +293,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message) } -const bool MessageListRequester::HandleGetFailed(FCPMessage &message) +const bool MessageListRequester::HandleGetFailed(FCPv2::Message &message) { SQLite3DB::Statement st; std::vector idparts; @@ -294,7 +321,7 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message) st.Step(); st.Finalize(); - m_log->error("MessageListRequester::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]); + m_log->error(m_fcpuniquename+"::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]); } // remove this identityid from request list @@ -305,11 +332,15 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message) void MessageListRequester::Initialize() { - m_fcpuniquename="MessageListRequester"; + m_fcpuniquename="ActiveMessageListRequester"; std::string tempval=""; m_maxrequests=0; Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests); + + // active identities get 1/2 of the max requests option + any remaining if not evenly divisible - inactive identities get 1/2 + m_maxrequests=(m_maxrequests/2)+(m_maxrequests%2); + if(m_maxrequests<1) { m_maxrequests=1; @@ -342,11 +373,17 @@ void MessageListRequester::Initialize() m_savetonewboards=false; } + m_messagedownloadmaxdaysbackward=5; + tempval="5"; + Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval); + StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward); + } void MessageListRequester::PopulateIDList() { Poco::DateTime date; + Poco::DateTime yesterday=date-Poco::Timespan(1,0,0,0,0); int id; SQLite3DB::Statement st; @@ -354,11 +391,11 @@ void MessageListRequester::PopulateIDList() // select identities we want to query (we've seen them today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending) if(m_localtrustoverrides==false) { - st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); + st=m_db->Prepare("SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN vwIdentityStats ON tblIdentity.IdentityID=vwIdentityStats.IdentityID WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (vwIdentityStats.LastMessageDate>='"+Poco::DateTimeFormatter::format(yesterday,"%Y-%m-%d")+"') AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); } else { - st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); + st=m_db->Prepare("SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN vwIdentityStats ON tblIdentity.IdentityID=vwIdentityStats.IdentityID WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (vwIdentityStats.LastMessageDate>='"+Poco::DateTimeFormatter::format(yesterday,"%Y-%m-%d")+"') AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); } st.Step(); @@ -372,13 +409,13 @@ void MessageListRequester::PopulateIDList() } } -void MessageListRequester::StartRedirectRequest(FCPMessage &message) +void MessageListRequester::StartRedirectRequest(FCPv2::Message &message) { std::vector parts; std::string indexstr=""; std::string identityidstr=""; std::string datestr=""; - FCPMessage newmessage; + FCPv2::Message newmessage; // get the new edition # StringFunctions::Split(message["RedirectURI"],"/",parts); @@ -406,14 +443,14 @@ void MessageListRequester::StartRedirectRequest(FCPMessage &message) newmessage["ReturnType"]="direct"; newmessage["MaxSize"]="1000000"; - m_fcp->SendMessage(newmessage); + m_fcp->Send(newmessage); } void MessageListRequester::StartRequest(const long &id) { Poco::DateTime now; - FCPMessage message; + FCPv2::Message message; std::string publickey; int index=0; std::string indexstr; @@ -456,7 +493,7 @@ void MessageListRequester::StartRequest(const long &id) message["ReturnType"]="direct"; message["MaxSize"]="1000000"; - m_fcp->SendMessage(message); + m_fcp->Send(message); m_requesting.push_back(id); }