Passing invalid instance to dns isnt a good idea

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

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index b9ca84fef85b3baea47718a5e2f4b0aea4f5b7c3..feaab0fe4b413f342ec5058c2199ed747ae3b48a 100644 (file)
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -35,20 +35,15 @@
 #include "socketengine.h"
 #include "commands/cmd_quit.h"
 
-extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern ModuleList modules;
 extern FactoryList factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       user_hash::iterator iter = clientlist.find(user->nick);
+       user_hash::iterator iter = ServerInstance->clientlist.find(user->nick);
        char reason[MAXBUF];
 
        if (user->registered == REG_ALL)
@@ -66,16 +61,16 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
                         */
                        if (user->fd > -1)
                        {
-                               user->Write("ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,Config->PrefixQuit,parameters[0]);
-                               WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,Config->PrefixQuit,parameters[0]);
-                               user->WriteCommonExcept("QUIT :%s%s",Config->PrefixQuit,parameters[0]);
+                               user->Write("ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,ServerInstance->Config->PrefixQuit,parameters[0]);
+                               WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,ServerInstance->Config->PrefixQuit,parameters[0]);
+                               user->WriteCommonExcept("QUIT :%s%s",ServerInstance->Config->PrefixQuit,parameters[0]);
                        }
                        else
                        {
                                WriteOpers("*** Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
                                user->WriteCommonExcept("QUIT :%s",parameters[0]);
                        }
-                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(Config->PrefixQuit)+std::string(parameters[0])));
+                       FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(ServerInstance->Config->PrefixQuit)+std::string(parameters[0])));
 
                }
                else
@@ -95,23 +90,23 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
        if (user->fd > -1)
        {
                ServerInstance->SE->DelFd(user->fd);
-               if (find(local_users.begin(),local_users.end(),user) != local_users.end())
+               if (find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user) != ServerInstance->local_users.end())
                {
                        log(DEBUG,"Delete local user");
-                       local_users.erase(find(local_users.begin(),local_users.end(),user));
+                       ServerInstance->local_users.erase(find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user));
                }
                user->CloseSocket();
        }
        
-       if (iter != clientlist.end())
+       if (iter != ServerInstance->clientlist.end())
        {
-               clientlist.erase(iter);
+               ServerInstance->clientlist.erase(iter);
        }
 
        if (user->registered == REG_ALL) {
                purge_empty_chans(user);
        }
        if (user->fd > -1)
-               fd_ref_table[user->fd] = NULL;
+               ServerInstance->fd_ref_table[user->fd] = NULL;
        DELETE(user);
 }