X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=527eb95b08bf865429908033b93124b2281e9ef3;hb=93b0661ddaebc82df76e0268ebe0ab0c17f7cbc7;hp=d152e5d1a24b934cd4c44fc464329fc95bda416d;hpb=6087d621f732289966d52e253477e3faa8e3f1bb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index d152e5d1a..527eb95b0 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -11,6 +11,8 @@ * --------------------------------------------------- */ +/* w00t was here. ;p */ + /* $Install: src/inspircd $(BINPATH) */ #include "inspircd.h" #include @@ -33,6 +35,9 @@ #include #include #endif + + #include // setuid + #include // setgid #endif #include @@ -46,13 +51,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 @@ -75,8 +84,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 void DeleteZero(T* n) +{ + if (n != NULL) + { + delete n; + n = NULL; + } +} + void InspIRCd::Cleanup() { if (Config) @@ -93,7 +115,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(); } @@ -119,102 +141,27 @@ void InspIRCd::Cleanup() 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 - if (this->Users) - { - delete this->Users; - this->Users = 0; - } - - if (this->Modes) - { - delete this->Modes; - this->Modes = 0; - } - - if (this->XLines) - { - delete this->XLines; - this->XLines = 0; - } - - if (this->Parser) - { - delete this->Parser; - this->Parser = 0; - - if (this->stats) - { - delete this->stats; - this->stats = 0; - } - - if (this->Modules) - { - delete this->Modules; - this->Modules = 0; - } - - if (this->BanCache) - delete this->BanCache; - this->BanCache = 0; - } - - if (this->SNO) - { - delete this->SNO; - this->SNO = 0; - } - - if (this->Config) - { - delete this->Config; - this->Config = 0; - } - - if (this->Res) - { - delete this->Res; - this->Res = 0; - } - - if (this->chanlist) - { - delete chanlist; - chanlist = 0; - } - - if (this->PI) - { - delete this->PI; - this->PI = 0; - } - - if (this->Threads) - { - delete this->Threads; - this->Threads = 0; - } - - /* Needs to be deleted after Res, DNS has a timer */ - if (this->Timers) - { - delete this->Timers; - this->Timers = 0; - } - + /* 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); - if (this->Logs) - { - delete this->Logs; - this->Logs = 0; - } + delete RehashFinishMutex; } void InspIRCd::Restart(const std::string &reason) @@ -351,7 +298,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; @@ -437,6 +385,8 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Modes = 0; this->Res = 0; + // Initialise TIME + this->TIME = time(NULL); memset(&server, 0, sizeof(server)); memset(&client, 0, sizeof(client)); @@ -451,6 +401,7 @@ InspIRCd::InspIRCd(int argc, char** argv) 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); @@ -570,16 +521,26 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!ServerConfig::FileExists(this->ConfigFileName)) { - 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); +#ifdef WIN32 + /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */ + if (ServerConfig::FileExists(this->ConfigFileName + ".txt")) + { + 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;32mpippijn, peavey, aquanight, fez, psychon, dz\033[0m\n\n"); printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); Config->ClearStack(); @@ -618,10 +579,15 @@ InspIRCd::InspIRCd(int argc, char** argv) /* During startup we don't actually initialize this * in the thread engine. */ - this->ConfigThread = new ConfigReaderThread(this, true, NULL); + 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); @@ -668,22 +634,15 @@ InspIRCd::InspIRCd(int argc, char** argv) 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 an IP instead of blank or *\n\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()); } } @@ -705,7 +664,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); @@ -723,10 +682,71 @@ InspIRCd::InspIRCd(int argc, char** argv) WindowsForkKillOwner(this); 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()); +#ifndef WIN32 + if (*(this->Config->SetGroup)) + { + int ret; + + // 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; + + errno = 0; + g = getgrnam(this->Config->SetGroup); + + if (!g) + { + this->Logs->Log("SETGUID", DEFAULT, "getgrnam() failed (bad user?): %s", strerror(errno)); + this->QuickExit(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); } @@ -740,6 +760,8 @@ int InspIRCd::Run() Exit(0); } + RehashFinishMutex = Mutexes->CreateMutex(); + while (true) { #ifndef WIN32 @@ -751,21 +773,22 @@ int InspIRCd::Run() #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 */ - this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up..."); - /* 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; + /* 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. + * 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!!! @@ -775,9 +798,18 @@ int InspIRCd::Run() this->Res->Rehash(); this->ResetMaxBans(); InitializeDisabledCommands(Config->DisabledCommands, this); - FOREACH_MOD_I(this, I_OnRehash, OnRehash(Config->RehashUser, Config->RehashParameter)); + 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. @@ -792,9 +824,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('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('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)OLDTIME-TIME); + SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME - OLDTIME); } if ((TIME % 3600) == 0) @@ -866,15 +903,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) @@ -898,3 +926,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; +}