Merge insp20

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 356904f741b35e8efbcfe5bac61cdaf98721f31e..d7a25785d1d6506f1ca132211cfe8b91a60d83ab 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -26,6 +26,7 @@
 #include "socket.h"
 #include "inspstring.h"
 #include "socketengine.h"
+#include "iohook.h"
 
 #ifndef DISABLE_WRITEV
 #include <sys/uio.h>
@@ -66,7 +67,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int
        irc::sockets::sockaddrs addr, bind;
        if (!irc::sockets::aptosa(ipaddr, aport, addr))
        {
-               ServerInstance->Logs->Log("SOCKET", DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
                return I_ERR_CONNECT;
        }
 
@@ -98,7 +99,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
        ServerInstance->SE->NonBlocking(fd);
 
-       if (ServerInstance->SE->Connect(this, &dest.sa, sa_size(dest)) == -1)
+       if (ServerInstance->SE->Connect(this, &dest.sa, dest.sa_size()) == -1)
        {
                if (errno != EINPROGRESS)
                        return I_ERR_CONNECT;
@@ -112,7 +113,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
        this->Timeout = new SocketTimeout(this->GetFd(), this, timeout, ServerInstance->Time());
        ServerInstance->Timers->AddTimer(this->Timeout);
 
-       ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BufferedSocket::DoConnect success");
        return I_ERR_NONE;
 }
 
@@ -122,18 +123,18 @@ void StreamSocket::Close()
        {
                // final chance, dump as much of the sendq as we can
                DoWrite();
-               if (IOHook)
+               if (GetIOHook())
                {
                        try
                        {
-                               IOHook->OnStreamSocketClose(this);
+                               GetIOHook()->OnStreamSocketClose(this);
                        }
                        catch (CoreException& modexcept)
                        {
-                               ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s",
+                               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
                                        modexcept.GetSource(), modexcept.GetReason());
                        }
-                       IOHook = NULL;
+                       DelIOHook();
                }
                ServerInstance->SE->Shutdown(this, 2);
                ServerInstance->SE->DelFd(this);
@@ -161,16 +162,16 @@ bool StreamSocket::GetNextLine(std::string& line, char delim)
 
 void StreamSocket::DoRead()
 {
-       if (IOHook)
+       if (GetIOHook())
        {
                int rv = -1;
                try
                {
-                       rv = IOHook->OnStreamSocketRead(this, recvq);
+                       rv = GetIOHook()->OnStreamSocketRead(this, recvq);
                }
                catch (CoreException& modexcept)
                {
-                       ServerInstance->Logs->Log("SOCKET", DEFAULT, "%s threw an exception: %s",
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
                                modexcept.GetSource(), modexcept.GetReason());
                        return;
                }
@@ -225,12 +226,12 @@ void StreamSocket::DoWrite()
                return;
        if (!error.empty() || fd < 0 || fd == INT_MAX)
        {
-               ServerInstance->Logs->Log("SOCKET", DEBUG, "DoWrite on errored or closed socket");
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DoWrite on errored or closed socket");
                return;
        }
 
 #ifndef DISABLE_WRITEV
-       if (IOHook)
+       if (GetIOHook())
 #endif
        {
                int rv = -1;
@@ -258,9 +259,9 @@ void StreamSocket::DoWrite()
                                }
                                std::string& front = sendq.front();
                                int itemlen = front.length();
-                               if (IOHook)
+                               if (GetIOHook())
                                {
-                                       rv = IOHook->OnStreamSocketWrite(this, front);
+                                       rv = GetIOHook()->OnStreamSocketWrite(this, front);
                                        if (rv > 0)
                                        {
                                                // consumed the entire string, and is ready for more
@@ -319,7 +320,7 @@ void StreamSocket::DoWrite()
                }
                catch (CoreException& modexcept)
                {
-                       ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s",
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
                                modexcept.GetSource(), modexcept.GetReason());
                }
        }
@@ -421,7 +422,7 @@ void StreamSocket::WriteData(const std::string &data)
 {
        if (fd < 0)
        {
-               ServerInstance->Logs->Log("SOCKET", DEBUG, "Attempt to write data to dead socket: %s",
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to write data to dead socket: %s",
                        data.c_str());
                return;
        }
@@ -433,12 +434,12 @@ void StreamSocket::WriteData(const std::string &data)
        ServerInstance->SE->ChangeEventMask(this, FD_ADD_TRIAL_WRITE);
 }
 
-void SocketTimeout::Tick(time_t)
+bool SocketTimeout::Tick(time_t)
 {
-       ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SocketTimeout::Tick");
 
        if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
-               return;
+               return false;
 
        if (this->sock->state == I_CONNECTING)
        {
@@ -454,6 +455,7 @@ void SocketTimeout::Tick(time_t)
        }
 
        this->sock->Timeout = NULL;
+       return false;
 }
 
 void BufferedSocket::OnConnected() { }
@@ -478,8 +480,8 @@ BufferedSocket::~BufferedSocket()
        this->Close();
        if (Timeout)
        {
-               ServerInstance->Timers->DelTimer(Timeout);
-               Timeout = NULL;
+               // The timer is removed from the TimerManager in Timer::~Timer()
+               delete Timeout;
        }
 }
 
@@ -530,13 +532,13 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
        }
        catch (CoreException& ex)
        {
-               ServerInstance->Logs->Log("SOCKET", DEFAULT, "Caught exception in socket processing on FD %d - '%s'",
+               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Caught exception in socket processing on FD %d - '%s'",
                        fd, ex.GetReason());
                SetError(ex.GetReason());
        }
        if (!error.empty())
        {
-               ServerInstance->Logs->Log("SOCKET", DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
+               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
                OnError(errcode);
        }
 }