X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=44f65842752eaf238b397aab105fc264a96c599e;hb=2b51585f8be4fe954b07416f75787ca48f1f1a27;hp=a259bf3490704df4f9fb5822e13386c011dc7a41;hpb=c1f88cfa9c653c0df9574edb6995a7385543be83;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index a259bf349..44f658427 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -14,10 +14,22 @@ #include "inspircd.h" #include "configreader.h" #include -#include + +#ifndef WIN32 + #include + #include + #include + #include + #include + + /* Some systems don't define RUSAGE_SELF. This should fix them. */ + #ifndef RUSAGE_SELF + #define RUSAGE_SELF 0 + #endif +#endif + #include #include -#include #include "modules.h" #include "mode.h" #include "xline.h" @@ -27,44 +39,145 @@ #include "typedefs.h" #include "command_parse.h" #include "exitcodes.h" -#include -#include +#ifdef WIN32 -using irc::sockets::NonBlocking; -using irc::sockets::Blocking; -using irc::sockets::insp_ntoa; -using irc::sockets::insp_inaddr; -using irc::sockets::insp_sockaddr; +/* This MUST remain static and delcared outside the class, so that WriteProcessMemory can reference it properly */ +static DWORD owner_processid = 0; -InspIRCd* SI = NULL; - -void InspIRCd::AddServerName(const std::string &servername) +DWORD WindowsForkStart(InspIRCd * Instance) { - if(find(servernames.begin(), servernames.end(), servername) == servernames.end()) - servernames.push_back(servername); /* Wasn't already there. */ -} + /* Windows implementation of fork() :P */ -const char* InspIRCd::FindServerNamePtr(const std::string &servername) -{ - servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername); + char module[MAX_PATH]; + if(!GetModuleFileName(NULL, module, MAX_PATH)) + { + printf("GetModuleFileName() failed.\n"); + return false; + } - if(iter == servernames.end()) + STARTUPINFO startupinfo; + PROCESS_INFORMATION procinfo; + ZeroMemory(&startupinfo, sizeof(STARTUPINFO)); + ZeroMemory(&procinfo, sizeof(PROCESS_INFORMATION)); + + // Fill in the startup info struct + GetStartupInfo(&startupinfo); + + /* Default creation flags create the processes suspended */ + DWORD startupflags = CREATE_SUSPENDED; + + /* On windows 2003/XP and above, we can use the value + * CREATE_PRESERVE_CODE_AUTHZ_LEVEL which gives more access + * to the process which we may require on these operating systems. + */ + OSVERSIONINFO vi; + vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&vi); + if ((vi.dwMajorVersion >= 5) && (vi.dwMinorVersion > 0)) + startupflags |= CREATE_PRESERVE_CODE_AUTHZ_LEVEL; + + // Launch our "forked" process. + BOOL bSuccess = CreateProcess ( module, // Module (exe) filename + strdup(GetCommandLine()), // Command line (exe plus parameters from the OS) + // NOTE: We cannot return the direct value of the + // GetCommandLine function here, as the pointer is + // passed straight to the child process, and will be + // invalid once we exit as it goes out of context. + // strdup() seems ok, though. + 0, // PROCESS_SECURITY_ATTRIBUTES + 0, // THREAD_SECURITY_ATTRIBUTES + TRUE, // We went to inherit handles. + startupflags, // Allow us full access to the process and suspend it. + 0, // ENVIRONMENT + 0, // CURRENT_DIRECTORY + &startupinfo, // startup info + &procinfo); // process info + + if(!bSuccess) + { + printf("CreateProcess() error: %s\n", dlerror()); + return false; + } + + // Set the owner process id in the target process. + SIZE_T written = 0; + DWORD pid = GetCurrentProcessId(); + if(!WriteProcessMemory(procinfo.hProcess, &owner_processid, &pid, sizeof(DWORD), &written) || written != sizeof(DWORD)) { - AddServerName(servername); - iter = --servernames.end(); + printf("WriteProcessMemory() failed: %s\n", dlerror()); + return false; } - return iter->c_str(); + // Resume the other thread (let it start) + ResumeThread(procinfo.hThread); + + // Wait for the new process to kill us. If there is some error, the new process will end and we will end up at the next line. + WaitForSingleObject(procinfo.hProcess, INFINITE); + + // If we hit this it means startup failed, default to 14 if this fails. + DWORD ExitCode = 14; + GetExitCodeProcess(procinfo.hProcess, &ExitCode); + CloseHandle(procinfo.hThread); + CloseHandle(procinfo.hProcess); + return ExitCode; } -bool InspIRCd::FindServerName(const std::string &servername) +void WindowsForkKillOwner(InspIRCd * Instance) { - return (find(servernames.begin(), servernames.end(), servername) != servernames.end()); + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, owner_processid); + if(!hProcess || !owner_processid) + { + printf("Could not open process id %u: %s.\n", owner_processid, dlerror()); + Instance->Exit(14); + } + + // die die die + if(!TerminateProcess(hProcess, 0)) + { + printf("Could not TerminateProcess(): %s\n", dlerror()); + Instance->Exit(14); + } + + CloseHandle(hProcess); } +#endif + +using irc::sockets::NonBlocking; +using irc::sockets::Blocking; +using irc::sockets::insp_ntoa; +using irc::sockets::insp_inaddr; +using irc::sockets::insp_sockaddr; + +InspIRCd* SI = NULL; + +/* Burlex: Moved from exitcodes.h -- due to duplicate symbols */ +const char* ExitCodes[] = +{ + "No error", /* 0 */ + "DIE command", /* 1 */ + "execv() failed", /* 2 */ + "Internal error", /* 3 */ + "Config file error", /* 4 */ + "Logfile error", /* 5 */ + "POSIX fork failed", /* 6 */ + "Bad commandline parameters", /* 7 */ + "No ports could be bound", /* 8 */ + "Can't write PID file", /* 9 */ + "SocketEngine could not initialize", /* 10 */ + "Refusing to start up as root", /* 11 */ + "Found a tag!", /* 12 */ + "Couldn't load module on startup", /* 13 */ + "Could not create windows forked process", /* 14 */ + "Received SIGTERM", /* 15 */ +}; + void InspIRCd::Exit(int status) { +#ifdef WINDOWS + CloseIPC(); +#endif if (SI) { SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")"); @@ -78,13 +191,13 @@ void InspIRCd::Cleanup() std::vector mymodnames; int MyModCount = this->GetModuleCount(); - for (unsigned int i = 0; i < stats->BoundPortCount; i++) + for (unsigned int i = 0; i < Config->ports.size(); i++) { /* This calls the constructor and closes the listening socket */ - delete Config->openSockfd[i]; - Config->openSockfd[i] = NULL; + delete Config->ports[i]; } - stats->BoundPortCount = 0; + + Config->ports.clear(); /* 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++) @@ -112,6 +225,15 @@ void InspIRCd::Cleanup() /* Close logging */ this->Logger->Close(); + + /* Cleanup Server Names */ + for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) + delete (*itr); + +#ifdef WINDOWS + /* WSACleanup */ + WSACleanup(); +#endif } void InspIRCd::Restart(const std::string &reason) @@ -124,7 +246,15 @@ void InspIRCd::Restart(const std::string &reason) this->Cleanup(); /* Figure out our filename (if theyve renamed it, we're boned) */ - std::string me = Config->MyDir + "/inspircd"; + std::string me; + +#ifdef WINDOWS + char module[MAX_PATH]; + if (GetModuleFileName(NULL, module, MAX_PATH)) + me = module; +#else + me = Config->MyDir + "/inspircd"; +#endif if (execv(me.c_str(), Config->argv) == -1) { @@ -133,17 +263,9 @@ void InspIRCd::Restart(const std::string &reason) } } -void InspIRCd::Start() -{ - printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); - 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"); -} - void InspIRCd::Rehash(int status) { - SI->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE)); + SI->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(SI->ConfigFileName)); SI->CloseLog(); SI->OpenLog(SI->Config->argv, SI->Config->argc); SI->RehashUsersAndChans(); @@ -152,6 +274,7 @@ void InspIRCd::Rehash(int status) SI->ResetMaxBans(); SI->Res->Rehash(); FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,"")); + SI->BuildISupport(); } void InspIRCd::ResetMaxBans() @@ -194,15 +317,28 @@ void InspIRCd::CloseLog() void InspIRCd::SetSignals() { +#ifndef WIN32 signal(SIGALRM, SIG_IGN); signal(SIGHUP, InspIRCd::Rehash); signal(SIGPIPE, SIG_IGN); - signal(SIGTERM, InspIRCd::Exit); signal(SIGCHLD, SIG_IGN); +#endif + signal(SIGTERM, InspIRCd::Exit); +} + +void InspIRCd::QuickExit(int status) +{ + exit(0); } bool InspIRCd::DaemonSeed() { +#ifdef WINDOWS + printf_c("InspIRCd Process ID: \033[1;32m%lu\033[0m\n", GetCurrentProcessId()); + return true; +#else + signal(SIGTERM, InspIRCd::QuickExit); + int childpid; if ((childpid = fork ()) < 0) return false; @@ -223,6 +359,8 @@ bool InspIRCd::DaemonSeed() umask (007); printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid()); + signal(SIGTERM, InspIRCd::Exit); + rlimit rl; if (getrlimit(RLIMIT_CORE, &rl) == -1) { @@ -237,6 +375,7 @@ bool InspIRCd::DaemonSeed() } return true; +#endif } void InspIRCd::WritePID(const std::string &filename) @@ -245,8 +384,8 @@ void InspIRCd::WritePID(const std::string &filename) if (*(fname.begin()) != '/') { std::string::size_type pos; - std::string confpath = CONFIG_FILE; - if ((pos = confpath.find("/inspircd.conf")) != std::string::npos) + std::string confpath = this->ConfigFileName; + if ((pos = confpath.rfind("/")) != std::string::npos) { /* Leaves us with just the path */ fname = confpath.substr(0, pos) + std::string("/") + fname; @@ -266,21 +405,18 @@ void InspIRCd::WritePID(const std::string &filename) } } -std::string InspIRCd::GetRevision() -{ - return REVISION; -} - 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), GlobalCulls(this) + : ModCount(-1), GlobalCulls(this) { int found_ports = 0; FailedPortList pl; - int do_nofork = 0, do_debug = 0, do_nolog = 0; /* flag variables */ + int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */ char c = 0; modules.resize(255); factory.resize(255); + memset(&server, 0, sizeof(server)); + memset(&client, 0, sizeof(client)); this->unregistered_count = 0; @@ -292,31 +428,28 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Config->argv = argv; this->Config->argc = argc; + chdir(Config->GetFullProgDir().c_str()); + this->Config->opertypes.clear(); this->Config->operclass.clear(); this->SNO = new SnomaskManager(this); - this->Start(); this->TIME = this->OLDTIME = this->startup_time = time(NULL); this->time_delta = 0; this->next_call = this->TIME + 3; srand(this->TIME); - 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(EXIT_STATUS_CONFIG); - } - *this->LogFileName = 0; + strlcpy(this->ConfigFileName, CONFIG_FILE, MAXBUF); struct option longopts[] = { { "nofork", no_argument, &do_nofork, 1 }, { "logfile", required_argument, NULL, 'f' }, + { "config", required_argument, NULL, 'c' }, { "debug", no_argument, &do_debug, 1 }, { "nolog", no_argument, &do_nolog, 1 }, + { "runasroot", no_argument, &do_root, 1 }, + { "version", no_argument, &do_version, 1 }, { 0, 0, 0, 0 } }; @@ -327,19 +460,55 @@ InspIRCd::InspIRCd(int argc, char** argv) case 'f': /* Log filename was set */ strlcpy(LogFileName, optarg, MAXBUF); - printf("LOG: Setting logfile to %s\n", LogFileName); + break; + case 'c': + /* Config filename was set */ + strlcpy(ConfigFileName, optarg, MAXBUF); 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]); + printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile ] [--runasroot] [--version] [--config ]\n", argv[0]); Exit(EXIT_STATUS_ARGV); break; } } + if (do_version) + { + printf("\n%s r%s\n", VERSION, REVISION); + Exit(EXIT_STATUS_NOERROR); + } + +#ifdef WIN32 + + // Handle forking + if(!do_nofork && !owner_processid) + { + DWORD ExitCode = WindowsForkStart(this); + if(ExitCode) + Exit(ExitCode); + } + + // Set up winsock + WSADATA wsadata; + WSAStartup(MAKEWORD(2,0), &wsadata); + +#endif + if (!ServerConfig::FileExists(this->ConfigFileName)) + { + printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); + this->Log(DEFAULT,"Unable to open config file %s", this->ConfigFileName); + Exit(EXIT_STATUS_CONFIG); + } + + printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); + printf_c("(C) InspIRCd Development Team.\033[0m\n\n"); + printf_c("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey, Burlex\033[0m\n"); + printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); + /* Set the finished argument values */ Config->nofork = do_nofork; Config->forcedebug = do_debug; @@ -348,35 +517,42 @@ InspIRCd::InspIRCd(int argc, char** argv) strlcpy(Config->MyExecutable,argv[0],MAXBUF); this->OpenLog(argv, argc); + this->stats = new serverstats(); this->Timers = new TimerManager(this); this->Parser = new CommandParser(this); this->XLines = new XLineManager(this); Config->ClearStack(); Config->Read(true, NULL); - this->CheckRoot(); - this->Modes = new ModeParser(this); - this->AddServerName(Config->ServerName); - CheckDie(); - InitializeDisabledCommands(Config->DisabledCommands, this); - stats->BoundPortCount = BindPorts(true, found_ports, pl); - for(int t = 0; t < 255; t++) - Config->global_implementation[t] = 0; - - memset(&Config->implement_lists,0,sizeof(Config->implement_lists)); + if (!do_root) + this->CheckRoot(); + else + { + printf("* WARNING * WARNING * WARNING * WARNING * WARNING * \n\n"); + printf("YOU ARE RUNNING INSPIRCD AS ROOT. THIS IS UNSUPPORTED\n"); + printf("AND IF YOU ARE HACKED, CRACKED, SPINDLED OR MUTILATED\n"); + printf("OR ANYTHING ELSE UNEXPECTED HAPPENS TO YOU OR YOUR\n"); + printf("SERVER, THEN IT IS YOUR OWN FAULT. IF YOU DID NOT MEAN\n"); + printf("TO START INSPIRCD AS ROOT, HIT CTRL+C NOW AND RESTART\n"); + printf("THE PROGRAM AS A NORMAL USER. YOU HAVE BEEN WARNED!\n"); + printf("\nInspIRCd starting in 20 seconds, ctrl+c to abort...\n"); + sleep(20); + } - printf("\n"); this->SetSignals(); + if (!Config->nofork) { if (!this->DaemonSeed()) { printf("ERROR: could not go into daemon mode. Shutting down.\n"); + Log(DEFAULT,"ERROR: could not go into daemon mode. Shutting down."); Exit(EXIT_STATUS_FORK); } } + /* Because of limitations in kqueue on freebsd, we must fork BEFORE we * initialize the socket engine. */ @@ -384,426 +560,92 @@ InspIRCd::InspIRCd(int argc, char** argv) SE = SEF->Create(this); delete SEF; + this->Modes = new ModeParser(this); + this->AddServerName(Config->ServerName); + CheckDie(); + int bounditems = BindPorts(true, found_ports, pl); + + for(int t = 0; t < 255; t++) + Config->global_implementation[t] = 0; + + memset(&Config->implement_lists,0,sizeof(Config->implement_lists)); + + printf("\n"); + this->Res = new DNS(this); this->LoadAllModules(); /* Just in case no modules were loaded - fix for bug #101 */ this->BuildISupport(); + InitializeDisabledCommands(Config->DisabledCommands, this); - if ((stats->BoundPortCount == 0) && (found_ports > 0)) + if ((Config->ports.size() == 0) && (found_ports > 0)) { printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); + Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?"); Exit(EXIT_STATUS_BIND); } - if (stats->BoundPortCount != (unsigned int)found_ports) + if (Config->ports.size() != (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" : ""); + printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", bounditems, found_ports); + printf("The following port(s) failed to bind:\n"); 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 - */ - for (unsigned long count = 0; count < stats->BoundPortCount; count++) - { - if (!SE->AddFd(Config->openSockfd[count])) - { - printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n"); - Exit(EXIT_STATUS_INTERNAL); - } - } - +#ifndef WINDOWS 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"); - - this->WritePID(Config->PID); -} - -std::string InspIRCd::GetVersionString() -{ - char versiondata[MAXBUF]; - char dnsengine[] = "singlethread-object"; - if (*Config->CustomVersion) - { - snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion); - } - else - { - snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine); - } - return versiondata; -} - -char* InspIRCd::ModuleError() -{ - return MODERR; -} - -void InspIRCd::EraseFactory(int j) -{ - int v = 0; - for (std::vector::iterator t = factory.begin(); t != factory.end(); t++) - { - if (v == j) - { - delete *t; - factory.erase(t); - factory.push_back(NULL); - return; - } - v++; - } -} - -void InspIRCd::EraseModule(int j) -{ - int v1 = 0; - for (ModuleList::iterator m = modules.begin(); m!= modules.end(); m++) - { - if (v1 == j) - { - DELETE(*m); - modules.erase(m); - modules.push_back(NULL); - break; - } - v1++; - } - int v2 = 0; - for (std::vector::iterator v = Config->module_names.begin(); v != Config->module_names.end(); v++) - { - if (v2 == j) - { - Config->module_names.erase(v); - break; - } - v2++; - } - -} - -void InspIRCd::MoveTo(std::string modulename,int slot) -{ - unsigned int v2 = 256; - for (unsigned int v = 0; v < Config->module_names.size(); v++) - { - if (Config->module_names[v] == modulename) - { - // found an instance, swap it with the item at the end - v2 = v; - break; - } - } - if ((v2 != (unsigned int)slot) && (v2 < 256)) - { - // Swap the module names over - Config->module_names[v2] = Config->module_names[slot]; - Config->module_names[slot] = modulename; - // now swap the module factories - ircd_module* temp = factory[v2]; - factory[v2] = factory[slot]; - factory[slot] = temp; - // now swap the module objects - Module* temp_module = modules[v2]; - modules[v2] = modules[slot]; - modules[slot] = temp_module; - // now swap the implement lists (we dont - // need to swap the global or recount it) - for (int n = 0; n < 255; n++) - { - char x = Config->implement_lists[v2][n]; - Config->implement_lists[v2][n] = Config->implement_lists[slot][n]; - Config->implement_lists[slot][n] = x; - } - } -} - -void InspIRCd::MoveAfter(std::string modulename, std::string after) -{ - for (unsigned int v = 0; v < Config->module_names.size(); v++) - { - if (Config->module_names[v] == after) - { - MoveTo(modulename, v); - return; - } - } -} - -void InspIRCd::MoveBefore(std::string modulename, std::string before) -{ - for (unsigned int v = 0; v < Config->module_names.size(); v++) - { - if (Config->module_names[v] == before) - { - if (v > 0) - { - MoveTo(modulename, v-1); - } - else - { - MoveTo(modulename, v); - } - return; - } - } -} - -void InspIRCd::MoveToFirst(std::string modulename) -{ - MoveTo(modulename,0); -} - -void InspIRCd::MoveToLast(std::string modulename) -{ - 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=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1; - v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN="; - 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) -{ - std::string filename_str = filename; - for (unsigned int j = 0; j != Config->module_names.size(); j++) - { - if (Config->module_names[j] == filename_str) { - if (modules[j]->GetVersion().Flags & VF_STATIC) - { - 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 = 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++) - { - 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++) - { - Config->global_implementation[t] -= Config->implement_lists[j][t]; - } - - /* We have to renumber implement_lists after unload because the module numbers change! - */ - for(int j2 = j; j2 < 254; j2++) - { - for(int t = 0; t < 255; t++) - { - Config->implement_lists[j2][t] = Config->implement_lists[j2+1][t]; - } - } - - // found the module - Parser->RemoveCommands(filename); - this->EraseModule(j); - this->EraseFactory(j); - this->Log(DEFAULT,"Module %s unloaded",filename); - this->ModCount--; - BuildISupport(); - return true; + printf("Error killing parent process: %s\n",strerror(errno)); + Log(DEFAULT,"Error killing parent process: %s",strerror(errno)); } } - 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,'?'))) + if (isatty(0) && isatty(1) && isatty(2)) { - 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. + /* We didn't start from a TTY, we must have started from a background process - + * e.g. we are restarting, or being launched by cron. Dont kill parent, and dont + * close stdin/stdout */ - return (n_match > 0); - } - - char modfile[MAXBUF]; - snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename); - std::string filename_str = filename; - - 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; - } - if (ServerConfig::FileExists(modfile)) - { - - for (unsigned int j = 0; j < Config->module_names.size(); j++) + if (!do_nofork) { - if (Config->module_names[j] == filename_str) - { - this->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); - snprintf(MODERR,MAXBUF,"Module already loaded"); - return false; - } + fclose(stdin); + fclose(stderr); + fclose(stdout); } - try - { - 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[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[this->ModCount+1][0]; - for(int t = 0; t < 255; t++) - x[t] = 0; - - modules[this->ModCount+1]->Implements(x); - - for(int t = 0; t < 255; t++) - Config->global_implementation[t] += Config->implement_lists[this->ModCount+1][t]; - } - else - { - this->Log(DEFAULT,"Unable to load %s",modfile); - snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint."); - return false; - } - } - catch (CoreException& modexcept) + else { - this->Log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason()); - snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - return false; + Log(DEFAULT,"Keeping pseudo-tty open as we are running in the foreground."); } } - else - { - this->Log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile); - snprintf(MODERR,MAXBUF,"Module file could not be found"); - return false; - } - 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; - std::vector put_to_front; - std::map put_before; - std::map put_after; - for (unsigned int j = 0; j < Config->module_names.size(); j++) +#else + InitIPC(); + if(!Config->nofork) { - 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]; + WindowsForkKillOwner(this); + FreeConsole(); } - 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; +#endif + printf("\nInspIRCd is now running!\n"); + Log(DEFAULT,"Startup complete."); + + this->WritePID(Config->PID); } void InspIRCd::DoOneIteration(bool process_module_sockets) { +#ifndef WIN32 static rusage ru; +#else + static time_t uptime; + static struct tm * stime; + static char window_title[100]; +#endif /* time() seems to be a pretty expensive syscall, so avoid calling it too much. * Once per loop iteration is pleanty. @@ -834,12 +676,25 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); Timers->TickMissedTimers(TIME); } - - if (!getrusage(0, &ru)) +#ifndef WIN32 + /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */ + if (!getrusage(RUSAGE_SELF, &ru)) { gettimeofday(&this->stats->LastSampled, NULL); this->stats->LastCPU = ru.ru_utime; } +#else + CheckIPC(this); + + if(Config->nofork) + { + uptime = Time() - startup_time; + stime = gmtime(&uptime); + snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u", + LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec); + SetConsoleTitle(window_title); + } +#endif } /* Call the socket engine to wait on the active @@ -849,34 +704,26 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) * This will cause any read or write events to be * dispatched to their handlers. */ - SE->DispatchEvents(); + this->SE->DispatchEvents(); /* if any users was quit, take them out */ - GlobalCulls.Apply(); + this->GlobalCulls.Apply(); + /* If any inspsockets closed, remove them */ + this->InspSocketCull(); } -bool InspIRCd::IsIdent(const char* n) +void InspIRCd::InspSocketCull() { - if (!n || !*n) - return false; - - for (char* i = (char*)n; *i; i++) + for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) { - if ((*i >= 'A') && (*i <= '}')) - { - continue; - } - if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.')) - { - continue; - } - return false; + SE->DelFd(x->second); + x->second->Close(); + delete x->second; } - return true; + SocketCull.clear(); } - int InspIRCd::Run() { while (true) @@ -937,7 +784,7 @@ time_t InspIRCd::Time(bool delta) int InspIRCd::SetTimeDelta(int delta) { int old = time_delta; - time_delta += delta; + time_delta = delta; this->Log(DEBUG, "Time delta set to %d (was %d)", time_delta, old); return old; } @@ -985,6 +832,9 @@ void FileLogger::WriteLogLine(const std::string &line) if (log) { int written = fprintf(log,"%s",buffer.c_str()); +#ifdef WINDOWS + buffer.clear(); +#else if ((written >= 0) && (written < (int)buffer.length())) { buffer.erase(0, buffer.length()); @@ -998,12 +848,13 @@ void FileLogger::WriteLogLine(const std::string &line) else { /* Wrote the whole buffer, and no need for write callback */ - buffer = ""; + buffer.clear(); + } +#endif + if (writeops++ % 20) + { + fflush(log); } - } - if (writeops++ % 20) - { - fflush(log); } } @@ -1011,18 +862,24 @@ void FileLogger::Close() { if (log) { + /* Burlex: Windows assumes nonblocking on FILE* pointers anyway, and also "file" fd's aren't the same + * as socket fd's. */ +#ifndef WIN32 int flags = fcntl(fileno(log), F_GETFL, 0); fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK); +#endif if (buffer.size()) fprintf(log,"%s",buffer.c_str()); +#ifndef WINDOWS ServerInstance->SE->DelFd(this); +#endif fflush(log); fclose(log); } - buffer = ""; + buffer.clear(); } FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0) @@ -1031,7 +888,7 @@ FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Insta { irc::sockets::NonBlocking(fileno(log)); this->SetFd(fileno(log)); - buffer = ""; + buffer.clear(); } }