]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspsocket.cpp
Rip flood/threshold out of config classes also.
[user/henk/code/inspircd.git] / src / inspsocket.cpp
index a2c5cc47f7acfa40290029c83c1326cf4eb25eb6..2e9114a2be78e818b55e9c652bcd6811d3987d91 100644 (file)
@@ -1 +1,634 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "socket.h"\r#include "configreader.h"\r#include "inspstring.h"\r#include "socketengine.h"\r#include "inspircd.h"\r\rusing irc::sockets::OpenTCPSocket;\r\rbool InspSocket::Readable()\r{\r  return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));\r}\r\rInspSocket::InspSocket(InspIRCd* SI)\r{\r     this->Timeout = NULL;\r  this->state = I_DISCONNECTED;\r  this->fd = -1;\r this->WaitingForWriteEvent = false;\r    this->Instance = SI;\r   this->IsIOHooked = false;\r}\r\rInspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip)\r{\r this->Timeout = NULL;\r  this->fd = newfd;\r      this->state = I_CONNECTED;\r     strlcpy(this->IP,ip,MAXBUF);\r   this->WaitingForWriteEvent = false;\r    this->Instance = SI;\r   this->IsIOHooked = false;\r      if (this->fd > -1)\r             this->Instance->SE->AddFd(this);\r}\r\rInspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip)\r{\r      this->cbindip = connectbindip;\r this->fd = -1;\r this->Instance = SI;\r   strlcpy(host,ipaddr.c_str(),MAXBUF);\r   this->WaitingForWriteEvent = false;\r    this->IsIOHooked = false;\r      this->Timeout = NULL;\r  if (listening)\r {\r              if ((this->fd = OpenTCPSocket(host)) == ERROR)\r         {\r                      this->fd = -1;\r                 this->state = I_ERROR;\r                 this->OnError(I_ERR_SOCKET);\r                   return;\r                }\r              else\r           {\r                      if (!SI->BindSocket(this->fd,aport,(char*)ipaddr.c_str()))\r                     {\r                              this->Close();\r                         this->fd = -1;\r                         this->state = I_ERROR;\r                         this->OnError(I_ERR_BIND);\r                             this->ClosePending = true;\r                             return;\r                        }\r                      else\r                   {\r                              this->state = I_LISTENING;\r                             this->port = aport;\r                            if (this->fd > -1)\r                             {\r                                      if (!this->Instance->SE->AddFd(this))\r                                  {\r                                              this->Close();\r                                         this->state = I_ERROR;\r                                         this->OnError(I_ERR_NOMOREFDS);\r                                        }\r                              }\r                              return;\r                        }\r              }\r      }\r      else\r   {\r              strlcpy(this->host,ipaddr.c_str(),MAXBUF);\r             this->port = aport;\r\r           bool ipvalid = true;\r#ifdef IPV6\r               if (strchr(host,':'))\r          {\r                      in6_addr n;\r                    if (inet_pton(AF_INET6, host, &n) < 1)\r                         ipvalid = false;\r               }\r              else\r#endif\r            {\r                      in_addr n;\r                     if (inet_aton(host,&n) < 1)\r                            ipvalid = false;\r               }\r              if (!ipvalid)\r          {\r                      this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!");\r                   this->OnError(I_ERR_CONNECT);\r                  this->Close();\r                 this->fd = -1;\r                 this->state = I_ERROR;\r                 return;\r                }\r              else\r           {\r                      strlcpy(this->IP,host,MAXBUF);\r                 timeout_val = maxtime;\r                 if (!this->DoConnect())\r                        {\r                              this->OnError(I_ERR_CONNECT);\r                          this->Close();\r                         this->fd = -1;\r                         this->state = I_ERROR;\r                         return;\r                        }\r              }\r      }\r}\r\rvoid InspSocket::WantWrite()\r{\r    this->Instance->SE->WantWrite(this);\r   this->WaitingForWriteEvent = true;\r}\r\rvoid InspSocket::SetQueues(int nfd)\r{\r    // attempt to increase socket sendq and recvq as high as its possible\r  int sendbuf = 32768;\r   int recvbuf = 32768;\r   setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf));\r   setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf));\r}\r\r/* Most irc servers require you to specify the ip you want to bind to.\r * If you dont specify an IP, they rather dumbly bind to the first IP\r * of the box (e.g. INADDR_ANY). In InspIRCd, we scan thought the IP\r * addresses we've bound server ports to, and we try and bind our outbound\r * connections to the first usable non-loopback and non-any IP we find.\r * This is easier to configure when you have a lot of links and a lot\r * of servers to configure.\r */\rbool InspSocket::BindAddr(const std::string &ip)\r{\r  ConfigReader Conf(this->Instance);\r     socklen_t size = sizeof(sockaddr_in);\r#ifdef IPV6\r      bool v6 = false;\r       /* Are we looking for a binding to fit an ipv6 host? */\r        if ((ip.empty()) || (ip.find(':') != std::string::npos))\r               v6 = true;\r#endif\r      int j = 0;\r     while (j < Conf.Enumerate("bind") || (!ip.empty()))\r    {\r              std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;\r         if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")\r               {\r                      if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (!IP.empty()) && (IP != "::1")))\r                     {\r                              sockaddr* s = new sockaddr[2];\r#ifdef IPV6\r                             if (v6)\r                                {\r                                      in6_addr n;\r                                    if (inet_pton(AF_INET6, IP.c_str(), &n) > 0)\r                                   {\r                                              memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(n));\r                                         ((sockaddr_in6*)s)->sin6_port = 0;\r                                             ((sockaddr_in6*)s)->sin6_family = AF_INET6;\r                                            size = sizeof(sockaddr_in6);\r                                   }\r                                      else\r                                   {\r                                              delete[] s;\r                                            j++;\r                                           continue;\r                                      }\r                              }\r                              else\r#endif\r                            {\r                                      in_addr n;\r                                     if (inet_aton(IP.c_str(), &n) > 0)\r                                     {\r                                              ((sockaddr_in*)s)->sin_addr = n;\r                                               ((sockaddr_in*)s)->sin_port = 0;\r                                               ((sockaddr_in*)s)->sin_family = AF_INET;\r                                       }\r                                      else\r                                   {\r                                              delete[] s;\r                                            j++;\r                                           continue;\r                                      }\r                              }\r\r                             if (bind(this->fd, s, size) < 0)\r                               {\r                                      this->state = I_ERROR;\r                                 this->OnError(I_ERR_BIND);\r                                     this->fd = -1;\r                                 delete[] s;\r                                    return false;\r                          }\r\r                             delete[] s;\r                            return true;\r                   }\r              }\r              j++;\r   }\r      return true;\r}\r\rbool InspSocket::DoConnect()\r{\r sockaddr* addr = new sockaddr[2];\r      socklen_t size = sizeof(sockaddr_in);\r#ifdef IPV6\r      bool v6 = false;\r       if ((!*this->host) || strchr(this->host, ':'))\r         v6 = true;\r\r    if (v6)\r        {\r              this->fd = socket(AF_INET6, SOCK_STREAM, 0);\r           if ((this->fd > -1) && ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)))\r         {\r                      if (!this->BindAddr(this->cbindip))\r                    {\r                              delete[] addr;\r                         return false;\r                  }\r              }\r      }\r      else\r#endif\r    {\r              this->fd = socket(AF_INET, SOCK_STREAM, 0);\r            if (this->fd > -1)\r             {\r                      if (!this->BindAddr(this->cbindip))\r                    {\r                              delete[] addr;\r                         return false;\r                  }\r              }\r      }\r\r     if (this->fd == -1)\r    {\r              this->state = I_ERROR;\r         this->OnError(I_ERR_SOCKET);\r           delete[] addr;\r         return false;\r  }\r\r#ifdef IPV6\r if (v6)\r        {\r              in6_addr addy;\r         if (inet_pton(AF_INET6, this->host, &addy) > 0)\r                {\r                      ((sockaddr_in6*)addr)->sin6_family = AF_INET6;\r                 memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy));\r                        ((sockaddr_in6*)addr)->sin6_port = htons(this->port);\r                  size = sizeof(sockaddr_in6);\r           }\r      }\r      else\r#endif\r    {\r              in_addr addy;\r          if (inet_aton(this->host, &addy) > 0)\r          {\r                      ((sockaddr_in*)addr)->sin_family = AF_INET;\r                    ((sockaddr_in*)addr)->sin_addr = addy;\r                 ((sockaddr_in*)addr)->sin_port = htons(this->port);\r            }\r      }\r#ifndef WIN32\r        int flags = fcntl(this->fd, F_GETFL, 0);\r       fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);\r#else\r    unsigned long flags = 0;\r       ioctlsocket(this->fd, FIONBIO, &flags);\r#endif\r if (connect(this->fd, (sockaddr*)addr, size) == -1)\r    {\r              if (errno != EINPROGRESS)\r              {\r                      this->OnError(I_ERR_CONNECT);\r                  this->Close();\r                 this->state = I_ERROR;\r                 return false;\r          }\r\r             this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time());\r           this->Instance->Timers->AddTimer(this->Timeout);\r       }\r      this->state = I_CONNECTING;\r    if (this->fd > -1)\r     {\r              if (!this->Instance->SE->AddFd(this))\r          {\r                      this->OnError(I_ERR_NOMOREFDS);\r                        this->Close();\r                 this->state = I_ERROR;\r                 return false;\r          }\r              this->SetQueues(this->fd);\r     }\r      return true;\r}\r\r\rvoid InspSocket::Close()\r{\r    /* Save this, so we dont lose it,\r       * otherise on failure, error messages\r  * might be inaccurate.\r         */\r    int save = errno;\r      if (this->fd > -1)\r     {\r              if (this->IsIOHooked && Instance->Config->GetIOHook(this))\r             {\r                      try\r                    {\r                              Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd);\r                 }\r                      catch (CoreException& modexcept)\r                       {\r                              Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());\r                      }\r              }\r              this->OnClose();\r               shutdown(this->fd,2);\r          close(this->fd);\r\r              if (Instance->SocketCull.find(this) == Instance->SocketCull.end())\r                     Instance->SocketCull[this] = this;\r     }\r      errno = save;\r}\r\rstd::string InspSocket::GetIP()\r{\r     return this->IP;\r}\r\rchar* InspSocket::Read()\r{\r#ifdef WINDOWS\r  if ((fd < 0) || (m_internalFd > MAX_DESCRIPTORS))\r#else\r        if ((fd < 0) || (fd > MAX_DESCRIPTORS))\r#endif\r         return NULL;\r\r  int n = 0;\r\r    if (this->IsIOHooked)\r  {\r              int result2 = 0;\r               int MOD_RESULT = 0;\r            try\r            {\r                      MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd,this->ibuf,sizeof(this->ibuf),result2);\r               }\r              catch (CoreException& modexcept)\r               {\r                      Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());\r              }\r              if (MOD_RESULT < 0)\r            {\r                      n = -1;\r                        errno = EAGAIN;\r                }\r              else\r           {\r                      n = result2;\r           }\r      }\r      else\r   {\r              n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);\r    }\r\r     if ((n > 0) && (n <= (int)sizeof(this->ibuf)))\r {\r              ibuf[n] = 0;\r           return ibuf;\r   }\r      else\r   {\r              int err = errno;\r               if (err == EAGAIN)\r                     return "";\r             else\r                   return NULL;\r   }\r}\r\rvoid InspSocket::MarkAsClosed()\r{\r}\r\r// There are two possible outcomes to this function.\r// It will either write all of the data, or an undefined amount.\r// If an undefined amount is written the connection has failed\r// and should be aborted.\rint InspSocket::Write(const std::string &data)\r{\r      /* Try and append the data to the back of the queue, and send it on its way\r     */\r    outbuffer.push_back(data);\r     this->Instance->SE->WantWrite(this);\r   return (!this->FlushWriteBuffer());\r}\r\rbool InspSocket::FlushWriteBuffer()\r{\r   errno = 0;\r     if ((this->fd > -1) && (this->state == I_CONNECTED))\r   {\r              if (this->IsIOHooked)\r          {\r                      while (outbuffer.size() && (errno != EAGAIN))\r                  {\r                              try\r                            {\r                                      /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to\r                                    * implement their own buffering mechanisms\r                                     */\r                                    Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());\r                                    outbuffer.pop_front();\r                         }\r                              catch (CoreException& modexcept)\r                               {\r                                      Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());\r                                        return true;\r                           }\r                      }\r              }\r              else\r           {\r                      /* If we have multiple lines, try to send them all,\r                     * not just the first one -- Brain\r                      */\r                    while (outbuffer.size() && (errno != EAGAIN))\r                  {\r                              /* Send a line */\r#ifndef WIN32\r                                int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());\r#else\r                         int result = send(this->fd,outbuffer[0].c_str(),outbuffer[0].length(), 0);\r#endif\r                              if (result > 0)\r                                {\r                                      if ((unsigned int)result >= outbuffer[0].length())\r                                     {\r                                              /* The whole block was written (usually a line)\r                                                 * Pop the block off the front of the queue,\r                                            * dont set errno, because we are clear of errors\r                                               * and want to try and write the next block too.\r                                                */\r                                            outbuffer.pop_front();\r                                 }\r                                      else\r                                   {\r                                              std::string temp = outbuffer[0].substr(result);\r                                                outbuffer[0] = temp;\r                                           /* We didnt get the whole line out. arses.\r                                              * Try again next time, i guess. Set errno,\r                                             * because we shouldnt be writing any more now,\r                                                 * until the socketengine says its safe to do so.\r                                               */\r                                            errno = EAGAIN;\r                                        }\r                              }\r                              else if ((result == -1) && (errno != EAGAIN))\r                          {\r                                      this->OnError(I_ERR_WRITE);\r                                    this->state = I_ERROR;\r                                 this->Instance->SE->DelFd(this);\r                                       this->Close();\r                                 return true;\r                           }\r                      }\r              }\r      }\r\r     if ((errno == EAGAIN) && (fd > -1))\r    {\r              this->Instance->SE->WantWrite(this);\r   }\r\r     return (fd < 0);\r}\r\rvoid SocketTimeout::Tick(time_t now)\r{\r     if (ServerInstance->SE->GetRef(this->sfd) != this->sock)\r               return;\r\r       if (this->sock->state == I_CONNECTING)\r {\r              // for non-listening sockets, the timeout can occur\r            // which causes termination of the connection after\r            // the given number of seconds without a successful\r            // connection.\r         this->sock->OnTimeout();\r               this->sock->OnError(I_ERR_TIMEOUT);\r            this->sock->timeout = true;\r\r           /* NOTE: We must set this AFTER DelFd, as we added\r              * this socket whilst writeable. This means that we\r             * must DELETE the socket whilst writeable too!\r                 */\r            this->sock->state = I_ERROR;\r\r          if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end())\r                   ServerInstance->SocketCull[this->sock] = this->sock;\r   }\r\r     this->sock->Timeout = NULL;\r}\r\rbool InspSocket::Poll()\r{\r#ifdef WINDOWS\r        if(Instance->SE->GetRef(this->fd) != this)\r             return false;\r  int incoming = -1;\r#else\r       if (this->Instance->SE->GetRef(this->fd) != this)\r              return false;\r\r int incoming = -1;\r\r    if ((fd < 0) || (fd > MAX_DESCRIPTORS))\r                return false;\r#endif\r   switch (this->state)\r   {\r              case I_CONNECTING:\r                     /* Our socket was in write-state, so delete it and re-add it\r                    * in read-state.\r                       */\r#ifndef WINDOWS\r                    if (this->fd > -1)\r                     {\r                              this->Instance->SE->DelFd(this);\r                               this->SetState(I_CONNECTED);\r                           if (!this->Instance->SE->AddFd(this))\r                                  return false;\r                  }\r#else\r                        this->SetState(I_CONNECTED);\r#endif\r                    Instance->Log(DEBUG,"Inspsocket I_CONNECTING state");\r                  if (Instance->Config->GetIOHook(this))\r                 {\r                              Instance->Log(DEBUG,"Hook for raw connect");\r                           try\r                            {\r                                      Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);\r                               }\r                              catch (CoreException& modexcept)\r                               {\r                                      Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());\r                                }\r                      }\r                      return this->OnConnected();\r            break;\r         case I_LISTENING:\r              {\r                      sockaddr* client = new sockaddr[2];\r                    length = sizeof (sockaddr_in);\r                 std::string recvip;\r#ifdef IPV6\r                        if ((!*this->host) || strchr(this->host, ':'))\r                         length = sizeof(sockaddr_in6);\r#endif\r                  incoming = _accept (this->fd, client, &length);\r#ifdef IPV6\r                    if ((!*this->host) || strchr(this->host, ':'))\r                 {\r                              char buf[1024];\r                                recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));\r                   }\r                      else\r#endif\r                    recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr);\r                  this->OnIncomingConnection(incoming, (char*)recvip.c_str());\r\r                  if (this->IsIOHooked)\r                  {\r                              try\r                            {\r                                      Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, recvip.c_str(), this->port);\r                            }\r                              catch (CoreException& modexcept)\r                               {\r                                      Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());\r                                }\r                      }\r\r                     this->SetQueues(incoming);\r\r                    delete[] client;\r                       return true;\r           }\r              break;\r         case I_CONNECTED:\r                      /* Process the read event */\r                   return this->OnDataReady();\r            break;\r         default:\r               break;\r }\r      return true;\r}\r\rvoid InspSocket::SetState(InspSocketState s)\r{\r this->state = s;\r}\r\rInspSocketState InspSocket::GetState()\r{\r   return this->state;\r}\r\rint InspSocket::GetFd()\r{\r       return this->fd;\r}\r\rbool InspSocket::OnConnected() { return true; }\rvoid InspSocket::OnError(InspSocketError e) { return; }\rint InspSocket::OnDisconnect() { return 0; }\rint InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }\rbool InspSocket::OnDataReady() { return true; }\rbool InspSocket::OnWriteReady() { return true; }\rvoid InspSocket::OnTimeout() { return; }\rvoid InspSocket::OnClose() { return; }\r\rInspSocket::~InspSocket()\r{\r this->Close();\r if (Timeout)\r   {\r              Instance->Timers->DelTimer(Timeout);\r           Timeout = NULL;\r        }\r}\r\rvoid InspSocket::HandleEvent(EventType et, int errornum)\r{\r        switch (et)\r    {\r              case EVENT_ERROR:\r                      switch (errornum)\r                      {\r                              case ETIMEDOUT:\r                                        this->OnError(I_ERR_TIMEOUT);\r                          break;\r                         case ECONNREFUSED:\r                             case 0:\r                                        this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE);\r                              break;\r                         case EADDRINUSE:\r                                       this->OnError(I_ERR_BIND);\r                             break;\r                         case EPIPE:\r                            case EIO:\r                                      this->OnError(I_ERR_WRITE);\r                            break;\r                 }\r                      if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())\r                         this->Instance->SocketCull[this] = this;\r                       return;\r                break;\r         case EVENT_READ:\r                       if (!this->Poll())\r                     {\r                              if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())\r                                 this->Instance->SocketCull[this] = this;\r                               return;\r                        }\r              break;\r         case EVENT_WRITE:\r                      if (this->WaitingForWriteEvent)\r                        {\r                              this->WaitingForWriteEvent = false;\r                            if (!this->OnWriteReady())\r                             {\r                                      if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())\r                                         this->Instance->SocketCull[this] = this;\r                                       return;\r                                }\r                      }\r                      if (this->state == I_CONNECTING)\r                       {\r                              /* This might look wrong as if we should be actually calling\r                            * with EVENT_WRITE, but trust me it is correct. There are some\r                                 * writeability-state things in the read code, because of how\r                           * InspSocket used to work regarding write buffering in previous\r                                * versions of InspIRCd. - Brain\r                                */\r                            this->HandleEvent(EVENT_READ);\r                         return;\r                        }\r                      else\r                   {\r                              if (this->FlushWriteBuffer())\r                          {\r                                      if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end())\r                                         this->Instance->SocketCull[this] = this;\r                                       return;\r                                }\r                      }\r              break;\r }\r}\r\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+/* $Core */
+
+#include "socket.h"
+#include "inspstring.h"
+#include "socketengine.h"
+#include "inspircd.h"
+
+bool BufferedSocket::Readable()
+{
+       return (this->state != I_CONNECTING);
+}
+
+BufferedSocket::BufferedSocket(InspIRCd* SI)
+{
+       this->Timeout = NULL;
+       this->state = I_DISCONNECTED;
+       this->fd = -1;
+       this->ServerInstance = SI;
+}
+
+BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
+{
+       this->Timeout = NULL;
+       this->fd = newfd;
+       this->state = I_CONNECTED;
+       strlcpy(this->IP,ip,MAXBUF);
+       this->ServerInstance = SI;
+       if (this->fd > -1)
+               this->ServerInstance->SE->AddFd(this);
+}
+
+BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
+{
+       this->cbindip = connectbindip;
+       this->fd = -1;
+       this->ServerInstance = SI;
+       strlcpy(host,ipaddr.c_str(),MAXBUF);
+       this->Timeout = NULL;
+
+       strlcpy(this->host,ipaddr.c_str(),MAXBUF);
+       this->port = aport;
+
+       bool ipvalid = true;
+#ifdef IPV6
+       if (strchr(host,':'))
+       {
+               in6_addr n;
+               if (inet_pton(AF_INET6, host, &n) < 1)
+                       ipvalid = false;
+       }
+       else
+#endif
+       {
+               in_addr n;
+               if (inet_aton(host,&n) < 1)
+                       ipvalid = false;
+       }
+       if (!ipvalid)
+       {
+               this->ServerInstance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+               this->OnError(I_ERR_CONNECT);
+               this->Close();
+               this->fd = -1;
+               this->state = I_ERROR;
+               return;
+       }
+       else
+       {
+               strlcpy(this->IP,host,MAXBUF);
+               if (!this->DoConnect(maxtime))
+               {
+                       this->OnError(I_ERR_CONNECT);
+                       this->Close();
+                       this->fd = -1;
+                       this->state = I_ERROR;
+                       return;
+               }
+       }
+}
+
+void BufferedSocket::SetQueues()
+{
+       // attempt to increase socket sendq and recvq as high as its possible
+       int sendbuf = 32768;
+       int recvbuf = 32768;
+       if(setsockopt(this->fd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(this->fd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)))
+       {
+               //this->ServerInstance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd());
+               ; // do nothing. I'm a little sick of people trying to interpret this message as a result of why their incorrect setups don't work.
+       }
+}
+
+/* Most irc servers require you to specify the ip you want to bind to.
+ * If you dont specify an IP, they rather dumbly bind to the first IP
+ * of the box (e.g. INADDR_ANY). In InspIRCd, we scan thought the IP
+ * addresses we've bound server ports to, and we try and bind our outbound
+ * connections to the first usable non-loopback and non-any IP we find.
+ * This is easier to configure when you have a lot of links and a lot
+ * of servers to configure.
+ */
+bool BufferedSocket::BindAddr(const std::string &ip)
+{
+       ConfigReader Conf(this->ServerInstance);
+       socklen_t size = sizeof(sockaddr_in);
+#ifdef IPV6
+       bool v6 = false;
+       /* Are we looking for a binding to fit an ipv6 host? */
+       if ((ip.empty()) || (ip.find(':') != std::string::npos))
+               v6 = true;
+#endif
+       int j = 0;
+       while (j < Conf.Enumerate("bind") || (!ip.empty()))
+       {
+               std::string sIP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip;
+               if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers")
+               {
+                       if (!ip.empty() || ((sIP != "*") && (sIP != "127.0.0.1") && (!sIP.empty()) && (sIP != "::1")))
+                       {
+                               /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
+                               sockaddr* s = new sockaddr[2];
+#ifdef IPV6
+                               if (v6)
+                               {
+                                       in6_addr n;
+                                       if (inet_pton(AF_INET6, sIP.c_str(), &n) > 0)
+                                       {
+                                               memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(sockaddr_in6));
+                                               ((sockaddr_in6*)s)->sin6_port = 0;
+                                               ((sockaddr_in6*)s)->sin6_family = AF_INET6;
+                                               size = sizeof(sockaddr_in6);
+                                       }
+                                       else
+                                       {
+                                               delete[] s;
+                                               j++;
+                                               continue;
+                                       }
+                               }
+                               else
+#endif
+                               {
+                                       in_addr n;
+                                       if (inet_aton(sIP.c_str(), &n) > 0)
+                                       {
+                                               ((sockaddr_in*)s)->sin_addr = n;
+                                               ((sockaddr_in*)s)->sin_port = 0;
+                                               ((sockaddr_in*)s)->sin_family = AF_INET;
+                                       }
+                                       else
+                                       {
+                                               delete[] s;
+                                               j++;
+                                               continue;
+                                       }
+                               }
+
+                               if (ServerInstance->SE->Bind(this->fd, s, size) < 0)
+                               {
+                                       this->state = I_ERROR;
+                                       this->OnError(I_ERR_BIND);
+                                       this->fd = -1;
+                                       delete[] s;
+                                       return false;
+                               }
+
+                               delete[] s;
+                               return true;
+                       }
+               }
+               j++;
+       }
+       ServerInstance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
+       return true;
+}
+
+bool BufferedSocket::DoConnect(unsigned long maxtime)
+{
+       /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
+       sockaddr* addr = new sockaddr[2];
+       socklen_t size = sizeof(sockaddr_in);
+#ifdef IPV6
+       bool v6 = false;
+       if ((!*this->host) || strchr(this->host, ':'))
+               v6 = true;
+
+       if (v6)
+       {
+               this->fd = socket(AF_INET6, SOCK_STREAM, 0);
+               if ((this->fd > -1) && ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)))
+               {
+                       if (!this->BindAddr(this->cbindip))
+                       {
+                               delete[] addr;
+                               return false;
+                       }
+               }
+       }
+       else
+#endif
+       {
+               this->fd = socket(AF_INET, SOCK_STREAM, 0);
+               if (this->fd > -1)
+               {
+                       if (!this->BindAddr(this->cbindip))
+                       {
+                               delete[] addr;
+                               return false;
+                       }
+               }
+       }
+
+       if (this->fd == -1)
+       {
+               this->state = I_ERROR;
+               this->OnError(I_ERR_SOCKET);
+               delete[] addr;
+               return false;
+       }
+
+#ifdef IPV6
+       if (v6)
+       {
+               in6_addr addy;
+               if (inet_pton(AF_INET6, this->host, &addy) > 0)
+               {
+                       ((sockaddr_in6*)addr)->sin6_family = AF_INET6;
+                       memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy));
+                       ((sockaddr_in6*)addr)->sin6_port = htons(this->port);
+                       size = sizeof(sockaddr_in6);
+               }
+       }
+       else
+#endif
+       {
+               in_addr addy;
+               if (inet_aton(this->host, &addy) > 0)
+               {
+                       ((sockaddr_in*)addr)->sin_family = AF_INET;
+                       ((sockaddr_in*)addr)->sin_addr = addy;
+                       ((sockaddr_in*)addr)->sin_port = htons(this->port);
+               }
+       }
+
+       ServerInstance->SE->NonBlocking(this->fd);
+
+       if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1)
+       {
+               if (errno != EINPROGRESS)
+               {
+                       this->OnError(I_ERR_CONNECT);
+                       this->Close();
+                       this->state = I_ERROR;
+                       return false;
+               }
+
+               this->Timeout = new SocketTimeout(this->GetFd(), this->ServerInstance, this, maxtime, this->ServerInstance->Time());
+               this->ServerInstance->Timers->AddTimer(this->Timeout);
+       }
+
+       this->state = I_CONNECTING;
+       if (this->fd > -1)
+       {
+               if (!this->ServerInstance->SE->AddFd(this))
+               {
+                       this->OnError(I_ERR_NOMOREFDS);
+                       this->Close();
+                       this->state = I_ERROR;
+                       return false;
+               }
+               this->SetQueues();
+       }
+
+       ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
+       return true;
+}
+
+
+void BufferedSocket::Close()
+{
+       /* Save this, so we dont lose it,
+        * otherise on failure, error messages
+        * might be inaccurate.
+        */
+       int save = errno;
+       if (this->fd > -1)
+       {
+               if (this->GetIOHook())
+               {
+                       try
+                       {
+                               this->GetIOHook()->OnRawSocketClose(this->fd);
+                       }
+                       catch (CoreException& modexcept)
+                       {
+                               ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                       }
+               }
+               ServerInstance->SE->Shutdown(this, 2);
+               if (ServerInstance->SE->Close(this) != -1)
+                       this->OnClose();
+
+               if (ServerInstance->SocketCull.find(this) == ServerInstance->SocketCull.end())
+                       ServerInstance->SocketCull[this] = this;
+       }
+       errno = save;
+}
+
+std::string BufferedSocket::GetIP()
+{
+       return this->IP;
+}
+
+const char* BufferedSocket::Read()
+{
+       if (!ServerInstance->SE->BoundsCheckFd(this))
+               return NULL;
+
+       int n = 0;
+       char* ReadBuffer = ServerInstance->GetReadBuffer();
+
+       if (this->GetIOHook())
+       {
+               int result2 = 0;
+               int MOD_RESULT = 0;
+               try
+               {
+                       MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, result2);
+               }
+               catch (CoreException& modexcept)
+               {
+                       ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+               }
+               if (MOD_RESULT < 0)
+               {
+                       n = -1;
+                       errno = EAGAIN;
+               }
+               else
+               {
+                       n = result2;
+               }
+       }
+       else
+       {
+               n = recv(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+       }
+
+       /*
+        * This used to do some silly bounds checking instead of just passing bufsize - 1 to recv.
+        * Not only does that make absolutely no sense, but it could potentially result in a read buffer's worth
+        * of data being thrown into the bit bucket for no good reason, which is just *stupid*.. do things correctly now.
+        * --w00t (july 2, 2008)
+        */
+       if (n > 0)
+       {
+               ReadBuffer[n] = 0;
+               return ReadBuffer;
+       }
+       else
+       {
+               int err = errno;
+               if (err == EAGAIN)
+                       return "";
+               else
+                       return NULL;
+       }
+}
+
+/*
+ * This function formerly tried to flush write buffer each call.
+ * While admirable in attempting to get the data out to wherever
+ * it is going, on a full socket, it's just going to syscall write() and
+ * EAGAIN constantly, instead of waiting in the SE to know if it can write
+ * which will chew a bit of CPU.
+ *
+ * So, now this function returns void (take note) and just adds to the sendq.
+ *
+ * It'll get written at a determinate point when the socketengine tells us it can write.
+ *             -- w00t (april 1, 2008)
+ */
+void BufferedSocket::Write(const std::string &data)
+{
+       /* Append the data to the back of the queue ready for writing */
+       outbuffer.push_back(data);
+
+       /* Mark ourselves as wanting write */
+       this->ServerInstance->SE->WantWrite(this);
+}
+
+bool BufferedSocket::FlushWriteBuffer()
+{
+       errno = 0;
+       if ((this->fd > -1) && (this->state == I_CONNECTED))
+       {
+               if (this->GetIOHook())
+               {
+                       while (outbuffer.size() && (errno != EAGAIN))
+                       {
+                               try
+                               {
+                                       /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+                                        * implement their own buffering mechanisms
+                                        */
+                                       this->GetIOHook()->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length());
+                                       outbuffer.pop_front();
+                               }
+                               catch (CoreException& modexcept)
+                               {
+                                       ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                                       return true;
+                               }
+                       }
+               }
+               else
+               {
+                       /* If we have multiple lines, try to send them all,
+                        * not just the first one -- Brain
+                        */
+                       while (outbuffer.size() && (errno != EAGAIN))
+                       {
+                               /* Send a line */
+                               int result = ServerInstance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0);
+
+                               if (result > 0)
+                               {
+                                       if ((unsigned int)result >= outbuffer[0].length())
+                                       {
+                                               /* The whole block was written (usually a line)
+                                                * Pop the block off the front of the queue,
+                                                * dont set errno, because we are clear of errors
+                                                * and want to try and write the next block too.
+                                                */
+                                               outbuffer.pop_front();
+                                       }
+                                       else
+                                       {
+                                               std::string temp = outbuffer[0].substr(result);
+                                               outbuffer[0] = temp;
+                                               /* We didnt get the whole line out. arses.
+                                                * Try again next time, i guess. Set errno,
+                                                * because we shouldnt be writing any more now,
+                                                * until the socketengine says its safe to do so.
+                                                */
+                                               errno = EAGAIN;
+                                       }
+                               }
+                               else if (result == 0)
+                               {
+                                       this->ServerInstance->SE->DelFd(this);
+                                       this->Close();
+                                       return true;
+                               }
+                               else if ((result == -1) && (errno != EAGAIN))
+                               {
+                                       this->OnError(I_ERR_WRITE);
+                                       this->state = I_ERROR;
+                                       this->ServerInstance->SE->DelFd(this);
+                                       this->Close();
+                                       return true;
+                               }
+                       }
+               }
+       }
+
+       if ((errno == EAGAIN) && (fd > -1))
+       {
+               this->ServerInstance->SE->WantWrite(this);
+       }
+
+       return (fd < 0);
+}
+
+void SocketTimeout::Tick(time_t)
+{
+       ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
+
+       if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
+               return;
+
+       if (this->sock->state == I_CONNECTING)
+       {
+               // for connecting sockets, the timeout can occur
+               // which causes termination of the connection after
+               // the given number of seconds without a successful
+               // connection.
+               this->sock->OnTimeout();
+               this->sock->OnError(I_ERR_TIMEOUT);
+
+               /* NOTE: We must set this AFTER DelFd, as we added
+                * this socket whilst writeable. This means that we
+                * must DELETE the socket whilst writeable too!
+                */
+               this->sock->state = I_ERROR;
+
+               if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end())
+                       ServerInstance->SocketCull[this->sock] = this->sock;
+       }
+
+       this->sock->Timeout = NULL;
+}
+
+bool BufferedSocket::InternalMarkConnected()
+{
+       /* Our socket was in write-state, so delete it and re-add it
+        * in read-state.
+        */
+       this->SetState(I_CONNECTED);
+
+       if (this->GetIOHook())
+       {
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
+               try
+               {
+                       this->GetIOHook()->OnRawSocketConnect(this->fd);
+               }
+               catch (CoreException& modexcept)
+               {
+                       ServerInstance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                       return false;
+               }
+       }
+       return this->OnConnected();
+}
+
+void BufferedSocket::SetState(BufferedSocketState s)
+{
+       this->state = s;
+}
+
+BufferedSocketState BufferedSocket::GetState()
+{
+       return this->state;
+}
+
+bool BufferedSocket::OnConnected() { return true; }
+void BufferedSocket::OnError(BufferedSocketError) { return; }
+int BufferedSocket::OnDisconnect() { return 0; }
+bool BufferedSocket::OnDataReady() { return true; }
+bool BufferedSocket::OnWriteReady()
+{
+       // Default behaviour: just try write some.
+       return !this->FlushWriteBuffer();
+}
+void BufferedSocket::OnTimeout() { return; }
+void BufferedSocket::OnClose() { return; }
+
+BufferedSocket::~BufferedSocket()
+{
+       this->Close();
+       if (Timeout)
+       {
+               ServerInstance->Timers->DelTimer(Timeout);
+               Timeout = NULL;
+       }
+}
+
+void BufferedSocket::HandleEvent(EventType et, int errornum)
+{
+       switch (et)
+       {
+               case EVENT_ERROR:
+               {
+                       switch (errornum)
+                       {
+                               case ETIMEDOUT:
+                                       this->OnError(I_ERR_TIMEOUT);
+                                       break;
+                               case ECONNREFUSED:
+                               case 0:
+                                       this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE);
+                                       break;
+                               case EADDRINUSE:
+                                       this->OnError(I_ERR_BIND);
+                                       break;
+                               case EPIPE:
+                               case EIO:
+                                       this->OnError(I_ERR_WRITE);
+                                       break;
+                       }
+
+                       if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+                               this->ServerInstance->SocketCull[this] = this;
+                       return;
+                       break;
+               }
+               case EVENT_READ:
+               {
+                       if (!this->OnDataReady())
+                       {
+                               if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+                                       this->ServerInstance->SocketCull[this] = this;
+                               return;
+                       }
+                       break;
+               }
+               case EVENT_WRITE:
+               {
+                       if (this->state == I_CONNECTING)
+                       {
+                               if (!this->InternalMarkConnected())
+                               {
+                                       if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+                                               this->ServerInstance->SocketCull[this] = this;
+                                       return;
+                               }
+                               return;
+                       }
+                       else
+                       {
+                               if (!this->OnWriteReady())
+                               {
+                                       if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
+                                               this->ServerInstance->SocketCull[this] = this;
+                                       return;
+                               }
+                       }
+                       break;
+               }
+       }
+}
+