Add strerror(errno) to port bind failure on TreeSocket

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index b738c80969609a094e4d0506280031efc2c03f92..c6a34561b4bc0048e23178b3f1a39bafa6c21be2 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"
@@ -44,9 +37,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 +56,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;
@@ -112,7 +103,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                        {
                                                this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                                this->SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
-                                               userrec::QuitUser(this, current,"Excess flood");
+                                               current->SetWriteError("Excess flood");
                                                return;
                                        }
                                        else
@@ -136,7 +127,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                        {
                                if (current->registered == REG_ALL)
                                {
-                                       userrec::QuitUser(this, current,"RecvQ exceeded");
+                                       current->SetWriteError("RecvQ exceeded");
                                }
                                else
                                {
@@ -162,7 +153,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                {
                                        this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                        this->SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
-                                       userrec::QuitUser(this, current,"Excess flood");
+                                       current->SetWriteError("Excess flood");
                                        return;
                                }
 
@@ -172,7 +163,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                        {
                                                this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                                SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
-                                               userrec::QuitUser(this, current,"Excess flood");
+                                               current->SetWriteError("Excess flood");
                                        }
                                        else
                                        {
@@ -210,8 +201,7 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
                {
-                       this->Log(DEBUG,"killing: %s",cu->nick);
-                       userrec::QuitUser(this,cu,strerror(errno));
+                       cu->SetWriteError(strerror(errno));
                        return;
                }
        }
@@ -223,8 +213,7 @@ void InspIRCd::ProcessUser(userrec* cu)
        }
        else if (result == 0)
        {
-               userrec::QuitUser(this,cu,"Client exited");
-               this->Log(DEBUG,"Bailing from client exit");
+               cu->SetWriteError("Client exited");
                return;
        }
 }
@@ -261,9 +250,8 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                 * 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");
                                        continue;
                                }
@@ -293,7 +281,6 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
        
                                if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (ready))
                                {
-                                       this->Log(DEBUG,"dns done, registered=3, and modules ready, OK");
                                        curr->FullConnect(&GlobalGoners);
                                        continue;
                                }
@@ -326,20 +313,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                        if ((curr->registered == REG_ALL) && (next_call > curr->nping))
                                                next_call = curr->nping;
                                }
-       
-                               /*
-                                * We can flush the write buffer as the last thing we do, because if they
-                                * match any of the above conditions its no use flushing their buffer anyway.
-                                */
-               
-                               curr->FlushWriteBuf();
-                               if (*curr->GetWriteError())
-                               {
-                                       GlobalGoners.AddItem(curr,curr->GetWriteError());
-                                       continue;
-                               }
                        }
-       
                }
        
                /* If theres nothing to do, trigger in the next second, something might come up */