X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fglobal.cpp;h=251ea2abbb4e48a0887ad18f2245bcd99679d623;hb=a007770a843aa759763b98288c9432c3906ce5c6;hp=0437eb4c5893c79223a84f60de802474de6e1bbe;hpb=f208e33c29132aacaec448e74341edea1b925a2a;p=fms.git

diff --git a/src/global.cpp b/src/global.cpp
index 0437eb4..251ea2a 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -7,6 +7,7 @@
 #include "../include/freenet/freenetmasterthread.h"
 #include "../include/nntp/nntplistener.h"
 #include "../include/http/httpthread.h"
+#include "../include/threadcontroller.h"
 
 #ifdef _WIN32
 	#include <winsock2.h>
@@ -16,6 +17,8 @@
 	#include <xmem.h>
 #endif
 
+bool wantshutdown=false;
+
 void SetupDB()
 {
 
@@ -26,6 +29,52 @@ void SetupDB()
 	db->SetBusyTimeout(10000);		// set timeout to 10 seconds
 	db->Execute("VACUUM;");
 
+	db->Execute("CREATE TABLE IF NOT EXISTS tblDBVersion(\
+				Major				INTEGER,\
+				Minor				INTEGER\
+				);");
+
+	SQLite3DB::Statement st=db->Prepare("SELECT Major,Minor FROM tblDBVersion;");
+	st.Step();
+	if(st.RowReturned())
+	{
+		int major;
+		int minor;
+		st.ResultInt(0,major);
+		st.ResultInt(1,minor);
+		st.Finalize();
+		if(major==1 && minor==0)
+		{
+			ConvertDB0100To0101();
+			major=1;
+			minor=1;
+		}
+		if(major==1 && (minor==1 || minor==2))
+		{
+			ConvertDB0101To0103();
+			major=1;
+			minor=3;
+		}
+		if(major==1 && minor==3)
+		{
+			ConvertDB0103To0104();
+			major=1;
+			minor=4;
+		}
+		if(major==1 && minor==4)
+		{
+			ConvertDB0104To0105();
+			major=1;
+			minor=5;
+		}
+	}
+	else
+	{
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,5);");
+	}
+
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
 				OptionValue			TEXT NOT NULL,\
