Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index acfe793e5bf74d6d9516fe77ec47db34a519640c..7cdb85cd231007c82c691336ad07b26be272184d 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -2,22 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-/* Now with added unF! ;) */
-
-using namespace std;
-
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -26,7 +19,6 @@ using namespace std;
 #include "socketengine.h"
 #include "inspircd.h"
 #include "command_parse.h"
-#include "cull_list.h"
 
 void InspIRCd::ProcessUser(userrec* cu)
 {
@@ -44,9 +36,9 @@ void InspIRCd::ProcessUser(userrec* cu)
                {
                        MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2);
                }
-               catch (ModuleException& modexcept)
+               catch (CoreException& modexcept)
                {
-                       this->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
+                       this->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                }
 
                if (MOD_RESULT < 0)
@@ -63,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;
@@ -210,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;
                }
@@ -224,7 +213,6 @@ void InspIRCd::ProcessUser(userrec* cu)
        else if (result == 0)
        {
                cu->SetWriteError("Client exited");
-               this->Log(DEBUG,"Bailing from client exit");
                return;
        }
 }
@@ -241,30 +229,28 @@ 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)
                        {
                                /*
                                 * registration timeout -- didnt send USER/NICK/HOST
                                 * in the time specified in their connection class.
                                 */
-                               if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != REG_ALL))
+                               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
@@ -272,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.
@@ -280,9 +266,10 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                bool ready = AllModulesReportReady(curr);
                                if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (ready))
                                {
+                                       curr->WriteServ("NOTICE Auth :*** Could not resolve your hostname: Request timed out; using your IP address (%s) instead.", curr->GetIPString());
                                        curr->dns_done = true;
                                        this->stats->statsDnsBad++;
-                                       curr->FullConnect(&GlobalGoners);
+                                       curr->FullConnect();
                                        continue;
                                }
                                else
@@ -290,11 +277,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
@@ -302,7 +288,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))
                                {
@@ -311,8 +297,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;
@@ -328,7 +315,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)
@@ -336,9 +323,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();
        }
 }
-