1) Fix for nickname overruled with new cullList stuff -- we have to change their...

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index b065c49fb51646b157b55e3700b314f8a01d002b..1d21871655f758e8d1aa9209caa926bbbb237c46 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -19,7 +19,6 @@
 #include "socketengine.h"
 #include "inspircd.h"
 #include "command_parse.h"
-#include "cull_list.h"
 
 void InspIRCd::ProcessUser(userrec* cu)
 {
@@ -56,8 +55,6 @@ void InspIRCd::ProcessUser(userrec* cu)
                result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer));
        }
 
-       this->Log(DEBUG,"Read result: %d",result);
-
        if ((result) && (result != -EAGAIN))
        {
                userrec *current;
@@ -203,7 +200,6 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
                {
-                       this->Log(DEBUG,"killing: %s",cu->nick);
                        cu->SetWriteError(strerror(errno));
                        return;
                }
@@ -217,7 +213,6 @@ void InspIRCd::ProcessUser(userrec* cu)
        else if (result == 0)
        {
                cu->SetWriteError("Client exited");
-               this->Log(DEBUG,"Bailing from client exit");
                return;
        }
 }
@@ -234,20 +229,18 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                return;
        else
        {
-               CullList GlobalGoners(this);
-       
                /* Time we actually need to call this again */
                const time_t DUMMY_VALUE = 32768;
                next_call = TIME + DUMMY_VALUE;
-       
+
                /* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */
                for (unsigned long count2 = 0; count2 != this->local_users.size(); count2++)
                {
                        if (count2 >= this->local_users.size())
                                break;
-       
+
                        userrec* curr = this->local_users[count2];
-       
+
                        if (curr)
                        {
                                /*
@@ -256,8 +249,8 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                 */
                                if ((TIME > curr->timeout) && (curr->registered != REG_ALL))
                                {
-                                       this->Log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
-                                       GlobalGoners.AddItem(curr,"Registration timeout");
+                                       curr->muted = true;
+                                       GlobalCulls.AddItem(curr,"Registration timeout");
                                        continue;
                                }
                                else
@@ -265,7 +258,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                        if ((curr->registered != REG_ALL) && (next_call > (time_t)curr->timeout))
                                                next_call = curr->timeout;
                                }
-       
+
                                /*
                                 * user has signed on with USER/NICK/PASS, and dns has completed, all the modules
                                 * say this user is ok to proceed, fully connect them.
@@ -275,7 +268,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                {
                                        curr->dns_done = true;
                                        this->stats->statsDnsBad++;
-                                       curr->FullConnect(&GlobalGoners);
+                                       curr->FullConnect();
                                        continue;
                                }
                                else
@@ -283,11 +276,10 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                        if ((curr->registered == REG_NICKUSER) && (ready) && (next_call > curr->signon))
                                                next_call = curr->signon;
                                }
-       
+
                                if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (ready))
                                {
-                                       this->Log(DEBUG,"dns done, registered=3, and modules ready, OK");
-                                       curr->FullConnect(&GlobalGoners);
+                                       curr->FullConnect();
                                        continue;
                                }
                                else
@@ -295,7 +287,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                        if ((curr->registered == REG_NICKUSER) && (ready) && (next_call > curr->signon + this->Config->dns_timeout))
                                                next_call = curr->signon + this->Config->dns_timeout;
                                }
-       
+
                                // It's time to PING this user. Send them a ping.
                                if ((TIME > curr->nping) && (curr->registered == REG_ALL))
                                {
@@ -304,8 +296,9 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                        {
                                                /* Everybody loves boobies. */
                                                time_t time = this->Time(false) - (curr->nping - curr->pingmax);
-                                               std::string boobies = "Ping timeout: " + ConvToStr(time) + " second" + (time > 1 ? "s" : ""); 
-                                               GlobalGoners.AddItem(curr, boobies);
+                                               std::string boobies = "Ping timeout: " + ConvToStr(time) + " second" + (time > 1 ? "s" : "");
+                                               curr->muted = true;
+                                               GlobalCulls.AddItem(curr, boobies);
                                                curr->lastping = 1;
                                                curr->nping = TIME+curr->pingmax;
                                                continue;
@@ -321,7 +314,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                }
                        }
                }
-       
+
                /* If theres nothing to do, trigger in the next second, something might come up */
                time_t delta = next_call - TIME;
                if (delta == DUMMY_VALUE)
@@ -329,9 +322,5 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                        next_call = TIME + 1;
                        delta = 1;
                }
-       
-               /* Remove all the queued users who are due to be quit, free memory used. */
-               GlobalGoners.Apply();
        }
 }
-