]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
A few cpu usage tweaks
[user/henk/code/inspircd.git] / src / inspircd.cpp
index c42306a30302408c7a979556ff8b7db550da59c1..ff1a9e9da09b51a7c7ce8a0b0ba67a62c882a127 100644 (file)
@@ -176,6 +176,13 @@ typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashCom
 typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
 typedef std::deque<command_t> command_table;
 
+// This table references users by file descriptor.
+// its an array to make it VERY fast, as all lookups are referenced
+// by an integer, meaning there is no need for a scan/search operation.
+userrec* fd_ref_table[65536];
+
+int statsAccept = 0, statsRefused = 0, statsUnknown = 0, statsCollisions = 0, statsDns = 0, statsDnsGood = 0, statsDnsBad = 0, statsConnects = 0, statsSent= 0, statsRecv = 0;
+
 serverrec* me[32];
 
 FILE *log_file;
@@ -197,10 +204,6 @@ int portCount = 0, UDPportCount = 0, ports[MAXSOCKS];
 int defaultRoute = 0;
 char ModPath[MAXBUF];
 
-connection C;
-
-long MyKey = C.GenKey();
-
 /* prototypes */
 
 int has_channel(userrec *u, chanrec *c);
@@ -215,6 +218,8 @@ std::stringstream config_f(stringstream::in | stringstream::out);
 
 std::vector<userrec*> all_opers;
 
+static char already_sent[65536];
+
 void AddOper(userrec* user)
 {
        log(DEBUG,"Oper added to optimization list");
@@ -341,7 +346,7 @@ void readfile(file_cache &F, const char* fname)
 void ReadConfig(bool bail, userrec* user)
 {
        char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF];
-       char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF];
+       char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF];
        ConnectClass c;
        std::stringstream errstr;
        
@@ -446,6 +451,7 @@ void ReadConfig(bool bail, userrec* user)
                ConfValue("connect","timeout",i,timeout,&config_f);
                ConfValue("connect","flood",i,flood,&config_f);
                ConfValue("connect","pingfreq",i,pfreq,&config_f);
+               ConfValue("connect","threshold",i,thold,&config_f);
                if (Value[0])
                {
                        strlcpy(c.host,Value,MAXBUF);
@@ -456,6 +462,11 @@ void ReadConfig(bool bail, userrec* user)
                        c.registration_timeout = 90; // default is 2 minutes
                        c.pingtime = 120;
                        c.flood = atoi(flood);
+                       c.threshold = 5;
+                       if (atoi(thold)>0)
+                       {
+                               c.threshold = atoi(thold);
+                       }
                        if (atoi(timeout)>0)
                        {
                                c.registration_timeout = atoi(timeout);
@@ -582,7 +593,16 @@ void Write(int sock,char *text, ...)
        chop(tb);
        if (sock != -1)
        {
-               write(sock,tb,bytes > 514 ? 514 : bytes);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes > 512 ? 512 : bytes));
+               if (!MOD_RESULT)
+                       write(sock,tb,bytes > 512 ? 512 : bytes);
+               if (fd_ref_table[sock])
+               {
+                       fd_ref_table[sock]->bytes_out += (bytes > 512 ? 512 : bytes);
+                       fd_ref_table[sock]->cmds_out++;
+               }
+               statsSent += (bytes > 512 ? 512 : bytes);
        }
 }
 
@@ -607,7 +627,16 @@ void WriteServ(int sock, char* text, ...)
        chop(tb);
        if (sock != -1)
        {
-               write(sock,tb,bytes > 514 ? 514 : bytes);
+                int MOD_RESULT = 0;
+                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes > 512 ? 512 : bytes));
+                if (!MOD_RESULT)
+                        write(sock,tb,bytes > 512 ? 512 : bytes);
+                if (fd_ref_table[sock])
+                {
+                        fd_ref_table[sock]->bytes_out += (bytes > 512 ? 512 : bytes);
+                        fd_ref_table[sock]->cmds_out++;
+                }
+               statsSent += (bytes > 512 ? 512 : bytes);
        }
 }
 
