X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=2a6bc4e0a2e80ecfe37477f1d57e4cffdaa87af8;hb=74066e0f563ef630e432d3bbb10544318b70ade3;hp=810c477f8e8ab721d6fc96c895674a87efdf8dbf;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 810c477f8..2a6bc4e0a 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -36,14 +36,13 @@ #include "xline.h" #include "bancache.h" #include "socketengine.h" -#include "inspircd_se_config.h" #include "socket.h" #include "command_parse.h" #include "exitcodes.h" #include "caller.h" #include "testsuite.h" -InspIRCd* SI = NULL; +InspIRCd* ServerInstance = NULL; int* mysig = NULL; /** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping @@ -105,19 +104,20 @@ void InspIRCd::Cleanup() } /* Close all client sockets, or the new process inherits them */ - for (std::vector::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++) + std::vector::reverse_iterator i = Users->local_users.rbegin(); + while (i != this->Users->local_users.rend()) { - this->Users->QuitUser((*i), "Server shutdown"); - (*i)->CloseSocket(); + User* u = *i++; + Users->QuitUser(u, "Server shutdown"); } /* 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. * - * XXX there may be a better way to do this with 1.2 + * XXX there may be a better way to do this */ - for (int tries = 0; tries < 3; tries++) + for (int tries = 0; tries < 4; tries++) { std::vector module_names = Modules->GetAllModuleNames(0); for (std::vector::iterator k = module_names.begin(); k != module_names.end(); ++k) @@ -125,12 +125,9 @@ void InspIRCd::Cleanup() /* Unload all modules, so they get a chance to clean up their listeners */ this->Modules->Unload(k->c_str()); } + GlobalCulls.Apply(); } - /* Cleanup Server Names */ - for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) - delete (*itr); - /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */ /* Must be deleted before modes as it decrements modelines */ DeleteZero(this->FakeClient); @@ -316,25 +313,13 @@ void InspIRCd::WritePID(const std::string &filename) } InspIRCd::InspIRCd(int argc, char** argv) : - /* 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), - HandleFloodQuitUser(this), - HandleIsChannel(this), - HandleIsSID(this), - HandleRehash(this), - - /* Functor pointer initialisation. Must match the order of the list above + ConfigFileName("inspircd.conf"), + + /* Functor pointer initialisation. * * 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), @@ -350,6 +335,12 @@ InspIRCd::InspIRCd(int argc, char** argv) : // Avoid erroneous frees on early exit WindowsIPC = 0; #endif + + ServerInstance = this; + + Extensible::Register(&User::NICKForced); + Extensible::Register(&User::OperQuit); + FailedPortList pl; int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0, do_testsuite = 0; /* flag variables */ @@ -377,21 +368,19 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->TIME = time(NULL); // This must be created first, so other parts of Insp can use it while starting up - this->Logs = new LogManager(this); + this->Logs = new LogManager; - SocketEngineFactory* SEF = new SocketEngineFactory(); - SE = SEF->Create(this); - delete SEF; + SE = CreateSocketEngine(); - this->Threads = new ThreadEngine(this); + this->Threads = new ThreadEngine; /* Default implementation does nothing */ - this->PI = new ProtocolInterface(this); + this->PI = new ProtocolInterface; this->s_signal = 0; // Create base manager classes early, so nothing breaks - this->Users = new UserManager(this); + this->Users = new UserManager; this->Users->unregistered_count = 0; @@ -399,14 +388,14 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->Users->uuidlist = new user_hash(); this->chanlist = new chan_hash(); - this->Config = new ServerConfig(this); - this->SNO = new SnomaskManager(this); - this->BanCache = new BanCacheManager(this); - this->Modules = new ModuleManager(this); + this->Config = new ServerConfig; + this->SNO = new SnomaskManager; + this->BanCache = new BanCacheManager; + this->Modules = new ModuleManager(); this->stats = new serverstats(); - this->Timers = new TimerManager(this); - this->Parser = new CommandParser(this); - this->XLines = new XLineManager(this); + this->Timers = new TimerManager; + this->Parser = new CommandParser; + this->XLines = new XLineManager; this->Config->argv = argv; this->Config->argc = argc; @@ -424,7 +413,6 @@ InspIRCd::InspIRCd(int argc, char** argv) : srand(this->TIME); *this->LogFileName = 0; - strlcpy(this->ConfigFileName, CONFIG_FILE, MAXBUF); struct option longopts[] = { @@ -450,7 +438,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : break; case 'c': /* Config filename was set */ - strlcpy(ConfigFileName, optarg, MAXBUF); + ConfigFileName = optarg; break; case 0: /* getopt_long_only() set an int variable, just keep going */ @@ -480,7 +468,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : // Handle forking if(!do_nofork) { - DWORD ExitCode = WindowsForkStart(this); + DWORD ExitCode = WindowsForkStart(); if(ExitCode) exit(ExitCode); } @@ -488,7 +476,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : // Set up winsock WSADATA wsadata; WSAStartup(MAKEWORD(2,0), &wsadata); - ChangeWindowsSpecificPointers(this); + ChangeWindowsSpecificPointers(); #endif Config->MyExecutable = argv[0]; @@ -504,7 +492,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : Exit(EXIT_STATUS_LOG); } - if (!ServerConfig::FileExists(this->ConfigFileName)) + if (!ServerConfig::FileExists(ConfigFileName.c_str())) { #ifdef WIN32 /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */ @@ -513,13 +501,13 @@ InspIRCd::InspIRCd(int argc, char** argv) : if (ServerConfig::FileExists(txtconf.c_str())) { - strlcat(this->ConfigFileName, ".txt", MAXBUF); + ConfigFileName = txtconf; } else #endif { - printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); - this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName); + printf("ERROR: Cannot open config file: %s\nExiting...\n", ConfigFileName.c_str()); + this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", ConfigFileName.c_str()); Exit(EXIT_STATUS_CONFIG); } } @@ -531,7 +519,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : printf_c("\t\033[1;32mpeavey, aquanight, psychon, dz, danieldg\033[0m\n\n"); printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); - this->Modes = new ModeParser(this); + this->Modes = new ModeParser; if (!do_root) this->CheckRoot(); @@ -569,34 +557,29 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->Config->Apply(NULL, ""); Logs->OpenFileLogs(); - this->Res = new DNS(this); - - this->AddServerName(Config->ServerName); + this->Res = new DNS; /* * Initialise SID/UID. * For an explanation as to exactly how this works, and why it works this way, see GetUID(). * -- w00t */ - if (!*Config->sid) + if (Config->sid.empty()) { // Generate one size_t sid = 0; - for (const char* x = Config->ServerName; *x; ++x) + for (const char* x = Config->ServerName.c_str(); *x; ++x) sid = 5 * sid + *x; - for (const char* y = Config->ServerDesc; *y; ++y) + for (const char* y = Config->ServerDesc.c_str(); *y; ++y) sid = 5 * sid + *y; sid = sid % 999; - Config->sid[0] = (char)(sid / 100 + 48); - Config->sid[1] = (char)(((sid / 10) % 10) + 48); - Config->sid[2] = (char)(sid % 10 + 48); - Config->sid[3] = '\0'; + Config->sid = ConvToStr(sid); } /* set up fake client again this time with the correct uid */ - this->FakeClient = new FakeUser(this, "!"); + this->FakeClient = new FakeUser("!"); this->FakeClient->SetFakeServer(Config->ServerName); // Get XLine to do it's thing. @@ -626,7 +609,8 @@ InspIRCd::InspIRCd(int argc, char** argv) : } } - printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); + printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", + Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds()); #ifndef WINDOWS if (!Config->nofork) @@ -656,20 +640,20 @@ InspIRCd::InspIRCd(int argc, char** argv) : } } #else - WindowsIPC = new IPC(this); + WindowsIPC = new IPC; if(!Config->nofork) { - WindowsForkKillOwner(this); + WindowsForkKillOwner(); FreeConsole(); } /* Set win32 service as running, if we are running as a service */ SetServiceRunning(); #endif - Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); + Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds()); #ifndef WIN32 - if (*(this->Config->SetGroup)) + if (!Config->SetGroup.empty()) { int ret; @@ -686,7 +670,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : struct group *g; errno = 0; - g = getgrnam(this->Config->SetGroup); + g = getgrnam(this->Config->SetGroup.c_str()); if (!g) { @@ -703,13 +687,13 @@ InspIRCd::InspIRCd(int argc, char** argv) : } } - if (*(this->Config->SetUser)) + if (!Config->SetUser.empty()) { // setuid struct passwd *u; errno = 0; - u = getpwnam(this->Config->SetUser); + u = getpwnam(this->Config->SetUser.c_str()); if (!u) { @@ -735,7 +719,7 @@ int InspIRCd::Run() /* See if we're supposed to be running the test suite rather than entering the mainloop */ if (Config->TestSuite) { - TestSuite* ts = new TestSuite(this); + TestSuite* ts = new TestSuite; delete ts; Exit(0); } @@ -789,7 +773,7 @@ int InspIRCd::Run() if ((TIME % 3600) == 0) { this->RehashUsersAndChans(); - FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); + FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); } Timers->TickTimers(TIME); @@ -797,7 +781,7 @@ int InspIRCd::Run() if ((TIME % 5) == 0) { - FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); + FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME)); SNO->FlushSnotices(); } #ifndef WIN32 @@ -819,14 +803,12 @@ int InspIRCd::Run() * This will cause any read or write events to be * dispatched to their handlers. */ + this->SE->DispatchTrialWrites(); this->SE->DispatchEvents(); /* if any users were quit, take them out */ this->GlobalCulls.Apply(); - /* If any inspsockets closed, remove them */ - this->BufferedSocketCull(); - if (this->s_signal) { this->SignalHandler(s_signal); @@ -837,18 +819,6 @@ int InspIRCd::Run() return 0; } -void InspIRCd::BufferedSocketCull() -{ - for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) - { - this->Logs->Log("MISC",DEBUG,"Cull socket"); - SE->DelFd(x->second); - x->second->Close(); - delete x->second; - } - SocketCull.clear(); -} - /**********************************************************************************/ /** @@ -862,7 +832,7 @@ void InspIRCd::BufferedSocketCull() bool InspIRCd::AllModulesReportReady(User* user) { ModResult res; - FIRST_MOD_RESULT(this, OnCheckReady, res, (user)); + FIRST_MOD_RESULT(OnCheckReady, res, (user)); return (res == MOD_RES_PASSTHRU); } @@ -884,9 +854,9 @@ void InspIRCd::SetSignal(int signal) */ ENTRYPOINT { - SI = new InspIRCd(argc, argv); - mysig = &SI->s_signal; - SI->Run(); - delete SI; + new InspIRCd(argc, argv); + mysig = &ServerInstance->s_signal; + ServerInstance->Run(); + delete ServerInstance; return 0; }