Fixed dodgy makefile generation

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

diff --git a/src/users.cpp b/src/users.cpp
index 5afed6fe14b5395871bba8ad7b4aa5669a048e0f..2ad0fd30739eee0607f0098f019b5372bb036d4f 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -29,11 +29,40 @@ using namespace std;
 #include "inspstring.h"
 #include "commands.h"
 #include "helperfuncs.h"
-
-extern ServerConfig* Config;
+#include "typedefs.h"
+#include "socketengine.h"
+#include "hashcomp.h"
+#include "message.h"
+#include "wildcard.h"
+#include "xline.h"
+
+extern InspIRCd* ServerInstance;
+extern int WHOWAS_STALE;
+extern int WHOWAS_MAX;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
+extern std::vector<InspSocket*> module_sockets;
+extern int MODCOUNT;
+extern InspSocket* socket_ref[65535];
 extern time_t TIME;
+extern SocketEngine* SE;
+extern userrec* fd_ref_table[65536];
+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;
 
+template<typename T> inline string ConvToStr(const T &in)
+{
+        stringstream tmp;
+        if (!(tmp << in)) return string();
+        return tmp.str();
+}
+
 userrec::userrec()
 {
        // the PROPER way to do it, AVOID bzero at *ALL* costs
@@ -126,15 +155,12 @@ void userrec::RemoveInvite(irc::string &channel)
        {
                for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
                {
-                       if (i->channel)
+                       irc::string compare = i->channel;
+                       if (compare == channel)
                        {
-                               irc::string compare = i->channel;
-                               if (compare == channel)
-                               {
-                                       invites.erase(i);
-                                       return;
-                               }
-                       }
+                               invites.erase(i);
+                               return;
+                               }
                        }
                }
 }
@@ -255,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;
@@ -347,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();
         }
@@ -366,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;
@@ -400,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();
         }
@@ -413,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;
@@ -594,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);
 }
 
@@ -690,3 +741,67 @@ void ConnectUser(userrec *user)
         }
 }
 
+/* re-allocates a nick in the user_hash after they change nicknames,
+ * returns a pointer to the new user as it may have moved */
+
+userrec* ReHashNick(char* Old, char* New)
+{
+        //user_hash::iterator newnick;
+        user_hash::iterator oldnick = clientlist.find(Old);
+
+        log(DEBUG,"ReHashNick: %s %s",Old,New);
+
+        if (!strcasecmp(Old,New))
+        {
+                log(DEBUG,"old nick is new nick, skipping");
+                return oldnick->second;
+        }
+
+        if (oldnick == clientlist.end()) return NULL; /* doesnt exist */
+
+        log(DEBUG,"ReHashNick: Found hashed nick %s",Old);
+
+        userrec* olduser = oldnick->second;
+        clientlist[New] = olduser;
+        clientlist.erase(oldnick);
+
+        log(DEBUG,"ReHashNick: Nick rehashed as %s",New);
+
+        return clientlist[New];
+}
+
+void force_nickchange(userrec* user,const char* newnick)
+{
+        char nick[MAXBUF];
+        int MOD_RESULT = 0;
+
+        strcpy(nick,"");
+
+        FOREACH_RESULT(OnUserPreNick(user,newnick));
+        if (MOD_RESULT) {
+                stats->statsCollisions++;
+                kill_link(user,"Nickname collision");
+                return;
+        }
+        if (matches_qline(newnick))
+        {
+                stats->statsCollisions++;
+                kill_link(user,"Nickname collision");
+                return;
+        }
+
+        if (user)
+        {
+                if (newnick)
+                {
+                        strncpy(nick,newnick,MAXBUF);
+                }
+                if (user->registered == 7)
+                {
+                        char* pars[1];
+                        pars[0] = nick;
+                        handle_nick(pars,1,user);
+                }
+        }
+}
+