X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=670b244415a2d00f747a274598848e4310a56acb;hb=37a53f1ac69315f1915aae67a447fb7b813e8217;hp=4b2690c49db2acc6dfef98fddd3161751c452d0d;hpb=8b8923d15564caeeb14a6c5a218b9936a93c3ae4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 4b2690c49..670b24441 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -143,7 +143,7 @@ void InspIRCd::Start() 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(); @@ -202,8 +202,15 @@ void InspIRCd::SetSignals() signal(SIGCHLD, SIG_IGN); } +void InspIRCd::QuickExit(int status) +{ + exit(0); +} + bool InspIRCd::DaemonSeed() { + signal(SIGTERM, InspIRCd::QuickExit); + int childpid; if ((childpid = fork ()) < 0) return false; @@ -224,6 +231,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) { @@ -246,8 +255,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; @@ -277,7 +286,7 @@ InspIRCd::InspIRCd(int argc, char** argv) { 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); @@ -296,28 +305,23 @@ InspIRCd::InspIRCd(int argc, char** argv) 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 } }; @@ -330,17 +334,37 @@ InspIRCd::InspIRCd(int argc, char** argv) strlcpy(LogFileName, optarg, MAXBUF); printf("LOG: Setting logfile to %s\n", LogFileName); break; + case 'c': + /* Config filename was set */ + strlcpy(ConfigFileName, optarg, MAXBUF); + printf("CONFIG: Setting config file to %s\n", ConfigFileName); + 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); + } + + 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); + } + + this->Start(); + /* Set the finished argument values */ Config->nofork = do_nofork; Config->forcedebug = do_debug; @@ -355,7 +379,22 @@ InspIRCd::InspIRCd(int argc, char** argv) this->XLines = new XLineManager(this); Config->ClearStack(); Config->Read(true, NULL); - this->CheckRoot(); + + 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); + } + this->Modes = new ModeParser(this); this->AddServerName(Config->ServerName); CheckDie(); @@ -369,11 +408,13 @@ InspIRCd::InspIRCd(int argc, char** argv) 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); } } @@ -394,6 +435,7 @@ InspIRCd::InspIRCd(int argc, char** argv) if ((stats->BoundPortCount == 0) && (found_ports > 0)) { printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); + Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?"); Exit(EXIT_STATUS_BIND); } @@ -416,6 +458,7 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!SE->AddFd(Config->openSockfd[count])) { printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n"); + Log(DEFAULT,"EH? Could not add listener to socketengine. You screwed up, aborting."); Exit(EXIT_STATUS_INTERNAL); } } @@ -423,13 +466,25 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!Config->nofork) { if (kill(getppid(), SIGTERM) == -1) + { printf("Error killing parent process: %s\n",strerror(errno)); + Log(DEFAULT,"Error killing parent process: %s",strerror(errno)); + } + } + + if (isatty(0) && isatty(1) && isatty(2)) + { + /* 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 + */ fclose(stdin); fclose(stderr); fclose(stdout); } printf("\nInspIRCd is now running!\n"); + Log(DEFAULT,"Startup complete."); this->WritePID(Config->PID); } @@ -438,6 +493,7 @@ 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); @@ -578,7 +634,7 @@ 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 << "WALLCHOPS WALLVOICES MODES=" << MAXMODES-1 << " 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(); @@ -760,7 +816,7 @@ bool InspIRCd::LoadModule(const char* filename) } catch (CoreException& modexcept) { - this->Log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason()); + this->Log(DEFAULT,"Unable to load %s: %s",modfile,modexcept.GetReason()); snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); return false; } @@ -855,6 +911,14 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) /* if any users was quit, take them out */ GlobalCulls.Apply(); + /* If any inspsockets closed, remove them */ + for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) + { + SE->DelFd(x->second); + x->second->Close(); + delete x->second; + } + SocketCull.clear(); } bool InspIRCd::IsIdent(const char* n) @@ -877,7 +941,6 @@ bool InspIRCd::IsIdent(const char* n) return true; } - int InspIRCd::Run() { while (true) @@ -938,7 +1001,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; } @@ -1001,10 +1064,11 @@ void FileLogger::WriteLogLine(const std::string &line) /* Wrote the whole buffer, and no need for write callback */ buffer = ""; } - } - if (writeops++ % 20) - { - fflush(log); + + if (writeops++ % 20) + { + fflush(log); + } } }