version 0.3.32

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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index f1429ab..fefe898 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -11,6 +11,8 @@
        #include <xmem.h>\r
 #endif\r
 \r
+std::string MessageRequester::m_validuuidchars="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~@_-";\r
+\r
 MessageRequester::MessageRequester(SQLite3DB::DB *db):IIndexRequester<std::string>(db)\r
 {\r
        Initialize();\r
@@ -172,7 +174,7 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
                        StringFunctions::SplitMultiple(publickey,"@,",keyparts);\r
                        StringFunctions::SplitMultiple(xml.GetMessageID(),"@",uuidparts);\r
 \r
-                       if(uuidparts.size()>1 && keyparts.size()>1)\r
+                       if(uuidparts.size()>1 && keyparts.size()>1 && xml.GetMessageID().find_first_not_of(m_validuuidchars)==std::string::npos)\r
                        {\r
                                keypart=StringFunctions::Replace(StringFunctions::Replace(keyparts[1],"-",""),"~","");\r
                                if(keypart!=uuidparts[1])\r
@@ -226,7 +228,7 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
 \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=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex,InsertDate) VALUES(?,?,?,?,?,?,?,?,?,?);");\r
                        st.Bind(0,identityid);\r
                        st.Bind(1,GetIdentityName(identityid));\r
                        st.Bind(2,xml.GetDate());\r
@@ -236,8 +238,9 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
                        st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));\r
                        st.Bind(7,nntpbody);\r
                        st.Bind(8,index);\r
+                       st.Bind(9,idparts[3]);\r
                        inserted=st.Step(true);\r
-                       int messageid=st.GetLastInsertRowID();\r
+                       long messageid=st.GetLastInsertRowID();\r
 \r
                        if(inserted==true)\r
                        {\r
@@ -274,6 +277,8 @@ 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
@@ -314,6 +319,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
@@ -419,7 +432,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
@@ -503,7 +516,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