@@ -632,7 +661,16 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
        chop(tb);
        if (sock != -1)
        {
-               write(sock,tb,bytes > 514 ? 514 : bytes);
+                int MOD_RESULT = 0;
+                FOREACH_RESULT(OnRawSocketWrite(sock,tb,bytes > 512 ? 512 : bytes));
+                if (!MOD_RESULT)
+                        write(sock,tb,bytes > 512 ? 512 : bytes);
+                if (fd_ref_table[sock])
+                {
+                        fd_ref_table[sock]->bytes_out += (bytes > 512 ? 512 : bytes);
+                        fd_ref_table[sock]->cmds_out++;
+                }
+               statsSent += (bytes > 512 ? 512 : bytes);
        }
 }
 
@@ -822,7 +860,9 @@ void WriteCommon(userrec *u, char* text, ...)
        va_end(argsPtr);
 
        // FIX: Stops a message going to the same person more than once
-       std::vector<int> already_sent;
+       bzero(&already_sent,65536);
+
+       bool sent_to_at_least_one = false;
 
         for (int i = 0; i < MAXCHANS; i++)
         {
@@ -833,26 +873,18 @@ void WriteCommon(userrec *u, char* text, ...)
                         {
                                 char* o = (*ulist)[j];
                                 userrec* otheruser = (userrec*)o;
-                               bool do_send = true;
-                               for (int t = 0; t < already_sent.size(); t++)
+                               if (!already_sent[otheruser->fd])
                                {
-                                       if (already_sent[t] == otheruser->fd)
-                                       {
-                                               do_send = false;
-                                               break;
-                                       }
-                               }
-                               if (do_send)
-                               {
-                                       already_sent.push_back(otheruser->fd);
+                                       already_sent[otheruser->fd] = 1;
                                        WriteFrom(otheruser->fd,u,"%s",textbuffer);
+                                       sent_to_at_least_one = true;
                                }
                         }
                 }
         }
        // if the user was not in any channels, no users will receive the text. Make sure the user
        // receives their OWN message for WriteCommon
-       if (!already_sent.size())
+       if (!sent_to_at_least_one)
        {
                WriteFrom(u->fd,u,"%s",textbuffer);
        }
@@ -880,7 +912,7 @@ void WriteCommonExcept(userrec *u, char* text, ...)
        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
        va_end(argsPtr);
 
-       std::vector<int> already_sent;
+        bzero(&already_sent,65536);
 
         for (int i = 0; i < MAXCHANS; i++)
         {
@@ -893,18 +925,9 @@ void WriteCommonExcept(userrec *u, char* text, ...)
                                 userrec* otheruser = (userrec*)o;
                                if (u != otheruser)
                                {
-                                       bool do_send = true;
-                                       for (int t = 0; t < already_sent.size(); t++)
-                                       {
-                                               if (already_sent[t] == otheruser->fd)
-                                               {
-                                                       do_send = false;
-                                                       break;
-                                               }
-                                       }
-                                       if (do_send)
+                                       if (!already_sent[otheruser->fd])
                                        {
-                                               already_sent.push_back(otheruser->fd);
+                                               already_sent[otheruser->fd] = 1;
                                                WriteFrom(otheruser->fd,u,"%s",textbuffer);
                                        }
                                }
@@ -941,6 +964,41 @@ void WriteOpers(char* text, ...)
        }
 }
 
+void NoticeAllOpers(userrec *source, bool local_only, char* text, ...)
+{
+        if ((!text) || (!source))
+        {
+                log(DEFAULT,"*** BUG *** NoticeAllOpers was given an invalid parameter");
+                return;
+        }
+
+        char textbuffer[MAXBUF];
+        va_list argsPtr;
+        va_start (argsPtr, text);
+        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+        va_end(argsPtr);
+
+        for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+        {
+                userrec* a = *i;
+                if ((a) && (a->fd != FD_MAGIC_NUMBER))
+                {
+                        if (strchr(a->modes,'s'))
+                        {
+                                // send server notices to all with +s
+                                WriteServ(a->fd,"NOTICE %s :*** Notice From %s: %s",a->nick,source->nick,textbuffer);
+                        }
+                }
+        }
+
+        if (!local_only)
+        {
+                char buffer[MAXBUF];
+                snprintf(buffer,MAXBUF,"V %s @* :%s",source->nick,textbuffer);
+                NetSendToAll(buffer);
+        }
+}
+
 // returns TRUE of any users on channel C occupy server 'servername'.
 
 bool ChanAnyOnThisServer(chanrec *c,char* servername)
