* ---------------------------------------------------
*/
+/* $Install: src/inspircd $(BINPATH) */
+
#include "inspircd.h"
#include <signal.h>
#include <fstream>
#include "xline.h"
+#include "bancache.h"
#include "socketengine.h"
#include "inspircd_se_config.h"
#include "socket.h"
void InspIRCd::Cleanup()
{
- std::vector<std::string> mymodnames;
- int MyModCount = this->GetModuleCount();
-
if (Config)
{
for (unsigned int i = 0; i < Config->ports.size(); i++)
}
/* 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++)
+ for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
{
(*i)->SetWriteError("Server shutdown");
(*i)->CloseSocket();
*/
for (int tries = 0; tries < 3; tries++)
{
- MyModCount = this->GetModuleCount();
- mymodnames.clear();
-
- if (MyModCount)
+ 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 */
- for (int j = 0; j <= MyModCount; j++)
- mymodnames.push_back(Config->module_names[j]);
-
- for (int k = 0; k <= MyModCount; k++)
- this->UnloadModule(mymodnames[k].c_str());
+ this->Modules->Unload(k->c_str());
}
}
if (this->Logger)
this->Logger->Close();
+
/* Cleanup Server Names */
for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
delete (*itr);
+
+
}
void InspIRCd::Restart(const std::string &reason)
}
InspIRCd::InspIRCd(int argc, char** argv)
- : ModCount(0),
- GlobalCulls(this),
+ : GlobalCulls(this),
/* Functor initialisation. Note that the ordering here is very important. */
HandleProcessUser(this),
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->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->stats = new serverstats();
+ this->Timers = new TimerManager(this);
+ this->Parser = new CommandParser(this);
+ this->XLines = new XLineManager(this);
this->Config->argv = argv;
this->Config->argc = argc;
this->Config->opertypes.clear();
this->Config->operclass.clear();
- this->SNO = new SnomaskManager(this);
+
this->TIME = this->OLDTIME = this->startup_time = time(NULL);
this->time_delta = 0;
- this->next_call = this->TIME + 3;
srand(this->TIME);
*this->LogFileName = 0;
{
DWORD ExitCode = WindowsForkStart(this);
if(ExitCode)
- Exit(ExitCode);
+ exit(ExitCode);
}
// Set up winsock
ChangeWindowsSpecificPointers(this);
#endif
+ strlcpy(Config->MyExecutable,argv[0],MAXBUF);
+
+ if (!this->OpenLog(argv, argc))
+ {
+ printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
+ Exit(EXIT_STATUS_LOG);
+ }
+
if (!ServerConfig::FileExists(this->ConfigFileName))
{
printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName);
/* Set the finished argument values */
Config->nofork = do_nofork;
Config->forcedebug = do_debug;
- Config->writelog = !do_nolog;
-
- strlcpy(Config->MyExecutable,argv[0],MAXBUF);
-
- if (!this->OpenLog(argv, argc))
- {
- printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
- Exit(EXIT_STATUS_LOG);
- }
-
- this->stats = new serverstats();
- this->Timers = new TimerManager(this);
- this->Parser = new CommandParser(this);
- this->XLines = new XLineManager(this);
+ Config->writelog = !do_nolog;
Config->ClearStack();
- Config->Read(true, NULL);
-
- /*
- * Initialise UID. XXX, we need to read SID from config, and use it instead of 000.
- * For an explanation as to exactly how this works, and why it works this way, see GetUID().
- * -- w00t
- */
- int i;
-
- /* Generate SID */
- size_t sid = 0;
- if (Config->sid)
- {
- sid = Config->sid;
- }
- else
- {
- for (const char* x = Config->ServerName; *x; ++x)
- sid = 5 * sid + *x;
- for (const char* y = Config->ServerDesc; *y; ++y)
- sid = 5 * sid + *y;
- sid = sid % 999;
- Config->sid = sid;
- }
- current_uid[0] = sid / 100 + 48;
- current_uid[1] = ((sid / 10) % 10) + 48;
- current_uid[2] = sid % 10 + 48;
+ this->Modes = new ModeParser(this);
- /* Initialise UID */
- for(i = 3; i < UUID_LENGTH - 1; i++)
- current_uid[i] = 'A';
+ /* set up fake client (uid is incorrect at this point,
+ * until after config is read. we set up the user again
+ * at that point
+ */
+ this->FakeClient = new User(this);
+ this->FakeClient->SetFd(FD_MAGIC_NUMBER);
if (!do_root)
this->CheckRoot();
SE->RecoverFromFork();
- this->Modes = new ModeParser(this);
- this->AddServerName(Config->ServerName);
- CheckDie();
- int bounditems = BindPorts(true, found_ports, pl);
+ this->Res = new DNS(this);
- for(int t = 0; t < 255; t++)
- Config->global_implementation[t] = 0;
+ /* Read config, pass 0. At the end if this pass,
+ * the Config->IncludeFiles is populated, we call
+ * Config->StartDownloads to initialize the downlaods of all
+ * these files.
+ */
+ Config->Read(true, NULL, 0);
+ Config->StartDownloads();
+
+ /* Now the downloads are started, we monitor them for completion.
+ * On completion, we call Read again with pass = 1.
+ * NOTE: We really should add a timeout here
+ */
- memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
+ while (Config->Downloading())
+ {
+ SE->DispatchEvents();
+ this->BufferedSocketCull();
+ }
printf("\n");
- this->Res = new DNS(this);
+ if (Config->FileErrors)
+ {
+ /* One or more file download/access errors, do not
+ * proceed to second pass
+ */
+ for (std::map<std::string, std::istream*>::iterator x = Config->IncludedFiles.begin(); x != Config->IncludedFiles.end(); ++x)
+ {
+ if (!x->second)
+ printf("ERROR: Failed to access the file: %s.\n", x->first.c_str());
+ }
+ printf("Initialisation of configuration failed.\n");
+ Exit(EXIT_STATUS_CONFIG);
+ }
+
+ /* We have all the files we can get, initiate pass 1 */
+ Config->Read(true, NULL, 1);
+
+ this->AddServerName(Config->ServerName);
+
+ /* set up fake client again this time with the correct uid */
+ delete FakeClient;
+ this->FakeClient = new User(this);
+ this->FakeClient->SetFd(FD_MAGIC_NUMBER);
+
+ /*
+ * Initialise SID/UID.
+ * For an explanation as to exactly how this works, and why it works this way, see GetUID().
+ * -- w00t
+ */
+ /* Generate SID */
+ size_t sid = 0;
+ if (Config->sid)
+ {
+ sid = Config->sid;
+ }
+ else
+ {
+ for (const char* x = Config->ServerName; *x; ++x)
+ sid = 5 * sid + *x;
+ for (const char* y = Config->ServerDesc; *y; ++y)
+ sid = 5 * sid + *y;
+ sid = sid % 999;
+
+ Config->sid = sid;
+ }
+
+ this->InitialiseUID();
+
+ // Get XLine to do it's thing.
+ this->XLines->CheckELines();
+ this->XLines->ApplyLines();
+
+
+ CheckDie();
+ int bounditems = BindPorts(true, found_ports, pl);
+
+ printf("\n");
- this->LoadAllModules();
+ /*this->Modules->LoadAll();*/
+
/* Just in case no modules were loaded - fix for bug #101 */
this->BuildISupport();
InitializeDisabledCommands(Config->DisabledCommands, this);
this->WritePID(Config->PID);
}
-void InspIRCd::DoOneIteration(bool process_module_sockets)
+/* moved to a function, as UID generation can call this also */
+void InspIRCd::InitialiseUID()
+{
+ int i;
+ size_t sid = Config->sid;
+
+ current_uid[0] = sid / 100 + 48;
+ current_uid[1] = ((sid / 10) % 10) + 48;
+ current_uid[2] = sid % 10 + 48;
+
+ /* Initialise UID */
+ for(i = 3; i < UUID_LENGTH - 1; i++)
+ current_uid[i] = 'A';
+}
+
+int InspIRCd::Run()
{
+ while (true)
+ {
#ifndef WIN32
- static rusage ru;
+ static rusage ru;
#else
- static time_t uptime;
- static struct tm * stime;
- static char window_title[100];
+ 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.
- */
- OLDTIME = TIME;
- TIME = time(NULL);
-
- /* Run background module timers every few seconds
- * (the docs say modules shouldnt rely on accurate
- * timing using this event, so we dont have to
- * time this exactly).
- */
- if (TIME != OLDTIME)
- {
- if (TIME < OLDTIME)
- WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
- if ((TIME % 3600) == 0)
- {
- this->RehashUsersAndChans();
- FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
- }
- Timers->TickTimers(TIME);
- this->DoBackgroundUserStuff(TIME);
+ /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
+ * Once per loop iteration is pleanty.
+ */
+ OLDTIME = TIME;
+ TIME = time(NULL);
- if ((TIME % 5) == 0)
+ /* Run background module timers every few seconds
+ * (the docs say modules shouldnt rely on accurate
+ * timing using this event, so we dont have to
+ * time this exactly).
+ */
+ if (TIME != OLDTIME)
{
- XLines->expire_lines();
- FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
- Timers->TickMissedTimers(TIME);
- }
+ if (TIME < OLDTIME)
+ {
+ WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
+ }
+
+ if ((TIME % 3600) == 0)
+ {
+ this->RehashUsersAndChans();
+ FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
+ }
+
+ Timers->TickTimers(TIME);
+ this->DoBackgroundUserStuff();
+
+ if ((TIME % 5) == 0)
+ {
+ FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+ Timers->TickMissedTimers(TIME);
+ }
#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;
- }
+ /* 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
- WindowsIPC->Check();
-
- 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);
- }
+ WindowsIPC->Check();
+
+ 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
- * 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
- * dispatched to their handlers.
- */
- this->SE->DispatchEvents();
+ /* 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
+ * dispatched to their handlers.
+ */
+ this->SE->DispatchEvents();
- /* if any users was quit, take them out */
- this->GlobalCulls.Apply();
+ /* if any users was quit, take them out */
+ this->GlobalCulls.Apply();
- /* If any inspsockets closed, remove them */
- this->InspSocketCull();
+ /* If any inspsockets closed, remove them */
+ this->BufferedSocketCull();
- if (this->s_signal)
- {
- this->SignalHandler(s_signal);
- this->s_signal = 0;
+ if (this->s_signal)
+ {
+ this->SignalHandler(s_signal);
+ this->s_signal = 0;
+ }
}
+ return 0;
}
-void InspIRCd::InspSocketCull()
+void InspIRCd::BufferedSocketCull()
{
- for (std::map<InspSocket*,InspSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
+ for (std::map<BufferedSocket*,BufferedSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
{
SE->DelFd(x->second);
x->second->Close();
SocketCull.clear();
}
-int InspIRCd::Run()
-{
- while (true)
- {
- DoOneIteration(true);
- }
- /* This is never reached -- we hope! */
- return 0;
-}
-
/**********************************************************************************/
/**
- * An ircd in four lines! bwahahaha. ahahahahaha. ahahah *cough*.
+ * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*.
*/
-int main(int argc, char** argv)
+int main(int argc, char ** argv)
{
SI = new InspIRCd(argc, argv);
mysig = &SI->s_signal;
* (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(userrec* user)
+bool InspIRCd::AllModulesReportReady(User* user)
{
- if (!Config->global_implementation[I_OnCheckReady])
- return true;
-
- for (int i = 0; i <= this->GetModuleCount(); i++)
+ for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i)
{
- if (Config->implement_lists[i][I_OnCheckReady])
- {
- int res = modules[i]->OnCheckReady(user);
- if (!res)
- return false;
- }
+ int res = (*i)->OnCheckReady(user);
+ if (!res)
+ return false;
}
- return true;
-}
-int InspIRCd::GetModuleCount()
-{
- return this->ModCount;
+ return true;
}
time_t InspIRCd::Time(bool delta)
return old;
}
-void InspIRCd::AddLocalClone(userrec* user)
+void InspIRCd::AddLocalClone(User* user)
{
clonemap::iterator x = local_clones.find(user->GetIPString());
if (x != local_clones.end())
local_clones[user->GetIPString()] = 1;
}
-void InspIRCd::AddGlobalClone(userrec* user)
+void InspIRCd::AddGlobalClone(User* user)
{
clonemap::iterator y = global_clones.find(user->GetIPString());
if (y != global_clones.end())
{
*mysig = signal;
}
-
projects / user / henk / code / inspircd.git / blobdiff