/who tidyup - needs QA'ing

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index ce083b3b94ccfd1a90a28033528d30d1880f5c4a..4b2690c49db2acc6dfef98fddd3161751c452d0d 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -48,9 +48,9 @@ void InspIRCd::AddServerName(const std::string &servername)
 const char* InspIRCd::FindServerNamePtr(const std::string &servername)
 {
        servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername);
-       
+
        if(iter == servernames.end())
-       {               
+       {
                AddServerName(servername);
                iter = --servernames.end();
        }
@@ -86,6 +86,13 @@ void InspIRCd::Cleanup()
        }
        stats->BoundPortCount = 0;
 
+       /* Close all client sockets, or the new process inherits them */
+       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       {
+               (*i)->SetWriteError("Server shutdown");
+               (*i)->CloseSocket();
+       }
+
        /* 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
         * a chance to be removed themsleves.
@@ -103,10 +110,6 @@ void InspIRCd::Cleanup()
                        this->UnloadModule(mymodnames[k].c_str());
        }
 
-       /* Close all client sockets, or the new process inherits them */
-       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
-               (*i)->CloseSocket();
-
        /* Close logging */
        this->Logger->Close();
 }
@@ -140,7 +143,7 @@ void InspIRCd::Start()
 
 void InspIRCd::Rehash(int status)
 {
-       SI->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE));
+       SI->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE));
        SI->CloseLog();
        SI->OpenLog(SI->Config->argv, SI->Config->argc);
        SI->RehashUsersAndChans();
@@ -148,6 +151,7 @@ void InspIRCd::Rehash(int status)
        SI->Config->Read(false,NULL);
        SI->ResetMaxBans();
        SI->Res->Rehash();
+       SI->BuildISupport();
        FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,""));
 }
 
@@ -248,7 +252,7 @@ void InspIRCd::WritePID(const std::string &filename)
                        /* Leaves us with just the path */
                        fname = confpath.substr(0, pos) + std::string("/") + fname;
                }
-       }                                                                       
+       }
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -269,7 +273,7 @@ std::string InspIRCd::GetRevision()
 }
 
 InspIRCd::InspIRCd(int argc, char** argv)
-       : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365)
+       : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365), GlobalCulls(this)
 {
        int found_ports = 0;
        FailedPortList pl;
@@ -346,14 +350,14 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        this->OpenLog(argv, argc);
        this->stats = new serverstats();
-       this->Timers = new TimerManager();
+       this->Timers = new TimerManager(this);
        this->Parser = new CommandParser(this);
        this->XLines = new XLineManager(this);
        Config->ClearStack();
        Config->Read(true, NULL);
        this->CheckRoot();
        this->Modes = new ModeParser(this);
-       this->AddServerName(Config->ServerName);        
+       this->AddServerName(Config->ServerName);
        CheckDie();
        InitializeDisabledCommands(Config->DisabledCommands, this);
        stats->BoundPortCount = BindPorts(true, found_ports, pl);
@@ -392,7 +396,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
                Exit(EXIT_STATUS_BIND);
        }
-       
+
        if (stats->BoundPortCount != (unsigned int)found_ports)
        {
                printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %ld of %d client ports bound.\n\n", stats->BoundPortCount, found_ports);
@@ -440,7 +444,7 @@ std::string InspIRCd::GetVersionString()
        }
        else
        {
-               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%lu,%s,%s]",VERSION,Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
        }
        return versiondata;
 }
@@ -574,7 +578,7 @@ 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=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
        v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
        v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32";
        Config->data005 = v.str();
@@ -843,10 +847,14 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
         * file descriptors. The socket engine has everything's
         * descriptors in its list... dns, modules, users,
         * servers... so its nice and easy, just one call.
-        * This will cause any read or write events to be 
+        * This will cause any read or write events to be
         * dispatched to their handlers.
         */
        SE->DispatchEvents();
+
+       /* if any users was quit, take them out */
+       GlobalCulls.Apply();
+
 }
 
 bool InspIRCd::IsIdent(const char* n)