@@ -1171,6 +1229,37 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 }
 
 
+void NoticeAll(userrec *source, bool local_only, char* text, ...)
+{
+        if ((!text) || (!source))
+        {
+                log(DEFAULT,"*** BUG *** NoticeAll was given an invalid parameter");
+                return;
+        }
+
+        char textbuffer[MAXBUF];
+        va_list argsPtr;
+        va_start (argsPtr, text);
+        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+        va_end(argsPtr);
+
+        for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+        {
+                if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER))
+                {
+                       WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer);
+                }
+        }
+
+        if (!local_only)
+        {
+                char buffer[MAXBUF];
+                snprintf(buffer,MAXBUF,"V %s * :%s",source->nick,textbuffer);
+                NetSendToAll(buffer);
+        }
+
+}
+
 void WriteWallOps(userrec *source, bool local_only, char* text, ...)  
 {  
        if ((!text) || (!source))
@@ -1821,7 +1910,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                if (iter != chanlist.end())
                {
                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       if (iter->second) delete iter->second;
+                       delete Ptr;
                        chanlist.erase(iter);
                }
        }
@@ -1906,7 +1995,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
                if (iter != chanlist.end())
                {
                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
-                       if (iter->second) delete iter->second;
+                       delete Ptr;
                        chanlist.erase(iter);
                }
        }
@@ -2096,7 +2185,6 @@ void kill_link(userrec *user,const char* r)
        Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
        log(DEBUG,"closing fd %lu",(unsigned long)user->fd);
 
-       /* bugfix, cant close() a nonblocking socket (sux!) */
        if (user->registered == 7) {
                FOREACH_MOD OnUserQuit(user);
                WriteCommonExcept(user,"QUIT :%s",reason);
@@ -2111,6 +2199,7 @@ void kill_link(userrec *user,const char* r)
 
        if (user->fd > -1)
        {
+               FOREACH_MOD OnRawSocketClose(user->fd);
                shutdown(user->fd,2);
                close(user->fd);
        }
@@ -2126,10 +2215,10 @@ void kill_link(userrec *user,const char* r)
 
        if (iter != clientlist.end())
        {
-               log(DEBUG,"deleting user hash value %lu",(unsigned long)iter->second);
-               if ((iter->second) && (user->registered == 7)) {
-                       if (iter->second) delete iter->second;
-               }
+               log(DEBUG,"deleting user hash value %lu",(unsigned long)user);
+               if (user->fd > -1)
+                       fd_ref_table[user->fd] = NULL;
+               delete user;
                clientlist.erase(iter);
        }
 }
@@ -2151,7 +2240,6 @@ void kill_link_silent(userrec *user,const char* r)
        Write(user->fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,reason);
        log(DEBUG,"closing fd %lu",(unsigned long)user->fd);
 
-       /* bugfix, cant close() a nonblocking socket (sux!) */
        if (user->registered == 7) {
                FOREACH_MOD OnUserQuit(user);
                WriteCommonExcept(user,"QUIT :%s",reason);
@@ -2166,6 +2254,7 @@ void kill_link_silent(userrec *user,const char* r)
 
         if (user->fd > -1)
         {
+               FOREACH_MOD OnRawSocketClose(user->fd);
                 shutdown(user->fd,2);
                 close(user->fd);
         }
@@ -2176,10 +2265,10 @@ void kill_link_silent(userrec *user,const char* r)
        
        if (iter != clientlist.end())
        {
-               log(DEBUG,"deleting user hash value %lu",(unsigned long)iter->second);
-               if ((iter->second) && (user->registered == 7)) {
-                       if (iter->second) delete iter->second;
-               }
+               log(DEBUG,"deleting user hash value %lu",(unsigned long)user);
+                if (user->fd > -1)
+                        fd_ref_table[user->fd] = NULL;
+               delete user;
                clientlist.erase(iter);
        }
 }
@@ -2385,7 +2474,17 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
 
        iter = clientlist.find(tempnick);
 
