X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finspircd.cpp;h=b75a91715c8ffeb613f4ab17d8b97d960402565e;hb=be70931a50f23c68e055602facce5736775f3fab;hp=876bf7f29fbcbb90c63943ccd061980457232401;hpb=c1316150a7b0679494828b8acab8c8fa2c35fa7b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 876bf7f29..b75a91715 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include "modules.h" #include "mode.h" #include "xline.h" @@ -25,7 +26,10 @@ #include "socket.h" #include "typedefs.h" #include "command_parse.h" +#include "exitcodes.h" #include +#include + using irc::sockets::NonBlocking; using irc::sockets::Blocking; @@ -63,25 +67,29 @@ bool InspIRCd::FindServerName(const std::string &servername) void InspIRCd::Exit(int status) { + if (SI) + { + SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")"); + SI->Cleanup(); + } exit (status); } -void InspIRCd::Restart(const std::string &reason) +void InspIRCd::Cleanup() { std::vector mymodnames; int MyModCount = this->GetModuleCount(); - /* SendError flushes each client's queue, - * regardless of writeability state - */ - this->SendError(reason); - for (unsigned int i = 0; i < stats->BoundPortCount; i++) + { /* This calls the constructor and closes the listening socket */ delete Config->openSockfd[i]; + Config->openSockfd[i] = NULL; + } + stats->BoundPortCount = 0; /* 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 + * chance to be unhooked by the modules using them, but then get * a chance to be removed themsleves. */ for (int tries = 0; tries < 3; tries++) @@ -101,11 +109,21 @@ void InspIRCd::Restart(const std::string &reason) for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) (*i)->CloseSocket(); - /* Figure out our filename (if theyve renamed it, we're boned) */ - std::string me = Config->MyDir + "/inspircd"; - /* Close logging */ this->Logger->Close(); +} + +void InspIRCd::Restart(const std::string &reason) +{ + /* SendError flushes each client's queue, + * regardless of writeability state + */ + this->SendError(reason); + + this->Cleanup(); + + /* Figure out our filename (if theyve renamed it, we're boned) */ + std::string me = Config->MyDir + "/inspircd"; if (execv(me.c_str(), Config->argv) == -1) { @@ -125,10 +143,52 @@ void InspIRCd::Start() void InspIRCd::Rehash(int status) { SI->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE)); - fclose(SI->Config->log_file); - SI->OpenLog(NULL,0); + SI->CloseLog(); + SI->OpenLog(SI->Config->argv, SI->Config->argc); + SI->RehashUsersAndChans(); + FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect()); SI->Config->Read(false,NULL); - FOREACH_MOD_I(SI,I_OnRehash,OnRehash("")); + SI->ResetMaxBans(); + SI->Res->Rehash(); + FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,"")); +} + +void InspIRCd::ResetMaxBans() +{ + for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++) + i->second->ResetMaxBans(); +} + + +/** Because hash_map doesnt free its buckets when we delete items (this is a 'feature') + * we must occasionally rehash the hash (yes really). + * We do this by copying the entries from the old hash to a new hash, causing all + * empty buckets to be weeded out of the hash. We dont do this on a timer, as its + * very expensive, so instead we do it when the user types /REHASH and expects a + * short delay anyway. + */ +void InspIRCd::RehashUsersAndChans() +{ + user_hash* old_users = this->clientlist; + chan_hash* old_chans = this->chanlist; + + this->clientlist = new user_hash(); + this->chanlist = new chan_hash(); + + for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++) + this->clientlist->insert(*n); + + delete old_users; + + for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++) + this->chanlist->insert(*n); + + delete old_chans; +} + +void InspIRCd::CloseLog() +{ + this->Logger->Close(); } void InspIRCd::SetSignals() @@ -156,7 +216,7 @@ bool InspIRCd::DaemonSeed() */ while (kill(childpid, 0) != -1) sleep(1); - exit(ERROR); + exit(0); } setsid (); umask (007); @@ -201,7 +261,7 @@ void InspIRCd::WritePID(const std::string &filename) { 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()); - Exit(0); + Exit(EXIT_STATUS_PID); } } @@ -215,11 +275,22 @@ InspIRCd::InspIRCd(int argc, char** argv) { int found_ports = 0; FailedPortList pl; + int do_nofork = 0, do_debug = 0, do_nolog = 0; /* flag variables */ + char c = 0; modules.resize(255); factory.resize(255); - + + this->unregistered_count = 0; + + this->clientlist = new user_hash(); + this->chanlist = new chan_hash(); + this->Config = new ServerConfig(this); + + this->Config->argv = argv; + this->Config->argc = argc; + this->Config->opertypes.clear(); this->Config->operclass.clear(); this->SNO = new SnomaskManager(this); @@ -228,62 +299,57 @@ InspIRCd::InspIRCd(int argc, char** argv) this->time_delta = 0; this->next_call = this->TIME + 3; srand(this->TIME); - this->Log(DEBUG,"*** InspIRCd starting up!"); + if (!ServerConfig::FileExists(CONFIG_FILE)) { printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE); this->Log(DEFAULT,"main: no config"); printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n"); - Exit(ERROR); + Exit(EXIT_STATUS_CONFIG); } + *this->LogFileName = 0; - if (argc > 1) { - for (int i = 1; i < argc; i++) + + struct option longopts[] = + { + { "nofork", no_argument, &do_nofork, 1 }, + { "logfile", required_argument, NULL, 'f' }, + { "debug", no_argument, &do_debug, 1 }, + { "nolog", no_argument, &do_nolog, 1 }, + { 0, 0, 0, 0 } + }; + + while ((c = getopt_long_only(argc, argv, ":f:", longopts, NULL)) != -1) + { + switch (c) { - if (!strcmp(argv[i],"-nofork")) - { - Config->nofork = true; - } - else if(!strcmp(argv[i],"-debug")) - { - Config->forcedebug = true; - } - else if(!strcmp(argv[i],"-nolog")) - { - Config->writelog = false; - } - else if (!strcmp(argv[i],"-wait")) - { - sleep(6); - } - else if (!strcmp(argv[i],"-logfile")) - { - if (argc > i+1) - { - strlcpy(LogFileName,argv[i+1],MAXBUF); - printf("LOG: Setting logfile to %s\n",LogFileName); - } - else - { - printf("ERROR: The -logfile parameter must be followed by a log file name and path.\n"); - Exit(ERROR); - } - i++; - } - else - { - printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-logfile ]\n",argv[0]); - Exit(ERROR); - } + case 'f': + /* Log filename was set */ + strlcpy(LogFileName, optarg, MAXBUF); + printf("LOG: Setting logfile to %s\n", LogFileName); + break; + case 0: + /* getopt_long_only() set an int variable, just keep going */ + break; + default: + /* Unknown parameter! DANGER, INTRUDER.... err.... yeah. */ + printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile ]\n", argv[0]); + Exit(EXIT_STATUS_ARGV); + break; } } + /* Set the finished argument values */ + Config->nofork = do_nofork; + Config->forcedebug = do_debug; + Config->writelog = !do_nolog; + strlcpy(Config->MyExecutable,argv[0],MAXBUF); this->OpenLog(argv, argc); this->stats = new serverstats(); - this->Parser = new CommandParser(this); this->Timers = new TimerManager(); + this->Parser = new CommandParser(this); this->XLines = new XLineManager(this); Config->ClearStack(); Config->Read(true, NULL); @@ -306,7 +372,7 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!this->DaemonSeed()) { printf("ERROR: could not go into daemon mode. Shutting down.\n"); - Exit(ERROR); + Exit(EXIT_STATUS_FORK); } } @@ -326,7 +392,7 @@ InspIRCd::InspIRCd(int argc, char** argv) if ((stats->BoundPortCount == 0) && (found_ports > 0)) { printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); - Exit(ERROR); + Exit(EXIT_STATUS_BIND); } if (stats->BoundPortCount != (unsigned int)found_ports) @@ -350,7 +416,7 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!SE->AddFd(Config->openSockfd[count])) { printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n"); - Exit(ERROR); + Exit(EXIT_STATUS_INTERNAL); } } @@ -549,11 +615,11 @@ bool InspIRCd::UnloadModule(const char* filename) return false; } /* Give the module a chance to tidy out all its metadata */ - for (chan_hash::iterator c = this->chanlist.begin(); c != this->chanlist.end(); c++) + for (chan_hash::iterator c = this->chanlist->begin(); c != this->chanlist->end(); c++) { modules[j]->OnCleanup(TYPE_CHANNEL,c->second); } - for (user_hash::iterator u = this->clientlist.begin(); u != this->clientlist.end(); u++) + for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++) { modules[j]->OnCleanup(TYPE_USER,u->second); } @@ -763,7 +829,8 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME)); if ((TIME % 3600) == 0) { - irc::whowas::MaintainWhoWas(this, TIME); + this->RehashUsersAndChans(); + FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); } Timers->TickTimers(TIME); this->DoBackgroundUserStuff(TIME); @@ -909,7 +976,8 @@ bool FileLogger::Readable() void FileLogger::HandleEvent(EventType et, int errornum) { this->WriteLogLine(""); - ServerInstance->SE->DelFd(this); + if (log) + ServerInstance->SE->DelFd(this); } void FileLogger::WriteLogLine(const std::string &line) @@ -950,18 +1018,24 @@ void FileLogger::Close() fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK); if (buffer.size()) fprintf(log,"%s",buffer.c_str()); + + ServerInstance->SE->DelFd(this); + fflush(log); fclose(log); } + buffer = ""; - ServerInstance->SE->DelFd(this); } FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0) { - irc::sockets::NonBlocking(fileno(log)); - this->SetFd(fileno(log)); - buffer = ""; + if (log) + { + irc::sockets::NonBlocking(fileno(log)); + this->SetFd(fileno(log)); + buffer = ""; + } } FileLogger::~FileLogger()