@@ -35,8 +84,8 @@ void SetupDB()
 	db->Execute("CREATE TABLE IF NOT EXISTS tblLocalIdentity(\
 				LocalIdentityID			INTEGER PRIMARY KEY,\
 				Name					TEXT,\
-				PublicKey				TEXT,\
-				PrivateKey				TEXT,\
+				PublicKey				TEXT UNIQUE,\
+				PrivateKey				TEXT UNIQUE,\
 				SingleUse				BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
 				PublishTrustList		BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
 				PublishBoardList		BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
@@ -49,7 +98,8 @@ void SetupDB()
 				InsertingBoardList		BOOL CHECK(InsertingBoardList IN('true','false')) DEFAULT 'false',\
 				LastInsertedBoardList	DATETIME,\
 				InsertingMessageList	BOOL CHECK(InsertingMessageList IN('true','false')) DEFAULT 'false',\
-				LastInsertedMessageList	DATETIME\
+				LastInsertedMessageList	DATETIME,\
+				DateCreated				DATETIME\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblLocalIdentityInserts(\
@@ -84,18 +134,21 @@ void SetupDB()
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentity(\
-				IdentityID			INTEGER PRIMARY KEY,\
-				PublicKey			TEXT UNIQUE,\
-				Name				TEXT,\
-				SingleUse			BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
-				PublishTrustList	BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
-				PublishBoardList	BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
-				DateAdded			DATETIME,\
-				LastSeen			DATETIME,\
-				LocalMessageTrust	INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT 50,\
-				PeerMessageTrust	INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT 50,\
-				LocalTrustListTrust	INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT 50,\
-				PeerTrustListTrust	INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT 50\
+				IdentityID				INTEGER PRIMARY KEY,\
+				PublicKey				TEXT UNIQUE,\
+				Name					TEXT,\
+				SingleUse				BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
+				PublishTrustList		BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
+				PublishBoardList		BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
+				DateAdded				DATETIME,\
+				LastSeen				DATETIME,\
+				LocalMessageTrust		INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerMessageTrust		INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				LocalTrustListTrust		INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerTrustListTrust		INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				AddedMethod				TEXT,\
+				MessageTrustComment		TEXT,\
+				TrustListTrustComment	TEXT\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentityRequests(\
@@ -125,23 +178,26 @@ void SetupDB()
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblPeerTrust(\
-				IdentityID			INTEGER,\
-				TargetIdentityID	INTEGER,\
-				MessageTrust		INTEGER CHECK(MessageTrust BETWEEN 0 AND 100),\
-				TrustListTrust		INTEGER CHECK(TrustListTrust BETWEEN 0 AND 100)\
+				IdentityID				INTEGER,\
+				TargetIdentityID		INTEGER,\
+				MessageTrust			INTEGER CHECK(MessageTrust BETWEEN 0 AND 100),\
+				TrustListTrust			INTEGER CHECK(TrustListTrust BETWEEN 0 AND 100),\
+				MessageTrustComment		TEXT,\
+				TrustListTrustComment	TEXT\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblBoard(\
-				BoardID				INTEGER PRIMARY KEY,\
-				BoardName			TEXT UNIQUE,\
-				BoardDescription	TEXT,\
-				DateAdded			DATETIME\
+				BoardID					INTEGER PRIMARY KEY,\
+				BoardName				TEXT UNIQUE,\
+				BoardDescription		TEXT,\
+				DateAdded				DATETIME,\
+				SaveReceivedMessages	BOOL CHECK(SaveReceivedMessages IN('true','false')) DEFAULT 'true'\
 				);");
 
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('fms','Freenet Message System','2007-12-01');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('freenet','Discussion about Freenet','2007-12-01');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('public','Public discussion','2007-12-01');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('test','Test board','2007-12-01');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('fms','Freenet Message System','2007-12-01 12:00:00');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('freenet','Discussion about Freenet','2007-12-01 12:00:00');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('public','Public discussion','2007-12-01 12:00:00');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('test','Test board','2007-12-01 12:00:00');");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessage(\
 				MessageID			INTEGER PRIMARY KEY,\
@@ -152,7 +208,8 @@ void SetupDB()
 				Subject				TEXT,\
 				MessageUUID			TEXT UNIQUE,\
 				ReplyBoardID		INTEGER,\
-				Body				TEXT\
+				Body				TEXT,\
+				MessageIndex		INTEGER\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageReplyTo(\
@@ -181,6 +238,8 @@ void SetupDB()
 				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false'\
 				);");
 
+	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageInserts(\
 				LocalIdentityID		INTEGER,\
 				Day					DATE,\
@@ -197,6 +256,26 @@ void SetupDB()
 				Inserted			BOOL CHECK(Inserted IN('true','false')) DEFAULT 'false'\
 				);");
 
+	db->Execute("CREATE TABLE IF NOT EXISTS tblAdministrationBoard(\
+				BoardID						INTEGER UNIQUE,\
+				ModifyLocalMessageTrust		INTEGER,\
+				ModifyLocalTrustListTrust	INTEGER\
+				);");
+
+	db->Execute("CREATE TABLE IF NOT EXISTS tblBoardListInserts(\
+				LocalIdentityID		INTEGER,\
+				Day					DATE,\
+				InsertIndex			INTEGER,\
+				Inserted			BOOL CHECK(Inserted IN('true','false')) DEFAULT 'false'\
+				);");
+
+	db->Execute("CREATE TABLE IF NOT EXISTS tblBoardListRequests(\
+				IdentityID			INTEGER,\
+				Day					DATE,\
+				RequestIndex		INTEGER,\
+				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false'\
+				);");	
+
 	// MessageInserter will insert a record into this temp table which the MessageListInserter will query for and insert a MessageList when needed
 	db->Execute("CREATE TEMPORARY TABLE IF NOT EXISTS tmpMessageListInsert(\
 				LocalIdentityID		INTEGER,\
@@ -211,15 +290,28 @@ void SetupDB()
 				GROUP BY tblBoard.BoardID;");
 
 	// calculates peer trust
+	// do the (MessageTrust+1)*LocalTrustListTrust/(MessageTrust+1)/100.0 - so it MessageTrust or TrustListTrust is NULL, the calc will be NULL and it won't be included at all in the average
+	// need the +1 so that when the values are 0 the result is not 0
+	db->Execute("DROP VIEW IF EXISTS vwCalculatedPeerTrust;");
 	db->Execute("CREATE VIEW IF NOT EXISTS vwCalculatedPeerTrust AS \
 				SELECT TargetIdentityID, \
-				ROUND(SUM(MessageTrust*(LocalMessageTrust/100.0))/SUM(LocalMessageTrust/100.0),0) AS 'PeerMessageTrust', \
-				ROUND(SUM(TrustListTrust*(LocalTrustListTrust/100.0))/SUM(LocalTrustListTrust/100.0),0) AS 'PeerTrustListTrust' \
+				ROUND(SUM(MessageTrust*(LocalTrustListTrust/100.0))/SUM(((MessageTrust+1)*LocalTrustListTrust/(MessageTrust+1))/100.0),0) AS 'PeerMessageTrust', \
+				ROUND(SUM(TrustListTrust*(LocalTrustListTrust/100.0))/SUM(((TrustListTrust+1)*LocalTrustListTrust/(TrustListTrust+1))/100.0),0) AS 'PeerTrustListTrust' \
 				FROM tblPeerTrust INNER JOIN tblIdentity ON tblPeerTrust.IdentityID=tblIdentity.IdentityID \
 				WHERE LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') \
 				AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') ) \
 				GROUP BY TargetIdentityID;");
 
+	/*
+		These peer trust calculations are too CPU intensive to be triggers - they were called every time a new trust list was processed
+		All trust levels will now be recalculated every hour in the PeriodicDBMaintenance class
+	*/
+	// drop existing triggers
+	db->Execute("DROP TRIGGER IF EXISTS trgDeleteOntblPeerTrust;");
+	db->Execute("DROP TRIGGER IF EXISTS trgInsertOntblPeerTrust;");
+	db->Execute("DROP TRIGGER IF EXISTS trgUpdateOntblPeerTrust;");
+	db->Execute("DROP TRIGGER IF EXISTS trgUpdateLocalTrustLevels;");
+/*
 	// update PeerTrustLevel when deleting a record from tblPeerTrust
 	db->Execute("CREATE TRIGGER IF NOT EXISTS trgDeleteOntblPeerTrust AFTER DELETE ON tblPeerTrust \
 				FOR EACH ROW \
@@ -248,6 +340,7 @@ void SetupDB()
 				BEGIN \
 					UPDATE tblIdentity SET PeerMessageTrust=(SELECT PeerMessageTrust FROM vwCalculatedPeerTrust WHERE TargetIdentityID=IdentityID), PeerTrustListTrust=(SELECT PeerTrustListTrust FROM vwCalculatedPeerTrust WHERE TargetIdentityID=IdentityID);\
 				END;");
+*/
 
 	db->Execute("CREATE TRIGGER IF NOT EXISTS trgDeleteMessage AFTER DELETE ON tblMessage \
 				FOR EACH ROW \
@@ -278,6 +371,12 @@ void SetupDB()
 					DELETE FROM tblTrustListInserts WHERE LocalIdentityID=old.LocalIdentityID;\
 				END;");
 
+	db->Execute("CREATE TRIGGER IF NOT EXISTS trgDeleteBoard AFTER DELETE ON tblBoard \
+				FOR EACH ROW \
+				BEGIN \
+					DELETE FROM tblMessageBoard WHERE BoardID=old.BoardID;\
+				END;");
+
 	// delete introduction puzzles that were half-way inserted
 	db->Execute("DELETE FROM tblIntroductionPuzzleInserts WHERE Day IS NULL AND InsertIndex IS NULL;");
 
@@ -287,10 +386,102 @@ void SetupDB()
 	db->Execute("DELETE FROM tblIntroductionPuzzleInserts WHERE Day<='"+date.Format("%Y-%m-%d")+"';");
 	db->Execute("DELETE FROM tblIntroductionPuzzleRequests WHERE Day<='"+date.Format("%Y-%m-%d")+"';");
 
+	date.SetToGMTime();
 	// insert SomeDude's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,LocalTrustListTrust) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"',51);");
+	// insert Shadow Panther's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@~mimyB1kmH4f7Cgsd2wM2Qv2NxrZHRMM6IY8~7EWRVQ,fxTKkR0TYhgMYb-vEGAv55sMOxCGD2xhE4ZxWHxdPz4,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
+	// insert garfield's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@T8l1IEGU4-PoASFzgc2GYhIgRzUvZsKdoQWeuLHuTmM,QLxAPfkGis8l5NafNpSCdbxzXhBlu9WL8svcqJw9Mpo,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
+
+	// TODO remove sometime after 0.1.17
+	FixCapitalBoardNames();
+
+}
+
+void ConvertDB0100To0101()
+{
+	// added unique constraint to public and private key
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("CREATE TEMPORARY TABLE tblLocalIdentityTemp AS SELECT * FROM tblLocalIdentity;");
+	db->Execute("DROP TABLE IF EXISTS tblLocalIdentity;");
+	db->Execute("CREATE TABLE IF NOT EXISTS tblLocalIdentity(\
+				LocalIdentityID			INTEGER PRIMARY KEY,\
+				Name					TEXT,\
+				PublicKey				TEXT UNIQUE,\
+				PrivateKey				TEXT UNIQUE,\
+				SingleUse				BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
+				PublishTrustList		BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
+				PublishBoardList		BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
+				InsertingIdentity		BOOL CHECK(InsertingIdentity IN('true','false')) DEFAULT 'false',\
+				LastInsertedIdentity	DATETIME,\
+				InsertingPuzzle			BOOL CHECK(InsertingPuzzle IN('true','false')) DEFAULT 'false',\
+				LastInsertedPuzzle		DATETIME,\
+				InsertingTrustList		BOOL CHECK(InsertingTrustList IN('true','false')) DEFAULT 'false',\
+				LastInsertedTrustList	DATETIME,\
+				InsertingBoardList		BOOL CHECK(InsertingBoardList IN('true','false')) DEFAULT 'false',\
+				LastInsertedBoardList	DATETIME,\
+				InsertingMessageList	BOOL CHECK(InsertingMessageList IN('true','false')) DEFAULT 'false',\
+				LastInsertedMessageList	DATETIME\
+				);");
+	db->Execute("INSERT INTO tblLocalIdentity SELECT * FROM tblLocalIdentityTemp;");
+	db->Execute("DROP TABLE IF EXISTS tblLocalIdentityTemp;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=1;");
+}
+
+void ConvertDB0101To0103()
+{
+	// remove default 50 from trust fields and set default to NULL
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("CREATE TEMPORARY TABLE tblIdentityTemp AS SELECT * FROM tblIdentity;");
+	db->Execute("DROP TABLE IF EXISTS tblIdentity;");
+	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentity(\
+				IdentityID			INTEGER PRIMARY KEY,\
+				PublicKey			TEXT UNIQUE,\
+				Name				TEXT,\
+				SingleUse			BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
+				PublishTrustList	BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
+				PublishBoardList	BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
+				DateAdded			DATETIME,\
+				LastSeen			DATETIME,\
+				LocalMessageTrust	INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerMessageTrust	INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				LocalTrustListTrust	INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerTrustListTrust	INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL\
+				);");
+	db->Execute("INSERT INTO tblIdentity SELECT * FROM tblIdentityTemp;");
+	db->Execute("DROP TABLE IF EXISTS tblIdentityTemp;");
+
+	// add SaveReceivedMessages field to tblBoard
+	db->Execute("ALTER TABLE tblBoard ADD COLUMN SaveReceivedMessages	BOOL CHECK(SaveReceivedMessages IN('true','false')) DEFAULT 'true';");
+
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=3;");
+}
+
+void ConvertDB0103To0104()
+{
+	// add MessageIndex to tblMessage
+	DateTime date;
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("ALTER TABLE tblMessage ADD COLUMN MessageIndex	INTEGER;");
+	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");
+	db->Execute("ALTER TABLE tblLocalIdentity ADD COLUMN DateCreated DATETIME;");
 	date.SetToGMTime();
-	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
+	db->Execute("UPDATE tblLocalIdentity SET DateCreated='"+date.Format("%Y-%m-%d %H:%M:%S")+"' WHERE DateCreated IS NULL;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
+}
 
+void ConvertDB0104To0105()
+{
+	// add AddedMethod, MessageTrustComment, TrustListTrustComment to tblIdentity
+	// add MessageTrustComment,TrustListTrustComment to tblPeerTrust
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN AddedMethod TEXT;");
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN MessageTrustComment TEXT;");
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN TrustListTrustComment TEXT;");
+	db->Execute("ALTER TABLE tblPeerTrust ADD COLUMN MessageTrustComment TEXT;");
+	db->Execute("ALTER TABLE tblPeerTrust ADD COLUMN TrustListTrustComment TEXT;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=5;");
 }
 
 void SetupDefaultOptions()
@@ -349,6 +540,12 @@ void SetupDefaultOptions()
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"HTTPAccessControl");
+	st.Bind(1,"-0.0.0.0/0,+127.0.0.1");
+	st.Bind(2,"Comma separated list of addresses and/or subnet masks that are allowed access to the administration pages.  Default is localhost only. + allows a host, - denies as host.");
+	st.Step();
+	st.Reset();
+
 	// StartFreenetUpdater
 	st.Bind(0,"StartFreenetUpdater");
 	st.Bind(1,"true");
@@ -425,7 +622,7 @@ void SetupDefaultOptions()
 	st.Reset();
 
 	st.Bind(0,"MinLocalTrustListTrust");
-	st.Bind(1,"50");
+	st.Bind(1,"51");
 	st.Bind(2,"Specifies a local trust list trust level that a peer must have before its trust list will be included in the weighted average.  Any peers below this number will be excluded from the results.");
 	st.Step();
 	st.Reset();
@@ -448,6 +645,42 @@ void SetupDefaultOptions()
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"MaxPeerMessagesPerDay");
+	st.Bind(1,"200");
+	st.Bind(2,"The maximum number of messages you will download from each peer on a given day.");
+	st.Step();
+	st.Reset();
+
+	st.Bind(0,"MaxBoardListRequests");
+	st.Bind(1,"5");
+	st.Bind(2,"The maximum number of concurrent requests for new Board Lists.  Set to 0 to disable.");
+	st.Step();
+	st.Reset();
+
+	st.Bind(0,"MaxBoardsPerMessage");
+	st.Bind(1,"8");
+	st.Bind(2,"The maximum number of boards a received message may be sent to.  Boards over this limit will be ignored.");
+	st.Step();
+	st.Reset();
+
+	st.Bind(0,"ChangeMessageTrustOnReply");
+	st.Bind(1,"0");
+	st.Bind(2,"How much the local message trust level of an identity should change when you reply to one of their messages.");
+	st.Step();
+	st.Reset();
+
+	st.Bind(0,"AddNewPostFromIdentities");
+	st.Bind(1,"false");
+	st.Bind(2,"Set to true to automatically create new identities when you send a message using a new name.  If you set this to false, posting messages will fail until you manually create the identity.");
+	st.Step();
+	st.Reset();
+
+	st.Bind(0,"DeleteMessagesOlderThan");
+	st.Bind(1,"180");
+	st.Bind(2,"Automatically delete messages older than this many days.");
+	st.Step();
+	st.Reset();
+
 }
 
 void SetupLogFile()
@@ -485,6 +718,16 @@ void SetupNetwork()
 #endif
 }
 
+void Shutdown()
+{
+	ThreadController::Instance()->ShutdownThreads();
+
+	ShutdownNetwork();
+
+	LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS shutdown");
+	LogFile::Instance()->WriteNewLine();
+}
+
 void ShutdownNetwork()
 {
 #ifdef _WIN32
@@ -492,77 +735,72 @@ void ShutdownNetwork()
 #endif
 }
 
-void ShutdownThreads(std::vector<PThread::Thread *> &threads)
+void SigHandler(int signum)
 {
-	std::vector<PThread::Thread *>::iterator i;
-	for(i=threads.begin(); i!=threads.end(); i++)
-	{
-/*		if((*i)->wait(1)==false)
-		{
-			try
-			{
-				(*i)->interrupt();
-			}
-			catch(...)
-			{
-			}
-		}
-		*/
-		(*i)->Cancel();
-	}
-
-	for(i=threads.begin(); i!=threads.end(); i++)
-	{
-		LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"ShutdownThreads waiting for thread to exit.");
-		//(*i)->wait();
-		(*i)->Join();
-		delete (*i);
-	}
-
-	threads.clear();
-
+	Shutdown();
+	exit(0);
 }
 
-void StartThreads(std::vector<PThread::Thread *> &threads)
+void FixCapitalBoardNames()
 {
-	std::string startfreenet;
-	std::string startnntp;
-	std::string starthttp;
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
 
-	if(Option::Instance()->Get("StartFreenetUpdater",startfreenet)==false)
-	{
-		startfreenet="true";
-		Option::Instance()->Set("StartFreenetUpdater","true");
-	}
+	SQLite3DB::Statement st=db->Prepare("SELECT BoardID,BoardName FROM tblBoard WHERE BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard);");
+	SQLite3DB::Statement st2=db->Prepare("SELECT BoardID FROM tblBoard WHERE BoardName=?;");
+	SQLite3DB::Statement del=db->Prepare("DELTE FROM tblBoard WHERE BoardID=?;");
+	SQLite3DB::Statement upd=db->Prepare("UPDATE tblBoard SET BoardName=? WHERE BoardID=?;");
+	SQLite3DB::Statement upd2=db->Prepare("UPDATE tblMessage SET ReplyBoardID=? WHERE ReplyBoardID=?;");
+	SQLite3DB::Statement upd3=db->Prepare("UPDATE tblMessageBoard SET BoardID=? WHERE BoardID=?;");
 
-	if(Option::Instance()->Get("StartNNTP",startnntp)==false)
+	st.Step();
+	while(st.RowReturned())
 	{
-		startnntp="true";
-		Option::Instance()->Set("StartNNTP","true");
-	}
+		int boardid=0;
+		int newboardid=0;
+		std::string name="";
+		std::string lowername="";
+
+		st.ResultInt(0,boardid);
+		st.ResultText(1,name);
+
+		lowername=name;
+		StringFunctions::LowerCase(lowername,lowername);
+       
+		if(name!=lowername)
+		{
+			st2.Bind(0,lowername);
+			st2.Step();
 
-	if(Option::Instance()->Get("StartHTTP",starthttp)==false)
-	{
-		starthttp="true";
-		Option::Instance()->Set("StartHTTP","true");
-	}
+			if(st2.RowReturned())
+			{
+				st2.ResultInt(0,newboardid);
 
-	if(startfreenet=="true")
-	{
-		PThread::Thread *t=new PThread::Thread(new FreenetMasterThread());
-		threads.push_back(t);
-	}
+				upd2.Bind(0,newboardid);
+				upd2.Bind(1,boardid);
+				upd2.Step();
+				upd2.Reset();
 
-	if(startnntp=="true")
-	{
-		PThread::Thread *t=new PThread::Thread(new NNTPListener());
-		threads.push_back(t);
-	}
+				upd3.Bind(0,newboardid);
+				upd3.Bind(1,boardid);
+				upd3.Step();
+				upd3.Reset();
 
-	if(starthttp=="true")
-	{
-		PThread::Thread *t=new PThread::Thread(new HTTPThread());
-		threads.push_back(t);
+				del.Bind(0,boardid);
+				del.Step();
+				del.Reset();
+			}
+			else
+			{
+				upd.Bind(0,lowername);
+				upd.Bind(1,boardid);
+				upd.Step();
+				upd.Reset();
+			}
+
+			st2.Reset();
+		}
+       
+		st.Step();
 	}
 
 }