-       if (iter != clientlist.end()) return;
+       // fix by brain.
+       // as these nicknames are 'RFC impossible', we can be sure nobody is going to be
+       // using one as a registered connection. As theyre per fd, we can also safely assume
+       // that we wont have collisions. Therefore, if the nick exists in the list, its only
+       // used by a dead socket, erase the iterator so that the new client may reclaim it.
+       // this was probably the cause of 'server ignores me when i hammer it with reconnects'
+       // issue in earlier alphas/betas
+       if (iter != clientlist.end())
+       {
+               clientlist.erase(iter);
+       }
 
        /*
         * It is OK to access the value here this way since we know
@@ -2414,6 +2513,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
        // set the registration timeout for this user
        unsigned long class_regtimeout = 90;
        int class_flood = 0;
+       long class_threshold = 5;
 
        for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
        {
@@ -2422,6 +2522,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
                        class_regtimeout = (unsigned long)i->registration_timeout;
                        class_flood = i->flood;
                        clientlist[tempnick]->pingmax = i->pingtime;
+                       class_threshold = i->threshold;
                        break;
                }
        }
@@ -2429,6 +2530,7 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
        clientlist[tempnick]->nping = TIME+clientlist[tempnick]->pingmax+dns_timeout;
        clientlist[tempnick]->timeout = TIME+class_regtimeout;
        clientlist[tempnick]->flood = class_flood;
+       clientlist[tempnick]->threshold = class_threshold;
 
        for (int i = 0; i < MAXCHANS; i++)
        {
@@ -2437,7 +2539,23 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
        }
 
        if (clientlist.size() == MAXCLIENTS)
+       {
                kill_link(clientlist[tempnick],"No more connections allowed in this class");
+               return;
+       }
+
+       // this is done as a safety check to keep the file descriptors within range of fd_ref_table.
+       // its a pretty big but for the moment valid assumption:
+       // file descriptors are handed out starting at 0, and are recycled as theyre freed.
+       // therefore if there is ever an fd over 65535, 65536 clients must be connected to the
+       // irc server at once (or the irc server otherwise initiating this many connections, files etc)
+       // which for the time being is a physical impossibility (even the largest networks dont have more
+       // than about 10,000 users on ONE server!)
+       if (socket > 65535)
+       {
+               kill_link(clientlist[tempnick],"Server is full");
+               return;
+       }
                
 
         char* e = matches_exception(ip);
@@ -2449,8 +2567,10 @@ void AddClient(int socket, char* host, int port, bool iscached, char* ip)
                        char reason[MAXBUF];
                        snprintf(reason,MAXBUF,"Z-Lined: %s",r);
                        kill_link(clientlist[tempnick],reason);
+                       return;
                }
        }
+       fd_ref_table[socket] = clientlist[tempnick];
 }
 
 // this function counts all users connected, wether they are registered or NOT.
@@ -2560,7 +2680,7 @@ void ShowMOTD(userrec *user)
         WholeMOTD = WholeMOTD + std::string(":") + std::string(ServerName) + std::string(" 376 ") + std::string(user->nick) + std::string(" :End of message of the day.\r\n");
         // only one write operation
         send(user->fd,WholeMOTD.c_str(),WholeMOTD.length(),0);
-
+       statsSent += WholeMOTD.length();
 }
 
 void ShowRULES(userrec *user)
@@ -2581,6 +2701,7 @@ void ShowRULES(userrec *user)
 /* shows the message of the day, and any other on-logon stuff */
 void FullConnectUser(userrec* user)
 {
+       statsConnects++;
         user->registered = 7;
         user->idle_lastmsg = TIME;
         log(DEBUG,"ConnectUser: %s",user->nick);
@@ -2706,6 +2827,12 @@ void handle_version(char **parameters, int pcnt, userrec *user)
        }
        else
        {
+               if (match(ServerName,parameters[0]))
+               {
+                       WriteServ(user->fd,"351 %s :%s",user->nick,GetVersionString().c_str());
+                       return;
+               }
+               bool displayed = false, found = false;
                 for (int j = 0; j < 32; j++)
                 {
                         if (me[j] != NULL)
@@ -2714,12 +2841,21 @@ void handle_version(char **parameters, int pcnt, userrec *user)
                                 {
                                         if (match(me[j]->connectors[x].GetServerName().c_str(),parameters[0]))
                                         {
-                                               WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str());
-                                               return;
+                                               found = true;
+                                               if ((me[j]->connectors[x].GetVersionString() != "") && (!displayed))
+                                               {
+                                                       displayed = true;
+                                                       WriteServ(user->fd,"351 %s :%s",user->nick,me[j]->connectors[x].GetVersionString().c_str());
+                                               }
                                        }
                                }
                        }
                }
