X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=8c297af07b45b2e65093b9bd3eddfd933e89ce41;hb=ed105d7fef72b5bb5f23e72fae40d6b4ffdcb5b8;hp=a2b4e0d92e2c1e7ea67917c9a3d06196c5787752;hpb=f4a4901fee693791493c340fd380658a24d4cf26;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index a2b4e0d92..8c297af07 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1,13 +1,13 @@ /* --------------------------------------------------------------------- * - * +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ + * +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * 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 @@ -27,83 +27,39 @@ * --------------------------------------------------------------------- */ -#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 "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "message.h" #include "mode.h" -#include "commands.h" #include "xline.h" -#include "inspstring.h" -#include "helperfuncs.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 -InspIRCd* ServerInstance; +using irc::sockets::NonBlocking; +using irc::sockets::Blocking; +using irc::sockets::insp_ntoa; +using irc::sockets::insp_inaddr; +using irc::sockets::insp_sockaddr; -extern ModuleList modules; -extern FactoryList factory; +InspIRCd* SI = NULL; -std::vector module_sockets; -std::vector local_users; - -extern int MODCOUNT; -extern char LOG_FILE[MAXBUF]; - -int iterations = 0; - -insp_sockaddr client, server; -socklen_t length; - -extern InspSocket* socket_ref[MAX_DESCRIPTORS]; -time_t TIME = time(NULL), OLDTIME = time(NULL); - -// This table references users by file descriptor. -// its an array to make it VERY fast, as all lookups are referenced -// by an integer, meaning there is no need for a scan/search operation. -userrec* fd_ref_table[MAX_DESCRIPTORS]; -Server* MyServer = new Server; -ServerConfig *Config = new ServerConfig; -user_hash clientlist; -chan_hash chanlist; -servernamelist servernames; -char lowermap[255]; - -void AddServerName(const std::string &servername) +void InspIRCd::AddServerName(const std::string &servername) { - log(DEBUG,"Adding server name: %s",servername.c_str()); + this->Log(DEBUG,"Adding server name: %s",servername.c_str()); if(find(servernames.begin(), servernames.end(), servername) == servernames.end()) servernames.push_back(servername); /* Wasn't already there. */ } -const char* FindServerNamePtr(const std::string &servername) +const char* InspIRCd::FindServerNamePtr(const std::string &servername) { servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername); @@ -116,16 +72,13 @@ const char* FindServerNamePtr(const std::string &servername) return iter->c_str(); } -bool FindServerName(const std::string &servername) +bool InspIRCd::FindServerName(const std::string &servername) { return (find(servernames.begin(), servernames.end(), servername) != servernames.end()); } -void Exit(int status) +void InspIRCd::Exit(int status) { - if (Config->log_file) - fclose(Config->log_file); - send_error("Server shutdown."); exit (status); } @@ -133,47 +86,46 @@ 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("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 Killed(int status) +void InspIRCd::Rehash(int status) { - if (Config->log_file) - fclose(Config->log_file); - send_error("Server terminated."); - exit(status); -} - -void Rehash(int status) -{ - WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE)); - fclose(Config->log_file); - OpenLog(NULL,0); - Config->Read(false,NULL); - FOREACH_MOD(I_OnRehash,OnRehash("")); + SI->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE)); + fclose(SI->Config->log_file); + SI->OpenLog(NULL,0); + SI->Config->Read(false,NULL); + FOREACH_MOD_I(SI,I_OnRehash,OnRehash("")); } void InspIRCd::SetSignals() { - signal (SIGALRM, SIG_IGN); - signal (SIGHUP, Rehash); - signal (SIGPIPE, SIG_IGN); - signal (SIGTERM, Exit); - signal (SIGSEGV, Error); + 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(ERROR); } setsid (); umask (007); @@ -182,22 +134,33 @@ bool InspIRCd::DaemonSeed() rlimit rl; if (getrlimit(RLIMIT_CORE, &rl) == -1) { - log(DEFAULT,"Failed to getrlimit()!"); + this->Log(DEFAULT,"Failed to getrlimit()!"); return false; } else { rl.rlim_cur = rl.rlim_max; if (setrlimit(RLIMIT_CORE, &rl) == -1) - log(DEFAULT,"setrlimit() failed, cannot increase coredump size."); + 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(); @@ -205,8 +168,8 @@ void InspIRCd::WritePID(const std::string &filename) } else { - printf("Failed to write PID-file '%s', exiting.\n",filename.c_str()); - log(DEFAULT,"Failed to write PID-file '%s', exiting.",filename.c_str()); + 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); } } @@ -216,35 +179,33 @@ std::string InspIRCd::GetRevision() return REVISION; } -void InspIRCd::MakeLowerMap() -{ - // initialize the lowercase mapping table - for (unsigned int cn = 0; cn < 256; cn++) - lowermap[cn] = cn; - // lowercase the uppercase chars - for (unsigned int cn = 65; cn < 91; cn++) - lowermap[cn] = tolower(cn); - // now replace the specific chars for scandanavian comparison - lowermap[(unsigned)'['] = '{'; - lowermap[(unsigned)']'] = '}'; - lowermap[(unsigned)'\\'] = '|'; -} - 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) { + int found_ports = 0; + FailedPortList pl; + + modules.resize(255); + factory.resize(255); + + this->Config = new ServerConfig(this); + this->Config->opertypes.clear(); + this->Config->operclass.clear(); + this->SNO = new SnomaskManager(this); this->Start(); - module_sockets.clear(); - this->startup_time = time(NULL); - srand(time(NULL)); - log(DEBUG,"*** InspIRCd starting up!"); - if (!FileExists(CONFIG_FILE)) + 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); - log(DEFAULT,"main: no config"); + this->Log(DEFAULT,"main: no config"); printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n"); Exit(ERROR); } - *LOG_FILE = 0; + *this->LogFileName = 0; if (argc > 1) { for (int i = 1; i < argc; i++) { @@ -264,41 +225,43 @@ InspIRCd::InspIRCd(int argc, char** argv) { 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],"-logfile")) { if (argc > i+1) { - strlcpy(LOG_FILE,argv[i+1],MAXBUF); - printf("LOG: Setting logfile to %s\n",LOG_FILE); + 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); } } } strlcpy(Config->MyExecutable,argv[0],MAXBUF); - this->MakeLowerMap(); - - OpenLog(argv, argc); + this->OpenLog(argv, argc); this->stats = new serverstats(); - this->Parser = new CommandParser(); + this->Parser = new CommandParser(this); + this->Timers = new TimerManager(); + this->XLines = new XLineManager(this); Config->ClearStack(); - Config->Read(true,NULL); - CheckRoot(); - this->ModeGrok = new ModeParser(); - AddServerName(Config->ServerName); + Config->Read(true, NULL); + this->CheckRoot(); + this->Modes = new ModeParser(this); + 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; @@ -320,12 +283,58 @@ InspIRCd::InspIRCd(int argc, char** argv) * initialize the socket engine. */ SocketEngineFactory* SEF = new SocketEngineFactory(); - SE = SEF->Create(); + 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(ERROR); + } + + 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(ERROR); + } + } + + 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() @@ -355,6 +364,7 @@ void InspIRCd::EraseFactory(int j) { if (v == j) { + delete *t; factory.erase(t); factory.push_back(NULL); return; @@ -366,7 +376,7 @@ void InspIRCd::EraseFactory(int j) void InspIRCd::EraseModule(int j) { int v1 = 0; - for (std::vector::iterator m = modules.begin(); m!= modules.end(); m++) + for (ModuleList::iterator m = modules.begin(); m!= modules.end(); m++) { if (v1 == j) { @@ -397,7 +407,7 @@ void InspIRCd::MoveTo(std::string modulename,int slot) { if (Config->module_names[v] == modulename) { - // found an instance, swap it with the item at MODCOUNT + // found an instance, swap it with the item at the end v2 = v; break; } @@ -426,7 +436,7 @@ void InspIRCd::MoveTo(std::string modulename,int slot) } else { - log(DEBUG,"Move of %s to slot failed!",modulename.c_str()); + this->Log(DEBUG,"Move of %s to slot failed!",modulename.c_str()); } } @@ -468,18 +478,18 @@ void InspIRCd::MoveToFirst(std::string modulename) void InspIRCd::MoveToLast(std::string modulename) { - MoveTo(modulename,MODCOUNT); + MoveTo(modulename,this->GetModuleCount()); } 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)); } bool InspIRCd::UnloadModule(const char* filename) @@ -491,21 +501,35 @@ bool InspIRCd::UnloadModule(const char* filename) { if (modules[j]->GetVersion().Flags & VF_STATIC) { - log(DEFAULT,"Failed to unload STATIC module %s",filename); + this->Log(DEFAULT,"Failed to unload STATIC module %s",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 = chanlist.begin(); c != 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 = clientlist.begin(); u != 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++) { @@ -523,107 +547,143 @@ bool InspIRCd::UnloadModule(const char* filename) } // found the module - log(DEBUG,"Deleting module..."); + this->Log(DEBUG,"Removing dependent commands..."); + Parser->RemoveCommands(filename); + this->Log(DEBUG,"Deleting module..."); this->EraseModule(j); - log(DEBUG,"Erasing module entry..."); + this->Log(DEBUG,"Erasing module entry..."); this->EraseFactory(j); - log(DEBUG,"Removing dependent commands..."); - Parser->RemoveCommands(filename); - log(DEFAULT,"Module %s unloaded",filename); - MODCOUNT--; + this->Log(DEFAULT,"Module %s unloaded",filename); + this->ModCount--; BuildISupport(); return true; } } - log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename); + this->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename); snprintf(MODERR,MAXBUF,"Module not loaded"); return false; } 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 (!DirValid(modfile)) + + if (!ServerConfig::DirValid(modfile)) { - log(DEFAULT,"Module %s is not within the modules directory.",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 - log(DEBUG,"Loading module: %s",modfile); -#ifndef STATIC_LINK - if (FileExists(modfile)) + this->Log(DEBUG,"Loading module: %s",modfile); + + if (ServerConfig::FileExists(modfile)) { -#endif + for (unsigned int j = 0; j < Config->module_names.size(); j++) { if (Config->module_names[j] == filename_str) { - log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); + this->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); snprintf(MODERR,MAXBUF,"Module already loaded"); return false; } } - ircd_module* a = new ircd_module(modfile); - factory[MODCOUNT+1] = a; - if (factory[MODCOUNT+1]->LastError()) - { - log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError()); - snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError()); - return false; - } try { - if (factory[MODCOUNT+1]->factory) + ircd_module* a = new ircd_module(this, modfile); + factory[this->ModCount+1] = a; + if (factory[this->ModCount+1]->LastError()) + { + this->Log(DEFAULT,"Unable to load %s: %s",modfile,factory[this->ModCount+1]->LastError()); + snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[this->ModCount+1]->LastError()); + return false; + } + if ((long)factory[this->ModCount+1]->factory != -1) { - Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer); - modules[MODCOUNT+1] = m; + 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 :/ */ Config->module_names.push_back(filename); - char* x = &Config->implement_lists[MODCOUNT+1][0]; + char* x = &Config->implement_lists[this->ModCount+1][0]; for(int t = 0; t < 255; t++) x[t] = 0; - modules[MODCOUNT+1]->Implements(x); + modules[this->ModCount+1]->Implements(x); for(int t = 0; t < 255; t++) - Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t]; + Config->global_implementation[t] += Config->implement_lists[this->ModCount+1][t]; } else { - log(DEFAULT,"Unable to load %s",modfile); - snprintf(MODERR,MAXBUF,"Factory function failed!"); + this->Log(DEFAULT,"Unable to load %s",modfile); + snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint."); return false; } } catch (ModuleException& modexcept) { - log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason()); + this->Log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason()); snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason()); return false; } -#ifndef STATIC_LINK } else { - log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile); + this->Log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile); snprintf(MODERR,MAXBUF,"Module file could not be found"); return false; } -#endif - MODCOUNT++; - FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[MODCOUNT],filename_str)); + this->ModCount++; + 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; @@ -633,297 +693,91 @@ 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 - /* 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)) - { - expire_lines(); - if (process_module_sockets) - { - /* Fix by brain - the addition of DoOneIteration means that this - * can end up getting called recursively in the following pattern: - * - * m_spanningtree DoPingChecks - * (server pings out and is squit) - * (squit causes call to DoOneIteration) - * DoOneIteration enters here - * calls DoBackground timer - * enters m_spanningtree DoPingChecks... see step 1. - * - * This should do the job and fix the bug. - */ - FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME)); - } - TickMissedTimers(TIME); - expire_run = true; - return; - } - else if ((TIME % 5) == 1) - { - expire_run = false; - } - - if (iterations++ == 15) - { - iterations = 0; - 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) { - MaintainWhoWas(TIME); + irc::whowas::MaintainWhoWas(this, TIME); + } + Timers->TickTimers(TIME); + this->DoBackgroundUserStuff(TIME); + + if ((TIME % 5) == 0) + { + XLines->expire_lines(); + FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); + Timers->TickMissedTimers(TIME); } } - /* 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) - DoSocketTimeouts(TIME); - - 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. - */ - log(DEBUG,"There are %d fd's to process.",numberactive); + SE->DispatchEvents(); +} + +bool InspIRCd::IsIdent(const char* n) +{ + if (!n || !*n) + return false; - for (unsigned int activefd = 0; activefd < numberactive; activefd++) + for (char* i = (char*)n; *i; i++) { - int socket_type = SE->GetType(activefds[activefd]); - switch (socket_type) + if ((*i >= 'A') && (*i <= '}')) { - case X_ESTAB_CLIENT: - - log(DEBUG,"Type: X_ESTAB_CLIENT: fd=%d",activefds[activefd]); - cu = fd_ref_table[activefds[activefd]]; - if (cu) - ProcessUser(cu); - - break; - - case X_ESTAB_MODULE: - - 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 = socket_ref[activefds[activefd]]; - - if ((s) && (!s->Poll())) - { - log(DEBUG,"Socket poll returned false, close and bail"); - SE->DelFd(s->GetFd()); - 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) - { - 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: - - 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 - 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) - { - log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); - } - } - stats->statsAccept++; -#ifdef IPV6 - log(DEBUG,"Add ipv6 client"); - AddClient(incomingSockfd, in_port, false, client.sin6_addr); -#else - log(DEBUG,"Add ipv4 client"); - AddClient(incomingSockfd, in_port, false, client.sin_addr); -#endif - log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd); - } - else - { - 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. - */ - log(DEBUG,"Type: X_WHAT_THE_FUCK_BBQ: fd=%d",activefds[activefd]); - SE->DelFd(activefds[activefd]); - break; + continue; } + if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.')) + { + continue; + } + return false; } + return true; } + int InspIRCd::Run() { - /* Until THIS point, ServerInstance == NULL */ - - this->Res = new DNS(); - - LoadAllModules(this); - - /* Just in case no modules were loaded - fix for bug #101 */ - this->BuildISupport(); - - printf("\nInspIRCd is now running!\n"); - - if (!Config->nofork) - { - fclose(stdout); - fclose(stderr); - fclose(stdin); - } - - /* Add the listening sockets used for client inbound connections - * to the socket engine - */ - for (unsigned long count = 0; count < stats->BoundPortCount; count++) - SE->AddFd(Config->openSockfd[count],true,X_LISTEN); - - this->WritePID(Config->PID); - - /* main loop, this never returns */ - expire_run = false; - iterations = 0; - while (true) { DoOneIteration(true); @@ -940,25 +794,141 @@ int InspIRCd::Run() int main(int argc, char** argv) { - /* This is a MatchCIDR() test suite - - printf("Should be 0: %d\n",MatchCIDR("127.0.0.1","1.2.3.4/8")); - printf("Should be 1: %d\n",MatchCIDR("127.0.0.1","127.0.0.0/8")); - printf("Should be 1: %d\n",MatchCIDR("127.0.0.1","127.0.0.0/18")); - printf("Should be 0: %d\n",MatchCIDR("3ffe::0","2fc9::0/16")); - printf("Should be 1: %d\n",MatchCIDR("3ffe:1:3::0", "3ffe:1::0/32")); - exit(0); */ + SI = new InspIRCd(argc, argv); + SI->Run(); + delete SI; + return 0; +} - try +/* 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) + */ +bool InspIRCd::AllModulesReportReady(userrec* user) +{ + if (!Config->global_implementation[I_OnCheckReady]) + return true; + + for (int i = 0; i <= this->GetModuleCount(); i++) { - ServerInstance = new InspIRCd(argc, argv); - ServerInstance->Run(); - DELETE(ServerInstance); + if (Config->implement_lists[i][I_OnCheckReady]) + { + int res = modules[i]->OnCheckReady(user); + if (!res) + return false; + } } - catch (std::bad_alloc) + return true; +} + +int InspIRCd::GetModuleCount() +{ + return this->ModCount; +} + +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(""); + ServerInstance->SE->DelFd(this); +} + +void FileLogger::WriteLogLine(const std::string &line) +{ + if (line.length()) + buffer.append(line); + + if (log) { - log(DEFAULT,"You are out of memory! (got exception std::bad_alloc!)"); - send_error("**** OUT OF MEMORY **** We're gonna need a bigger boat!"); - printf("Out of memory! (got exception std::bad_alloc!"); + 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 = ""; + } } - return 0; + 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()); + 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 = ""; +} + +FileLogger::~FileLogger() +{ + this->Close(); +} +