X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=145d4582a14c71b2e3bf22ee05a9188f4e6e2b38;hb=aa05a6fd4d5c11dc8e8adc469134a2802446fe9f;hp=50899435bceec383a8db27d3763773d37770797f;hpb=da45f24ff1ab4fbac1b674c820796e9b3850a380;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 50899435b..145d4582a 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -52,12 +52,7 @@
 #include <fstream>
 #include <iostream>
 #include "xline.h"
-#include "bancache.h"
-#include "socketengine.h"
-#include "socket.h"
-#include "command_parse.h"
 #include "exitcodes.h"
-#include "caller.h"
 #include "testsuite.h"
 
 InspIRCd* ServerInstance = NULL;
@@ -113,11 +108,6 @@ void InspIRCd::Cleanup()
 	}
 	ports.clear();
 
-	/* Close all client sockets, or the new process inherits them */
-	LocalUserList& list = Users->local_users;
-	for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i)
-		Users->QuitUser(*i, "Server shutdown");
-
 	GlobalCulls.Apply();
 	Modules->UnloadAll();
 
@@ -129,21 +119,10 @@ void InspIRCd::Cleanup()
 		FakeClient->cull();
 	}
 	DeleteZero(this->FakeClient);
-	DeleteZero(this->Users);
-	DeleteZero(this->Modes);
 	DeleteZero(this->XLines);
-	DeleteZero(this->Parser);
-	DeleteZero(this->stats);
-	DeleteZero(this->Modules);
-	DeleteZero(this->BanCache);
-	DeleteZero(this->SNO);
 	DeleteZero(this->Config);
-	DeleteZero(this->PI);
-	DeleteZero(this->Threads);
-	DeleteZero(this->Timers);
 	SocketEngine::Deinit();
 	Logs->CloseLogs();
-	DeleteZero(this->Logs);
 }
 
 void InspIRCd::SetSignals()
@@ -237,14 +216,15 @@ void InspIRCd::WritePID(const std::string &filename)
 }
 
 InspIRCd::InspIRCd(int argc, char** argv) :
-	 ConfigFileName(CONFIG_PATH "/inspircd.conf"),
+	 ConfigFileName(INSPIRCD_CONFIG_PATH "/inspircd.conf"),
+	 PI(&DefaultProtocolInterface),
 
 	 /* Functor pointer initialisation.
 	  *
 	  * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
 	  * themselves within the class.
 	  */
-	 OperQuit("operquit", NULL),
+	 OperQuit("operquit", ExtensionItem::EXT_USER, NULL),
 	 GenRandom(&HandleGenRandom),
 	 IsChannel(&HandleIsChannel),
 	 IsNick(&HandleIsNick),
@@ -261,46 +241,18 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	    do_nolog = 0, do_root = 0;
 
 	// Initialize so that if we exit before proper initialization they're not deleted
-	this->Logs = 0;
-	this->Threads = 0;
-	this->PI = 0;
-	this->Users = 0;
 	this->Config = 0;
-	this->SNO = 0;
-	this->BanCache = 0;
-	this->Modules = 0;
-	this->stats = 0;
-	this->Timers = 0;
-	this->Parser = 0;
 	this->XLines = 0;
-	this->Modes = 0;
 	this->ConfigThread = NULL;
 	this->FakeClient = NULL;
 
 	UpdateTime();
 	this->startup_time = TIME.tv_sec;
 
-	// This must be created first, so other parts of Insp can use it while starting up
-	this->Logs = new LogManager;
-
 	SocketEngine::Init();
 
-	this->Threads = new ThreadEngine;
-
-	/* Default implementation does nothing */
-	this->PI = new ProtocolInterface;
-
-	// Create base manager classes early, so nothing breaks
-	this->Users = new UserManager;
-
 	this->Config = new ServerConfig;
-	this->SNO = new SnomaskManager;
-	this->BanCache = new BanCacheManager;
-	this->Modules = new ModuleManager();
 	dynamic_reference_base::reset_all();
