diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2005-12-14 18:32:06 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2005-12-14 18:32:06 +0000 |
| commit | bd8175272f71eaa298262de7f6c140035273b263 (patch) | |
| tree | 6d62218051646c25f87aeec281e68a569687a02e | |
| parent | 70f135207c36463878ab3c6e5d397f59c4ab0faa (diff) | |
Moving module_sockets into main class
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2441 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/inspircd.cpp | 7 | ||||
| -rw-r--r-- | src/modules.cpp | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 4b4b3bfbe..64f12affe 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -70,8 +70,6 @@ int WHOWAS_MAX = 100; // default 100 people maximum in the WHOWAS list extern std::vector<Module*> modules; extern std::vector<ircd_module*> factory; -std::vector<InspSocket*> module_sockets; - extern int MODCOUNT; int openSockfd[MAXSOCKS]; sockaddr_in client,server; @@ -96,7 +94,6 @@ user_hash clientlist; chan_hash chanlist; whowas_hash whowas; command_table cmdlist; -address_cache IP; servernamelist servernames; int BoundPortCount = 0; std::vector<userrec*> all_opers; @@ -1613,12 +1610,12 @@ int InspIRCd::Run() { log(DEBUG,"Socket poll returned false, close and bail"); SE->DelFd(s->GetFd()); - for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) + for (std::vector<InspSocket*>::iterator a = this->module_sockets.begin(); a < this->module_sockets.end(); a++) { s_del = (InspSocket*)*a; if ((s_del) && (s_del->GetFd() == activefds[activefd])) { - module_sockets.erase(a); + this->module_sockets.erase(a); break; } } diff --git a/src/modules.cpp b/src/modules.cpp index e2c131780..668c7ec1b 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -56,7 +56,6 @@ extern InspIRCd* ServerInstance; extern int MODCOUNT; extern std::vector<Module*> modules; extern std::vector<ircd_module*> factory; -extern std::vector<InspSocket*> module_sockets; extern time_t TIME; class Server; @@ -312,7 +311,7 @@ Server::~Server() void Server::AddSocket(InspSocket* sock) { - module_sockets.push_back(sock); + ServerInstance->module_sockets.push_back(sock); } void Server::RehashServer() @@ -328,11 +327,11 @@ ServerConfig* Server::GetConfig() void Server::DelSocket(InspSocket* sock) { - for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) + for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++) { if (*a == sock) { - module_sockets.erase(a); + ServerInstance->module_sockets.erase(a); return; } } |