+               if ((!displayed) && (found))
+               {
+                       WriteServ(user->fd,"402 %s %s :Server %s has no version information",user->nick,parameters[0],parameters[0]);
+                       return;
+               }
                WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]);
        }
        return;
@@ -2839,11 +2975,13 @@ void force_nickchange(userrec* user,const char* newnick)
 
        FOREACH_RESULT(OnUserPreNick(user,newnick));
        if (MOD_RESULT) {
+               statsCollisions++;
                kill_link(user,"Nickname collision");
                return;
        }
        if (matches_qline(newnick))
        {
+               statsCollisions++;
                kill_link(user,"Nickname collision");
                return;
        }
@@ -3050,6 +3188,7 @@ void process_command(userrec *user, char* cmd)
                        {
                                if (strchr("@!\"$%^&*(){}[]_=+;:'#~,<>/?\\|`",command[x]))
                                {
+                                       statsUnknown++;
                                        WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
                                        return;
                                }
@@ -3142,13 +3281,6 @@ void process_command(userrec *user, char* cmd)
                                                        /* ikky /stats counters */
                                                        if (temp)
                                                        {
-                                                               if (user)
-                                                               {
-                                                                       user->bytes_in += strlen(temp);
-                                                                       user->cmds_in++;
-                                                                       user->bytes_out+=strlen(temp);
-                                                                       user->cmds_out++;
-                                                               }
                                                                cmdlist[i].use_count++;
                                                                cmdlist[i].total_bytes+=strlen(temp);
                                                        }
@@ -3179,6 +3311,7 @@ void process_command(userrec *user, char* cmd)
        }
        if ((!cmd_found) && (user))
        {
+               statsUnknown++;
                WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,command);
        }
 }
@@ -3985,9 +4118,16 @@ int InspIRCd(void)
 
                if (count2 == clientlist.end()) break;
 
+               userrec* curr = NULL;
+
                if (count2->second)
-               if (count2->second->fd != 0)
+                       curr = count2->second;
+
+               if ((curr) && (curr->fd != 0))
                {
+#ifdef _POSIX_PRIORITY_SCHEDULING
+        sched_yield();
+#endif
                        // assemble up to 64 sockets into an fd_set
                        // to implement a pooling mechanism.
                        //
@@ -3997,44 +4137,46 @@ int InspIRCd(void)
                        {
                                if (count2 != clientlist.end())
                                {
+                                       curr = count2->second;
                                        // we don't check the state of remote users.
-                                       if ((count2->second->fd != -1) && (count2->second->fd != FD_MAGIC_NUMBER))
+                                       if ((curr->fd != -1) && (curr->fd != FD_MAGIC_NUMBER))
                                        {
-                                               FD_SET (count2->second->fd, &sfd);
+                                               FD_SET (curr->fd, &sfd);
 
                                                // registration timeout -- didnt send USER/NICK/HOST in the time specified in
                                                // their connection class.
-                                               if ((TIME > count2->second->timeout) && (count2->second->registered != 7)) 
+                                               if ((TIME > curr->timeout) && (curr->registered != 7)) 
                                                {
-                                                       log(DEBUG,"InspIRCd: registration timeout: %s",count2->second->nick);
-                                                       kill_link(count2->second,"Registration timeout");
+                                                       log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
+                                                       kill_link(curr,"Registration timeout");
                                                        goto label;
                                                }
-                                               if ((TIME > count2->second->signon) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second)))
+                                               if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr)))
                                                {
                                                        log(DEBUG,"signon exceed, registered=3, and modules ready, OK");
-                                                       count2->second->dns_done = true;
-                                                       FullConnectUser(count2->second);
+                                                       curr->dns_done = true;
+                                                       statsDnsBad++;
+                                                       FullConnectUser(curr);
                                                        goto label;
                                                }
-                                               if ((count2->second->dns_done) && (count2->second->registered == 3) && (AllModulesReportReady(count2->second))) // both NICK and USER... and DNS
+                                               if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr))) // both NICK and USER... and DNS
                                                {
                                                        log(DEBUG,"dns done, registered=3, and modules ready, OK");
-                                                       FullConnectUser(count2->second);
+                                                       FullConnectUser(curr);
                                                        goto label;
                                                }
