X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=898b4f455e1d03659cb364ec73e05efd3fdda3aa;hb=7f878af39e659176677913890e143a247add7bdc;hp=101df432fe699fcc7e3c1f1263f2972f279b999f;hpb=efe77ba63b1e519fc4d563bd9b599277c4bd96e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 101df432f..898b4f455 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -52,7 +52,6 @@
 #include <fstream>
 #include <iostream>
 #include "xline.h"
-#include "bancache.h"
 #include "socketengine.h"
 #include "socket.h"
 #include "command_parse.h"
@@ -133,15 +132,10 @@ void InspIRCd::Cleanup()
 	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->chanlist);
 	DeleteZero(this->PI);
-	DeleteZero(this->Threads);
-	DeleteZero(this->Timers);
 	SocketEngine::Deinit();
 	Logs->CloseLogs();
 	DeleteZero(this->Logs);
@@ -238,7 +232,7 @@ void InspIRCd::WritePID(const std::string &filename)
 }
 
 InspIRCd::InspIRCd(int argc, char** argv) :
-	 ConfigFileName(CONFIG_PATH "/inspircd.conf"),
+	 ConfigFileName(INSPIRCD_CONFIG_PATH "/inspircd.conf"),
 
 	 /* Functor pointer initialisation.
 	  *
@@ -263,16 +257,11 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	// 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->chanlist = 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;
@@ -287,23 +276,16 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	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->chanlist = new chan_hash();
-
 	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;
 
@@ -376,7 +358,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);
 	}
 
@@ -389,7 +371,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)
 	{
@@ -556,7 +538,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());
@@ -690,18 +672,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
 
@@ -723,7 +705,7 @@ void InspIRCd::Run()
 				FOREACH_MOD(OnGarbageCollect, ());
 			}
 
-			Timers->TickTimers(TIME.tv_sec);
+			Timers.TickTimers(TIME.tv_sec);
 			Users->DoBackgroundUserStuff();
 
 			if ((TIME.tv_sec % 5) == 0)