X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=d58494b1d731960aecb67dfee8d5d1b16de80142;hb=f60495a029c54358f82956482fe203fe2b7b5b23;hp=c9908a5ecaefa20e22d35e8c40346d3891ff6d1a;hpb=37a8d59548287dcad78ef00e7b18058721eb9935;p=fms.git

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index c9908a5..d58494b 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -78,6 +78,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 	MessageXML xml;
 	long identityid;
 	long index;
+	bool inserted=false;
 
 	StringFunctions::Split(message["Identifier"],"|",idparts);
 	StringFunctions::Convert(message["DataLength"],datalength);
@@ -133,32 +134,41 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 		st.Bind(5,xml.GetMessageID());
 		st.Bind(6,GetBoardID(xml.GetReplyBoard()));
 		st.Bind(7,xml.GetBody());
-		st.Step(true);
+		inserted=st.Step(true);
 		int messageid=st.GetLastInsertRowID();
 
-		st=m_db->Prepare("INSERT INTO tblMessageBoard(MessageID,BoardID) VALUES(?,?);");
-		for(std::vector<std::string>::iterator i=boards.begin(); i!=boards.end(); i++)
+		if(inserted==true)
 		{
-			st.Bind(0,messageid);
-			st.Bind(1,GetBoardID((*i)));
-			st.Step();
-			st.Reset();
-		}
-		st.Finalize();
 
-		st=m_db->Prepare("INSERT INTO tblMessageReplyTo(MessageID,ReplyToMessageUUID,ReplyOrder) VALUES(?,?,?);");
-		std::map<long,std::string> replyto=xml.GetInReplyTo();
-		for(std::map<long,std::string>::iterator j=replyto.begin(); j!=replyto.end(); j++)
+			st=m_db->Prepare("INSERT INTO tblMessageBoard(MessageID,BoardID) VALUES(?,?);");
+			for(std::vector<std::string>::iterator i=boards.begin(); i!=boards.end(); i++)
+			{
+				st.Bind(0,messageid);
+				st.Bind(1,GetBoardID((*i)));
+				st.Step();
+				st.Reset();
+			}
+			st.Finalize();
+
+			st=m_db->Prepare("INSERT INTO tblMessageReplyTo(MessageID,ReplyToMessageUUID,ReplyOrder) VALUES(?,?,?);");
+			std::map<long,std::string> replyto=xml.GetInReplyTo();
+			for(std::map<long,std::string>::iterator j=replyto.begin(); j!=replyto.end(); j++)
+			{
+				st.Bind(0,messageid);
+				st.Bind(1,(*j).second);
+				st.Bind(2,(*j).first);
+				st.Step();
+				st.Reset();
+			}
+			st.Finalize();
+
+			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::HandleAllData parsed Message XML file : "+message["Identifier"]);
+
+		}
+		else	// couldn't insert - was already in database
 		{
-			st.Bind(0,messageid);
-			st.Bind(1,(*j).second);
-			st.Bind(2,(*j).first);
-			st.Step();
-			st.Reset();
+			//m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database.  "+message["Identifier"]);
 		}
-		st.Finalize();
-
-		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::HandleAllData parsed Message XML file : "+message["Identifier"]);
 
 	}
 	else
@@ -231,6 +241,17 @@ void MessageRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MessageDownloadMaxDaysBackward is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
+	Option::Instance()->Get("MaxPeerMessagesPerDay",tempval);
+	StringFunctions::Convert(tempval,m_maxpeermessages);
+	if(m_maxpeermessages<1)
+	{
+		m_maxpeermessages=1;
+		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxPeerMessagesPerDay is currently set at "+tempval+".  It must be 1 or greater.");
+	}
+	if(m_maxpeermessages<20 || m_maxpeermessages>1000)
+	{
+		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxPeerMessagesPerDay is currently set at "+tempval+".  This value might be incorrectly configured.  The suggested value is 200.");
+	}
 }
 
 void MessageRequester::PopulateIDList()
@@ -240,6 +261,7 @@ void MessageRequester::PopulateIDList()
 	std::string val2;
 	std::string val3;
 	std::string sql;
+	long requestindex;
 
 	date.SetToGMTime();
 	date.Add(0,0,0,-m_maxdaysbackward);
@@ -260,9 +282,17 @@ void MessageRequester::PopulateIDList()
 		st.ResultText(0,val1);
 		st.ResultText(1,val2);
 		st.ResultText(2,val3);
-		if(m_ids.find(val1+"*"+val2+"*"+val3)==m_ids.end())
+
+		requestindex=0;
+		StringFunctions::Convert(val3,requestindex);
+
+		// only continue if index is < max messages we will accept from a peer
+		if(requestindex<m_maxpeermessages)
 		{
-			m_ids[val1+"*"+val2+"*"+val3]=false;
+			if(m_ids.find(val1+"*"+val2+"*"+val3)==m_ids.end())
+			{
+				m_ids[val1+"*"+val2+"*"+val3]=false;
+			}
 		}
 		st.Step();
 	}
@@ -297,10 +327,13 @@ void MessageRequester::StartRequest(const std::string &requestid)
 		message["Identifier"]=m_fcpuniquename+"|"+requestid+"|"+parts[0]+"|"+parts[1]+"|"+parts[2]+"|"+message["URI"];
 		message["ReturnType"]="direct";
 		message["MaxSize"]="1000000";		// 1 MB
+		message["MaxRetries"]="-1";			// use new ULPR since we are fairly sure message exists since the author says it does
 
 		m_fcp->SendMessage(message);
 
 		m_requesting.push_back(requestid);
+
+		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::StartRequest requesting "+message["Identifier"]);
 	}
 	
 	m_ids[requestid]=true;