From 278ee758050cb7772cd95946688c5b40104f4d8b Mon Sep 17 00:00:00 2001
From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Mon, 1 Sep 2008 10:12:00 +0200
Subject: [PATCH] version 0.3.19

---
 include/dbsetup.h                               |  2 ++
 include/freenet/freenetmasterthread.h           |  2 +-
 include/freenet/identityintroductionrequester.h |  2 +-
 include/freenet/iindexrequester.h               |  2 +-
 include/freenet/introductionpuzzlerequester.h   |  2 +-
 include/freenet/messagerequester.h              |  6 +++---
 include/global.h                                |  6 +++---
 include/option.h                                |  1 +
 src/dbsetup.cpp                                 | 24 ++++++++++++++++++++++++
 src/fmsapp.cpp                                  |  7 ++++++-
 src/freenet/boardlistrequester.cpp              |  3 +--
 src/freenet/freenetmasterthread.cpp             | 18 +++++++++---------
 src/freenet/identityintroductionrequester.cpp   |  9 ++++-----
 src/freenet/identityrequester.cpp               |  8 +++-----
 src/freenet/introductionpuzzlerequester.cpp     |  9 ++++-----
 src/freenet/messagelistrequester.cpp            |  7 ++++---
 src/freenet/messagerequester.cpp                | 20 ++++++++++++--------
 src/freenet/trustlistrequester.cpp              |  5 +++--
 src/nntp/nntpconnection.cpp                     |  8 ++++++++
 src/option.cpp                                  | 21 +++++++++++++++++++++
 20 files changed, 112 insertions(+), 50 deletions(-)

diff --git a/include/dbsetup.h b/include/dbsetup.h
index e3618d6..2738e5a 100644
--- a/include/dbsetup.h
+++ b/include/dbsetup.h
@@ -3,5 +3,7 @@
 
 // opens database and creates tables and initial inserts if necessary
 void SetupDB();
+// verifies DB isn't corrupt
+const bool VerifyDB();
 
 #endif	// _dbsetup_
diff --git a/include/freenet/freenetmasterthread.h b/include/freenet/freenetmasterthread.h
index 6b2fc0b..76d6102 100644
--- a/include/freenet/freenetmasterthread.h
+++ b/include/freenet/freenetmasterthread.h
@@ -33,7 +33,7 @@ private:
 	void Shutdown();
 
 	std::string m_fcphost;
-	long m_fcpport;
+	int m_fcpport;
 	FCPv2 m_fcp;
 	std::vector<IFreenetRegistrable *> m_registrables;
 	std::vector<IPeriodicProcessor *> m_processors;
diff --git a/include/freenet/identityintroductionrequester.h b/include/freenet/identityintroductionrequester.h
index 6b3c18a..f6dac85 100644
--- a/include/freenet/identityintroductionrequester.h
+++ b/include/freenet/identityintroductionrequester.h
@@ -37,7 +37,7 @@ private:
 	std::map<long,bool> m_ids;
 	std::vector<std::string> m_requesting;
 	std::string m_messagebase;
-	long m_maxrequests;
+	int m_maxrequests;
 
 };
 
diff --git a/include/freenet/iindexrequester.h b/include/freenet/iindexrequester.h
index b74e69a..678e43e 100644
--- a/include/freenet/iindexrequester.h
+++ b/include/freenet/iindexrequester.h
@@ -51,7 +51,7 @@ protected:
 	std::vector<IDTYPE> m_requesting;		// list of ids we are currently requesting from
 
 	// these MUST be populated by child class
-	long m_maxrequests;
+	int m_maxrequests;
 	std::string m_fcpuniquename;
 
 };
diff --git a/include/freenet/introductionpuzzlerequester.h b/include/freenet/introductionpuzzlerequester.h
index 8dcec3f..a345d3d 100644
--- a/include/freenet/introductionpuzzlerequester.h
+++ b/include/freenet/introductionpuzzlerequester.h
@@ -35,7 +35,7 @@ private:
 
 	Poco::DateTime m_tempdate;
 	std::string m_messagebase;
-	long m_maxrequests;
+	int m_maxrequests;
 	std::vector<long> m_requesting;		// list of ids we are currently requesting from
 	std::map<long,bool> m_ids;			// map of all ids we know and whether we have requested file from them yet
 	
diff --git a/include/freenet/messagerequester.h b/include/freenet/messagerequester.h
index 17b577f..d458ccb 100644
--- a/include/freenet/messagerequester.h
+++ b/include/freenet/messagerequester.h
@@ -20,9 +20,9 @@ private:
 	const bool SaveToBoard(const std::string &boardname);
 	const std::string GetIdentityName(const long identityid);
 
-	long m_maxdaysbackward;
-	long m_maxpeermessages;
-	long m_maxboardspermessage;
+	int m_maxdaysbackward;
+	int m_maxpeermessages;
+	int m_maxboardspermessage;
 	bool m_savemessagesfromnewboards;
 	bool m_localtrustoverrides;
 	
