X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fglobal.cpp;h=7f635791088beb7281125b2110f27a67c3e7539e;hb=df316253862dc50e8e5a790d9634ef90be37badb;hp=a3c811121ea2168cfa0f29159537870950fe75f1;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;p=fms.git

diff --git a/src/global.cpp b/src/global.cpp
index a3c8111..7f63579 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()
 {
 
@@ -42,12 +45,21 @@ void SetupDB()
 		int minor;
 		st.ResultInt(0,major);
 		st.ResultInt(1,minor);
+		st.Finalize();
+		if(major==1 && minor==0)
+		{
+			ConvertDB0100To0101();
+			major=1;
+			minor=1;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,0);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,1);");
 	}
 
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=2;");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
 				OptionValue			TEXT NOT NULL,\
@@ -57,8 +69,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',\
@@ -160,10 +172,10 @@ void SetupDB()
 				DateAdded			DATETIME\
 				);");
 
-	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,\
@@ -225,6 +237,20 @@ void SetupDB()
 				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,\
@@ -326,10 +352,44 @@ 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")+"';");
 
-	// insert SomeDude's public key
 	date.SetToGMTime();
+	// insert SomeDude's public key
 	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
+	// 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")+"');");
+
+}
 
+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 SetupDefaultOptions()
@@ -487,6 +547,24 @@ 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();
+
 }
 
 void SetupLogFile()
@@ -524,6 +602,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
@@ -531,22 +619,18 @@ void ShutdownNetwork()
 #endif
 }
 
+void SigHandler(int signum)
+{
+	Shutdown();
+	exit(0);
+}
+
+/*
 void ShutdownThreads(std::vector<PThread::Thread *> &threads)
 {
 	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();
 	}
 
@@ -605,3 +689,4 @@ void StartThreads(std::vector<PThread::Thread *> &threads)
 	}
 
 }
+*/