Added RemoveSocket as a test fix for merwins bug

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

diff --git a/src/modules.cpp b/src/modules.cpp
index b3b2daab36fca62d4347663bc6e287f17d3bb041..030007d1ef8ae01908d27d35ebdc76064e3c36df 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -60,7 +60,7 @@ extern std::vector<InspSocket*> module_sockets;
 extern std::vector<userrec*> local_users;
 extern time_t TIME;
 class Server;
-extern userrec* fd_ref_table[65536];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 extern user_hash clientlist;
 extern chan_hash chanlist;
@@ -255,7 +255,7 @@ int         Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
 int            Module::OnCheckKey(userrec* user, chanrec* chan, std::string keygiven) { return 0; };
 int            Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
 int            Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; };
-void           Module::OnStats(char symbol) { };
+int            Module::OnStats(char symbol, userrec* user) { return 0; };
 int            Module::OnChangeLocalUserHost(userrec* user, std::string newhost) { return 0; };
 int            Module::OnChangeLocalUserGECOS(userrec* user, std::string newhost) { return 0; };
 int            Module::OnLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { return 0; };
@@ -298,6 +298,7 @@ void                Module::OnDelQLine(userrec* source, std::string nickmask) { };
 void           Module::OnDelELine(userrec* source, std::string hostmask) { };
 void           Module::OnCleanup(int target_type, void* item) { };
 void           Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; };
+Priority       Module::Prioritize() { return PRIORITY_DONTCARE; }
 
 /* server is a wrapper class that provides methods to all of the C-style
  * exports in the core
@@ -316,6 +317,23 @@ void Server::AddSocket(InspSocket* sock)
        module_sockets.push_back(sock);
 }
 
+void Server::RemoveSocket(InspSocket* sock)
+{
+        for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+        {
+                InspSocket* s = (InspSocket*)*a;
+                if (s == sock)
+                {
+                       log(DEBUG,"Forcibly removed socket");
+                        ServerInstance->SE->DelFd(s->GetFd());
+                        s->Close();
+                        module_sockets.erase(a);
+                        delete s;
+                        return;
+                }
+        }
+}
+
 void Server::RehashServer()
 {
        WriteOpers("*** Rehashing config file");
@@ -376,10 +394,10 @@ chanuserlist Server::GetUsers(chanrec* chan)
 {
        chanuserlist userl;
        userl.clear();
-       std::vector<char*> *list = chan->GetUsers();
-       for (std::vector<char*>::iterator i = list->begin(); i != list->end(); i++)
+       std::map<char*,char*> *list = chan->GetUsers();
+       for (std::map<char*,char*>::iterator i = list->begin(); i != list->end(); i++)
        {
-               char* o = *i;
+               char* o = i->second;
                userl.push_back((userrec*)o);
        }
        return userl;