-                                               if ((TIME > count2->second->nping) && (isnick(count2->second->nick)) && (count2->second->registered == 7))
+                                               if ((TIME > curr->nping) && (isnick(curr->nick)) && (curr->registered == 7))
                                                {
-                                                       if ((!count2->second->lastping) && (count2->second->registered == 7))
+                                                       if ((!curr->lastping) && (curr->registered == 7))
                                                        {
-                                                               log(DEBUG,"InspIRCd: ping timeout: %s",count2->second->nick);
-                                                               kill_link(count2->second,"Ping timeout");
+                                                               log(DEBUG,"InspIRCd: ping timeout: %s",curr->nick);
+                                                               kill_link(curr,"Ping timeout");
                                                                goto label;
                                                        }
-                                                       Write(count2->second->fd,"PING :%s",ServerName);
-                                                       log(DEBUG,"InspIRCd: pinging: %s",count2->second->nick);
-                                                       count2->second->lastping = 0;
-                                                       count2->second->nping = TIME+count2->second->pingmax;   // was hard coded to 120
+                                                       Write(curr->fd,"PING :%s",ServerName);
+                                                       log(DEBUG,"InspIRCd: pinging: %s",curr->nick);
+                                                       curr->lastping = 0;
+                                                       curr->nping = TIME+curr->pingmax;       // was hard coded to 120
                                                }
                                        }
                                        count2++;
@@ -4054,20 +4196,30 @@ int InspIRCd(void)
                        selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
                        
                        // now loop through all of the items in this pool if any are waiting
