* ---------------------------------------------------
*/
+/* $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->Modules->GetCount();
-
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->Modules->GetCount();
- 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->Modules->Unload(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)
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
/* Set the finished argument values */
Config->nofork = do_nofork;
Config->forcedebug = do_debug;
- Config->writelog = !do_nolog;
-
- 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->writelog = !do_nolog;
Config->ClearStack();
- Config->Read(true, NULL);
-
- this->Modules->modules.resize(255);
- this->Modules->handles.resize(255);
+
+ this->Modes = new ModeParser(this);
+ this->AddServerName(Config->ServerName);
/*
* Initialise SID/UID.
this->InitialiseUID();
/* set up fake client */
- this->FakeClient = new userrec(this);
+ this->FakeClient = new User(this);
this->FakeClient->SetFd(FD_MAGIC_NUMBER);
if (!do_root)
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
+ */
+ Exit(EXIT_STATUS_CONFIG);
+ }
+
+ /* We have all the files we can get, initiate pass 1 */
+ Config->Read(true, NULL, 1);
+
+ // Get XLine to do it's thing.
+ this->XLines->CheckELines();
+ this->XLines->ApplyLines();
+
- this->Modules->LoadAll();
+ CheckDie();
+ int bounditems = BindPorts(true, found_ports, pl);
+
+ printf("\n");
+
+ /*this->Modules->LoadAll();*/
/* Just in case no modules were loaded - fix for bug #101 */
this->BuildISupport();
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);
+ this->DoBackgroundUserStuff();
if ((TIME % 5) == 0)
{
- XLines->expire_lines();
FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
Timers->TickMissedTimers(TIME);
}
this->GlobalCulls.Apply();
/* If any inspsockets closed, remove them */
- this->InspSocketCull();
+ this->BufferedSocketCull();
if (this->s_signal)
{
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();
/**********************************************************************************/
/**
- * An ircd in four lines! bwahahaha. ahahahahaha. ahahah *cough*.
+ * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*.
*/
-int ircd(int argc, char ** argv)
+int main(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)
*/
-bool InspIRCd::AllModulesReportReady(userrec* user)
+bool InspIRCd::AllModulesReportReady(User* user)
{
- if (!Config->global_implementation[I_OnCheckReady])
- return true;
-
- for (int i = 0; i <= this->Modules->GetCount(); 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 = this->Modules->modules[i]->OnCheckReady(user);
- if (!res)
- return false;
- }
+ int res = (*i)->OnCheckReady(user);
+ if (!res)
+ return false;
}
+
return true;
}
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())