#include <dirent.h>
#include <exception>
#include <fstream>
+#include <unistd.h>
#include "modules.h"
#include "mode.h"
#include "xline.h"
#include "socket.h"
#include "typedefs.h"
#include "command_parse.h"
+#include "exitcodes.h"
#include <dlfcn.h>
+#include <getopt.h>
+
using irc::sockets::NonBlocking;
using irc::sockets::Blocking;
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. */
}
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();
}
void InspIRCd::Exit(int status)
{
+ if (SI)
+ {
+ SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
+ SI->Cleanup();
+ }
exit (status);
}
-void InspIRCd::Restart(const std::string &reason)
+void InspIRCd::Cleanup()
{
std::vector<std::string> mymodnames;
- int MyModCount = 0;
-
- /* SendError flushes each client's queue,
- * regardless of writeability state
- */
- this->SendError(reason);
+ int MyModCount = this->GetModuleCount();
for (unsigned int i = 0; i < stats->BoundPortCount; i++)
+ {
/* This calls the constructor and closes the listening socket */
delete Config->openSockfd[i];
+ Config->openSockfd[i] = NULL;
+ }
+ stats->BoundPortCount = 0;
+
+ /* 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 twice, so that any service providers get a chance to be
- * unhooked by the modules using them, but then get a chance to be
- * removed themsleves.
+ /* 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
+ * a chance to be removed themsleves.
*/
- for (int tries = 0; tries < 2; tries++)
+ for (int tries = 0; tries < 3; tries++)
{
- MyModCount = ModCount;
+ MyModCount = this->GetModuleCount();
mymodnames.clear();
/* Unload all modules, so they get a chance to clean up their listeners */
- for (int j = 0; j < ModCount; j++)
+ for (int j = 0; j <= MyModCount; j++)
mymodnames.push_back(Config->module_names[j]);
- for (int k = 0; k < MyModCount; k++)
+ for (int k = 0; k <= MyModCount; k++)
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();
+}
+
+void InspIRCd::Restart(const std::string &reason)
+{
+ /* SendError flushes each client's queue,
+ * regardless of writeability state
+ */
+ this->SendError(reason);
+
+ this->Cleanup();
/* Figure out our filename (if theyve renamed it, we're boned) */
std::string me = Config->MyDir + "/inspircd";
- /* Close logging */
- this->Logger->Close();
+ char* argv[10];
+ int endp = 2;
+ argv[0] = Config->argv[0];
+ argv[1] = "--restart";
+ if (Config->forcedebug)
+ argv[endp++] = "--debug";
+ if (Config->nofork)
+ argv[endp++] = "--nofork";
+ if (!Config->writelog)
+ argv[endp++] = "--nolog";
+ if (*this->LogFileName)
+ {
+ argv[endp++] = "--logfile";
+ argv[endp++] = this->LogFileName;
+ }
+
+ argv[endp] = NULL;
- if (execv(me.c_str(), Config->argv) == -1)
+ if (execv(me.c_str(), argv) == -1)
{
/* Will raise a SIGABRT if not trapped */
throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno));
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(CONFIG_FILE));
+ 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()
*/
while (kill(childpid, 0) != -1)
sleep(1);
- exit(ERROR);
+ exit(0);
}
setsid ();
umask (007);
/* Leaves us with just the path */
fname = confpath.substr(0, pos) + std::string("/") + fname;
}
- }
+ }
std::ofstream outfile(fname.c_str());
if (outfile.is_open())
{
{
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);
+ Exit(EXIT_STATUS_PID);
}
}
}
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)
{
int found_ports = 0;
FailedPortList pl;
+ int do_nofork = 0, do_debug = 0, do_nolog = 0, do_restart = 0; /* flag variables */
+ char c = 0;
modules.resize(255);
factory.resize(255);
-
+
+ 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->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(ERROR);
+ Exit(EXIT_STATUS_CONFIG);
}
+
*this->LogFileName = 0;
- if (argc > 1) {
- for (int i = 1; i < argc; i++)
+
+ struct option longopts[] =
+ {
+ { "nofork", no_argument, &do_nofork, 1 },
+ { "logfile", required_argument, NULL, 'f' },
+ { "debug", no_argument, &do_debug, 1 },
+ { "nolog", no_argument, &do_nolog, 1 },
+ { "restart", no_argument, &do_restart, 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(ERROR);
- }
- i++;
- }
- else
- {
- printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-logfile <filename>]\n",argv[0]);
- Exit(ERROR);
- }
+ case 'f':
+ /* Log filename was set */
+ strlcpy(LogFileName, optarg, MAXBUF);
+ printf("LOG: Setting logfile to %s\n", LogFileName);
+ 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>] [--restart]\n", argv[0]);
+ Exit(EXIT_STATUS_ARGV);
+ break;
}
}
+ /* 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);
+ this->AddServerName(Config->ServerName);
CheckDie();
InitializeDisabledCommands(Config->DisabledCommands, this);
stats->BoundPortCount = BindPorts(true, found_ports, pl);
printf("\n");
this->SetSignals();
+
if (!Config->nofork)
{
if (!this->DaemonSeed())
{
printf("ERROR: could not go into daemon mode. Shutting down.\n");
- Exit(ERROR);
+ Log(DEFAULT,"ERROR: could not go into daemon mode. Shutting down.");
+ Exit(EXIT_STATUS_FORK);
}
}
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);
+ 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)
{
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);
/* 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);
+ Log(DEFAULT,"EH? Could not add listener to socketengine. You screwed up, aborting.");
+ Exit(EXIT_STATUS_INTERNAL);
}
}
- if (!Config->nofork)
+ if (!Config->nofork && !do_restart)
{
+ int closed = 0;
+
if (kill(getppid(), SIGTERM) == -1)
+ {
printf("Error killing parent process: %s\n",strerror(errno));
- fclose(stdin);
- fclose(stderr);
- fclose(stdout);
+ Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
+ }
+
+ /*Log(DEBUG,"Fileno(stdin, stdout, stderr): %d %d %d", fileno(stdin), fileno(stdout), fileno(stderr));*/
+
+ if (stdin)
+ {
+ fclose(stdin);
+ closed++;
+ }
+
+ if (stdout)
+ {
+ fclose(stdout);
+ closed++;
+ }
+
+ if (stderr)
+ {
+ fclose(stderr);
+ closed++;
+ }
+
+ Log(DEBUG,"%d system descriptors closed.", closed);
}
printf("\nInspIRCd is now running!\n");
+ Log(DEFAULT,"Startup complete, Initial TS=%d.", time(NULL));
this->WritePID(Config->PID);
}
}
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;
}
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 << " 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();
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);
}
}
// found the module
- this->Log(DEBUG,"Removing dependent commands...");
Parser->RemoveCommands(filename);
- this->Log(DEBUG,"Deleting module...");
this->EraseModule(j);
- this->Log(DEBUG,"Erasing module entry...");
this->EraseFactory(j);
this->Log(DEFAULT,"Module %s unloaded",filename);
this->ModCount--;
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))
{
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);
* 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();
+
+ /* if any users was quit, take them out */
+ GlobalCulls.Apply();
+
}
bool InspIRCd::IsIdent(const char* n)
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)
/* Wrote the whole buffer, and no need for write callback */
buffer = "";
}
- }
- if (writeops++ % 20)
- {
- fflush(log);
+
+ if (writeops++ % 20)
+ {
+ fflush(log);
+ }
}
}
fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK);
if (buffer.size())
fprintf(log,"%s",buffer.c_str());
+
+ ServerInstance->SE->DelFd(this);
+
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()
projects / user / henk / code / inspircd.git / blobdiff