-	this->stats = new serverstats();
-	this->Timers = new TimerManager;
-	this->Parser = new CommandParser;
 	this->XLines = new XLineManager;
 
 	this->Config->cmdline.argv = argv;
@@ -372,7 +324,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	if (do_version)
 	{
-		std::cout << std::endl << VERSION << " " << REVISION << std::endl;
+		std::cout << std::endl << INSPIRCD_VERSION << " " << INSPIRCD_REVISION << std::endl;
 		Exit(EXIT_STATUS_NOERROR);
 	}
 
@@ -385,7 +337,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	/* Set the finished argument values */
 	Config->cmdline.nofork = (do_nofork != 0);
 	Config->cmdline.forcedebug = (do_debug != 0);
-	Config->cmdline.writelog = (!do_nolog != 0);
+	Config->cmdline.writelog = !do_nolog;
 
 	if (do_debug)
 	{
@@ -414,7 +366,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		}
 	}
 
-	std::cout << con_green << "Inspire Internet Relay Chat Server" << con_reset << ", compiled on " __DATE__ " at " __TIME__ << std::endl;
+	std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << ", compiled on " __DATE__ " at " __TIME__ << std::endl;
 	std::cout << con_green << "(C) InspIRCd Development Team." << con_reset << std::endl << std::endl;
 	std::cout << "Developers:" << std::endl;
 	std::cout << con_green << "\tBrain, FrostyCoolSlug, w00t, Om, Special, peavey" << std::endl;
@@ -422,8 +374,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	std::cout << "\tAttila" << con_reset << std::endl << std::endl;
 	std::cout << "Others:\t\t\t" << con_green << "See /INFO Output" << con_reset << std::endl;
 
-	this->Modes = new ModeParser;
-
 #ifndef _WIN32
 	if (!do_root)
 		this->CheckRoot();
@@ -552,7 +502,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		FreeConsole();
 	}
 
-	QueryPerformanceFrequency(&stats->QPFrequency);
+	QueryPerformanceFrequency(&stats.QPFrequency);
 #endif
 
 	Logs->Log("STARTUP", LOG_DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SocketEngine::GetMaxFds());
@@ -686,18 +636,18 @@ void InspIRCd::Run()
 		{
 #ifndef _WIN32
 			getrusage(RUSAGE_SELF, &ru);
-			stats->LastSampled = TIME;
-			stats->LastCPU = ru.ru_utime;
+			stats.LastSampled = TIME;
+			stats.LastCPU = ru.ru_utime;
 #else
-			if(QueryPerformanceCounter(&stats->LastSampled))
+			if(QueryPerformanceCounter(&stats.LastSampled))
 			{
 				FILETIME CreationTime;
 				FILETIME ExitTime;
 				FILETIME KernelTime;
 				FILETIME UserTime;
 				GetProcessTimes(GetCurrentProcess(), &CreationTime, &ExitTime, &KernelTime, &UserTime);
-				stats->LastCPU.dwHighDateTime = KernelTime.dwHighDateTime + UserTime.dwHighDateTime;
-				stats->LastCPU.dwLowDateTime = KernelTime.dwLowDateTime + UserTime.dwLowDateTime;
+				stats.LastCPU.dwHighDateTime = KernelTime.dwHighDateTime + UserTime.dwHighDateTime;
+				stats.LastCPU.dwLowDateTime = KernelTime.dwLowDateTime + UserTime.dwLowDateTime;
 			}
 #endif
 
@@ -714,12 +664,9 @@ void InspIRCd::Run()
 			OLDTIME = TIME.tv_sec;
 
 			if ((TIME.tv_sec % 3600) == 0)
-			{
-				Users->GarbageCollect();
 				FOREACH_MOD(OnGarbageCollect, ());
-			}
 
-			Timers->TickTimers(TIME.tv_sec);
+			Timers.TickTimers(TIME.tv_sec);
 			Users->DoBackgroundUserStuff();
 
 			if ((TIME.tv_sec % 5) == 0)