From d0f0cbea0727e3a3f670a308b173559061a0ca1d Mon Sep 17 00:00:00 2001 From: brain Date: Wed, 14 Dec 2005 18:33:22 +0000 Subject: Removed externs for module_sockets git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2442 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/userprocess.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/userprocess.cpp b/src/userprocess.cpp index d67a85e78..fd1976a22 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -64,7 +64,6 @@ extern struct sockaddr_in client,server; extern socklen_t length; extern std::vector modules; extern std::vector factory; -extern std::vector module_sockets; extern time_t TIME; extern time_t OLDTIME; @@ -248,8 +247,8 @@ void ProcessUser(userrec* cu) */ bool DoBackgroundUserStuff(time_t TIME) { - unsigned int numsockets = module_sockets.size(); - for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) + unsigned int numsockets = ServerInstance->module_sockets.size(); + for (std::vector::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++) { InspSocket* s = (InspSocket*)*a; if (s->Timeout(TIME)) @@ -257,11 +256,11 @@ bool DoBackgroundUserStuff(time_t TIME) log(DEBUG,"Socket poll returned false, close and bail"); SE->DelFd(s->GetFd()); s->Close(); - module_sockets.erase(a); + ServerInstance->module_sockets.erase(a); delete s; break; } - if (module_sockets.size() != numsockets) break; + if (ServerInstance->module_sockets.size() != numsockets) break; } /* TODO: We need a seperate hash containing only local users for this */ -- cgit v1.2.3