X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=f1429ab44b21b689bf0907f49ab46f69f3c83bb4;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=ea3ec858540aa6220969c8db54c31189f83fef40;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index ea3ec85..f1429ab 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -11,12 +11,12 @@
 	#include <xmem.h>
 #endif
 
-MessageRequester::MessageRequester()
+MessageRequester::MessageRequester(SQLite3DB::DB *db):IIndexRequester<std::string>(db)
 {
 	Initialize();
 }
 
-MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)
+MessageRequester::MessageRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<std::string>(db,fcp)
 {
 	Initialize();
 }
@@ -85,7 +85,7 @@ const std::string MessageRequester::GetIdentityName(const long identityid)
 	}
 }
 
-const bool MessageRequester::HandleAllData(FCPMessage &message)
+const bool MessageRequester::HandleAllData(FCPv2::Message &message)
 {
 	SQLite3DB::Statement st;
 	std::vector<std::string> idparts;
@@ -104,20 +104,16 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 	StringFunctions::Convert(idparts[4],index);
 
 	// wait for all data to be received from connection
-	while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)
-	{
-		m_fcp->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);
 
 	// mark this index as received
 	st=m_db->Prepare("UPDATE tblMessageRequests SET Found='true' WHERE IdentityID=? AND Day=? AND RequestIndex=?;");
@@ -128,7 +124,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 	st.Finalize();
 
 	// 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)
 	{
 		std::vector<std::string> boards=xml.GetBoards();
 		std::map<long,std::string> replyto=xml.GetInReplyTo();
@@ -228,6 +224,8 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 				nntpbody+="\r\n";
 			}
 
+			m_db->Execute("BEGIN;");
+
 			st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex) VALUES(?,?,?,?,?,?,?,?,?);");
 			st.Bind(0,identityid);
 			st.Bind(1,GetIdentityName(identityid));
@@ -276,6 +274,8 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 				//m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database.  "+message["Identifier"]);
 			}
 
+			m_db->Execute("COMMIT;");
+
 		}	// if validmessage
 	}
 	else
@@ -288,7 +288,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 	return true;
 }
 
-const bool MessageRequester::HandleGetFailed(FCPMessage &message)
+const bool MessageRequester::HandleGetFailed(FCPv2::Message &message)
 {
 	SQLite3DB::Statement st;
 	std::vector<std::string> idparts;
@@ -323,9 +323,11 @@ const bool MessageRequester::HandleGetFailed(FCPMessage &message)
 void MessageRequester::Initialize()
 {
 	m_fcpuniquename="MessageRequester";
-	std::string tempval;
-	Option::Instance()->Get("MaxMessageRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	std::string tempval("");
+	m_maxrequests=0;
+	Option option(m_db);
+
+	option.GetInt("MaxMessageRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
@@ -335,8 +337,9 @@ void MessageRequester::Initialize()
 	{
 		m_log->warning("Option MaxMessageRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);
-	StringFunctions::Convert(tempval,m_maxdaysbackward);
+
+	m_maxdaysbackward=0;
+	option.GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);
 	if(m_maxdaysbackward<0)
 	{
 		m_maxdaysbackward=0;
@@ -346,8 +349,9 @@ void MessageRequester::Initialize()
 	{
 		m_log->warning("Option MessageDownloadMaxDaysBackward is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::Instance()->Get("MaxPeerMessagesPerDay",tempval);
-	StringFunctions::Convert(tempval,m_maxpeermessages);
+
+	m_maxpeermessages=0;
+	option.GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);
 	if(m_maxpeermessages<1)
 	{
 		m_maxpeermessages=1;
@@ -357,8 +361,9 @@ void MessageRequester::Initialize()
 	{
 		m_log->warning("Option MaxPeerMessagesPerDay is currently set at "+tempval+".  This value might be incorrectly configured.  The suggested value is 200.");
 	}
-	Option::Instance()->Get("MaxBoardsPerMessage",tempval);
-	StringFunctions::Convert(tempval,m_maxboardspermessage);
+
+	m_maxboardspermessage=0;
+	option.GetInt("MaxBoardsPerMessage",m_maxboardspermessage);
 	if(m_maxboardspermessage<1)
 	{
 		m_maxboardspermessage=1;
@@ -369,7 +374,7 @@ void MessageRequester::Initialize()
 		m_log->warning("Option MaxBoardsPerMessage 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;
@@ -379,7 +384,7 @@ void MessageRequester::Initialize()
 		m_savemessagesfromnewboards=false;
 	}
 
-	Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);
+	option.Get("LocalTrustOverridesPeerTrust",tempval);
 	if(tempval=="true")
 	{
 		m_localtrustoverrides=true;
@@ -416,7 +421,9 @@ void MessageRequester::PopulateIDList()
 	}
 	sql+="AND tblIdentity.Name <> '' ";
 	// 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
-	sql+="ORDER BY tblMessageRequests.Day DESC ";
+	// secondary ascending sort on tries
+	// tertiary sort on request index (so we get low indexes first)
+	sql+="ORDER BY tblMessageRequests.Day DESC, tblMessageRequests.Tries ASC, tblMessageRequests.RequestIndex ASC ";
 	sql+=";";
 
 	SQLite3DB::Statement st=m_db->Prepare(sql);
@@ -470,7 +477,7 @@ const bool MessageRequester::SaveToBoard(const std::string &boardname)
 
 void MessageRequester::StartRequest(const std::string &requestid)
 {
-	FCPMessage message;
+	FCPv2::Message message;
 	std::vector<std::string> parts;
 	std::string tempval;
 	long identityid;
@@ -498,10 +505,17 @@ void MessageRequester::StartRequest(const std::string &requestid)
 		message["MaxSize"]="1000000";		// 1 MB
 		message["MaxRetries"]="-1";			// use ULPR since we are fairly sure message exists since the author says it does
 
-		m_fcp->SendMessage(message);
+		m_fcp->Send(message);
 
 		m_requesting.push_back(requestid);
 
+		// update tries
+		st=m_db->Prepare("UPDATE tblMessageRequests SET Tries=Tries+1 WHERE IdentityID=? AND Day=? AND RequestIndex=?;");
+		st.Bind(0,identityid);
+		st.Bind(1,date);
+		st.Bind(2,indexstr);
+		st.Step();
+
 		m_log->debug("MessageRequester::StartRequest requesting "+message["Identifier"]);
 	}