InspSocket -> BufferedSocket. Paves the way for a SimpleSocket class which ident...

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 3149d74ea712b854b950f8354499da3d5783f0bd..54243e807fccab83acb95f796959b534484683ea 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -82,7 +82,7 @@ void InspIRCd::Cleanup()
        }
 
        /* 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();
@@ -106,15 +106,19 @@ void InspIRCd::Cleanup()
                        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)
@@ -388,7 +392,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        {
                DWORD ExitCode = WindowsForkStart(this);
                if(ExitCode)
-                       Exit(ExitCode);
+                       exit(ExitCode);
        }
 
        // Set up winsock
@@ -459,7 +463,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        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)
@@ -660,7 +664,7 @@ int InspIRCd::Run()
                this->GlobalCulls.Apply();
 
                /* If any inspsockets closed, remove them */
-               this->InspSocketCull();
+               this->BufferedSocketCull();
 
                if (this->s_signal)
                {
@@ -672,9 +676,9 @@ int InspIRCd::Run()
        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();
@@ -702,9 +706,7 @@ int ircd(int argc, char ** argv)
 
 int main(int argc, char ** argv)
 {
-       __try {
-               ircd(argc,argv);
-       } __except(__exceptionHandler(GetExceptionInformation())) {}
+       ircd(argc,argv);
        return 0;
 }
 
@@ -719,7 +721,7 @@ int main(int argc, char** argv)
  * (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;
@@ -751,7 +753,7 @@ int InspIRCd::SetTimeDelta(int 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())
@@ -760,7 +762,7 @@ void InspIRCd::AddLocalClone(userrec* user)
                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())