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 01aef0802f560503f8eb6063547ed3855b6fd523..030007d1ef8ae01908d27d35ebdc76064e3c36df 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -57,9 +57,10 @@ extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 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;
@@ -254,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; };
@@ -296,7 +297,8 @@ void                Module::OnDelKLine(userrec* source, std::string hostmask) { };
 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(bool &Implements[255]) { for (int j = 0; j < 255; j++) Implements[j] = false; };
+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
@@ -315,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");
@@ -375,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;
@@ -425,17 +444,17 @@ void Server::SendMode(char **parameters, int pcnt, userrec *user)
 
 void Server::Send(int Socket, std::string s)
 {
-       Write(Socket,"%s",s.c_str());
+       Write_NoFormat(Socket,s.c_str());
 }
 
 void Server::SendServ(int Socket, std::string s)
 {
-       WriteServ(Socket,"%s",s.c_str());
+       WriteServ_NoFormat(Socket,s.c_str());
 }
 
 void Server::SendFrom(int Socket, userrec* User, std::string s)
 {
-       WriteFrom(Socket,User,"%s",s.c_str());
+       WriteFrom_NoFormat(Socket,User,s.c_str());
 }
 
 void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
@@ -448,24 +467,24 @@ void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
        else
        {
                // otherwise it comes from the user specified
-               WriteTo(Source,Dest,"%s",s.c_str());
+               WriteTo_NoFormat(Source,Dest,s.c_str());
        }
 }
 
 void Server::SendChannelServerNotice(std::string ServName, chanrec* Channel, std::string text)
 {
-       WriteChannelWithServ((char*)ServName.c_str(), Channel, "%s", text.c_str());
+       WriteChannelWithServ_NoFormat((char*)ServName.c_str(), Channel, text.c_str());
 }
 
 void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender)
 {
        if (IncludeSender)
        {
-               WriteChannel(Channel,User,"%s",s.c_str());
+               WriteChannel_NoFormat(Channel,User,s.c_str());
        }
        else
        {
-               ChanExceptSender(Channel,User,"%s",s.c_str());
+               ChanExceptSender_NoFormat(Channel,User,s.c_str());
        }
 }
 
@@ -478,11 +497,11 @@ void Server::SendCommon(userrec* User, std::string text,bool IncludeSender)
 {
        if (IncludeSender)
        {
-               WriteCommon(User,"%s",text.c_str());
+               WriteCommon_NoFormat(User,text.c_str());
        }
        else
        {
-               WriteCommonExcept(User,"%s",text.c_str());
+               WriteCommonExcept_NoFormat(User,text.c_str());
        }
 }
 
@@ -598,9 +617,17 @@ int Server::CountUsers(chanrec* c)
 bool Server::UserToPseudo(userrec* user,std::string message)
 {
        unsigned int old_fd = user->fd;
-       user->fd = FD_MAGIC_NUMBER;
-       user->ClearBuffer();
        Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
+       user->FlushWriteBuf();
+       user->ClearBuffer();
+       user->fd = FD_MAGIC_NUMBER;
+
+       if (find(local_users.begin(),local_users.end(),user) != local_users.end())
+       {
+               local_users.erase(find(local_users.begin(),local_users.end(),user));
+               log(DEBUG,"Delete local user");
+       }
+
        ServerInstance->SE->DelFd(old_fd);
         shutdown(old_fd,2);
         close(old_fd);
@@ -609,11 +636,21 @@ bool Server::UserToPseudo(userrec* user,std::string message)
 
 bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
 {
+       log(DEBUG,"PseudoToUser");
        zombie->fd = alive->fd;
+       FOREACH_MOD(I_OnUserQuit,OnUserQuit(alive,message));
        alive->fd = FD_MAGIC_NUMBER;
+       alive->FlushWriteBuf();
        alive->ClearBuffer();
        Write(zombie->fd,":%s!%s@%s NICK %s",alive->nick,alive->ident,alive->host,zombie->nick);
        kill_link(alive,message.c_str());
+
+        if (find(local_users.begin(),local_users.end(),alive) != local_users.end())
+        {
+               local_users.erase(find(local_users.begin(),local_users.end(),alive));
+               log(DEBUG,"Delete local user");
+        }
+
        fd_ref_table[zombie->fd] = zombie;
         for (unsigned int i = 0; i < zombie->chans.size(); i++)
         {
@@ -634,6 +671,9 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
                         }
                 }
         }
+       if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER))
+               local_users.push_back(zombie);
+
        return true;
 }