X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=a921db193514338a9a0bdb31adefe6680f2d4f98;hb=63bdb9171f19deb8483de0a521ed7a712543382d;hp=d1af4188caf7163a4d93faac34e88562a7e9e19c;hpb=07e1c65d9e6419df30a316a3b1f33434ab59f16f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index d1af4188c..a921db193 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,7 +12,6 @@ */ /* $Install: src/inspircd $(BINPATH) */ - #include "inspircd.h" #include @@ -27,6 +26,9 @@ #ifndef RUSAGE_SELF #define RUSAGE_SELF 0 #endif + + #include // setuid + #include // setgid #endif #include @@ -40,13 +42,17 @@ #include "caller.h" #include "testsuite.h" -using irc::sockets::insp_ntoa; -using irc::sockets::insp_inaddr; -using irc::sockets::insp_sockaddr; - InspIRCd* SI = NULL; int* mysig = NULL; +/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping + * if it must. + * + * This is provided as a pointer so that modules can change it to their custom mapping tables, + * e.g. for national character support. + */ +unsigned const char *national_case_insensitive_map = rfc_case_insensitive_map; + /* Moved from exitcodes.h -- due to duplicate symbols -- Burlex * XXX this is a bit ugly. -- w00t @@ -69,8 +75,21 @@ const char* ExitCodes[] = "Couldn't load module on startup", /* 13 */ "Could not create windows forked process", /* 14 */ "Received SIGTERM", /* 15 */ + "Bad command handler loaded", /* 16 */ + "RegisterServiceCtrlHandler failed", /* 17 */ + "UpdateSCMStatus failed", /* 18 */ + "CreateEvent failed" /* 19 */ }; +template static void DeleteZero(T* n) +{ + if (n != NULL) + { + delete n; + n = NULL; + } +} + void InspIRCd::Cleanup() { if (Config) @@ -87,7 +106,7 @@ 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++) { - (*i)->SetWriteError("Server shutdown"); + this->Users->QuitUser((*i), "Server shutdown"); (*i)->CloseSocket(); } @@ -106,15 +125,34 @@ void InspIRCd::Cleanup() this->Modules->Unload(k->c_str()); } } - - /* Close logging */ - this->Logs->CloseLogs(); + /* Remove core commands */ + Parser->RemoveCommands(""); /* 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->Users); + DeleteZero(this->Modes); + DeleteZero(this->XLines); + DeleteZero(this->Parser); + DeleteZero(this->stats); + DeleteZero(this->Modules); + DeleteZero(this->BanCache); + DeleteZero(this->SNO); + DeleteZero(this->Config); + DeleteZero(this->Res); + DeleteZero(this->chanlist); + DeleteZero(this->PI); + DeleteZero(this->Threads); + DeleteZero(this->Timers); + /* Close logging */ + this->Logs->CloseLogs(); + DeleteZero(this->Logs); + delete RehashFinishMutex; } void InspIRCd::Restart(const std::string &reason) @@ -124,8 +162,6 @@ void InspIRCd::Restart(const std::string &reason) */ this->SendError(reason); - this->Cleanup(); - /* Figure out our filename (if theyve renamed it, we're boned) */ std::string me; @@ -137,7 +173,11 @@ void InspIRCd::Restart(const std::string &reason) me = Config->MyDir + "/inspircd"; #endif - if (execv(me.c_str(), Config->argv) == -1) + char** argv = Config->argv; + + this->Cleanup(); + + if (execv(me.c_str(), argv) == -1) { /* Will raise a SIGABRT if not trapped */ throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno)); @@ -190,6 +230,8 @@ void InspIRCd::SetSignals() signal(SIGHUP, InspIRCd::SetSignal); signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, SIG_IGN); + /* We want E2BIG not a signal! */ + signal(SIGXFSZ, SIG_IGN); #endif signal(SIGTERM, InspIRCd::SetSignal); } @@ -232,14 +274,14 @@ bool InspIRCd::DaemonSeed() rlimit rl; if (getrlimit(RLIMIT_CORE, &rl) == -1) { - this->Log(DEFAULT,"Failed to getrlimit()!"); + this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!"); return false; } else { rl.rlim_cur = rl.rlim_max; if (setrlimit(RLIMIT_CORE, &rl) == -1) - this->Log(DEFAULT,"setrlimit() failed, cannot increase coredump size."); + this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size."); } return true; @@ -249,7 +291,8 @@ bool InspIRCd::DaemonSeed() void InspIRCd::WritePID(const std::string &filename) { std::string fname = (filename.empty() ? "inspircd.pid" : filename); - if (*(fname.begin()) != '/') + std::replace(fname.begin(), fname.end(), '\\', '/'); + if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename))) { std::string::size_type pos; std::string confpath = this->ConfigFileName; @@ -268,7 +311,7 @@ void InspIRCd::WritePID(const std::string &filename) else { printf("Failed to write PID-file '%s', exiting.\n",fname.c_str()); - this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str()); + this->Logs->Log("STARTUP",DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str()); Exit(EXIT_STATUS_PID); } } @@ -276,28 +319,68 @@ void InspIRCd::WritePID(const std::string &filename) InspIRCd::InspIRCd(int argc, char** argv) : GlobalCulls(this), - /* Functor initialisation. Note that the ordering here is very important. */ + /* 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), HandleFindDescriptor(this), HandleFloodQuitUser(this), - - /* Functor pointer initialisation. Must match the order of the list above */ + HandleIsChannel(this), + HandleIsSID(this), + HandleRehash(this), + + /* Functor pointer initialisation. Must match the order of the list above + * + * 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), IsNick(&HandleIsNick), IsIdent(&HandleIsIdent), FindDescriptor(&HandleFindDescriptor), FloodQuitUser(&HandleFloodQuitUser) { +#ifdef WIN32 + // Strict, frequent checking of memory on debug builds + _CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); + // Avoid erroneous frees on early exit + WindowsIPC = 0; +#endif int found_ports = 0; FailedPortList pl; int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0, do_testsuite = 0; /* flag variables */ char c = 0; + // Initialize so that if we exit before proper initialization they're not deleted + this->Logs = 0; + this->Threads = 0; + this->PI = 0; + this->Users = 0; + this->chanlist = 0; + this->Config = 0; + this->SNO = 0; + this->BanCache = 0; + this->Modules = 0; + this->stats = 0; + this->Timers = 0; + this->Parser = 0; + this->XLines = 0; + this->Modes = 0; + this->Res = 0; + + // Initialise TIME + this->TIME = time(NULL); + memset(&server, 0, sizeof(server)); memset(&client, 0, sizeof(client)); @@ -308,19 +391,25 @@ InspIRCd::InspIRCd(int argc, char** argv) SE = SEF->Create(this); delete SEF; + ThreadEngineFactory* tef = new ThreadEngineFactory(); + this->Threads = tef->Create(this); + delete tef; + this->Mutexes = new MutexFactory(this); + + /* Default implementation does nothing */ + this->PI = new ProtocolInterface(this); + this->s_signal = 0; - + // Create base manager classes early, so nothing breaks this->Users = new UserManager(this); - + this->Users->unregistered_count = 0; this->Users->clientlist = new user_hash(); this->Users->uuidlist = new user_hash(); this->chanlist = new chan_hash(); - this->Res = NULL; - this->Config = new ServerConfig(this); this->SNO = new SnomaskManager(this); this->BanCache = new BanCacheManager(this); @@ -425,29 +514,35 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!ServerConfig::FileExists(this->ConfigFileName)) { - printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); - this->Log(DEFAULT,"Unable to open config file %s", this->ConfigFileName); - Exit(EXIT_STATUS_CONFIG); +#ifdef WIN32 + /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */ + std::string txtconf = this->ConfigFileName; + txtconf.append(".txt"); + + if (ServerConfig::FileExists(txtconf.c_str())) + { + strlcat(this->ConfigFileName, ".txt", MAXBUF); + } + 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); + Exit(EXIT_STATUS_CONFIG); + } } printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); printf_c("(C) InspIRCd Development Team.\033[0m\n\n"); printf_c("Developers:\n"); printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\n"); - printf_c("\t\033[1;32mpippijn, peavey, aquanight, fez\033[0m\n\n"); + 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"); Config->ClearStack(); this->Modes = new ModeParser(this); - /* set up fake client (uid is incorrect at this point, - * until after config is read. we set up the user again - * at that point - */ - this->FakeClient = new User(this); - this->FakeClient->SetFd(FD_MAGIC_NUMBER); - if (!do_root) this->CheckRoot(); else @@ -477,15 +572,20 @@ InspIRCd::InspIRCd(int argc, char** argv) SE->RecoverFromFork(); - /* Read config, pass 0. At the end if this pass, - * the Config->IncludeFiles is populated, we call - * Config->StartDownloads to initialize the downlaods of all - * these files. + /* During startup we don't actually initialize this + * in the thread engine. */ - Config->Read(true, NULL, 0); - Config->DoDownloads(); - /* We have all the files we can get, initiate pass 1 */ - Config->Read(true, NULL, 1); + this->ConfigThread = new ConfigReaderThread(this, true, ""); + ConfigThread->Run(); + delete ConfigThread; + this->ConfigThread = NULL; + /* Switch over logfiles */ + Logs->OpenFileLogs(); + + /** Note: This is safe, the method checks for user == NULL */ + this->Parser->SetupCommandTable(); + + this->Res = new DNS(this); this->AddServerName(Config->ServerName); @@ -494,10 +594,7 @@ InspIRCd::InspIRCd(int argc, char** argv) * For an explanation as to exactly how this works, and why it works this way, see GetUID(). * -- w00t */ - if (*Config->sid) - { - } - else + if (!*Config->sid) { // Generate one size_t sid = 0; @@ -511,48 +608,42 @@ InspIRCd::InspIRCd(int argc, char** argv) 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'; } - this->InitialiseUID(); - /* set up fake client again this time with the correct uid */ - delete FakeClient; - this->FakeClient = new User(this); + this->FakeClient = new User(this, "#INVALID"); this->FakeClient->SetFd(FD_MAGIC_NUMBER); // Get XLine to do it's thing. this->XLines->CheckELines(); this->XLines->ApplyLines(); - CheckDie(); int bounditems = BindPorts(true, found_ports, pl); printf("\n"); - /*this->Modules->LoadAll();*/ - + this->Modules->LoadAll(); + /* Just in case no modules were loaded - fix for bug #101 */ this->BuildISupport(); InitializeDisabledCommands(Config->DisabledCommands, this); - if ((Config->ports.size() == 0) && (found_ports > 0)) - { - printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); - Logs->Log("STARTUP", DEFAULT,"ERROR: I couldn't bind any ports! Something else is bound to those ports!"); - Exit(EXIT_STATUS_BIND); - } - if (Config->ports.size() != (unsigned int)found_ports) { printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", bounditems, found_ports); printf("The following port(s) failed to bind:\n"); + printf("Hint: Try using a public IP instead of blank or *\n\n"); int j = 1; for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) { - printf("%d.\tIP: %s\tPort: %lu\n", j, i->first.empty() ? "" : i->first.c_str(), (unsigned long)i->second); + printf("%d.\tAddress: %s\tReason: %s\n", j, i->first.empty() ? "" : i->first.c_str(), i->second.c_str()); } } + + printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); + #ifndef WINDOWS if (!Config->nofork) { @@ -569,7 +660,7 @@ InspIRCd::InspIRCd(int argc, char** argv) * e.g. we are restarting, or being launched by cron. Dont kill parent, and dont * close stdin/stdout */ - if (!do_nofork) + if ((!do_nofork) && (!do_testsuite)) { fclose(stdin); fclose(stderr); @@ -587,28 +678,72 @@ InspIRCd::InspIRCd(int argc, char** argv) WindowsForkKillOwner(this); FreeConsole(); } + /* Set win32 service as running, if we are running as a service */ + SetServiceRunning(); #endif - printf("\nInspIRCd is now running as '%s'[%s]\n", Config->ServerName,Config->GetSID().c_str()); - Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s]", Config->ServerName,Config->GetSID().c_str()); + Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); - this->WritePID(Config->PID); -} +#ifndef WIN32 + if (*(this->Config->SetGroup)) + { + int ret; -/* moved to a function, as UID generation can call this also */ -void InspIRCd::InitialiseUID() -{ - int i = 3; + // setgroups + ret = setgroups(0, NULL); + + if (ret == -1) + { + this->Logs->Log("SETGROUPS", DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno)); + this->QuickExit(0); + } + + // setgid + struct group *g; - current_uid[0] = Config->sid[0]; - current_uid[1] = Config->sid[1]; - current_uid[2] = Config->sid[2]; + errno = 0; + g = getgrnam(this->Config->SetGroup); - /* Initialise UID */ - for(i = 3; i < UUID_LENGTH - 1; i++) - current_uid[i] = 'A'; + if (!g) + { + this->Logs->Log("SETGUID", DEFAULT, "getgrnam() failed (bad user?): %s", strerror(errno)); + this->QuickExit(0); + } - current_uid[UUID_LENGTH] = '\0'; + ret = setgid(g->gr_gid); + + if (ret == -1) + { + this->Logs->Log("SETGUID", DEFAULT, "setgid() failed (bad user?): %s", strerror(errno)); + this->QuickExit(0); + } + } + + if (*(this->Config->SetUser)) + { + // setuid + struct passwd *u; + + errno = 0; + u = getpwnam(this->Config->SetUser); + + if (!u) + { + this->Logs->Log("SETGUID", DEFAULT, "getpwnam() failed (bad user?): %s", strerror(errno)); + this->QuickExit(0); + } + + int ret = setuid(u->pw_uid); + + if (ret == -1) + { + this->Logs->Log("SETGUID", DEFAULT, "setuid() failed (bad user?): %s", strerror(errno)); + this->QuickExit(0); + } + } +#endif + + this->WritePID(Config->PID); } int InspIRCd::Run() @@ -621,6 +756,8 @@ int InspIRCd::Run() Exit(0); } + RehashFinishMutex = Mutexes->CreateMutex(); + while (true) { #ifndef WIN32 @@ -631,6 +768,45 @@ int InspIRCd::Run() static char window_title[100]; #endif + /* Check if there is a config thread which has finished executing but has not yet been freed */ + RehashFinishMutex->Lock(); + if (this->ConfigThread && this->ConfigThread->GetExitFlag()) + { + /* Rehash has completed */ + + /* Switch over logfiles */ + Logs->CloseLogs(); + Logs->OpenFileLogs(); + + this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up..."); + + /* These are currently not known to be threadsafe, so they are executed outside + * of the thread. It would be pretty simple to move them to the thread Run method + * once they are known threadsafe with all the correct mutexes in place. This might + * not be worth the effort however as these functions execute relatively quickly + * and would not benefit from being within the config read thread. + * + * XXX: The order of these is IMPORTANT, do not reorder them without testing + * thoroughly!!! + */ + this->XLines->CheckELines(); + this->XLines->ApplyLines(); + this->Res->Rehash(); + this->ResetMaxBans(); + InitializeDisabledCommands(Config->DisabledCommands, this); + User* user = !Config->RehashUserUID.empty() ? FindNick(Config->RehashUserUID) : NULL; + FOREACH_MOD_I(this, I_OnRehash, OnRehash(user, Config->RehashParameter)); + this->BuildISupport(); + + /* IMPORTANT: This delete may hang if you fuck up your thread syncronization. + * It will hang waiting for the ConfigThread to 'join' to avoid race conditons, + * until the other thread is completed. + */ + delete ConfigThread; + ConfigThread = NULL; + } + RehashFinishMutex->Unlock(); + /* time() seems to be a pretty expensive syscall, so avoid calling it too much. * Once per loop iteration is pleanty. */ @@ -644,9 +820,14 @@ int InspIRCd::Run() */ if (TIME != OLDTIME) { - if (TIME < OLDTIME) + /* Allow a buffer of two seconds drift on this so that ntpdate etc dont harass admins */ + if (TIME < OLDTIME - 2) { - SNO->WriteToSnoMask('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME)); + SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)OLDTIME-TIME); + } + else if (TIME > OLDTIME + 2) + { + SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME - OLDTIME); } if ((TIME % 3600) == 0) @@ -671,7 +852,7 @@ int InspIRCd::Run() this->stats->LastCPU = ru.ru_utime; } #else - WindowsIPC->Check(); + WindowsIPC->Check(); #endif } @@ -704,7 +885,7 @@ void InspIRCd::BufferedSocketCull() { for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) { - Log(DEBUG,"Cull socket"); + this->Logs->Log("MISC",DEBUG,"Cull socket"); SE->DelFd(x->second); x->second->Close(); delete x->second; @@ -718,15 +899,6 @@ void InspIRCd::BufferedSocketCull() * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*. */ -int main(int argc, char ** argv) -{ - SI = new InspIRCd(argc, argv); - mysig = &SI->s_signal; - SI->Run(); - delete SI; - return 0; -} - /* this returns true when all modules are satisfied that the user should be allowed onto the irc server * (until this returns true, a user will block in the waiting state, waiting to connect up to the * registration timeout maximum seconds) @@ -735,11 +907,9 @@ bool InspIRCd::AllModulesReportReady(User* user) { for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i) { - int res = (*i)->OnCheckReady(user); - if (!res) + if (!(*i)->OnCheckReady(user)) return false; } - return true; } @@ -752,3 +922,18 @@ void InspIRCd::SetSignal(int signal) { *mysig = signal; } + +/* On posix systems, the flow of the program starts right here, with + * ENTRYPOINT being a #define that defines main(). On Windows, ENTRYPOINT + * defines smain() and the real main() is in the service code under + * win32service.cpp. This allows the service control manager to control + * the process where we are running as a windows service. + */ +ENTRYPOINT +{ + SI = new InspIRCd(argc, argv); + mysig = &SI->s_signal; + SI->Run(); + delete SI; + return 0; +}