X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fboardlistrequester.cpp;h=41df7d67cd15aee4d30c70ec5aa921f2f21bf112;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=9fbc6b216c819352d0e7485361a037db034081c7;hpb=107bd97018964d48425306026d06afd038e84db0;p=fms.git diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp index 9fbc6b2..41df7d6 100644 --- a/src/freenet/boardlistrequester.cpp +++ b/src/freenet/boardlistrequester.cpp @@ -1,16 +1,19 @@ #include "../../include/freenet/boardlistrequester.h" #include "../../include/freenet/boardlistxml.h" +#include +#include + #ifdef XMEM #include #endif -BoardListRequester::BoardListRequester() +BoardListRequester::BoardListRequester(SQLite3DB::DB *db):IIndexRequester(db) { Initialize(); } -BoardListRequester::BoardListRequester(FCPv2 *fcp):IIndexRequester(fcp) +BoardListRequester::BoardListRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester(db,fcp) { Initialize(); } @@ -45,9 +48,9 @@ std::string BoardListRequester::GetIdentityName(const long identityid) } } -const bool BoardListRequester::HandleAllData(FCPMessage &message) +const bool BoardListRequester::HandleAllData(FCPv2::Message &message) { - DateTime now; + Poco::DateTime now; SQLite3DB::Statement st; std::vector idparts; long datalength; @@ -57,7 +60,6 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message) long index; std::string identityname=""; - now.SetToGMTime(); StringFunctions::Split(message["Identifier"],"|",idparts); StringFunctions::Convert(message["DataLength"],datalength); StringFunctions::Convert(idparts[1],identityid); @@ -66,23 +68,19 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message) identityname=GetIdentityName(identityid); // 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); - m_fcp->ReceiveRaw(&data[0],datalength); + m_fcp->Receive(data,datalength); // parse file into xml and update the database - if(xml.ParseXML(std::string(data.begin(),data.end()))==true) + if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true) { SQLite3DB::Statement brd=m_db->Prepare("SELECT BoardID,BoardName,BoardDescription FROM tblBoard WHERE BoardName=?;"); @@ -113,7 +111,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message) { ins.Bind(0,xml.GetName(i)); ins.Bind(1,xml.GetDescription(i)); - ins.Bind(2,now.Format("%Y-%m-%d %H:%M:%S")); + ins.Bind(2,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S")); if(m_savemessagesfromnewboards) { ins.Bind(3,"true"); @@ -136,7 +134,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message) st.Step(); st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"BoardListRequester::HandleAllData parsed BoardList XML file : "+message["Identifier"]); + m_log->debug("BoardListRequester::HandleAllData parsed BoardList XML file : "+message["Identifier"]); } else { @@ -148,7 +146,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message) st.Step(); st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"BoardListRequester::HandleAllData error parsing BoardList XML file : "+message["Identifier"]); + m_log->error("BoardListRequester::HandleAllData error parsing BoardList XML file : "+message["Identifier"]); } // remove this identityid from request list @@ -158,15 +156,13 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message) } -const bool BoardListRequester::HandleGetFailed(FCPMessage &message) +const bool BoardListRequester::HandleGetFailed(FCPv2::Message &message) { - DateTime now; SQLite3DB::Statement st; std::vector idparts; long identityid; long index; - now.SetToGMTime(); StringFunctions::Split(message["Identifier"],"|",idparts); StringFunctions::Convert(idparts[1],identityid); StringFunctions::Convert(idparts[2],index); @@ -181,7 +177,7 @@ const bool BoardListRequester::HandleGetFailed(FCPMessage &message) st.Step(); st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"BoardListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]); + m_log->error("BoardListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]); } // remove this identityid from request list @@ -196,20 +192,20 @@ void BoardListRequester::Initialize() m_fcpuniquename="BoardListRequester"; m_maxrequests=0; + Option option(m_db); - Option::Instance()->Get("MaxBoardListRequests",tempval); - StringFunctions::Convert(tempval,m_maxrequests); + option.GetInt("MaxBoardListRequests",m_maxrequests); if(m_maxrequests<0) { m_maxrequests=0; - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxBoardListRequests is currently set at "+tempval+". It must be 0 or greater."); + m_log->error("Option MaxBoardListRequests is currently set at "+tempval+". It must be 0 or greater."); } if(m_maxrequests>100) { - m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardListRequests is currently set at "+tempval+". This value might be incorrectly configured."); + m_log->warning("Option MaxBoardListRequests is currently set at "+tempval+". This value might be incorrectly configured."); } - Option::Instance()->Get("SaveMessagesFromNewBoards",tempval); + option.Get("SaveMessagesFromNewBoards",tempval); if(tempval=="true") { m_savemessagesfromnewboards=true; @@ -219,15 +215,33 @@ void BoardListRequester::Initialize() m_savemessagesfromnewboards=false; } + option.Get("LocalTrustOverridesPeerTrust",tempval); + if(tempval=="true") + { + m_localtrustoverrides=true; + } + else + { + m_localtrustoverrides=false; + } + } void BoardListRequester::PopulateIDList() { int id; - DateTime today; - today.SetToGMTime(); + Poco::DateTime today; + + SQLite3DB::Statement st; - SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+today.Format("%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')) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); + if(m_localtrustoverrides==false) + { + st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(today,"%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')) AND PublishBoardList='true' 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(today,"%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')))) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;"); + } st.Step(); m_ids.clear(); @@ -243,8 +257,8 @@ void BoardListRequester::PopulateIDList() void BoardListRequester::StartRequest(const long &identityid) { - DateTime now; - FCPMessage message; + Poco::DateTime now; + FCPv2::Message message; std::string publickey; std::string indexstr; int index; @@ -258,10 +272,8 @@ void BoardListRequester::StartRequest(const long &identityid) { st.ResultText(0,publickey); - now.SetToGMTime(); - SQLite3DB::Statement st2=m_db->Prepare("SELECT MAX(RequestIndex) FROM tblBoardListRequests WHERE Day=? AND IdentityID=?;"); - st2.Bind(0,now.Format("%Y-%m-%d")); + st2.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d")); st2.Bind(1,identityid); st2.Step(); @@ -280,12 +292,12 @@ void BoardListRequester::StartRequest(const long &identityid) StringFunctions::Convert(identityid,identityidstr); message.SetName("ClientGet"); - message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|BoardList|"+indexstr+".xml"; + message["URI"]=publickey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|BoardList|"+indexstr+".xml"; message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"]; message["ReturnType"]="direct"; message["MaxSize"]="100000"; // 100 KB - m_fcp->SendMessage(message); + m_fcp->Send(message); m_requesting.push_back(identityid);