X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=2f00b9f2e7cb3e5278a1a3c955ed57d9a9ab26d7;hb=21f9acdb6c5c35b26d926f75845135f16c3c54e9;hp=a7a2b1bb63b3d8b5f0f573d25fc0959da52259ae;hpb=27d4ea0d970ed95cf21acedf72a08611ea082d72;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index a7a2b1bb6..2f00b9f2e 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -6,13 +6,14 @@ * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ +/* $Install: src/inspircd $(BINPATH) */ + #include "inspircd.h" -#include "configreader.h" #include #ifndef WIN32 @@ -28,21 +29,15 @@ #endif #endif -#include #include -#include "modules.h" -#include "mode.h" #include "xline.h" #include "socketengine.h" #include "inspircd_se_config.h" #include "socket.h" -#include "typedefs.h" #include "command_parse.h" #include "exitcodes.h" #include "caller.h" -using irc::sockets::NonBlocking; -using irc::sockets::Blocking; using irc::sockets::insp_ntoa; using irc::sockets::insp_inaddr; using irc::sockets::insp_sockaddr; @@ -50,6 +45,7 @@ using irc::sockets::insp_sockaddr; InspIRCd* SI = NULL; int* mysig = NULL; + /* Burlex: Moved from exitcodes.h -- due to duplicate symbols */ const char* ExitCodes[] = { @@ -74,18 +70,21 @@ const char* ExitCodes[] = void InspIRCd::Cleanup() { std::vector mymodnames; - int MyModCount = this->GetModuleCount(); + int MyModCount = this->Modules->GetCount(); - for (unsigned int i = 0; i < Config->ports.size(); i++) + if (Config) { - /* This calls the constructor and closes the listening socket */ - delete Config->ports[i]; - } + for (unsigned int i = 0; i < Config->ports.size(); i++) + { + /* This calls the constructor and closes the listening socket */ + delete Config->ports[i]; + } - Config->ports.clear(); + Config->ports.clear(); + } /* Close all client sockets, or the new process inherits them */ - for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) + for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) { (*i)->SetWriteError("Server shutdown"); (*i)->CloseSocket(); @@ -97,28 +96,31 @@ void InspIRCd::Cleanup() */ for (int tries = 0; tries < 3; tries++) { - MyModCount = this->GetModuleCount(); + MyModCount = this->Modules->GetCount(); mymodnames.clear(); - /* Unload all modules, so they get a chance to clean up their listeners */ - for (int j = 0; j <= MyModCount; j++) - mymodnames.push_back(Config->module_names[j]); + if (MyModCount) + { + /* Unload all modules, so they get a chance to clean up their listeners */ + for (int j = 0; j <= MyModCount; j++) + mymodnames.push_back(Config->module_names[j]); + + for (int k = 0; k <= MyModCount; k++) + this->Modules->Unload(mymodnames[k].c_str()); + } - for (int k = 0; k <= MyModCount; k++) - this->UnloadModule(mymodnames[k].c_str()); } /* Close logging */ - this->Logger->Close(); + if (this->Logger) + this->Logger->Close(); + /* Cleanup Server Names */ for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) delete (*itr); -#ifdef WINDOWS - /* WSACleanup */ - WSACleanup(); -#endif + } void InspIRCd::Restart(const std::string &reason) @@ -164,9 +166,11 @@ void InspIRCd::ResetMaxBans() void InspIRCd::RehashUsersAndChans() { user_hash* old_users = this->clientlist; + user_hash* old_uuid = this->uuidlist; chan_hash* old_chans = this->chanlist; this->clientlist = new user_hash(); + this->uuidlist = new user_hash(); this->chanlist = new chan_hash(); for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++) @@ -174,6 +178,11 @@ void InspIRCd::RehashUsersAndChans() delete old_users; + for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++) + this->uuidlist->insert(*n); + + delete old_uuid; + for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++) this->chanlist->insert(*n); @@ -182,7 +191,8 @@ void InspIRCd::RehashUsersAndChans() void InspIRCd::CloseLog() { - this->Logger->Close(); + if (this->Logger) + this->Logger->Close(); } void InspIRCd::SetSignals() @@ -276,8 +286,7 @@ void InspIRCd::WritePID(const std::string &filename) } InspIRCd::InspIRCd(int argc, char** argv) - : ModCount(0), - GlobalCulls(this), + : GlobalCulls(this), /* Functor initialisation. Note that the ordering here is very important. */ HandleProcessUser(this), @@ -300,19 +309,29 @@ InspIRCd::InspIRCd(int argc, char** argv) int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */ char c = 0; - modules.resize(255); - factory.resize(255); memset(&server, 0, sizeof(server)); memset(&client, 0, sizeof(client)); + SocketEngineFactory* SEF = new SocketEngineFactory(); + SE = SEF->Create(this); + delete SEF; + this->s_signal = 0; this->unregistered_count = 0; this->clientlist = new user_hash(); + this->uuidlist = new user_hash(); this->chanlist = new chan_hash(); + this->Config = new ServerConfig(this); + this->SNO = new SnomaskManager(this); + this->Modules = new ModuleManager(this); + this->stats = new serverstats(); + this->Timers = new TimerManager(this); + this->Parser = new CommandParser(this); + this->XLines = new XLineManager(this); this->Config->argv = argv; this->Config->argc = argc; @@ -325,10 +344,9 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Config->opertypes.clear(); this->Config->operclass.clear(); - this->SNO = new SnomaskManager(this); + this->TIME = this->OLDTIME = this->startup_time = time(NULL); this->time_delta = 0; - this->next_call = this->TIME + 3; srand(this->TIME); *this->LogFileName = 0; @@ -382,14 +400,23 @@ InspIRCd::InspIRCd(int argc, char** argv) { DWORD ExitCode = WindowsForkStart(this); if(ExitCode) - Exit(ExitCode); + exit(ExitCode); } // Set up winsock WSADATA wsadata; WSAStartup(MAKEWORD(2,0), &wsadata); + ChangeWindowsSpecificPointers(this); #endif + strlcpy(Config->MyExecutable,argv[0],MAXBUF); + + if (!this->OpenLog(argv, argc)) + { + printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); + Exit(EXIT_STATUS_LOG); + } + if (!ServerConfig::FileExists(this->ConfigFileName)) { printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); @@ -405,18 +432,44 @@ InspIRCd::InspIRCd(int argc, char** argv) /* Set the finished argument values */ Config->nofork = do_nofork; Config->forcedebug = do_debug; - Config->writelog = !do_nolog; + Config->writelog = !do_nolog; + Config->ClearStack(); + Config->Read(true, NULL); - strlcpy(Config->MyExecutable,argv[0],MAXBUF); + // Get XLine to do it's thing. + this->XLines->CheckELines(this->XLines->lookup_lines['E']); + this->XLines->ApplyLines(); + + this->Modules->modules.resize(255); + this->Modules->handles.resize(255); + + /* + * Initialise SID/UID. + * For an explanation as to exactly how this works, and why it works this way, see GetUID(). + * -- w00t + */ + /* Generate SID */ + size_t sid = 0; + if (Config->sid) + { + sid = Config->sid; + } + else + { + for (const char* x = Config->ServerName; *x; ++x) + sid = 5 * sid + *x; + for (const char* y = Config->ServerDesc; *y; ++y) + sid = 5 * sid + *y; + sid = sid % 999; - this->OpenLog(argv, argc); + Config->sid = sid; + } - this->stats = new serverstats(); - this->Timers = new TimerManager(this); - this->Parser = new CommandParser(this); - this->XLines = new XLineManager(this); - Config->ClearStack(); - Config->Read(true, NULL); + this->InitialiseUID(); + + /* set up fake client */ + this->FakeClient = new User(this); + this->FakeClient->SetFd(FD_MAGIC_NUMBER); if (!do_root) this->CheckRoot(); @@ -445,13 +498,7 @@ InspIRCd::InspIRCd(int argc, char** argv) } } - - /* Because of limitations in kqueue on freebsd, we must fork BEFORE we - * initialize the socket engine. - */ - SocketEngineFactory* SEF = new SocketEngineFactory(); - SE = SEF->Create(this); - delete SEF; + SE->RecoverFromFork(); this->Modes = new ModeParser(this); this->AddServerName(Config->ServerName); @@ -467,7 +514,8 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Res = new DNS(this); - this->LoadAllModules(); + this->Modules->LoadAll(); + /* Just in case no modules were loaded - fix for bug #101 */ this->BuildISupport(); InitializeDisabledCommands(Config->DisabledCommands, this); @@ -524,98 +572,122 @@ InspIRCd::InspIRCd(int argc, char** argv) FreeConsole(); } #endif + printf("\nInspIRCd is now running!\n"); Log(DEFAULT,"Startup complete."); this->WritePID(Config->PID); } -void InspIRCd::DoOneIteration(bool process_module_sockets) +/* moved to a function, as UID generation can call this also */ +void InspIRCd::InitialiseUID() +{ + int i; + size_t sid = Config->sid; + + current_uid[0] = sid / 100 + 48; + current_uid[1] = ((sid / 10) % 10) + 48; + current_uid[2] = sid % 10 + 48; + + /* Initialise UID */ + for(i = 3; i < UUID_LENGTH - 1; i++) + current_uid[i] = 'A'; +} + +int InspIRCd::Run() { + while (true) + { #ifndef WIN32 - static rusage ru; + static rusage ru; #else - static time_t uptime; - static struct tm * stime; - static char window_title[100]; + static time_t uptime; + static struct tm * stime; + static char window_title[100]; #endif - /* time() seems to be a pretty expensive syscall, so avoid calling it too much. - * Once per loop iteration is pleanty. - */ - OLDTIME = TIME; - TIME = time(NULL); - - /* Run background module timers every few seconds - * (the docs say modules shouldnt rely on accurate - * timing using this event, so we dont have to - * time this exactly). - */ - if (TIME != OLDTIME) - { - if (TIME < OLDTIME) - WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME)); - if ((TIME % 3600) == 0) - { - this->RehashUsersAndChans(); - FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); - } - Timers->TickTimers(TIME); - this->DoBackgroundUserStuff(TIME); + /* time() seems to be a pretty expensive syscall, so avoid calling it too much. + * Once per loop iteration is pleanty. + */ + OLDTIME = TIME; + TIME = time(NULL); - if ((TIME % 5) == 0) + /* Run background module timers every few seconds + * (the docs say modules shouldnt rely on accurate + * timing using this event, so we dont have to + * time this exactly). + */ + if (TIME != OLDTIME) { - XLines->expire_lines(); - FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); - Timers->TickMissedTimers(TIME); - } + if (TIME < OLDTIME) + { + WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME)); + } + + if ((TIME % 3600) == 0) + { + this->RehashUsersAndChans(); + FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); + } + + Timers->TickTimers(TIME); + this->DoBackgroundUserStuff(); + + if ((TIME % 5) == 0) + { + XLines->expire_lines(); + FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); + Timers->TickMissedTimers(TIME); + } #ifndef WIN32 - /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */ - if (!getrusage(RUSAGE_SELF, &ru)) - { - gettimeofday(&this->stats->LastSampled, NULL); - this->stats->LastCPU = ru.ru_utime; - } + /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */ + if (!getrusage(RUSAGE_SELF, &ru)) + { + gettimeofday(&this->stats->LastSampled, NULL); + this->stats->LastCPU = ru.ru_utime; + } #else - WindowsIPC->Check(); - - if(Config->nofork) - { - uptime = Time() - startup_time; - stime = gmtime(&uptime); - snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u", - LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec); - SetConsoleTitle(window_title); - } + WindowsIPC->Check(); + + if(Config->nofork) + { + uptime = Time() - startup_time; + stime = gmtime(&uptime); + snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u", + LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec); + SetConsoleTitle(window_title); + } #endif - } + } - /* Call the socket engine to wait on the active - * 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 - * dispatched to their handlers. - */ - this->SE->DispatchEvents(); + /* Call the socket engine to wait on the active + * 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 + * dispatched to their handlers. + */ + this->SE->DispatchEvents(); - /* if any users was quit, take them out */ - this->GlobalCulls.Apply(); + /* if any users was quit, take them out */ + this->GlobalCulls.Apply(); - /* If any inspsockets closed, remove them */ - this->InspSocketCull(); + /* If any inspsockets closed, remove them */ + this->BufferedSocketCull(); - if (this->s_signal) - { - this->SignalHandler(s_signal); - this->s_signal = 0; + if (this->s_signal) + { + this->SignalHandler(s_signal); + this->s_signal = 0; + } } + return 0; } -void InspIRCd::InspSocketCull() +void InspIRCd::BufferedSocketCull() { - for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) + for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) { SE->DelFd(x->second); x->second->Close(); @@ -624,23 +696,13 @@ void InspIRCd::InspSocketCull() SocketCull.clear(); } -int InspIRCd::Run() -{ - while (true) - { - DoOneIteration(true); - } - /* This is never reached -- we hope! */ - return 0; -} - /**********************************************************************************/ /** - * An ircd in four lines! bwahahaha. ahahahahaha. ahahah *cough*. + * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*. */ -int main(int argc, char** argv) +int main(int argc, char ** argv) { SI = new InspIRCd(argc, argv); mysig = &SI->s_signal; @@ -653,16 +715,16 @@ int main(int argc, char** argv) * (until this returns true, a user will block in the waiting state, waiting to connect up to the * registration timeout maximum seconds) */ -bool InspIRCd::AllModulesReportReady(userrec* user) +bool InspIRCd::AllModulesReportReady(User* user) { if (!Config->global_implementation[I_OnCheckReady]) return true; - for (int i = 0; i <= this->GetModuleCount(); i++) + for (int i = 0; i <= this->Modules->GetCount(); i++) { if (Config->implement_lists[i][I_OnCheckReady]) { - int res = modules[i]->OnCheckReady(user); + int res = this->Modules->modules[i]->OnCheckReady(user); if (!res) return false; } @@ -670,11 +732,6 @@ bool InspIRCd::AllModulesReportReady(userrec* user) return true; } -int InspIRCd::GetModuleCount() -{ - return this->ModCount; -} - time_t InspIRCd::Time(bool delta) { if (delta) @@ -690,7 +747,7 @@ int InspIRCd::SetTimeDelta(int delta) return old; } -void InspIRCd::AddLocalClone(userrec* user) +void InspIRCd::AddLocalClone(User* user) { clonemap::iterator x = local_clones.find(user->GetIPString()); if (x != local_clones.end()) @@ -699,7 +756,7 @@ void InspIRCd::AddLocalClone(userrec* user) local_clones[user->GetIPString()] = 1; } -void InspIRCd::AddGlobalClone(userrec* user) +void InspIRCd::AddGlobalClone(User* user) { clonemap::iterator y = global_clones.find(user->GetIPString()); if (y != global_clones.end()) @@ -717,4 +774,3 @@ void InspIRCd::SetSignal(int signal) { *mysig = signal; } -