X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=d533a6e450b035157bdb5d81f6a0adbfbf96029f;hb=e5131f92b3b88ae7646da9a9972b1bbb5855f874;hp=1d6986f5723539a38f5da7d97fbe38286ebcf937;hpb=519d8e5dfe379840ae5da2ac43231ec4364d7b18;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 1d6986f57..d533a6e45 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>
@@ -277,22 +282,38 @@ void InspIRCd::WritePID(const std::string &filename)
 InspIRCd::InspIRCd(int argc, char** argv)
 	: GlobalCulls(this),
 
-	 /* Functor initialisation. Note that the ordering here is very important. */
+	 /* Functor initialisation. Note that the ordering here is very important. 
+	  *
+	  * THIS MUST MATCH ORDER OF DECLARATION OF THE HandleWhateverFunc classes
+	  * within class InspIRCd.
+	  */
 	 HandleProcessUser(this),
 	 HandleIsNick(this),
 	 HandleIsIdent(this),
 	 HandleFindDescriptor(this),
 	 HandleFloodQuitUser(this),
-
-	 /* Functor pointer initialisation. Must match the order of the list above */
+	 HandleIsChannel(this),
+	 HandleIsSID(this),
+	 HandleRehash(this),
+
+	 /* Functor pointer initialisation. Must match the order of the list above
+	  *
+	  * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
+	  * themselves within the class.
+	  */
 	 ProcessUser(&HandleProcessUser),
+	 IsChannel(&HandleIsChannel),
+	 IsSID(&HandleIsSID),
+	 Rehash(&HandleRehash),
 	 IsNick(&HandleIsNick),
 	 IsIdent(&HandleIsIdent),
 	 FindDescriptor(&HandleFindDescriptor),
 	 FloodQuitUser(&HandleFloodQuitUser)
 
 {
-
+#ifdef WIN32
+	_CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+#endif
 	int found_ports = 0;
 	FailedPortList pl;
 	int do_version = 0, do_nofork = 0, do_debug = 0,
@@ -309,11 +330,13 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	SE = SEF->Create(this);
 	delete SEF;
 
-
 	ThreadEngineFactory* tef = new ThreadEngineFactory();
 	this->Threads = tef->Create(this);
 	delete tef;
 
+	/* Default implementation does nothing */
+	this->PI = new ProtocolInterface(this);
+
 	this->s_signal = 0;
 	
 	// Create base manager classes early, so nothing breaks
@@ -539,12 +562,16 @@ 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 an IP instead of blank or *\n\n");
 		int j = 1;
 		for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
 		{
 			printf("%d.\tIP: %s\tPort: %lu\n", j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);
 		}
 	}
+
+	printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds());
+	
 #ifndef WINDOWS
 	if (!Config->nofork)
 	{
@@ -581,8 +608,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	}
 #endif
 
-	printf("\nInspIRCd is now running as '%s'[%s]\n", Config->ServerName,Config->GetSID().c_str());
-	Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s]", Config->ServerName,Config->GetSID().c_str());
+	Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds());
 
 	this->WritePID(Config->PID);
 }
@@ -651,7 +677,7 @@ int InspIRCd::Run()
 		{
 			if (TIME < OLDTIME)
 			{
-				SNO->WriteToSnoMask('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %ld secs.",OLDTIME-TIME);
+				SNO->WriteToSnoMask('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)OLDTIME-TIME);
 			}
 
 			if ((TIME % 3600) == 0)