*/
/* $Core */
-/* $Install: src/inspircd $(BINPATH) */
#include "inspircd.h"
+#include "inspircd_version.h"
#include <signal.h>
#ifndef WIN32
#include "xline.h"
#include "bancache.h"
#include "socketengine.h"
-#include "inspircd_se_config.h"
#include "socket.h"
#include "command_parse.h"
#include "exitcodes.h"
#include "caller.h"
#include "testsuite.h"
-InspIRCd* SI = NULL;
+InspIRCd* ServerInstance = NULL;
int* mysig = NULL;
/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping
"CreateEvent failed" /* 19 */
};
-template<typename T> static void DeleteZero(T* n)
+template<typename T> static void DeleteZero(T*&n)
{
- if (n != NULL)
- {
- delete n;
- n = NULL;
- }
+ T* t = n;
+ n = NULL;
+ delete t;
}
void InspIRCd::Cleanup()
{
- if (Config)
+ for (unsigned int i = 0; i < ports.size(); i++)
{
- for (unsigned int i = 0; i < ports.size(); i++)
- {
- /* This calls the constructor and closes the listening socket */
- delete ports[i];
- }
-
- ports.clear();
+ /* This calls the constructor and closes the listening socket */
+ ports[i]->cull();
+ delete ports[i];
}
+ ports.clear();
/* Close all client sockets, or the new process inherits them */
- for (std::vector<User*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
+ std::vector<LocalUser*>::reverse_iterator i = Users->local_users.rbegin();
+ while (i != this->Users->local_users.rend())
{
- this->Users->QuitUser((*i), "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
- * a chance to be removed themsleves.
- *
- * XXX there may be a better way to do this with 1.2
- */
- for (int tries = 0; tries < 3; tries++)
- {
- std::vector<std::string> module_names = Modules->GetAllModuleNames(0);
- for (std::vector<std::string>::iterator k = module_names.begin(); k != module_names.end(); ++k)
- {
- /* Unload all modules, so they get a chance to clean up their listeners */
- this->Modules->Unload(k->c_str());
- }
+ User* u = *i++;
+ Users->QuitUser(u, "Server shutdown");
}
- /* Remove core commands */
- Parser->RemoveCommands("<core>");
- /* Cleanup Server Names */
- for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
- delete (*itr);
+ GlobalCulls.Apply();
+ Modules->UnloadAll();
/* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
/* Must be deleted before modes as it decrements modelines */
+ if (FakeClient)
+ FakeClient->cull();
+ DeleteZero(this->FakeClient);
DeleteZero(this->Users);
DeleteZero(this->Modes);
DeleteZero(this->XLines);
DeleteZero(this->PI);
DeleteZero(this->Threads);
DeleteZero(this->Timers);
+ DeleteZero(this->SE);
/* Close logging */
this->Logs->CloseLogs();
DeleteZero(this->Logs);
this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!");
return false;
}
- else
- {
- rl.rlim_cur = rl.rlim_max;
- if (setrlimit(RLIMIT_CORE, &rl) == -1)
+ rl.rlim_cur = rl.rlim_max;
+
+ if (setrlimit(RLIMIT_CORE, &rl) == -1)
this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size.");
- }
return true;
#endif
void InspIRCd::WritePID(const std::string &filename)
{
- std::string fname = (filename.empty() ? "inspircd.pid" : filename);
- std::replace(fname.begin(), fname.end(), '\\', '/');
- if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename)))
- {
- std::string::size_type pos;
- 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::string fname(filename);
+ if (fname.empty())
+ fname = "data/inspircd.pid";
std::ofstream outfile(fname.c_str());
if (outfile.is_open())
{
}
}
-InspIRCd::InspIRCd(int argc, char** argv)
- : GlobalCulls(this),
+InspIRCd::InspIRCd(int argc, char** argv) :
+ ConfigFileName("inspircd.conf"),
- /* Functor initialisation. Note that the ordering here is very important.
- *
- * THIS MUST MATCH ORDER OF DECLARATION OF THE HandleWhateverFunc classes
- * within class InspIRCd.
- */
- HandleProcessUser(this),
- HandleIsNick(this),
- HandleIsIdent(this),
- HandleFloodQuitUser(this),
- HandleIsChannel(this),
- HandleIsSID(this),
- HandleRehash(this),
-
- /* Functor pointer initialisation. Must match the order of the list above
+ /* Functor pointer initialisation.
*
* THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
* themselves within the class.
*/
- ProcessUser(&HandleProcessUser),
+ NICKForced("NICKForced", NULL),
+ OperQuit("OperQuit", NULL),
IsChannel(&HandleIsChannel),
IsSID(&HandleIsSID),
Rehash(&HandleRehash),
IsNick(&HandleIsNick),
IsIdent(&HandleIsIdent),
FloodQuitUser(&HandleFloodQuitUser)
-
{
#ifdef WIN32
// Strict, frequent checking of memory on debug builds
// Avoid erroneous frees on early exit
WindowsIPC = 0;
#endif
+
+ ServerInstance = this;
+
+ Extensions.Register(&NICKForced);
+ Extensions.Register(&OperQuit);
+
FailedPortList pl;
int do_version = 0, do_nofork = 0, do_debug = 0,
do_nolog = 0, do_root = 0, do_testsuite = 0; /* flag variables */
// Initialise TIME
this->TIME = time(NULL);
- memset(&server, 0, sizeof(server));
- memset(&client, 0, sizeof(client));
-
// This must be created first, so other parts of Insp can use it while starting up
- this->Logs = new LogManager(this);
+ this->Logs = new LogManager;
- SocketEngineFactory* SEF = new SocketEngineFactory();
- SE = SEF->Create(this);
- delete SEF;
+ SE = CreateSocketEngine();
- this->Threads = new ThreadEngine(this);
+ this->Threads = new ThreadEngine;
/* Default implementation does nothing */
- this->PI = new ProtocolInterface(this);
+ this->PI = new ProtocolInterface;
this->s_signal = 0;
// Create base manager classes early, so nothing breaks
- this->Users = new UserManager(this);
+ this->Users = new UserManager;
this->Users->unregistered_count = 0;
this->Users->uuidlist = new user_hash();
this->chanlist = new chan_hash();
- this->Config = new ServerConfig(this);
- this->SNO = new SnomaskManager(this);
- this->BanCache = new BanCacheManager(this);
- this->Modules = new ModuleManager(this);
+ this->Config = new ServerConfig;
+ this->SNO = new SnomaskManager;
+ this->BanCache = new BanCacheManager;
+ this->Modules = new ModuleManager();
this->stats = new serverstats();
- this->Timers = new TimerManager(this);
- this->Parser = new CommandParser(this);
- this->XLines = new XLineManager(this);
+ this->Timers = new TimerManager;
+ this->Parser = new CommandParser;
+ this->XLines = new XLineManager;
this->Config->argv = argv;
this->Config->argc = argc;
- if (chdir(Config->GetFullProgDir().c_str()))
- {
- printf("Unable to change to my directory: %s\nAborted.", strerror(errno));
- exit(0);
- }
-
- this->Config->opertypes.clear();
- this->Config->operclass.clear();
-
this->TIME = this->OLDTIME = this->startup_time = time(NULL);
srand(this->TIME);
*this->LogFileName = 0;
- strlcpy(this->ConfigFileName, CONFIG_FILE, MAXBUF);
struct option longopts[] =
{
break;
case 'c':
/* Config filename was set */
- strlcpy(ConfigFileName, optarg, MAXBUF);
+ ConfigFileName = optarg;
break;
case 0:
/* getopt_long_only() set an int variable, just keep going */
// Handle forking
if(!do_nofork)
{
- DWORD ExitCode = WindowsForkStart(this);
+ DWORD ExitCode = WindowsForkStart();
if(ExitCode)
exit(ExitCode);
}
// Set up winsock
WSADATA wsadata;
WSAStartup(MAKEWORD(2,0), &wsadata);
- ChangeWindowsSpecificPointers(this);
+ ChangeWindowsSpecificPointers();
#endif
- Config->MyExecutable = argv[0];
/* Set the finished argument values */
Config->nofork = do_nofork;
Exit(EXIT_STATUS_LOG);
}
- if (!ServerConfig::FileExists(this->ConfigFileName))
+ if (!ServerConfig::FileExists(ConfigFileName.c_str()))
{
#ifdef WIN32
/* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
if (ServerConfig::FileExists(txtconf.c_str()))
{
- strlcat(this->ConfigFileName, ".txt", MAXBUF);
+ ConfigFileName = txtconf;
}
else
#endif
{
- printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
- this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName);
+ printf("ERROR: Cannot open config file: %s\nExiting...\n", ConfigFileName.c_str());
+ this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", ConfigFileName.c_str());
Exit(EXIT_STATUS_CONFIG);
}
}
printf_c("\t\033[1;32mpeavey, aquanight, psychon, dz, danieldg\033[0m\n\n");
printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
- this->Modes = new ModeParser(this);
+ this->Modes = new ModeParser;
if (!do_root)
this->CheckRoot();
this->Config->Apply(NULL, "");
Logs->OpenFileLogs();
- /** Note: This is safe, the method checks for user == NULL */
- this->Parser->SetupCommandTable();
-
- this->Res = new DNS(this);
-
- this->AddServerName(Config->ServerName);
+ this->Res = new DNS;
/*
* Initialise SID/UID.
* For an explanation as to exactly how this works, and why it works this way, see GetUID().
* -- w00t
*/
- if (!*Config->sid)
+ if (Config->sid.empty())
{
// Generate one
- size_t sid = 0;
+ unsigned int sid = 0;
+ char sidstr[4];
- for (const char* x = Config->ServerName; *x; ++x)
+ for (const char* x = Config->ServerName.c_str(); *x; ++x)
sid = 5 * sid + *x;
- for (const char* y = Config->ServerDesc; *y; ++y)
+ for (const char* y = Config->ServerDesc.c_str(); *y; ++y)
sid = 5 * sid + *y;
- sid = sid % 999;
+ sprintf(sidstr, "%03d", sid % 1000);
- Config->sid[0] = (char)(sid / 100 + 48);
- Config->sid[1] = (char)(((sid / 10) % 10) + 48);
- Config->sid[2] = (char)(sid % 10 + 48);
- Config->sid[3] = '\0';
+ Config->sid = sidstr;
}
/* set up fake client again this time with the correct uid */
- this->FakeClient = new FakeUser(this, "!");
+ this->FakeClient = new FakeUser("!");
this->FakeClient->SetFakeServer(Config->ServerName);
// Get XLine to do it's thing.
}
}
- printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds());
+ printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n",
+ Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds());
#ifndef WINDOWS
if (!Config->nofork)
}
}
#else
- WindowsIPC = new IPC(this);
+ WindowsIPC = new IPC;
if(!Config->nofork)
{
- WindowsForkKillOwner(this);
+ WindowsForkKillOwner();
FreeConsole();
}
/* Set win32 service as running, if we are running as a service */
SetServiceRunning();
#endif
- Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds());
+ Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds());
#ifndef WIN32
- if (*(this->Config->SetGroup))
+ if (!Config->SetGroup.empty())
{
int ret;
struct group *g;
errno = 0;
- g = getgrnam(this->Config->SetGroup);
+ g = getgrnam(this->Config->SetGroup.c_str());
if (!g)
{
}
}
- if (*(this->Config->SetUser))
+ if (!Config->SetUser.empty())
{
// setuid
struct passwd *u;
errno = 0;
- u = getpwnam(this->Config->SetUser);
+ u = getpwnam(this->Config->SetUser.c_str());
if (!u)
{
/* See if we're supposed to be running the test suite rather than entering the mainloop */
if (Config->TestSuite)
{
- TestSuite* ts = new TestSuite(this);
+ TestSuite* ts = new TestSuite;
delete ts;
Exit(0);
}
if ((TIME % 3600) == 0)
{
this->RehashUsersAndChans();
- FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
+ FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
}
Timers->TickTimers(TIME);
if ((TIME % 5) == 0)
{
- FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+ FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME));
SNO->FlushSnotices();
}
#ifndef WIN32
* This will cause any read or write events to be
* dispatched to their handlers.
*/
+ this->SE->DispatchTrialWrites();
this->SE->DispatchEvents();
/* if any users were quit, take them out */
- this->GlobalCulls.Apply();
-
- /* If any inspsockets closed, remove them */
- this->BufferedSocketCull();
+ GlobalCulls.Apply();
+ AtomicActions.Run();
if (this->s_signal)
{
return 0;
}
-void InspIRCd::BufferedSocketCull()
-{
- for (std::map<BufferedSocket*,BufferedSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
- {
- this->Logs->Log("MISC",DEBUG,"Cull socket");
- SE->DelFd(x->second);
- x->second->Close();
- delete x->second;
- }
- SocketCull.clear();
-}
-
/**********************************************************************************/
/**
* (until this returns true, a user will block in the waiting state, waiting to connect up to the
* registration timeout maximum seconds)
*/
-bool InspIRCd::AllModulesReportReady(User* user)
+bool InspIRCd::AllModulesReportReady(LocalUser* user)
{
- for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i)
- {
- if (!(*i)->OnCheckReady(user))
- return false;
- }
- return true;
+ ModResult res;
+ FIRST_MOD_RESULT(OnCheckReady, res, (user));
+ return (res == MOD_RES_PASSTHRU);
}
time_t InspIRCd::Time()
*/
ENTRYPOINT
{
- SI = new InspIRCd(argc, argv);
- mysig = &SI->s_signal;
- SI->Run();
- delete SI;
+ new InspIRCd(argc, argv);
+ mysig = &ServerInstance->s_signal;
+ ServerInstance->Run();
+ delete ServerInstance;
return 0;
}
projects / user / henk / code / inspircd.git / blobdiff