}
/* 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 k = 0; k <= MyModCount; k++)
this->Modules->Unload(mymodnames[k].c_str());
}
+
}
/* Close logging */
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)
{
DWORD ExitCode = WindowsForkStart(this);
if(ExitCode)
- Exit(ExitCode);
+ exit(ExitCode);
}
// Set up winsock
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)
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();
* (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;
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())