-                       //if (selectResult2 > 0)
+                       if (selectResult2 > 0)
                        for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)
                        {
 
 #ifdef _POSIX_PRIORITY_SCHEDULING
                                sched_yield();
 #endif
-
+                               userrec* cu = count2a->second;
                                result = EAGAIN;
-                               if ((count2a->second->fd != FD_MAGIC_NUMBER) && (count2a->second->fd != -1) && (FD_ISSET (count2a->second->fd, &sfd)))
+                               if ((cu->fd != FD_MAGIC_NUMBER) && (cu->fd != -1) && (FD_ISSET (cu->fd, &sfd)))
                                {
-                                       result = read(count2a->second->fd, data, 65535);
+                                       log(DEBUG,"Data waiting on socket %d",cu->fd);
+                                       int MOD_RESULT = 0;
+                                       int result2 = 0;
+                                       FOREACH_RESULT(OnRawSocketRead(cu->fd,data,65535,result2));
+                                       if (!MOD_RESULT)
+                                       {
+                                               result = read(cu->fd, data, 65535);
+                                       }
+                                       else result = result2;
+                                       log(DEBUG,"Read result: %d",result);
                                        if (result)
                                        {
+                                               statsRecv += result;
                                                // perform a check on the raw buffer as an array (not a string!) to remove
                                                // characters 0 and 7 which are illegal in the RFC - replace them with spaces.
                                                // hopefully this should stop even more people whining about "Unknown command: *"
@@ -4078,10 +4230,26 @@ int InspIRCd(void)
                                                }
                                                if (result > 0)
                                                        data[result] = '\0';
-                                               userrec* current = count2a->second;
+                                               userrec* current = cu;
                                                int currfd = current->fd;
                                                int floodlines = 0;
-                                               current->AddBuffer(data);
+                                               // add the data to the users buffer
+                                               if (!current->AddBuffer(data))
+                                               {
+                                                       // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good.
+                                                        if (current->registered == 7)
+                                                        {
+                                                                kill_link(current,"RecvQ exceeded");
+                                                        }
+                                                        else
+                                                        {
+                                                                WriteOpers("*** Excess flood from %s",current->ip);
+                                                                log(DEFAULT,"Excess flood from: %s",current->ip);
+                                                                add_zline(120,ServerName,"Flood from unregistered connection",current->ip);
+                                                                apply_lines();
+                                                        }
+                                                        goto label;
+                                               }
                                                if (current->recvq.length() > NetBufferSize)
                                                {
                                                        if (current->registered == 7)
@@ -4101,6 +4269,19 @@ int InspIRCd(void)
                                                while (current->BufferIsReady())
                                                {
                                                        floodlines++;
+                                                       if (TIME > current->reset_due)
+                                                       {
+                                                               current->reset_due = TIME + current->threshold;
+                                                               current->lines_in = 0;
+                                                       }
+                                                       current->lines_in++;
+                                                       if (current->lines_in > current->flood)
+                                                       {
+                                                               log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+                                                               WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+                                                               kill_link(current,"Excess flood");
+                                                               goto label;
+                                                       }
                                                        if ((floodlines > current->flood) && (current->flood != 0))
                                                        {
                                                                if (current->registered == 7)
@@ -4118,25 +4299,27 @@ int InspIRCd(void)
                                                        }
                                                        char sanitized[MAXBUF];
                                                        // use GetBuffer to copy single lines into the sanitized string
-                                                       strlcpy(sanitized,current->GetBuffer().c_str(),MAXBUF);
+                                                       std::string single_line = current->GetBuffer();
+                                                        current->bytes_in += single_line.length();
+                                                        current->cmds_in++;
+                                                       if (single_line.length()>512)
+                                                       {
+                                                               log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+                                                               WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+                                                               kill_link(current,"Excess flood");
+                                                               goto label;
+                                                       }
+                                                       strlcpy(sanitized,single_line.c_str(),MAXBUF);
                                                        if (*sanitized)
                                                        {
                                                                // we're gonna re-scan to check if the nick is gone, after every
                                                                // command - if it has, we're gonna bail
-                                                               bool find_again = false;
                                                                process_buffer(sanitized,current);
-                                                               // look for the user's record in case it's changed
-                                                               for (user_hash::iterator c2 = clientlist.begin(); c2 != clientlist.end(); c2++)
-                                                               {
-                                                                       if (c2->second->fd == currfd)
-                                                                       {
-                                                                               // found again, update pointer
-                                                                               current == c2->second;
-                                                                               find_again = true;
-                                                                               break;
-                                                                       }
-                                                               }
-                                                               if (!find_again)
+                                                               // look for the user's record in case it's changed... if theyve quit,
+                                                               // we cant do anything more with their buffer, so bail.
+                                                               // there used to be an ugly, slow loop here. Now we have a reference
+                                                               // table, life is much easier (and FASTER)
+                                                               if (!fd_ref_table[currfd])
                                                                        goto label;
 
                                                        }
@@ -4146,8 +4329,8 @@ int InspIRCd(void)
 
                                        if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
                                        {
-                                               log(DEBUG,"killing: %s",count2a->second->nick);
-                                               kill_link(count2a->second,strerror(errno));
+                                               log(DEBUG,"killing: %s",cu->nick);
+                                               kill_link(cu,strerror(errno));
                                                goto label;
                                        }
                                }
@@ -4160,8 +4343,8 @@ int InspIRCd(void)
                                {
                                        if (count2->second)
                                        {
-                                               log(DEBUG,"InspIRCd: Exited: %s",count2a->second->nick);
-                                               kill_link(count2a->second,"Client exited");
+                                               log(DEBUG,"InspIRCd: Exited: %s",cu->nick);
+                                               kill_link(cu,"Client exited");
                                                // must bail here? kill_link removes the hash, corrupting the iterator
                                                log(DEBUG,"Bailing from client exit");
                                                goto label;
@@ -4209,9 +4392,12 @@ int InspIRCd(void)
                                {
                                        WriteOpers("*** WARNING: Accept failed on port %lu (%s)",(unsigned long)ports[count],target);
                                        log(DEBUG,"InspIRCd: accept failed: %lu",(unsigned long)ports[count]);
+                                       statsRefused++;
                                }
                                else
                                {
+                                       FOREACH_MOD OnRawSocketAccept(incomingSockfd, resolved, ports[count]);
+                                       statsAccept++;
                                        AddClient(incomingSockfd, resolved, ports[count], false, inet_ntoa (client.sin_addr));
                                        log(DEBUG,"InspIRCd: adding client on port %lu fd=%lu",(unsigned long)ports[count],(unsigned long)incomingSockfd);
                                }
@@ -4223,6 +4409,7 @@ int InspIRCd(void)
        if (0) {};
 #ifdef _POSIX_PRIORITY_SCHEDULING
         sched_yield();
+       sched_yield();
 #endif
 }
 /* not reached */