m_dnsbl updates

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index a37cb9ea0001f2772c218376921f7009764cc89c..f06ddf28d84d1ef96b6fec587cc6ff193b5b8229 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -52,7 +52,7 @@ void BufferedSocket::DoConnect(const std::string &ipaddr, int aport, unsigned lo
 BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
 {
        irc::sockets::sockaddrs addr, bind;
-       if (!irc::sockets::aptosa(ipaddr, aport, &addr))
+       if (!irc::sockets::aptosa(ipaddr, aport, addr))
        {
                ServerInstance->Logs->Log("SOCKET", DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
                return I_ERR_CONNECT;
@@ -61,7 +61,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int
        bind.sa.sa_family = 0;
        if (!connectbindip.empty())
        {
-               if (!irc::sockets::aptosa(connectbindip, 0, &bind))
+               if (!irc::sockets::aptosa(connectbindip, 0, bind))
                {
                        return I_ERR_BIND;
                }
@@ -90,7 +90,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
        if (bind.sa.sa_family != 0)
        {
-               if (ServerInstance->SE->Bind(fd, &bind.sa, sa_size(bind)) < 0)
+               if (ServerInstance->SE->Bind(fd, bind) < 0)
                        return I_ERR_BIND;
        }
 
@@ -118,11 +118,6 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
 void StreamSocket::Close()
 {
-       /* Save this, so we dont lose it,
-        * otherise on failure, error messages
-        * might be inaccurate.
-        */
-       int save = errno;
        if (this->fd > -1)
        {
                if (IOHook)
@@ -136,13 +131,13 @@ void StreamSocket::Close()
                                ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s",
                                        modexcept.GetSource(), modexcept.GetReason());
                        }
+                       IOHook = NULL;
                }
                ServerInstance->SE->Shutdown(this, 2);
                ServerInstance->SE->DelFd(this);
                ServerInstance->SE->Close(this);
                fd = -1;
        }
-       errno = save;
 }
 
 CullResult StreamSocket::cull()
@@ -156,7 +151,7 @@ bool StreamSocket::GetNextLine(std::string& line, char delim)
        std::string::size_type i = recvq.find(delim);
        if (i == std::string::npos)
                return false;
-       line = recvq.substr(0, i - 1);
+       line = recvq.substr(0, i);
        // TODO is this the most efficient way to split?
        recvq = recvq.substr(i + 1);
        return true;
@@ -236,7 +231,7 @@ void StreamSocket::DoWrite()
                int rv = -1;
                try
                {
-                       while (!sendq.empty())
+                       while (error.empty() && !sendq.empty())
                        {
                                if (sendq.size() > 1 && sendq[0].length() < 1024)
                                {
@@ -329,7 +324,7 @@ void StreamSocket::DoWrite()
                        return;
                // start out optimistic - we won't need to write any more
                int eventChange = FD_WANT_EDGE_WRITE;
-               while (sendq_len && eventChange == FD_WANT_EDGE_WRITE)
+               while (error.empty() && sendq_len && eventChange == FD_WANT_EDGE_WRITE)
                {
                        // Prepare a writev() call to write all buffers efficiently
                        int bufcount = sendq.size();
@@ -491,49 +486,56 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
        if (!error.empty())
                return;
        BufferedSocketError errcode = I_ERR_OTHER;
-       switch (et)
-       {
-               case EVENT_ERROR:
+       try {
+               switch (et)
                {
-                       if (errornum == 0)
-                               SetError("Connection closed");
-                       else
-                               SetError(strerror(errornum));
-                       switch (errornum)
+                       case EVENT_ERROR:
                        {
-                               case ETIMEDOUT:
-                                       errcode = I_ERR_TIMEOUT;
-                                       break;
-                               case ECONNREFUSED:
-                               case 0:
-                                       errcode = I_ERR_CONNECT;
-                                       break;
-                               case EADDRINUSE:
-                                       errcode = I_ERR_BIND;
-                                       break;
-                               case EPIPE:
-                               case EIO:
-                                       errcode = I_ERR_WRITE;
-                                       break;
+                               if (errornum == 0)
+                                       SetError("Connection closed");
+                               else
+                                       SetError(strerror(errornum));
+                               switch (errornum)
+                               {
+                                       case ETIMEDOUT:
+                                               errcode = I_ERR_TIMEOUT;
+                                               break;
+                                       case ECONNREFUSED:
+                                       case 0:
+                                               errcode = I_ERR_CONNECT;
+                                               break;
+                                       case EADDRINUSE:
+                                               errcode = I_ERR_BIND;
+                                               break;
+                                       case EPIPE:
+                                       case EIO:
+                                               errcode = I_ERR_WRITE;
+                                               break;
+                               }
+                               break;
+                       }
+                       case EVENT_READ:
+                       {
+                               DoRead();
+                               break;
+                       }
+                       case EVENT_WRITE:
+                       {
+                               DoWrite();
+                               break;
                        }
-                       break;
-               }
-               case EVENT_READ:
-               {
-                       DoRead();
-                       break;
-               }
-               case EVENT_WRITE:
-               {
-                       DoWrite();
-                       break;
                }
        }
+       catch (CoreException& ex)
+       {
+               ServerInstance->Logs->Log("SOCKET", 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());
                OnError(errcode);
-               ServerInstance->GlobalCulls.AddItem(this);
        }
 }