X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=7efbaa54f02a3c078a7f4cf543c9ff593a647d23;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=4679c8acd9c319f4ca5498479fdaa7699a3f07a2;hpb=594d430ee457b621c731a6cc70d84c02c295d59c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 4679c8acd..7efbaa54f 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -30,16 +30,8 @@
 #include "inspircd.h"
 #include "configreader.h"
 #include <signal.h>
-#include <time.h>
-#include <string>
 #include <exception>
-#include <stdexcept>
-#include <new>
-#include <map>
-#include <sstream>
 #include <fstream>
-#include <vector>
-#include <deque>
 #include "modules.h"
 #include "mode.h"
 #include "xline.h"
@@ -183,8 +175,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	factory.resize(255);
 	
 	this->Config = new ServerConfig(this);
+	this->SNO = new SnomaskManager(this);
 	this->Start();
-	this->module_sockets.clear();
 	this->TIME = this->OLDTIME = this->startup_time = time(NULL);
 	srand(this->TIME);
 	this->Log(DEBUG,"*** InspIRCd starting up!");
@@ -473,7 +465,7 @@ void InspIRCd::BuildISupport()
 	std::stringstream v;
 	v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
 	v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
-	v << MAXAWAY << " CHANMODES=b,k,l,psmnti FNC NETWORK=" << Config->Network << " MAXPARA=32";
+	v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32";
 	Config->data005 = v.str();
 	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
 }
@@ -671,8 +663,6 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 			irc::whowas::MaintainWhoWas(TIME);
 		}
 		Timers->TickTimers(TIME);
-		if (process_module_sockets)
-			this->DoSocketTimeouts(TIME);
 		this->DoBackgroundUserStuff(TIME);
 
 		if ((TIME % 5) == 0)