Converted more stuff to 'Implements' system

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

diff --git a/src/users.cpp b/src/users.cpp
index f2a43238a0f60cfdeef8f413171fed92ece3916b..a9f927f3fcff89a88731bf4a29529af235554f96 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  Inspire is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -45,13 +45,11 @@ 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;
-std::vector<userrec*> local_users;
+extern std::vector<userrec*> local_users;
 
 std::vector<userrec*> all_opers;
 
@@ -65,23 +63,12 @@ template<typename T> inline string ConvToStr(const T &in)
 userrec::userrec()
 {
        // the PROPER way to do it, AVOID bzero at *ALL* costs
-       strcpy(nick,"");
-       strcpy(ip,"127.0.0.1");
-       timeout = 0;
-       strcpy(ident,"");
-       strcpy(host,"");
-       strcpy(dhost,"");
-       strcpy(fullname,"");
-       strcpy(modes,"");
+       *nick = *ident = *host = *dhost = *fullname = *modes = *awaymsg = *oper = *ip = 0;
        server = (char*)FindServerNamePtr(Config->ServerName);
-       strcpy(awaymsg,"");
-       strcpy(oper,"");
        reset_due = TIME;
-       lines_in = 0;
-       fd = lastping = signon = idle_lastmsg = nping = registered = 0;
-       flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-       haspassed = false;
-       dns_done = false;
+       lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
+       timeout = flood = port = bytes_in = bytes_out = cmds_in = cmds_out = 0;
+       haspassed = dns_done = false;
        recvq = "";
        sendq = "";
        chans.clear();
@@ -280,8 +267,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;
@@ -362,18 +353,21 @@ void kill_link(userrec *user,const char* r)
         log(DEBUG,"closing fd %lu",(unsigned long)user->fd);
 
         if (user->registered == 7) {
-                FOREACH_MOD OnUserQuit(user,reason);
+                FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason));
                 WriteCommonExcept(user,"QUIT :%s",reason);
         }
 
         user->FlushWriteBuf();
 
-        FOREACH_MOD OnUserDisconnect(user);
+        FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
 
         if (user->fd > -1)
         {
-                FOREACH_MOD OnRawSocketClose(user->fd);
-                SE->DelFd(user->fd);
+               if (Config->GetIOHook(user->port))
+               {
+                       Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+               }
+                ServerInstance->SE->DelFd(user->fd);
                 user->CloseSocket();
         }
 
@@ -424,16 +418,19 @@ void kill_link_silent(userrec *user,const char* r)
         user->FlushWriteBuf();
 
         if (user->registered == 7) {
-                FOREACH_MOD OnUserQuit(user,reason);
+                FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,reason));
                 WriteCommonExcept(user,"QUIT :%s",reason);
         }
 
-        FOREACH_MOD OnUserDisconnect(user);
+        FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
 
         if (user->fd > -1)
         {
-                FOREACH_MOD OnRawSocketClose(user->fd);
-                SE->DelFd(user->fd);
+               if (Config->GetIOHook(user->port))
+               {
+                       Config->GetIOHook(user->port)->OnRawSocketClose(user->fd);
+               }
+                ServerInstance->SE->DelFd(user->fd);
                 user->CloseSocket();
         }
 
@@ -547,7 +544,6 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
          */
         clientlist[tempnick] = new userrec();
 
-        NonBlocking(socket);
         log(DEBUG,"AddClient: %lu %s %d %s",(unsigned long)socket,host,port,ip);
 
         clientlist[tempnick]->fd = socket;
@@ -571,7 +567,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
 
         for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
         {
-                if (match(clientlist[tempnick]->host,i->host) && (i->type == CC_ALLOW))
+                if (match(clientlist[tempnick]->host,i->host.c_str()) && (i->type == CC_ALLOW))
                 {
                         class_regtimeout = (unsigned long)i->registration_timeout;
                         class_flood = i->flood;
@@ -634,12 +630,12 @@ 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);
+        ServerInstance->SE->AddFd(socket,true,X_ESTAB_CLIENT);
 }
 
 void FullConnectUser(userrec* user)
 {
-        stats->statsConnects++;
+        ServerInstance->stats->statsConnects++;
         user->idle_lastmsg = TIME;
         log(DEBUG,"ConnectUser: %s",user->nick);
 
@@ -690,7 +686,7 @@ void FullConnectUser(userrec* user)
         v << " TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=20 AWAYLEN=" << MAXAWAY << " CHANMODES=ohvb,k,l,psmnti NETWORK=";
         v << Config->Network;
         std::string data005 = v.str();
-        FOREACH_MOD On005Numeric(data005);
+        FOREACH_MOD(I_On005Numeric,On005Numeric(data005));
         // anfl @ #ratbox, efnet reminded me that according to the RFC this cant contain more than 13 tokens per line...
         // so i'd better split it :)
         std::stringstream out(data005);
@@ -713,8 +709,8 @@ void FullConnectUser(userrec* user)
 
         // fix 3 by brain, move registered = 7 below these so that spurious modes and host changes dont go out
         // onto the network and produce 'fake direction'
-        FOREACH_MOD OnUserConnect(user);
-        FOREACH_MOD OnGlobalConnect(user);
+        FOREACH_MOD(I_OnUserConnect,OnUserConnect(user));
+        FOREACH_MOD(I_OnGlobalConnect,OnGlobalConnect(user));
         user->registered = 7;
         WriteOpers("*** Client connecting on port %lu: %s!%s@%s [%s]",(unsigned long)user->port,user->nick,user->ident,user->host,user->ip);
 }
@@ -764,17 +760,17 @@ void force_nickchange(userrec* user,const char* newnick)
         char nick[MAXBUF];
         int MOD_RESULT = 0;
 
-        strcpy(nick,"");
+        *nick = 0;
 
-        FOREACH_RESULT(OnUserPreNick(user,newnick));
+        FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,newnick));
         if (MOD_RESULT) {
-                stats->statsCollisions++;
+                ServerInstance->stats->statsCollisions++;
                 kill_link(user,"Nickname collision");
                 return;
         }
         if (matches_qline(newnick))
         {
-                stats->statsCollisions++;
+               ServerInstance->stats->statsCollisions++;
                 kill_link(user,"Nickname collision");
                 return;
         }
@@ -789,7 +785,8 @@ void force_nickchange(userrec* user,const char* newnick)
                 {
                         char* pars[1];
                         pars[0] = nick;
-                        handle_nick(pars,1,user);
+                       std::string cmd = "NICK";
+                        ServerInstance->Parser->CallHandler(cmd,pars,1,user);
                 }
         }
 }