X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=b75a91715c8ffeb613f4ab17d8b97d960402565e;hb=be70931a50f23c68e055602facce5736775f3fab;hp=83373236ed95bb723730686ad351843cc011b960;hpb=6112fadab13aa7971ed34709759141529194edac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 83373236e..b75a91715 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -30,6 +30,7 @@
 #include <dlfcn.h>
 #include <getopt.h>
 
+
 using irc::sockets::NonBlocking;
 using irc::sockets::Blocking;
 using irc::sockets::insp_ntoa;
@@ -80,8 +81,12 @@ void InspIRCd::Cleanup()
 	int MyModCount = this->GetModuleCount();
 
 	for (unsigned int i = 0; i < stats->BoundPortCount; i++)
+	{
 		/* This calls the constructor and closes the listening socket */
 		delete Config->openSockfd[i];
+		Config->openSockfd[i] = NULL;
+	}
+	stats->BoundPortCount = 0;
 
 	/* We do this more than once, so that any service providers get a
 	 * chance to be unhooked by the modules using them, but then get
@@ -143,9 +148,18 @@ void InspIRCd::Rehash(int status)
 	SI->RehashUsersAndChans();
 	FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect());
 	SI->Config->Read(false,NULL);
-	FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
+	SI->ResetMaxBans();
+	SI->Res->Rehash();
+	FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,""));
+}
+
+void InspIRCd::ResetMaxBans()
+{
+	for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++)
+		i->second->ResetMaxBans();
 }
 
+
 /** Because hash_map doesnt free its buckets when we delete items (this is a 'feature')
  * we must occasionally rehash the hash (yes really).
  * We do this by copying the entries from the old hash to a new hash, causing all
@@ -267,6 +281,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	modules.resize(255);
 	factory.resize(255);
 
+	this->unregistered_count = 0;
+
 	this->clientlist = new user_hash();
 	this->chanlist = new chan_hash();
 
@@ -283,7 +299,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	this->time_delta = 0;
 	this->next_call = this->TIME + 3;
 	srand(this->TIME);
-	this->Log(DEBUG,"*** InspIRCd starting up!");
+
 	if (!ServerConfig::FileExists(CONFIG_FILE))
 	{
 		printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE);
@@ -332,8 +348,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
 	this->OpenLog(argv, argc);
 	this->stats = new serverstats();
-	this->Parser = new CommandParser(this);
 	this->Timers = new TimerManager();
+	this->Parser = new CommandParser(this);
 	this->XLines = new XLineManager(this);
 	Config->ClearStack();
 	Config->Read(true, NULL);
@@ -813,7 +829,6 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 			WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
 		if ((TIME % 3600) == 0)
 		{
-			irc::whowas::MaintainWhoWas(this, TIME);
 			this->RehashUsersAndChans();
 			FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
 		}