X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=b75a91715c8ffeb613f4ab17d8b97d960402565e;hb=be70931a50f23c68e055602facce5736775f3fab;hp=9084f8277da38bf83dc86a7a40cd646f7dc6b37b;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 9084f8277..b75a91715 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1,82 +1,43 @@ -/* --------------------------------------------------------------------- - * - * +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; you can redistribute - * it and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation, version 2 - * (two) ONLY. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is free but copyrighted software; see + * the file COPYING for details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * --------------------------------------------------------------------- + * --------------------------------------------------- */ -#include -#include "inspircd_config.h" #include "inspircd.h" #include "configreader.h" -#include -#include -#include #include -#include -#include +#include #include -#include -#include -#include -#include #include -#include -#include -#include "users.h" -#include "ctables.h" -#include "globals.h" +#include #include "modules.h" -#include "dynamic.h" -#include "wildcard.h" #include "mode.h" -#include "commands.h" #include "xline.h" -#include "inspstring.h" - -#include "hashcomp.h" #include "socketengine.h" #include "inspircd_se_config.h" -#include "userprocess.h" #include "socket.h" #include "typedefs.h" #include "command_parse.h" +#include "exitcodes.h" +#include +#include + using irc::sockets::NonBlocking; +using irc::sockets::Blocking; using irc::sockets::insp_ntoa; using irc::sockets::insp_inaddr; using irc::sockets::insp_sockaddr; -InspIRCd* ServerInstance = NULL; - -int iterations = 0; - -insp_sockaddr client, server; -socklen_t length; - -char lowermap[255]; +InspIRCd* SI = NULL; void InspIRCd::AddServerName(const std::string &servername) { @@ -106,48 +67,156 @@ bool InspIRCd::FindServerName(const std::string &servername) void InspIRCd::Exit(int status) { - if (ServerInstance->Config->log_file) - fclose(ServerInstance->Config->log_file); - ServerInstance->SendError("Server shutdown."); + if (SI) + { + SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")"); + SI->Cleanup(); + } exit (status); } +void InspIRCd::Cleanup() +{ + std::vector mymodnames; + int MyModCount = this->GetModuleCount(); + + 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 + * a chance to be removed themsleves. + */ + for (int tries = 0; tries < 3; tries++) + { + MyModCount = this->GetModuleCount(); + 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]); + + for (int k = 0; k <= MyModCount; k++) + this->UnloadModule(mymodnames[k].c_str()); + } + + /* 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++) + (*i)->CloseSocket(); + + /* 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) + { + /* Will raise a SIGABRT if not trapped */ + throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno)); + } +} + void InspIRCd::Start() { printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); - printf("(C) ChatSpike Development team.\033[0m\n\n"); - printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\033[0m\n"); + printf("(C) InspIRCd Development Team.\033[0m\n\n"); + printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey\033[0m\n"); printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); - printf("Name concept:\t\t\033[1;32mLord_Zathras\033[0m\n\n"); } void InspIRCd::Rehash(int status) { - ServerInstance->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE)); - fclose(ServerInstance->Config->log_file); - ServerInstance->OpenLog(NULL,0); - ServerInstance->Config->Read(false,NULL); - FOREACH_MOD(I_OnRehash,OnRehash("")); + SI->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE)); + SI->CloseLog(); + SI->OpenLog(SI->Config->argv, SI->Config->argc); + SI->RehashUsersAndChans(); + FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect()); + SI->Config->Read(false,NULL); + 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(bool SEGVHandler) +void InspIRCd::SetSignals() { - signal (SIGALRM, SIG_IGN); - signal (SIGHUP, InspIRCd::Rehash); - signal (SIGPIPE, SIG_IGN); - signal (SIGTERM, InspIRCd::Exit); + signal(SIGALRM, SIG_IGN); + signal(SIGHUP, InspIRCd::Rehash); + signal(SIGPIPE, SIG_IGN); + signal(SIGTERM, InspIRCd::Exit); + signal(SIGCHLD, SIG_IGN); } bool InspIRCd::DaemonSeed() { int childpid; if ((childpid = fork ()) < 0) - return (ERROR); + return false; else if (childpid > 0) { - /* We wait a few seconds here, so that the shell prompt doesnt come back over the output */ - sleep(6); - exit (0); + /* We wait here for the child process to kill us, + * so that the shell prompt doesnt come back over + * the output. + * Sending a kill with a signal of 0 just checks + * if the child pid is still around. If theyre not, + * they threw an error and we should give up. + */ + while (kill(childpid, 0) != -1) + sleep(1); + exit(0); } setsid (); umask (007); @@ -165,13 +234,24 @@ bool InspIRCd::DaemonSeed() if (setrlimit(RLIMIT_CORE, &rl) == -1) this->Log(DEFAULT,"setrlimit() failed, cannot increase coredump size."); } - + return true; } void InspIRCd::WritePID(const std::string &filename) { - std::ofstream outfile(filename.c_str()); + std::string fname = (filename.empty() ? "inspircd.pid" : filename); + if (*(fname.begin()) != '/') + { + std::string::size_type pos; + std::string confpath = CONFIG_FILE; + if ((pos = confpath.find("/inspircd.conf")) != std::string::npos) + { + /* Leaves us with just the path */ + fname = confpath.substr(0, pos) + std::string("/") + fname; + } + } + std::ofstream outfile(fname.c_str()); if (outfile.is_open()) { outfile << getpid(); @@ -179,9 +259,9 @@ void InspIRCd::WritePID(const std::string &filename) } else { - printf("Failed to write PID-file '%s', exiting.\n",filename.c_str()); - this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",filename.c_str()); - Exit(0); + 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(EXIT_STATUS_PID); } } @@ -193,83 +273,83 @@ std::string InspIRCd::GetRevision() InspIRCd::InspIRCd(int argc, char** argv) : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365) { - bool SEGVHandler = false; - ServerInstance = this; + 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); this->Start(); - this->module_sockets.clear(); this->TIME = this->OLDTIME = this->startup_time = time(NULL); + 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],"-nolimit")) - { - printf("WARNING: The `-nolimit' option is deprecated, and now on by default. This behaviour may change in the future.\n"); - } - else if (!strcmp(argv[i],"-notraceback")) - { - SEGVHandler = false; - } - 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] [-nolimit] [-notraceback] [-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; } } - strlcpy(Config->MyExecutable,argv[0],MAXBUF); + /* Set the finished argument values */ + Config->nofork = do_nofork; + Config->forcedebug = do_debug; + Config->writelog = !do_nolog; - this->MakeLowerMap(); + strlcpy(Config->MyExecutable,argv[0],MAXBUF); - OpenLog(argv, argc); + 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); @@ -278,7 +358,7 @@ InspIRCd::InspIRCd(int argc, char** argv) this->AddServerName(Config->ServerName); CheckDie(); InitializeDisabledCommands(Config->DisabledCommands, this); - stats->BoundPortCount = BindPorts(true); + stats->BoundPortCount = BindPorts(true, found_ports, pl); for(int t = 0; t < 255; t++) Config->global_implementation[t] = 0; @@ -286,13 +366,13 @@ InspIRCd::InspIRCd(int argc, char** argv) memset(&Config->implement_lists,0,sizeof(Config->implement_lists)); printf("\n"); - this->SetSignals(SEGVHandler); + this->SetSignals(); if (!Config->nofork) { if (!this->DaemonSeed()) { printf("ERROR: could not go into daemon mode. Shutting down.\n"); - Exit(ERROR); + Exit(EXIT_STATUS_FORK); } } @@ -303,9 +383,55 @@ InspIRCd::InspIRCd(int argc, char** argv) SE = SEF->Create(this); delete SEF; - /* We must load the modules AFTER initializing the socket engine, now */ + this->Res = new DNS(this); + + this->LoadAllModules(); + /* Just in case no modules were loaded - fix for bug #101 */ + this->BuildISupport(); + + 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(EXIT_STATUS_BIND); + } + + if (stats->BoundPortCount != (unsigned int)found_ports) + { + printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %ld of %d client ports bound.\n\n", stats->BoundPortCount, found_ports); + printf("The following port%s failed to bind:\n", found_ports - stats->BoundPortCount != 1 ? "s" : ""); + 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); + } + } + + /* Add the listening sockets used for client inbound connections + * to the socket engine + */ + this->Log(DEBUG,"%d listeners",stats->BoundPortCount); + for (unsigned long count = 0; count < stats->BoundPortCount; count++) + { + this->Log(DEBUG,"Add listener: %d",Config->openSockfd[count]->GetFd()); + if (!SE->AddFd(Config->openSockfd[count])) + { + printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n"); + Exit(EXIT_STATUS_INTERNAL); + } + } + + if (!Config->nofork) + { + if (kill(getppid(), SIGTERM) == -1) + printf("Error killing parent process: %s\n",strerror(errno)); + fclose(stdin); + fclose(stderr); + fclose(stdout); + } + + printf("\nInspIRCd is now running!\n"); - return; + this->WritePID(Config->PID); } std::string InspIRCd::GetVersionString() @@ -335,6 +461,7 @@ void InspIRCd::EraseFactory(int j) { if (v == j) { + delete *t; factory.erase(t); factory.push_back(NULL); return; @@ -455,11 +582,12 @@ void InspIRCd::BuildISupport() { // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it... std::stringstream v; - v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1; + v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1; v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN="; - v << MAXAWAY << " CHANMODES=b,k,l,psmnti FNC NETWORK=" << Config->Network << " MAXPARA=32"; + v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32"; Config->data005 = v.str(); - FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005)); + FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005)); + Config->Update005(); } bool InspIRCd::UnloadModule(const char* filename) @@ -475,17 +603,31 @@ bool InspIRCd::UnloadModule(const char* filename) snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)"); return false; } + std::pair intercount = GetInterfaceInstanceCount(modules[j]); + if (intercount.first > 0) + { + this->Log(DEFAULT,"Failed to unload module %s, being used by %d other(s) via interface '%s'",filename, intercount.first, intercount.second.c_str()); + snprintf(MODERR,MAXBUF,"Module not unloadable (Still in use by %d other module%s which %s using its interface '%s') -- unload dependent modules first!", + intercount.first, + intercount.first > 1 ? "s" : "", + intercount.first > 1 ? "are" : "is", + intercount.second.c_str()); + 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); } - FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j])); + /* Tidy up any dangling resolvers */ + this->Res->CleanResolvers(modules[j]); + + FOREACH_MOD_I(this,I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j])); for(int t = 0; t < 255; t++) { @@ -503,11 +645,8 @@ bool InspIRCd::UnloadModule(const char* filename) } // found the module - this->Log(DEBUG,"Removing dependent commands..."); Parser->RemoveCommands(filename); - this->Log(DEBUG,"Deleting module..."); this->EraseModule(j); - this->Log(DEBUG,"Erasing module entry..."); this->EraseFactory(j); this->Log(DEFAULT,"Module %s unloaded",filename); this->ModCount--; @@ -522,28 +661,50 @@ bool InspIRCd::UnloadModule(const char* filename) bool InspIRCd::LoadModule(const char* filename) { + /* Do we have a glob pattern in the filename? + * The user wants to load multiple modules which + * match the pattern. + */ + if (strchr(filename,'*') || (strchr(filename,'?'))) + { + int n_match = 0; + DIR* library = opendir(Config->ModPath); + if (library) + { + /* Try and locate and load all modules matching the pattern */ + dirent* entry = NULL; + while ((entry = readdir(library))) + { + if (this->MatchText(entry->d_name, filename)) + { + if (!this->LoadModule(entry->d_name)) + n_match++; + } + } + closedir(library); + } + /* Loadmodule will now return false if any one of the modules failed + * to load (but wont abort when it encounters a bad one) and when 1 or + * more modules were actually loaded. + */ + return (n_match > 0); + } + char modfile[MAXBUF]; -#ifdef STATIC_LINK - strlcpy(modfile,filename,MAXBUF); -#else snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename); -#endif std::string filename_str = filename; -#ifndef STATIC_LINK -#ifndef IS_CYGWIN + if (!ServerConfig::DirValid(modfile)) { this->Log(DEFAULT,"Module %s is not within the modules directory.",modfile); snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile); return false; } -#endif -#endif this->Log(DEBUG,"Loading module: %s",modfile); -#ifndef STATIC_LINK + if (ServerConfig::FileExists(modfile)) { -#endif + for (unsigned int j = 0; j < Config->module_names.size(); j++) { if (Config->module_names[j] == filename_str) @@ -566,6 +727,22 @@ bool InspIRCd::LoadModule(const char* filename) if ((long)factory[this->ModCount+1]->factory != -1) { Module* m = factory[this->ModCount+1]->factory->CreateModule(this); + + Version v = m->GetVersion(); + + if (v.API != API_VERSION) + { + delete m; + delete a; + this->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION); + snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION); + return false; + } + else + { + this->Log(DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); + } + modules[this->ModCount+1] = m; /* save the module and the module's classfactory, if * this isnt done, random crashes can occur :/ */ @@ -587,13 +764,12 @@ bool InspIRCd::LoadModule(const char* filename) return false; } } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { this->Log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason()); - snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason()); + snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); return false; } -#ifndef STATIC_LINK } else { @@ -601,9 +777,8 @@ bool InspIRCd::LoadModule(const char* filename) snprintf(MODERR,MAXBUF,"Module file could not be found"); return false; } -#endif this->ModCount++; - FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str)); + FOREACH_MOD_I(this,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str)); // now work out which modules, if any, want to move to the back of the queue, // and if they do, move them there. std::vector put_to_back; @@ -613,251 +788,75 @@ bool InspIRCd::LoadModule(const char* filename) for (unsigned int j = 0; j < Config->module_names.size(); j++) { if (modules[j]->Prioritize() == PRIORITY_LAST) - { put_to_back.push_back(Config->module_names[j]); - } else if (modules[j]->Prioritize() == PRIORITY_FIRST) - { put_to_front.push_back(Config->module_names[j]); - } else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE) - { put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8]; - } else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER) - { put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8]; - } } for (unsigned int j = 0; j < put_to_back.size(); j++) - { MoveToLast(put_to_back[j]); - } for (unsigned int j = 0; j < put_to_front.size(); j++) - { MoveToFirst(put_to_front[j]); - } for (std::map::iterator j = put_before.begin(); j != put_before.end(); j++) - { MoveBefore(j->first,j->second); - } for (std::map::iterator j = put_after.begin(); j != put_after.end(); j++) - { MoveAfter(j->first,j->second); - } BuildISupport(); return true; } void InspIRCd::DoOneIteration(bool process_module_sockets) { - int activefds[MAX_DESCRIPTORS]; - int incomingSockfd; - int in_port; - userrec* cu = NULL; - InspSocket* s = NULL; - InspSocket* s_del = NULL; - unsigned int numberactive; - insp_sockaddr sock_us; // our port number - socklen_t uslen; // length of our port number + static rusage ru; /* 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 % 5) == 0) && (!expire_run)) - { - XLines->expire_lines(); - if (process_module_sockets) - { - FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME)); - } - Timers->TickMissedTimers(TIME); - expire_run = true; - return; - } - else if ((TIME % 5) == 1) - { - expire_run = false; - } - - if (iterations++ == 15) - { - iterations = 0; - this->DoBackgroundUserStuff(TIME); - } - - /* Once a second, do the background processing */ 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) { - irc::whowas::MaintainWhoWas(TIME); + this->RehashUsersAndChans(); + FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); + } + Timers->TickTimers(TIME); + this->DoBackgroundUserStuff(TIME); + + if ((TIME % 5) == 0) + { + XLines->expire_lines(); + FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); + Timers->TickMissedTimers(TIME); + } + + if (!getrusage(0, &ru)) + { + gettimeofday(&this->stats->LastSampled, NULL); + this->stats->LastCPU = ru.ru_utime; } } - /* Process timeouts on module sockets each time around - * the loop. There shouldnt be many module sockets, at - * most, 20 or so, so this won't be much of a performance - * hit at all. - */ - if (process_module_sockets) - this->DoSocketTimeouts(TIME); - - Timers->TickTimers(TIME); - /* 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. */ - if (!(numberactive = SE->Wait(activefds))) - return; - - /** - * Now process each of the fd's. For users, we have a fast - * lookup table which can find a user by file descriptor, so - * processing them by fd isnt expensive. If we have a lot of - * listening ports or module sockets though, things could get - * ugly. - */ - this->Log(DEBUG,"There are %d fd's to process.",numberactive); - - for (unsigned int activefd = 0; activefd < numberactive; activefd++) - { - int socket_type = SE->GetType(activefds[activefd]); - switch (socket_type) - { - case X_ESTAB_CLIENT: - - this->Log(DEBUG,"Type: X_ESTAB_CLIENT: fd=%d",activefds[activefd]); - cu = this->fd_ref_table[activefds[activefd]]; - if (cu) - this->ProcessUser(cu); - - break; - - case X_ESTAB_MODULE: - - this->Log(DEBUG,"Type: X_ESTAB_MODULE: fd=%d",activefds[activefd]); - - if (!process_module_sockets) - break; - - /* Process module-owned sockets. - * Modules are encouraged to inherit their sockets from - * InspSocket so we can process them neatly like this. - */ - s = this->socket_ref[activefds[activefd]]; - - if ((s) && (!s->Poll())) - { - this->Log(DEBUG,"Socket poll returned false, close and bail"); - SE->DelFd(s->GetFd()); - this->socket_ref[activefds[activefd]] = NULL; - for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) - { - s_del = *a; - if ((s_del) && (s_del->GetFd() == activefds[activefd])) - { - module_sockets.erase(a); - break; - } - } - s->Close(); - DELETE(s); - } - else if (!s) - { - this->Log(DEBUG,"WTF, X_ESTAB_MODULE for nonexistent InspSocket, removed!"); - SE->DelFd(s->GetFd()); - } - break; - - case X_ESTAB_DNS: - /* Handles instances of the Resolver class, - * a simple class extended by modules and the core for - * nonblocking resolving of addresses. - */ - this->Res->MarshallReads(activefds[activefd]); - break; - - case X_LISTEN: - - this->Log(DEBUG,"Type: X_LISTEN: fd=%d",activefds[activefd]); - - /* It's a listener */ - uslen = sizeof(sock_us); - length = sizeof(client); - incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length); - - if ((incomingSockfd > -1) && (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen))) - { -#ifdef IPV6 - in_port = ntohs(sock_us.sin6_port); -#else - in_port = ntohs(sock_us.sin_port); -#endif - this->Log(DEBUG,"Accepted socket %d",incomingSockfd); - /* Years and years ago, we used to resolve here - * using gethostbyaddr(). That is sucky and we - * don't do that any more... - */ - NonBlocking(incomingSockfd); - if (Config->GetIOHook(in_port)) - { - try - { -#ifdef IPV6 - Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin6_addr), in_port); -#else - Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port); -#endif - } - catch (ModuleException& modexcept) - { - this->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); - } - } - stats->statsAccept++; -#ifdef IPV6 - this->Log(DEBUG,"Add ipv6 client"); - userrec::AddClient(this, incomingSockfd, in_port, false, client.sin6_addr); -#else - this->Log(DEBUG,"Add ipv4 client"); - userrec::AddClient(this, incomingSockfd, in_port, false, client.sin_addr); -#endif - this->Log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd); - } - else - { - this->Log(DEBUG,"Accept failed on fd %d: %s",incomingSockfd,strerror(errno)); - shutdown(incomingSockfd,2); - close(incomingSockfd); - stats->statsRefused++; - } - break; - - default: - /* Something went wrong if we're in here. - * In fact, so wrong, im not quite sure - * what we would do, so for now, its going - * to safely do bugger all. - */ - this->Log(DEBUG,"Type: X_WHAT_THE_FUCK_BBQ: fd=%d",activefds[activefd]); - SE->DelFd(activefds[activefd]); - break; - } - } + SE->DispatchEvents(); } bool InspIRCd::IsIdent(const char* n) @@ -881,76 +880,8 @@ bool InspIRCd::IsIdent(const char* n) } -bool InspIRCd::IsNick(const char* n) -{ - if (!n || !*n) - return false; - - int p = 0; - for (char* i = (char*)n; *i; i++, p++) - { - /* "A"-"}" can occur anywhere in a nickname */ - if ((*i >= 'A') && (*i <= '}')) - { - continue; - } - /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */ - if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n)) - { - continue; - } - /* invalid character! abort */ - return false; - } - return (p < NICKMAX - 1); -} - int InspIRCd::Run() { - this->Res = new DNS(this); - - this->Log(DEBUG,"RES: %08x",this->Res); - - this->LoadAllModules(); - - /* Just in case no modules were loaded - fix for bug #101 */ - this->BuildISupport(); - - if (!stats->BoundPortCount) - { - printf("\nI couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); - Exit(ERROR); - } - - /* Add the listening sockets used for client inbound connections - * to the socket engine - */ - this->Log(DEBUG,"%d listeners",stats->BoundPortCount); - for (unsigned long count = 0; count < stats->BoundPortCount; count++) - { - this->Log(DEBUG,"Add listener: %d",Config->openSockfd[count]); - if (!SE->AddFd(Config->openSockfd[count],true,X_LISTEN)) - { - printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n"); - Exit(ERROR); - } - } - - if (!Config->nofork) - { - fclose(stdout); - fclose(stderr); - fclose(stdin); - } - - printf("\nInspIRCd is now running!\n"); - - this->WritePID(Config->PID); - - /* main loop, this never returns */ - expire_run = false; - iterations = 0; - while (true) { DoOneIteration(true); @@ -967,9 +898,9 @@ int InspIRCd::Run() int main(int argc, char** argv) { - ServerInstance = new InspIRCd(argc, argv); - ServerInstance->Run(); - delete ServerInstance; + SI = new InspIRCd(argc, argv); + SI->Run(); + delete SI; return 0; } @@ -999,8 +930,116 @@ int InspIRCd::GetModuleCount() return this->ModCount; } -time_t InspIRCd::Time() +time_t InspIRCd::Time(bool delta) { + if (delta) + return TIME + time_delta; return TIME; } +int InspIRCd::SetTimeDelta(int delta) +{ + int old = time_delta; + time_delta += delta; + this->Log(DEBUG, "Time delta set to %d (was %d)", time_delta, old); + return old; +} + +void InspIRCd::AddLocalClone(userrec* user) +{ + clonemap::iterator x = local_clones.find(user->GetIPString()); + if (x != local_clones.end()) + x->second++; + else + local_clones[user->GetIPString()] = 1; +} + +void InspIRCd::AddGlobalClone(userrec* user) +{ + clonemap::iterator y = global_clones.find(user->GetIPString()); + if (y != global_clones.end()) + y->second++; + else + global_clones[user->GetIPString()] = 1; +} + +int InspIRCd::GetTimeDelta() +{ + return time_delta; +} + +bool FileLogger::Readable() +{ + return false; +} + +void FileLogger::HandleEvent(EventType et, int errornum) +{ + this->WriteLogLine(""); + if (log) + ServerInstance->SE->DelFd(this); +} + +void FileLogger::WriteLogLine(const std::string &line) +{ + if (line.length()) + buffer.append(line); + + if (log) + { + int written = fprintf(log,"%s",buffer.c_str()); + if ((written >= 0) && (written < (int)buffer.length())) + { + buffer.erase(0, buffer.length()); + ServerInstance->SE->AddFd(this); + } + else if (written == -1) + { + if (errno == EAGAIN) + ServerInstance->SE->AddFd(this); + } + else + { + /* Wrote the whole buffer, and no need for write callback */ + buffer = ""; + } + } + if (writeops++ % 20) + { + fflush(log); + } +} + +void FileLogger::Close() +{ + if (log) + { + int flags = fcntl(fileno(log), F_GETFL, 0); + 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 = ""; +} + +FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0) +{ + if (log) + { + irc::sockets::NonBlocking(fileno(log)); + this->SetFd(fileno(log)); + buffer = ""; + } +} + +FileLogger::~FileLogger() +{ + this->Close(); +} +