X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=54c3aa0abdbae606d71402bc179b5efb1af7b784;hb=e2322b3feb0b70a5c5d74fff4a9ab2bd7c85bcac;hp=41e0897b7ff306f1395f8b1590cde9e9ca4e76cc;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 41e0897b7..54c3aa0ab 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1,45 +1,22 @@ -/* --------------------------------------------------------------------- - * - * +------------------------------------+ - * | 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 "inspircd.h" #include "configreader.h" #include -#include -#include +#include #include -#include -#include -#include -#include #include -#include -#include #include "modules.h" #include "mode.h" #include "xline.h" @@ -48,14 +25,14 @@ #include "socket.h" #include "typedefs.h" #include "command_parse.h" +#include using irc::sockets::NonBlocking; +using irc::sockets::Blocking; using irc::sockets::insp_ntoa; using irc::sockets::insp_inaddr; using irc::sockets::insp_sockaddr; -char lowermap[255]; - InspIRCd* SI = NULL; void InspIRCd::AddServerName(const std::string &servername) @@ -92,10 +69,9 @@ void InspIRCd::Exit(int status) 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) @@ -107,24 +83,32 @@ void InspIRCd::Rehash(int status) FOREACH_MOD_I(SI,I_OnRehash,OnRehash("")); } -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(ERROR); } setsid (); umask (007); @@ -142,13 +126,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(); @@ -156,8 +151,8 @@ 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()); + 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); } } @@ -170,15 +165,20 @@ 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; + 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(); - 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)) @@ -208,14 +208,6 @@ 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],"-notraceback")) - { - SEGVHandler = false; - } else if (!strcmp(argv[i],"-logfile")) { if (argc > i+1) @@ -232,7 +224,7 @@ InspIRCd::InspIRCd(int argc, char** argv) } else { - printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-nolimit] [-notraceback] [-logfile ]\n",argv[0]); + printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-logfile ]\n",argv[0]); Exit(ERROR); } } @@ -240,9 +232,7 @@ InspIRCd::InspIRCd(int argc, char** argv) strlcpy(Config->MyExecutable,argv[0],MAXBUF); - this->MakeLowerMap(); - - OpenLog(argv, argc); + this->OpenLog(argv, argc); this->stats = new serverstats(); this->Parser = new CommandParser(this); this->Timers = new TimerManager(); @@ -254,7 +244,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; @@ -262,7 +252,7 @@ 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()) @@ -281,18 +271,26 @@ InspIRCd::InspIRCd(int argc, char** argv) 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) + 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 @@ -300,7 +298,7 @@ InspIRCd::InspIRCd(int argc, char** argv) 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]); + 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"); @@ -310,9 +308,11 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!Config->nofork) { - fclose(stdout); - fclose(stderr); + 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"); @@ -347,6 +347,7 @@ void InspIRCd::EraseFactory(int j) { if (v == j) { + delete *t; factory.erase(t); factory.push_back(NULL); return; @@ -467,11 +468,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(this,I_On005Numeric,On005Numeric(Config->data005)); + Config->Update005(); } bool InspIRCd::UnloadModule(const char* filename) @@ -487,6 +489,17 @@ 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++) { @@ -497,6 +510,9 @@ bool InspIRCd::UnloadModule(const char* filename) modules[j]->OnCleanup(TYPE_USER,u->second); } + /* 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++) @@ -534,28 +550,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) @@ -578,6 +616,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 :/ */ @@ -599,13 +653,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 { @@ -613,7 +666,6 @@ bool InspIRCd::LoadModule(const char* filename) snprintf(MODERR,MAXBUF,"Module file could not be found"); return false; } -#endif 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, @@ -625,46 +677,29 @@ 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) { - EventHandler* activefds[MAX_DESCRIPTORS]; - unsigned int numberactive; + static rusage ru; /* time() seems to be a pretty expensive syscall, so avoid calling it too much. * Once per loop iteration is pleanty. @@ -683,11 +718,9 @@ 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(TIME); + irc::whowas::MaintainWhoWas(this, TIME); } Timers->TickTimers(TIME); - if (process_module_sockets) - this->DoSocketTimeouts(TIME); this->DoBackgroundUserStuff(TIME); if ((TIME % 5) == 0) @@ -696,30 +729,22 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) 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; + } } - + /* 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++) - { - this->Log(DEBUG,"Handle %s event on fd %d",activefds[activefd]->Readable() ? "read" : "write", activefds[activefd]->GetFd()); - activefds[activefd]->HandleEvent(activefds[activefd]->Readable() ? EVENT_READ : EVENT_WRITE); - } + SE->DispatchEvents(); } bool InspIRCd::IsIdent(const char* n) @@ -743,30 +768,6 @@ 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() { while (true) @@ -817,8 +818,109 @@ 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(""); + 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()); + 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(); +} +