X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=ab499f1d1a66a1d13d385563b3c481ad9cb945f8;hb=24d34de00efac5ff04c53a09cab995654bf6f5b7;hp=228b9a08946c424f35f2b235e1a49251643450fc;hpb=dd737891345a7ff80f601ab0c0ba712de5e10943;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 228b9a089..ab499f1d1 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -12,8 +12,6 @@
  */
 
 /* $Install: src/inspircd $(BINPATH) */
-
-
 #include "inspircd.h"
 #include <signal.h>
 
@@ -28,6 +26,13 @@
 	#ifndef RUSAGE_SELF
 		#define RUSAGE_SELF 0
 	#endif
+
+	/* CRT memory debugging */
+	#ifdef DEBUG
+	#define _CRTDBG_MAP_ALLOC
+	#include <stdlib.h>
+	#include <crtdbg.h>
+	#endif
 #endif
 
 #include <fstream>
@@ -107,15 +112,109 @@ void InspIRCd::Cleanup()
 			this->Modules->Unload(k->c_str());
 		}
 	}
-
-	/* Close logging */
-	this->Logs->CloseLogs();
+	/* Remove core commands */
+	Parser->RemoveCommands("<core>");
 
 	/* Cleanup Server Names */
 	for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
 		delete (*itr);
 
+	/* Delete objects dynamically allocated in constructor
+	 * (destructor would be more appropriate, but we're likely exiting)
+	 */
+
+	// Must be deleted before modes as it decrements modelines
+	if (this->Users)
+	{
+		delete this->Users;
+		this->Users = 0;
+	}
+	
+	if (this->Modes)
+	{
+		delete this->Modes;
+		this->Modes = 0;
+	}
+
+	if (this->XLines)
+	{
+		delete this->XLines;
+		this->XLines = 0;
+	}
+
+	if (this->Parser)
+	{
+		delete this->Parser;
+		this->Parser = 0;
+
+	if (this->stats)
+	{
+		delete this->stats;
+		this->stats = 0;
+	}
+
+	if (this->Modules)
+	{
+		delete this->Modules;
+		this->Modules = 0;
+	}
+
+	if (this->BanCache)
+		delete this->BanCache;
+		this->BanCache = 0;
+	}
+
+	if (this->SNO)
+	{
+		delete this->SNO;
+		this->SNO = 0;
+	}
+
+	if (this->Config)
+	{
+		delete this->Config;
+		this->Config = 0;
+	}
 
+	if (this->Res)
+	{
+		delete this->Res;
+		this->Res = 0;
+	}
+
+	if (this->chanlist)
+	{
+		delete chanlist;
+		chanlist = 0;
+	}
+
+	if (this->PI)
+	{
+		delete this->PI;
+		this->PI = 0;
+	}
+	
+	if (this->Threads)
+	{
+		delete this->Threads;
+		this->Threads = 0;
+	}
+
+	/* Needs to be deleted after Res, DNS has a timer */
+	if (this->Timers)
+	{
+		delete this->Timers;
+		this->Timers = 0;
+	}
+
+	/* Close logging */
+	this->Logs->CloseLogs();
+
+	if (this->Logs)
+	{
+		delete this->Logs;
+		this->Logs = 0;
+	}
 }
 
 void InspIRCd::Restart(const std::string &reason)
@@ -125,8 +224,6 @@ void InspIRCd::Restart(const std::string &reason)
 	 */
 	this->SendError(reason);
 
-	this->Cleanup();
-
 	/* Figure out our filename (if theyve renamed it, we're boned) */
 	std::string me;
 
@@ -138,7 +235,11 @@ void InspIRCd::Restart(const std::string &reason)
 	me = Config->MyDir + "/inspircd";
 #endif
 
-	if (execv(me.c_str(), Config->argv) == -1)
+	char** argv = Config->argv;
+
+	this->Cleanup();
+
+	if (execv(me.c_str(), argv) == -1)
 	{
 		/* Will raise a SIGABRT if not trapped */
 		throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno));
@@ -250,7 +351,8 @@ bool InspIRCd::DaemonSeed()
 void InspIRCd::WritePID(const std::string &filename)
 {
 	std::string fname = (filename.empty() ? "inspircd.pid" : filename);
-	if (*(fname.begin()) != '/')
+	std::replace(fname.begin(), fname.end(), '\\', '/');
+	if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename)))
 	{
 		std::string::size_type pos;
 		std::string confpath = this->ConfigFileName;
@@ -306,13 +408,37 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	 FloodQuitUser(&HandleFloodQuitUser)
 
 {
-
+#ifdef WIN32
+	// Strict, frequent checking of memory on debug builds
+	_CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+	
+	// Avoid erroneous frees on early exit
+	WindowsIPC = 0;
+#endif
 	int found_ports = 0;
 	FailedPortList pl;
 	int do_version = 0, do_nofork = 0, do_debug = 0,
 	    do_nolog = 0, do_root = 0, do_testsuite = 0;    /* flag variables */
 	char c = 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->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;
+	this->Res = 0;
+
+
 	memset(&server, 0, sizeof(server));
 	memset(&client, 0, sizeof(client));
 
@@ -341,8 +467,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	this->Users->uuidlist = new user_hash();
 	this->chanlist = new chan_hash();
 
-	this->Res = NULL;
-
 	this->Config = new ServerConfig(this);
 	this->SNO = new SnomaskManager(this);
 	this->BanCache = new BanCacheManager(this);
@@ -523,6 +647,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 		Config->sid[0] = (char)(sid / 100 + 48);
 		Config->sid[1] = (char)(((sid / 10) % 10) + 48);
 		Config->sid[2] = (char)(sid % 10 + 48);
+		Config->sid[3] = '\0';
 	}
 
 	/* set up fake client again this time with the correct uid */
@@ -555,6 +680,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	{
 		printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", bounditems, found_ports);
 		printf("The following port(s) failed to bind:\n");
+		printf("Hint: Try using a public IP instead of blank or *\n\n");
 		int j = 1;
 		for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
 		{
@@ -580,7 +706,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 		 * e.g. we are restarting, or being launched by cron. Dont kill parent, and dont
 		 * close stdin/stdout
 		 */
-		if (!do_nofork)
+		if ((!do_nofork) && (!do_testsuite))
 		{
 			fclose(stdin);
 			fclose(stderr);