#include "inspircd.h"
#include "configreader.h"
#include <signal.h>
+#ifndef WIN32
#include <dirent.h>
+#include <unistd.h>
+#endif
#include <exception>
#include <fstream>
#include "modules.h"
#include "typedefs.h"
#include "command_parse.h"
#include "exitcodes.h"
+
+#ifndef WIN32
#include <dlfcn.h>
+#include <getopt.h>
+#endif
using irc::sockets::NonBlocking;
using irc::sockets::Blocking;
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 */
+ "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 <die> tag!", /* 12 */
+ "Couldn't load module on startup", /* 13 */
+ "", /* 14 */
+ "Received SIGTERM", /* 15 */
+};
+
void InspIRCd::AddServerName(const std::string &servername)
{
- 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. */
+ servernamelist::iterator itr = servernames.begin();
+ for(; itr != servernames.end(); ++itr)
+ if(**itr == servername)
+ return;
+
+ string * ns = new string(servername);
+ servernames.push_back(ns);
}
const char* InspIRCd::FindServerNamePtr(const std::string &servername)
{
- servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername);
-
- if(iter == servernames.end())
- {
- AddServerName(servername);
- iter = --servernames.end();
- }
-
- return iter->c_str();
+ servernamelist::iterator itr = servernames.begin();
+ for(; itr != servernames.end(); ++itr)
+ if(**itr == servername)
+ return (*itr)->c_str();
+
+ servernames.push_back(new string(servername));
+ itr = --servernames.end();
+ return (*itr)->c_str();
}
bool InspIRCd::FindServerName(const std::string &servername)
{
- return (find(servernames.begin(), servernames.end(), servername) != servernames.end());
+ servernamelist::iterator itr = servernames.begin();
+ for(; itr != servernames.end(); ++itr)
+ if(**itr == servername)
+ return true;
+ return false;
}
void InspIRCd::Exit(int status)
{
+#ifdef WINDOWS
+ CloseIPC();
+#endif
if (SI)
{
SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
std::vector<std::string> 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];
+ delete Config->ports[i];
+ }
+
+ Config->ports.clear();
+
+ /* Close all client sockets, or the new process inherits them */
+ for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+ {
+ (*i)->SetWriteError("Server shutdown");
+ (*i)->CloseSocket();
+ }
/* We do this more than once, so that any service providers get a
* chance to be unhooked by the modules using them, but then get
this->UnloadModule(mymodnames[k].c_str());
}
- /* Close all client sockets, or the new process inherits them */
- for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
- (*i)->CloseSocket();
-
/* 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)
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)
{
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");
+ 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\033[0m\n");
+ printf_c("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));
- fclose(SI->Config->log_file);
- SI->OpenLog(NULL,0);
+ 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();
+ FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect());
SI->Config->Read(false,NULL);
- FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
+ SI->ResetMaxBans();
+ SI->Res->Rehash();
+ SI->BuildISupport();
+ FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,""));
+}
+
+void InspIRCd::ResetMaxBans()
+{
+ for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++)
+ i->second->ResetMaxBans();
+}
+
+
+/** Because hash_map doesnt free its buckets when we delete items (this is a 'feature')
+ * we must occasionally rehash the hash (yes really).
+ * We do this by copying the entries from the old hash to a new hash, causing all
+ * empty buckets to be weeded out of the hash. We dont do this on a timer, as its
+ * very expensive, so instead we do it when the user types /REHASH and expects a
+ * short delay anyway.
+ */
+void InspIRCd::RehashUsersAndChans()
+{
+ user_hash* old_users = this->clientlist;
+ chan_hash* old_chans = this->chanlist;
+
+ this->clientlist = new user_hash();
+ this->chanlist = new chan_hash();
+
+ for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++)
+ this->clientlist->insert(*n);
+
+ delete old_users;
+
+ for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++)
+ this->chanlist->insert(*n);
+
+ delete old_chans;
+}
+
+void InspIRCd::CloseLog()
+{
+ this->Logger->Close();
}
void InspIRCd::SetSignals()
{
+#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
+ // Create process, with argument --service
+ STARTUPINFO si;
+ PROCESS_INFORMATION pi;
+ memset(&si, 0, sizeof(si));
+ memset(&pi, 0, sizeof(pi));
+ SHELLEXECUTEINFO sh = {0};
+ sh.cbSize = sizeof(sh);
+ sh.fMask = SEE_MASK_NOCLOSEPROCESS;
+ sh.hwnd = 0;
+ sh.lpVerb = 0;
+ sh.lpDirectory = 0;
+ sh.hInstApp = 0;
+ sh.nShow = SW_HIDE;
+ sh.lpFile = "inspircd.exe";
+ sh.lpParameters = "--service";
+ if(!ShellExecuteEx(&sh))
+ return false;
+
+ CloseHandle(sh.hProcess);
+ exit(0);
+ return true;
+#else
+ signal(SIGTERM, InspIRCd::QuickExit);
+
int childpid;
if ((childpid = fork ()) < 0)
return false;
*/
while (kill(childpid, 0) != -1)
sleep(1);
- Exit(EXIT_STATUS_FORK);
+ exit(0);
}
setsid ();
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)
{
}
return true;
+#endif
}
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;
}
- }
+ }
std::ofstream outfile(fname.c_str());
if (outfile.is_open())
{
}
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)
+ : 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)
{
+#ifdef WINDOWS
+ WSADATA wsadata;
+ WSAStartup(MAKEWORD(2,0), &wsadata);
+#endif
+
int found_ports = 0;
FailedPortList pl;
+ int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0, is_service = 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;
+
+ this->clientlist = new user_hash();
+ this->chanlist = new chan_hash();
+
this->Config = new ServerConfig(this);
+
+ this->Config->argv = argv;
+ this->Config->argc = argc;
+
this->Config->opertypes.clear();
this->Config->operclass.clear();
this->SNO = new SnomaskManager(this);
- this->Start();
this->TIME = this->OLDTIME = this->startup_time = time(NULL);
this->time_delta = 0;
this->next_call = this->TIME + 3;
srand(this->TIME);
- this->Log(DEBUG,"*** InspIRCd starting up!");
- if (!ServerConfig::FileExists(CONFIG_FILE))
- {
- printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE);
- this->Log(DEFAULT,"main: no config");
- printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n");
- Exit(EXIT_STATUS_CONFIG);
- }
+
*this->LogFileName = 0;
- if (argc > 1) {
- for (int i = 1; i < argc; i++)
+ 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 },
+ { "service", no_argument, &is_service, 1 },
+ { 0, 0, 0, 0 }
+ };
+
+ while ((c = getopt_long_only(argc, argv, ":f:", longopts, NULL)) != -1)
+ {
+ switch (c)
{
- if (!strcmp(argv[i],"-nofork"))
- {
- Config->nofork = true;
- }
- else if(!strcmp(argv[i],"-debug"))
- {
- Config->forcedebug = true;
- }
- else if(!strcmp(argv[i],"-nolog"))
- {
- Config->writelog = false;
- }
- else if (!strcmp(argv[i],"-wait"))
- {
- sleep(6);
- }
- else if (!strcmp(argv[i],"-logfile"))
- {
- if (argc > i+1)
- {
- strlcpy(LogFileName,argv[i+1],MAXBUF);
- printf("LOG: Setting logfile to %s\n",LogFileName);
- }
- else
- {
- printf("ERROR: The -logfile parameter must be followed by a log file name and path.\n");
- Exit(EXIT_STATUS_CONFIG);
- }
- i++;
- }
- else
- {
- printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-logfile <filename>]\n",argv[0]);
+ 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);
+ 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 <filename>] [--runasroot] [--version] [--config <config>]\n", argv[0]);
Exit(EXIT_STATUS_ARGV);
- }
+ break;
}
}
+#ifdef WINDOWS
+ if(is_service)
+ FreeConsole();
+#endif
+
+ 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;
+ Config->writelog = !do_nolog;
+
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->Timers = new TimerManager();
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())
+ if (!is_service && !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.
*/
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() ? "<all>" : 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++)
+#ifndef WINDOWS
+ if (!Config->nofork)
{
- this->Log(DEBUG,"Add listener: %d",Config->openSockfd[count]->GetFd());
- if (!SE->AddFd(Config->openSockfd[count]))
+ if (kill(getppid(), SIGTERM) == -1)
{
- printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
- Exit(EXIT_STATUS_INTERNAL);
+ printf("Error killing parent process: %s\n",strerror(errno));
+ Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
}
}
- if (!Config->nofork)
+ if (isatty(0) && isatty(1) && isatty(2))
{
- if (kill(getppid(), SIGTERM) == -1)
- printf("Error killing parent process: %s\n",strerror(errno));
- fclose(stdin);
- fclose(stderr);
- fclose(stdout);
+ /* 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
+ */
+ if (!do_nofork)
+ {
+ fclose(stdin);
+ fclose(stderr);
+ fclose(stdout);
+ }
+ else
+ {
+ Log(DEFAULT,"Keeping pseudo-tty open as we are running in the foreground.");
+ }
}
-
+#endif
printf("\nInspIRCd is now running!\n");
+ Log(DEFAULT,"Startup complete.");
this->WritePID(Config->PID);
+
+#ifdef WINDOWS
+ InitIPC();
+#endif
}
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=%lu,%s,%s]",VERSION,Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+ snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
}
return versiondata;
}
{
if (v2 == j)
{
- Config->module_names.erase(v);
- break;
+ Config->module_names.erase(v);
+ break;
}
v2++;
}
Config->implement_lists[slot][n] = x;
}
}
- else
- {
- this->Log(DEBUG,"Move of %s to slot failed!",modulename.c_str());
- }
}
void InspIRCd::MoveAfter(std::string modulename, std::string after)
{
// 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=" << 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";
+ v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
Config->data005 = v.str();
FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
Config->Update005();
return false;
}
/* Give the module a chance to tidy out all its metadata */
- for (chan_hash::iterator c = this->chanlist.begin(); c != this->chanlist.end(); c++)
+ for (chan_hash::iterator c = this->chanlist->begin(); c != this->chanlist->end(); c++)
{
modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
}
- for (user_hash::iterator u = this->clientlist.begin(); u != this->clientlist.end(); u++)
+ for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++)
{
modules[j]->OnCleanup(TYPE_USER,u->second);
}
{
int n_match = 0;
DIR* library = opendir(Config->ModPath);
- if (library)
- {
+ if (library)
+ {
/* Try and locate and load all modules matching the pattern */
dirent* entry = NULL;
while ((entry = readdir(library)))
snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
return false;
}
- this->Log(DEBUG,"Loading module: %s",modfile);
-
if (ServerConfig::FileExists(modfile))
{
}
else
{
- this->Log(DEFAULT,"Unable to load %s",modfile);
+ this->Log(DEFAULT,"Unable to load %s",modfile);
snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint.");
return false;
}
}
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;
}
void InspIRCd::DoOneIteration(bool process_module_sockets)
{
+#ifndef WIN32
static rusage ru;
+#endif
/* time() seems to be a pretty expensive syscall, so avoid calling it too much.
* Once per loop iteration is pleanty.
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(this, TIME);
+ this->RehashUsersAndChans();
+ FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
}
Timers->TickTimers(TIME);
this->DoBackgroundUserStuff(TIME);
FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
Timers->TickMissedTimers(TIME);
}
-
+#ifndef WIN32
if (!getrusage(0, &ru))
{
gettimeofday(&this->stats->LastSampled, NULL);
this->stats->LastCPU = ru.ru_utime;
}
+#else
+ CheckIPC(this);
+#endif
}
/* 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
+ * This will cause any read or write events to be
* dispatched to their handlers.
*/
SE->DispatchEvents();
-}
-bool InspIRCd::IsIdent(const char* n)
-{
- if (!n || !*n)
- return false;
+ /* if any users was quit, take them out */
+ GlobalCulls.Apply();
- for (char* i = (char*)n; *i; i++)
+ /* If any inspsockets closed, remove them */
+ for (std::map<InspSocket*,InspSocket*>::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)
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;
}
void FileLogger::HandleEvent(EventType et, int errornum)
{
this->WriteLogLine("");
- ServerInstance->SE->DelFd(this);
+ if (log)
+ ServerInstance->SE->DelFd(this);
}
void FileLogger::WriteLogLine(const std::string &line)
if (log)
{
int written = fprintf(log,"%s",buffer.c_str());
+#ifdef WINDOWS
+ buffer = "";
+#else
if ((written >= 0) && (written < (int)buffer.length()))
{
buffer.erase(0, buffer.length());
/* Wrote the whole buffer, and no need for write callback */
buffer = "";
}
- }
- if (writeops++ % 20)
- {
- fflush(log);
+#endif
+ if (writeops++ % 20)
+ {
+ fflush(log);
+ }
}
}
{
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 = "";
- 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 = "";
+ if (log)
+ {
+ irc::sockets::NonBlocking(fileno(log));
+ this->SetFd(fileno(log));
+ buffer = "";
+ }
}
FileLogger::~FileLogger()