version 0.3.31

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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index fbd767c..043d2bf 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -11,12 +11,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-MessageRequester::MessageRequester()\r
+MessageRequester::MessageRequester(SQLite3DB::DB *db):IIndexRequester<std::string>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-MessageRequester::MessageRequester(FCPv2::Connection *fcp):IIndexRequester<std::string>(fcp)\r
+MessageRequester::MessageRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<std::string>(db,fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -224,6 +224,8 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
                                nntpbody+="\r\n";\r
                        }\r
 \r
+                       m_db->Execute("BEGIN;");\r
+\r
                        st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex) VALUES(?,?,?,?,?,?,?,?,?);");\r
                        st.Bind(0,identityid);\r
                        st.Bind(1,GetIdentityName(identityid));\r
@@ -272,6 +274,10 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
                                //m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database.  "+message["Identifier"]);\r
                        }\r
 \r
+                       st.Finalize();\r
+\r
+                       m_db->Execute("COMMIT;");\r
+\r
                }       // if validmessage\r
        }\r
        else\r
@@ -310,6 +316,14 @@ const bool MessageRequester::HandleGetFailed(FCPv2::Message &message)
                m_log->error("MessageRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
        }\r
 \r
+       // increase the failure count of the identity who gave us this index\r
+       st=m_db->Prepare("UPDATE tblIdentity SET FailureCount=FailureCount+1 WHERE IdentityID IN (SELECT FromIdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?);");\r
+       st.Bind(0,identityid);\r
+       st.Bind(1,idparts[3]);\r
+       st.Bind(2,index);\r
+       st.Step();\r
+       st.Finalize();\r
+\r
        // remove this identityid from request list\r
        RemoveFromRequestList(requestid);\r
 \r
@@ -319,10 +333,11 @@ const bool MessageRequester::HandleGetFailed(FCPv2::Message &message)
 void MessageRequester::Initialize()\r
 {\r
        m_fcpuniquename="MessageRequester";\r
-       std::string tempval;\r
-\r
+       std::string tempval("");\r
        m_maxrequests=0;\r
-       Option::Instance()->GetInt("MaxMessageRequests",m_maxrequests);\r
+       Option option(m_db);\r
+\r
+       option.GetInt("MaxMessageRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r
@@ -334,7 +349,7 @@ void MessageRequester::Initialize()
        }\r
 \r
        m_maxdaysbackward=0;\r
-       Option::Instance()->GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);\r
+       option.GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);\r
        if(m_maxdaysbackward<0)\r
        {\r
                m_maxdaysbackward=0;\r
@@ -346,7 +361,7 @@ void MessageRequester::Initialize()
        }\r
 \r
        m_maxpeermessages=0;\r
-       Option::Instance()->GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);\r
+       option.GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);\r
        if(m_maxpeermessages<1)\r
        {\r
                m_maxpeermessages=1;\r
@@ -358,7 +373,7 @@ void MessageRequester::Initialize()
        }\r
 \r
        m_maxboardspermessage=0;\r
-       Option::Instance()->GetInt("MaxBoardsPerMessage",m_maxboardspermessage);\r
+       option.GetInt("MaxBoardsPerMessage",m_maxboardspermessage);\r
        if(m_maxboardspermessage<1)\r
        {\r
                m_maxboardspermessage=1;\r
@@ -369,7 +384,7 @@ void MessageRequester::Initialize()
                m_log->warning("Option MaxBoardsPerMessage is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
 \r
-       Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+       option.Get("SaveMessagesFromNewBoards",tempval);\r
        if(tempval=="true")\r
        {\r
                m_savemessagesfromnewboards=true;\r
@@ -379,7 +394,7 @@ void MessageRequester::Initialize()
                m_savemessagesfromnewboards=false;\r
        }\r
 \r
-       Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+       option.Get("LocalTrustOverridesPeerTrust",tempval);\r
        if(tempval=="true")\r
        {\r
                m_localtrustoverrides=true;\r
@@ -414,7 +429,7 @@ void MessageRequester::PopulateIDList()
        {\r
                sql+="AND (tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (tblIdentity.LocalMessageTrust IS NULL AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ";\r
        }\r
-       sql+="AND tblIdentity.Name <> '' ";\r
+       sql+="AND tblIdentity.Name <> '' AND tblIdentity.FailureCount<=(SELECT OptionValue FROM tblOption WHERE Option='MaxFailureCount') ";\r
        // sort by day descending - in case there is a bunch of messages on a day that keep timing out, we will eventually get to the next day and hopefully find messages there\r
        // secondary ascending sort on tries\r
        // tertiary sort on request index (so we get low indexes first)\r
@@ -498,7 +513,8 @@ 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 ULPR since we are fairly sure message exists since the author says it does\r
+               // don't use ULPR - we wan't to know of failures ASAP so we can mark them as such\r
+               //message["MaxRetries"]="-1";                   // use ULPR since we are fairly sure message exists since the author says it does\r
 \r
                m_fcp->Send(message);\r
 \r