void InspIRCd::Cleanup()
{
std::vector<std::string> mymodnames;
- int MyModCount = this->GetModuleCount();
+ int MyModCount = this->Modules->GetCount();
if (Config)
{
*/
for (int tries = 0; tries < 3; tries++)
{
- MyModCount = this->GetModuleCount();
+ MyModCount = this->Modules->GetCount();
mymodnames.clear();
if (MyModCount)
mymodnames.push_back(Config->module_names[j]);
for (int k = 0; k <= MyModCount; k++)
- this->UnloadModule(mymodnames[k].c_str());
+ this->Modules->Unload(mymodnames[k].c_str());
}
}
}
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));
Exit(EXIT_STATUS_LOG);
}
+ this->Modules = new ModuleManager(this);
this->stats = new serverstats();
this->Timers = new TimerManager(this);
this->Parser = new CommandParser(this);
this->XLines = new XLineManager(this);
+
Config->ClearStack();
Config->Read(true, NULL);
+
+ this->Modules->modules.resize(255);
+ this->Modules->handles.resize(255);
/*
- * Initialise UID. XXX, we need to read SID from config, and use it instead of 000.
+ * Initialise SID/UID.
* 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)
Config->sid = 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';
+ this->InitialiseUID();
/* set up fake client */
this->FakeClient = new userrec(this);
this->Res = new DNS(this);
- 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(TIME);
+
+ if ((TIME % 5) == 0)
+ {
+ XLines->expire_lines();
+ 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->InspSocketCull();
- 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()
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*.
*/
-int main(int argc, char** argv)
+int ircd(int argc, char ** argv)
{
SI = new InspIRCd(argc, argv);
mysig = &SI->s_signal;
return 0;
}
+#ifdef WINDOWS
+
+int main(int argc, char ** argv)
+{
+ __try {
+ ircd(argc,argv);
+ } __except(__exceptionHandler(GetExceptionInformation())) {}
+ return 0;
+}
+
+#else
+int main(int argc, char** argv)
+{
+ return ircd(argc,argv);
+}
+#endif
+
/* this returns true when all modules are satisfied that the user should be allowed onto the irc server
* (until this returns true, a user will block in the waiting state, waiting to connect up to the
* registration timeout maximum seconds)
if (!Config->global_implementation[I_OnCheckReady])
return true;
- for (int i = 0; i <= this->GetModuleCount(); i++)
+ for (int i = 0; i <= this->Modules->GetCount(); i++)
{
if (Config->implement_lists[i][I_OnCheckReady])
{
- int res = modules[i]->OnCheckReady(user);
+ int res = this->Modules->modules[i]->OnCheckReady(user);
if (!res)
return false;
}
return true;
}
-int InspIRCd::GetModuleCount()
-{
- return this->ModCount;
-}
-
time_t InspIRCd::Time(bool delta)
{
if (delta)
{
*mysig = signal;
}
-
projects / user / henk / code / inspircd.git / blobdiff