Take some debug crap out of ModeParser::ModeString()

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 5b2d5aac2a2ec311d4179d9cbe82b1e78649f100..dc139fa0dc036c125d1c86f49d00928593307012 100644 (file)
--- 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"
@@ -48,6 +40,7 @@
 #include "socket.h"
 #include "typedefs.h"
 #include "command_parse.h"
+#include <dlfcn.h>
 
 using irc::sockets::NonBlocking;
 using irc::sockets::Blocking;
@@ -183,8 +176,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!");
@@ -351,6 +344,7 @@ void InspIRCd::EraseFactory(int j)
        {
                if (v == j)
                {
+                       delete *t;
                        factory.erase(t);
                        factory.push_back(NULL);
                        return;
@@ -471,9 +465,9 @@ void InspIRCd::BuildISupport()
 {
        // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
        std::stringstream v;
-       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+       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 +665,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)