Fixed dodgy makefile generation

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

diff --git a/src/users.cpp b/src/users.cpp
index 57091aea18d8705d042776572dc916c1bb59d57b..2ad0fd30739eee0607f0098f019b5372bb036d4f 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -51,6 +51,8 @@ extern serverstats* stats;
 extern ServerConfig *Config;
 extern user_hash clientlist;
 extern whowas_hash whowas;
+extern Module* IOHookModule;
+std::vector<userrec*> local_users;
 
 std::vector<userrec*> all_opers;
 
@@ -279,8 +281,12 @@ void userrec::AddWriteBuf(std::string data)
                return;
        if (sendq.length() + data.length() > (unsigned)this->sendqmax)
        {
-               WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
+               /* Fix by brain - Set the error text BEFORE calling writeopers, because
+                * if we dont it'll recursively  call here over and over again trying
+                * to repeatedly add the text to the sendq!
+                */
                this->SetWriteError("SendQ exceeded");
+               WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->sendqmax);
                return;
        }
         std::stringstream stream;
@@ -371,7 +377,10 @@ void kill_link(userrec *user,const char* r)
 
         if (user->fd > -1)
         {
-                FOREACH_MOD OnRawSocketClose(user->fd);
+               if (IOHookModule)
+               {
+                       IOHookModule->OnRawSocketClose(user->fd);
+               }
                 SE->DelFd(user->fd);
                 user->CloseSocket();
         }
@@ -390,7 +399,14 @@ void kill_link(userrec *user,const char* r)
         {
                 log(DEBUG,"deleting user hash value %lu",(unsigned long)user);
                 if (user->fd > -1)
+               {
                         fd_ref_table[user->fd] = NULL;
+                       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");
+                       }
+               }
                 clientlist.erase(iter);
         }
         delete user;
@@ -424,7 +440,10 @@ void kill_link_silent(userrec *user,const char* r)
 
         if (user->fd > -1)
         {
-                FOREACH_MOD OnRawSocketClose(user->fd);
+               if (IOHookModule)
+               {
+                       IOHookModule->OnRawSocketClose(user->fd);
+               }
                 SE->DelFd(user->fd);
                 user->CloseSocket();
         }
@@ -437,7 +456,14 @@ void kill_link_silent(userrec *user,const char* r)
         {
                 log(DEBUG,"deleting user hash value %lu",(unsigned long)user);
                 if (user->fd > -1)
+               {
                         fd_ref_table[user->fd] = NULL;
+                       if (find(local_users.begin(),local_users.end(),user) != local_users.end())
+                       {
+                               log(DEBUG,"Delete local user");
+                               local_users.erase(find(local_users.begin(),local_users.end(),user));
+                       }
+               }
                 clientlist.erase(iter);
         }
         delete user;
@@ -618,6 +644,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
                 }
         }
         fd_ref_table[socket] = clientlist[tempnick];
+       local_users.push_back(clientlist[tempnick]);
         SE->AddFd(socket,true,X_ESTAB_CLIENT);
 }