diff --git a/include/global.h b/include/global.h
index f2a9e56..6dd1730 100644
--- a/include/global.h
+++ b/include/global.h
@@ -7,10 +7,10 @@
 
 #define VERSION_MAJOR		"0"
 #define VERSION_MINOR		"3"
-#define VERSION_RELEASE		"18"
+#define VERSION_RELEASE		"19"
 #define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
-#define FMS_FREESITE_USK	"USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/78/"
-#define FMS_VERSION_EDITION	"19"
+#define FMS_FREESITE_USK	"USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/79/"
+#define FMS_VERSION_EDITION	"20"
 
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;
 
diff --git a/include/option.h b/include/option.h
index c01621d..9de5adf 100644
--- a/include/option.h
+++ b/include/option.h
@@ -11,6 +11,7 @@ class Option:public Singleton<Option>
 {
 public:
 	const bool Get(const std::string &option, std::string &value);
+	const bool GetInt(const std::string &option, int &value);
 	template<class T>
 	void Set(const std::string &option, const T &value);
 private:
diff --git a/src/dbsetup.cpp b/src/dbsetup.cpp
index 2eb5403..2e0a460 100644
--- a/src/dbsetup.cpp
+++ b/src/dbsetup.cpp
@@ -549,3 +549,27 @@ void SetupDB()
 	db->Execute("ANALYZE;");
 
 }
+
+const bool VerifyDB()
+{
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	SQLite3DB::Statement st=db->Prepare("PRAGMA integrity_check;");
+	st.Step();
+	if(st.RowReturned())
+	{
+		std::string res="";
+		st.ResultText(0,res);
+		if(res=="ok")
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return false;
+	}
+}
diff --git a/src/fmsapp.cpp b/src/fmsapp.cpp
index 8a462e2..01fcf9a 100644
--- a/src/fmsapp.cpp
+++ b/src/fmsapp.cpp
@@ -162,7 +162,12 @@ int FMSApp::main(const std::vector<std::string> &args)
 	// so we need to set the working directory again
 	int rval=chdir(m_workingdirectory.c_str());
 
-	if(m_displayhelp)
+	if(VerifyDB()==false)
+	{
+		std::cout << "The FMS database failed verification.  It is most likely corrupt!" << std::endl;
+		logger().fatal("The FMS database failed verification.  It is most likely corrupt!");
+	}
+	else if(m_displayhelp)
 	{
 	}
 	else if(m_showoptions)
diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp
index a39d1a6..eb95e91 100644
--- a/src/freenet/boardlistrequester.cpp
+++ b/src/freenet/boardlistrequester.cpp
@@ -197,8 +197,7 @@ void BoardListRequester::Initialize()
 	m_fcpuniquename="BoardListRequester";
 	m_maxrequests=0;
 
