Use a set to mark client SSL ports rather than going by textual IP/port pairs

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 74f8c18617a464b667430ba3fa46513d12d283a8..af2f1b16972b33fbfb340730ba8926f3a8965c2d 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -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;
 }
 
@@ -142,7 +149,7 @@ std::string SocketEngine::GetName()
 }
 
 bool SocketEngine::BoundsCheckFd(EventHandler* eh)
-{       
+{
        if (!eh)
                return false;
        if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS))
@@ -181,7 +188,7 @@ int SocketEngine::Blocking(int fd)
        return ioctlsocket(fd, FIONBIO, &opt);
 #else
        int flags = fcntl(fd, F_GETFL, 0);
-       return fcntl(fd, F_SETFL, flags ^ O_NONBLOCK);
+       return fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
 #endif
 }
 
@@ -204,25 +211,25 @@ int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namel
 int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen)
 {
        this->UpdateStats(len, 0);
-       return recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
+       return recvfrom(fd->GetFd(), buf, len, flags, from, fromlen);
 }
 
 int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
 {
        this->UpdateStats(0, len);
-       return send(fd->GetFd(), (const char*)buf, len, flags);
+       return send(fd->GetFd(), buf, len, flags);
 }
 
 int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
 {
        this->UpdateStats(len, 0);
-       return recv(fd->GetFd(), (char*)buf, len, flags);
+       return recv(fd->GetFd(), buf, len, flags);
 }
 
 int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen)
 {
        this->UpdateStats(0, len);
-       return sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
+       return sendto(fd->GetFd(), buf, len, flags, to, tolen);
 }
 
 int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
@@ -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;