Create StreamSocket for IO hooking implementation

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 90d25e0604eaea1d5e392c364487d620e583a423..c0ae3f278945982345107f66a4a46c96fe1e799a 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.
@@ -11,12 +11,18 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsocketengine */
+/* $Core */
 
 /*********        DEFAULTS       **********/
+
 /* $ExtraSources: socketengines/socketengine_select.cpp */
 /* $ExtraObjects: socketengine_select.o */
 
+/* $If: USE_POLL */
+/* $ExtraSources: socketengines/socketengine_poll.cpp */
+/* $ExtraObjects: socketengine_poll.o */
+/* $EndIf */
+
 /* $If: USE_KQUEUE */
 /* $ExtraSources: socketengines/socketengine_kqueue.cpp */
 /* $ExtraObjects: socketengine_kqueue.o */
@@ -35,9 +41,9 @@
 #include "inspircd.h"
 #include "socketengine.h"
 
-int EventHandler::GetFd()
+EventHandler::EventHandler()
 {
-       return this->fd;
+       fd = -1;
 }
 
 void EventHandler::SetFd(int FD)
@@ -45,24 +51,10 @@ void EventHandler::SetFd(int FD)
        this->fd = FD;
 }
 
-bool EventHandler::Readable()
-{
-       return true;
-}
-
-bool EventHandler::Writeable()
-{
-       return false;
-}
-
-void SocketEngine::WantWrite(EventHandler* eh)
-{
-}
-
-SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
+SocketEngine::SocketEngine()
 {
        TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
-       lastempty = time(NULL);
+       lastempty = ServerInstance->Time();
        indata = outdata = 0;
 }
 
@@ -70,11 +62,6 @@ SocketEngine::~SocketEngine()
 {
 }
 
-bool SocketEngine::AddFd(EventHandler* eh)
-{
-       return true;
-}
-
 bool SocketEngine::HasFd(int fd)
 {
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
@@ -89,11 +76,6 @@ EventHandler* SocketEngine::GetRef(int fd)
        return ref[fd];
 }
 
-bool SocketEngine::DelFd(EventHandler* eh, bool force)
-{
-       return true;
-}
-
 int SocketEngine::GetMaxFds()
 {
        return 0;
@@ -109,13 +91,8 @@ int SocketEngine::DispatchEvents()
        return 0;
 }
 
-std::string SocketEngine::GetName()
-{
-       return "misconfigured";
-}
-
 bool SocketEngine::BoundsCheckFd(EventHandler* eh)
-{       
+{
        if (!eh)
                return false;
        if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS))
@@ -154,7 +131,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
 }
 
@@ -177,25 +154,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)
@@ -229,9 +206,9 @@ void SocketEngine::RecoverFromFork()
 
 void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
 {
-       if (lastempty + 1 > time(NULL))
+       if (lastempty != ServerInstance->Time())
        {
-               lastempty = time(NULL);
+               lastempty = ServerInstance->Time();
                indata = outdata = 0;
        }
        indata += len_in;
@@ -240,9 +217,10 @@ void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
 
 void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total)
 {
+       UpdateStats(0, 0); /* Forces emptying of the values if its been more than a second */
        float in_kbit = indata * 8;
        float out_kbit = outdata * 8;
-       kbitpersec_total = ((in_kbit + out_kbit)) / 1024);
+       kbitpersec_total = ((in_kbit + out_kbit) / 1024);
        kbitpersec_in = in_kbit / 1024;
        kbitpersec_out = out_kbit / 1024;
 }