-	Option::Instance()->Get("MaxBoardListRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	Option::Instance()->GetInt("MaxBoardListRequests",m_maxrequests);
 	if(m_maxrequests<0)
 	{
 		m_maxrequests=0;
diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index b957c50..c23ee27 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -34,24 +34,24 @@
 
 FreenetMasterThread::FreenetMasterThread()
 {
-	std::string fcpport;
 
 	if(Option::Instance()->Get("FCPHost",m_fcphost)==false)
 	{
 		m_fcphost="localhost";
 		Option::Instance()->Set("FCPHost",m_fcphost);
 	}
-	if(Option::Instance()->Get("FCPPort",fcpport)==false)
+	if(Option::Instance()->GetInt("FCPPort",m_fcpport)==false)
 	{
-		fcpport="9481";
-		Option::Instance()->Set("FCPPort",fcpport);
+		m_fcpport=9481;
+		Option::Instance()->Set("FCPPort",m_fcpport);
 	}
-
-	// convert fcp port to long, and make sure it's within the valid port range
-	if(StringFunctions::Convert(fcpport,m_fcpport)==false)
+	else
 	{
-		m_fcpport=9481;
-		Option::Instance()->Set("FCPPort","9481");
+		if(m_fcpport<1 || m_fcpport>65535)
+		{
+			m_fcpport=9481;
+			Option::Instance()->Set("FCPPort",m_fcpport);
+		}
 	}
 
 	m_receivednodehello=false;
diff --git a/src/freenet/identityintroductionrequester.cpp b/src/freenet/identityintroductionrequester.cpp
index 6552770..843ed0a 100644
--- a/src/freenet/identityintroductionrequester.cpp
+++ b/src/freenet/identityintroductionrequester.cpp
@@ -181,17 +181,16 @@ const bool IdentityIntroductionRequester::HandleMessage(FCPMessage &message)
 
 void IdentityIntroductionRequester::Initialize()
 {
-	std::string tempval="";
-	Option::Instance()->Get("MaxIdentityIntroductionRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	m_maxrequests=0;
+	Option::Instance()->GetInt("MaxIdentityIntroductionRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
-		m_log->error("Option MaxIdentityIntroductionRequests is currently set at "+tempval+".  It must be 1 or greater.");
+		m_log->error("Option MaxIdentityIntroductionRequests is currently less than 1.  It must be 1 or greater.");
 	}
 	if(m_maxrequests>100)
 	{
-		m_log->warning("Option MaxIdentityIntroductionRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
+		m_log->warning("Option MaxIdentityIntroductionRequests is currently set at more than 100.  This value might be incorrectly configured.");
 	}
 	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate=Poco::Timestamp();
diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index 3375f1d..9e055e0 100644
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -166,18 +166,16 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
 
 void IdentityRequester::Initialize()
 {
-	std::string tempval="";
 	m_fcpuniquename="IdentityRequester";
-	Option::Instance()->Get("MaxIdentityRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	Option::Instance()->GetInt("MaxIdentityRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
-		m_log->error("Option MaxIdentityRequests is currently set at "+tempval+".  It must be 1 or greater.");
+		m_log->error("Option MaxIdentityRequests is currently set at less than 1.  It must be 1 or greater.");
 	}
 	if(m_maxrequests>100)
 	{
-		m_log->warning("Option MaxIdentityRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
+		m_log->warning("Option MaxIdentityRequests is currently set at more than 100.  This value might be incorrectly configured.");
 	}
 }
 
diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index 66669b3..dabe818 100644
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -234,17 +234,16 @@ const bool IntroductionPuzzleRequester::HandleMessage(FCPMessage &message)
 
 void IntroductionPuzzleRequester::Initialize()
 {
-	std::string tempval="";
-	Option::Instance()->Get("MaxIntroductionPuzzleRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	m_maxrequests=0;
+	Option::Instance()->GetInt("MaxIntroductionPuzzleRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
-		m_log->error("Option MaxIntroductionPuzzleRequests is currently set at "+tempval+".  It must be 1 or greater.");
+		m_log->error("Option MaxIntroductionPuzzleRequests is currently set at less than 1.  It must be 1 or greater.");
 	}
 	if(m_maxrequests>100)
 	{
-		m_log->warning("Option MaxIntroductionPuzzleRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
+		m_log->warning("Option MaxIntroductionPuzzleRequests is currently set at more than 100.  This value might be incorrectly configured.");
 	}
 	Option::Instance()->Get("MessageBase",m_messagebase);
 	m_tempdate=Poco::Timestamp();
diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 24f70d1..1d42675 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -303,9 +303,10 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
 void MessageListRequester::Initialize()
 {
 	m_fcpuniquename="MessageListRequester";
-	std::string tempval;
-	Option::Instance()->Get("MaxMessageListRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+	std::string tempval="";
+
+	m_maxrequests=0;
+	Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index c641c95..4ea393a 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -324,8 +324,9 @@ void MessageRequester::Initialize()
 {
 	m_fcpuniquename="MessageRequester";
 	std::string tempval;
-	Option::Instance()->Get("MaxMessageRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+
+	m_maxrequests=0;
+	Option::Instance()->GetInt("MaxMessageRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
@@ -335,8 +336,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::Instance()->GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);
 	if(m_maxdaysbackward<0)
 	{
 		m_maxdaysbackward=0;
@@ -346,8 +348,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::Instance()->GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);
 	if(m_maxpeermessages<1)
 	{
 		m_maxpeermessages=1;
@@ -357,8 +360,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::Instance()->GetInt("MaxBoardsPerMessage",m_maxboardspermessage);
 	if(m_maxboardspermessage<1)
 	{
 		m_maxboardspermessage=1;
diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index be6bfc1..78ec556 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -270,8 +270,9 @@ void TrustListRequester::Initialize()
 {
 	std::string tempval="";
 	m_fcpuniquename="TrustListRequester";
-	Option::Instance()->Get("MaxIdentityRequests",tempval);
-	StringFunctions::Convert(tempval,m_maxrequests);
+
+	m_maxrequests=0;
+	Option::Instance()->GetInt("MaxIdentityRequests",m_maxrequests);
 	if(m_maxrequests<1)
 	{
 		m_maxrequests=1;
diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp
index 6e53237..84d07ff 100644
--- a/src/nntp/nntpconnection.cpp
+++ b/src/nntp/nntpconnection.cpp
@@ -1323,6 +1323,14 @@ void NNTPConnection::run()
 			m_log->error("NNTPConnection::run select returned -1 : "+GetSocketErrorMessage());	
 		}
 
+		//process all remaining commands in buffer
+		std::vector<char>::size_type rbs=0;
+		while(rbs!=m_receivebuffer.size())
+		{
+			rbs=m_receivebuffer.size();
+			HandleReceivedData();
+		}
+
 	}while(!Disconnected() && !IsCancelled());
 
 	Disconnect();
diff --git a/src/option.cpp b/src/option.cpp
index b79e90c..9694a45 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -20,3 +20,24 @@ const bool Option::Get(const std::string &option, std::string &value)
 		return false;
 	}
 }
+
+const bool Option::GetInt(const std::string &option, int &value)
+{
+	std::string valstr="";
+	if(Get(option,valstr))
+	{
+		std::istringstream istr(valstr);
+		if(istr >> value)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return false;
+	}
+}
-- 
2.7.4