Make xline expiry messages a bit clearer that the xline may have expired a while...

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 74f8c18617a464b667430ba3fa46513d12d283a8..43de35e1ea7e3e9eb8f8cfb351e38f2ba6bb19b2 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -41,20 +41,27 @@
 #include "inspircd.h"
 #include "socketengine.h"
 
+EventHandler::EventHandler()
+{
+       this->IOHook = NULL;
+}
+
 bool EventHandler::AddIOHook(Module *IOHooker)
 {
        if (this->IOHook)
                return false;
 
        this->IOHook = IOHooker;
+       return true;
 }
 
 bool EventHandler::DelIOHook()
 {
        if (!this->IOHook)
-               return false
+               return false;
 
-       this->IOHook = false;
+       this->IOHook = NULL;
+       return true;
 }
 
 Module *EventHandler::GetIOHook()
@@ -89,7 +96,7 @@ void SocketEngine::WantWrite(EventHandler* eh)
 SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
 {
        TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
-       lastempty = time(NULL);
+       lastempty = ServerInstance->Time();
        indata = outdata = 0;
 }
 
@@ -256,9 +263,9 @@ void SocketEngine::RecoverFromFork()
 
 void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
 {
-       if (lastempty != time(NULL))
+       if (lastempty != ServerInstance->Time())
        {
-               lastempty = time(NULL);
+               lastempty = ServerInstance->Time();
                indata = outdata = 0;
        }
        indata += len_in;