-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * ---------------------------------------------------
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "socket.h"
-#include "configreader.h"
-#include "inspstring.h"
-#include "socketengine.h"
+
#include "inspircd.h"
+#include "iohook.h"
-using irc::sockets::OpenTCPSocket;
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_sockaddr;
+#ifndef DISABLE_WRITEV
+#include <sys/uio.h>
+#endif
-bool InspSocket::Readable()
-{
- return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));
-}
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
-InspSocket::InspSocket(InspIRCd* SI)
+BufferedSocket::BufferedSocket()
{
- this->state = I_DISCONNECTED;
- this->fd = -1;
- this->WaitingForWriteEvent = false;
- this->Instance = SI;
+ Timeout = NULL;
+ state = I_ERROR;
}
-InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip)
+BufferedSocket::BufferedSocket(int newfd)
{
+ Timeout = NULL;
this->fd = newfd;
this->state = I_CONNECTED;
- strlcpy(this->IP,ip,MAXBUF);
- this->WaitingForWriteEvent = false;
- this->Instance = SI;
- if (this->fd > -1)
- this->Instance->SE->AddFd(this);
+ if (fd > -1)
+ SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
}
-InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime)
+void BufferedSocket::DoConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
{
- this->fd = -1;
- this->Instance = SI;
- strlcpy(host,ipaddr.c_str(),MAXBUF);
- this->WaitingForWriteEvent = false;
- if (listening)
+ BufferedSocketError err = BeginConnect(ipaddr, aport, maxtime, connectbindip);
+ if (err != I_ERR_NONE)
{
- if ((this->fd = OpenTCPSocket()) == ERROR)
- {
- this->fd = -1;
- this->state = I_ERROR;
- this->OnError(I_ERR_SOCKET);
- this->Instance->Log(DEBUG,"OpenTCPSocket() error");
- return;
- }
- else
- {
- if (!SI->BindSocket(this->fd,this->client,this->server,aport,(char*)ipaddr.c_str()))
- {
- this->Instance->Log(DEBUG,"BindSocket() error %s",strerror(errno));
- this->Close();
- this->fd = -1;
- this->state = I_ERROR;
- this->OnError(I_ERR_BIND);
- this->ClosePending = true;
- return;
- }
- else
- {
- this->state = I_LISTENING;
- if (this->fd > -1)
- {
- if (!this->Instance->SE->AddFd(this))
- {
- this->Close();
- this->state = I_ERROR;
- this->OnError(I_ERR_NOMOREFDS);
- }
- }
- this->Instance->Log(DEBUG,"New socket now in I_LISTENING state");
- return;
- }
- }
- }
- else
- {
- strlcpy(this->host,ipaddr.c_str(),MAXBUF);
- this->port = aport;
-
- if (insp_aton(host,&addy) < 1)
- {
- this->Instance->Log(DEBUG,"You cannot pass hostnames to InspSocket, resolve them first with Resolver!");
- this->Close();
- this->fd = -1;
- this->state = I_ERROR;
- this->OnError(I_ERR_RESOLVE);
- return;
- }
- else
- {
- this->Instance->Log(DEBUG,"No need to resolve %s",this->host);
- strlcpy(this->IP,host,MAXBUF);
- timeout_val = maxtime;
- this->DoConnect();
- }
+ state = I_ERROR;
+ SetError(SocketEngine::LastError());
+ OnError(err);
}
}
-void InspSocket::WantWrite()
+BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
{
- /** XXX:
- * The socket engine may only have each FD in the list ONCE.
- * This means we cant watch for write AND read at the same
- * time. We have to remove the READ fd, to insert the WRITE
- * fd. Once we receive our WRITE event (which WILL ARRIVE,
- * pretty much gauranteed) we switch back to watching for
- * READ events again.
- *
- * This behaviour may be fixed in a later version.
- */
- this->Instance->SE->DelFd(this);
- this->WaitingForWriteEvent = true;
- if (!this->Instance->SE->AddFd(this))
+ irc::sockets::sockaddrs addr, bind;
+ if (!irc::sockets::aptosa(ipaddr, aport, addr))
{
- this->Close();
- this->fd = -1;
- this->state = I_ERROR;
- this->OnError(I_ERR_NOMOREFDS);
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+ return I_ERR_CONNECT;
}
-}
-
-void InspSocket::SetQueues(int nfd)
-{
- // attempt to increase socket sendq and recvq as high as its possible
- int sendbuf = 32768;
- int recvbuf = 32768;
- setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const void *)&sendbuf,sizeof(sendbuf));
- setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf));
-}
-
-/* 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 InspSocket::BindAddr()
-{
- insp_inaddr n;
- ConfigReader Conf(this->Instance);
- this->Instance->Log(DEBUG,"In InspSocket::BindAddr()");
- for (int j =0; j < Conf.Enumerate("bind"); j++)
+ bind.sa.sa_family = 0;
+ if (!connectbindip.empty())
{
- std::string Type = Conf.ReadValue("bind","type",j);
- std::string IP = Conf.ReadValue("bind","address",j);
- if (Type == "servers")
+ if (!irc::sockets::aptosa(connectbindip, 0, bind))
{
- if ((IP != "*") && (IP != "127.0.0.1") && (IP != ""))
- {
- insp_sockaddr s;
-
- if (insp_aton(IP.c_str(),&n) > 0)
- {
- this->Instance->Log(DEBUG,"Found an IP to bind to: %s",IP.c_str());
-#ifdef IPV6
- s.sin6_addr = n;
- s.sin6_family = AF_FAMILY;
-#else
- s.sin_addr = n;
- s.sin_family = AF_FAMILY;
-#endif
- if (bind(this->fd,(struct sockaddr*)&s,sizeof(s)) < 0)
- {
- this->Instance->Log(DEBUG,"Cant bind()");
- this->state = I_ERROR;
- this->OnError(I_ERR_BIND);
- this->fd = -1;
- return false;
- }
- this->Instance->Log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str());
- return true;
- }
- else
- {
- this->Instance->Log(DEBUG,"Address '%s' was not an IP address",IP.c_str());
- }
- }
+ return I_ERR_BIND;
}
}
- this->Instance->Log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY");
- return true;
+
+ return BeginConnect(addr, bind, maxtime);
}
-bool InspSocket::DoConnect()
+BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned long timeout)
{
- this->Instance->Log(DEBUG,"In DoConnect()");
- if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
- {
- this->Instance->Log(DEBUG,"Cant socket()");
- this->state = I_ERROR;
- this->OnError(I_ERR_SOCKET);
- return false;
- }
+ if (fd < 0)
+ fd = socket(dest.sa.sa_family, SOCK_STREAM, 0);
- if ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP))
+ if (fd < 0)
+ return I_ERR_SOCKET;
+
+ if (bind.sa.sa_family != 0)
{
- if (!this->BindAddr())
- return false;
+ if (SocketEngine::Bind(fd, bind) < 0)
+ return I_ERR_BIND;
}
- this->Instance->Log(DEBUG,"Part 2 DoConnect() %s",this->IP);
- insp_aton(this->IP,&addy);
-#ifdef IPV6
- addr.sin6_family = AF_FAMILY;
- memcpy(&addr.sin6_addr, &addy, sizeof(insp_inaddr));
- addr.sin6_port = htons(this->port);
-#else
- addr.sin_family = AF_FAMILY;
- addr.sin_addr = addy;
- addr.sin_port = htons(this->port);
-#endif
-
- int flags;
- flags = fcntl(this->fd, F_GETFL, 0);
- fcntl(this->fd, F_SETFL, flags | O_NONBLOCK);
+ SocketEngine::NonBlocking(fd);
- if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
+ if (SocketEngine::Connect(this, &dest.sa, dest.sa_size()) == -1)
{
if (errno != EINPROGRESS)
- {
- this->Instance->Log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
- this->OnError(I_ERR_CONNECT);
- this->Close();
- this->state = I_ERROR;
- return false;
- }
-
- this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time());
- this->Instance->Timers->AddTimer(this->Timeout);
+ return I_ERR_CONNECT;
}
+
this->state = I_CONNECTING;
+
+ if (!SocketEngine::AddFd(this, FD_WANT_NO_READ | FD_WANT_SINGLE_WRITE | FD_WRITE_WILL_BLOCK))
+ return I_ERR_NOMOREFDS;
+
+ this->Timeout = new SocketTimeout(this->GetFd(), this, timeout);
+ ServerInstance->Timers.AddTimer(this->Timeout);
+
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BufferedSocket::DoConnect success");
+ return I_ERR_NONE;
+}
+
+void StreamSocket::Close()
+{
if (this->fd > -1)
{
- if (!this->Instance->SE->AddFd(this))
+ // final chance, dump as much of the sendq as we can
+ DoWrite();
+ if (GetIOHook())
{
- this->OnError(I_ERR_NOMOREFDS);
- this->Close();
- this->state = I_ERROR;
- return false;
+ try
+ {
+ GetIOHook()->OnStreamSocketClose(this);
+ }
+ catch (CoreException& modexcept)
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
+ modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
+ }
+ delete iohook;
+ DelIOHook();
}
- this->SetQueues(this->fd);
+ SocketEngine::Shutdown(this, 2);
+ SocketEngine::Close(this);
}
- this->Instance->Log(DEBUG,"Returning true from InspSocket::DoConnect");
- return true;
}
-
-void InspSocket::Close()
+CullResult StreamSocket::cull()
{
- if (this->fd > -1)
- {
- this->OnClose();
- shutdown(this->fd,2);
- close(this->fd);
- }
+ Close();
+ return EventHandler::cull();
}
-std::string InspSocket::GetIP()
+bool StreamSocket::GetNextLine(std::string& line, char delim)
{
- return this->IP;
+ std::string::size_type i = recvq.find(delim);
+ if (i == std::string::npos)
+ return false;
+ line = recvq.substr(0, i);
+ // TODO is this the most efficient way to split?
+ recvq = recvq.substr(i + 1);
+ return true;
}
-char* InspSocket::Read()
+void StreamSocket::DoRead()
{
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
- return NULL;
- int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0);
- if ((n > 0) && (n <= (int)sizeof(this->ibuf)))
+ if (GetIOHook())
{
- ibuf[n] = 0;
- return ibuf;
+ int rv = -1;
+ try
+ {
+ rv = GetIOHook()->OnStreamSocketRead(this, recvq);
+ }
+ catch (CoreException& modexcept)
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
+ modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
+ return;
+ }
+ if (rv > 0)
+ OnDataReady();
+ if (rv < 0)
+ SetError("Read Error"); // will not overwrite a better error message
}
else
{
- int err = errno;
- if (err == EAGAIN)
+ char* ReadBuffer = ServerInstance->GetReadBuffer();
+ int n = SocketEngine::Recv(this, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+ if (n == ServerInstance->Config->NetBufferSize)
+ {
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
+ recvq.append(ReadBuffer, n);
+ OnDataReady();
+ }
+ else if (n > 0)
+ {
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ);
+ recvq.append(ReadBuffer, n);
+ OnDataReady();
+ }
+ else if (n == 0)
+ {
+ error = "Connection closed";
+ SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+ }
+ else if (SocketEngine::IgnoreError())
+ {
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
+ }
+ else if (errno == EINTR)
{
- return "";
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
}
else
{
- if (!n)
- this->Instance->Log(DEBUG,"EOF or error on socket: EOF");
- else
- this->Instance->Log(DEBUG,"EOF or error on socket: %s",strerror(err));
- return NULL;
+ error = SocketEngine::LastError();
+ SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
}
}
}
-void InspSocket::MarkAsClosed()
-{
- this->Instance->Log(DEBUG,"Marked as closed");
-}
+/* Don't try to prepare huge blobs of data to send to a blocked socket */
+static const int MYIOV_MAX = IOV_MAX < 128 ? IOV_MAX : 128;
-// There are two possible outcomes to this function.
-// It will either write all of the data, or an undefined amount.
-// If an undefined amount is written the connection has failed
-// and should be aborted.
-int InspSocket::Write(const std::string &data)
+void StreamSocket::DoWrite()
{
- /* Try and append the data to the back of the queue, and send it on its way
- */
- outbuffer.push_back(data);
- return (!this->FlushWriteBuffer());
-}
+ if (sendq.empty())
+ return;
+ if (!error.empty() || fd < 0 || fd == INT_MAX)
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DoWrite on errored or closed socket");
+ return;
+ }
-bool InspSocket::FlushWriteBuffer()
-{
- if ((this->fd > -1) && (this->state == I_CONNECTED))
+#ifndef DISABLE_WRITEV
+ if (GetIOHook())
+#endif
{
- if (outbuffer.size())
+ int rv = -1;
+ try
{
- int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
- if (result > 0)
+ while (error.empty() && !sendq.empty())
{
- if ((unsigned int)result == outbuffer[0].length())
+ if (sendq.size() > 1 && sendq[0].length() < 1024)
{
- /* The whole block was written (usually a line)
- * Pop the block off the front of the queue
- */
- outbuffer.pop_front();
+ // Avoid multiple repeated SSL encryption invocations
+ // This adds a single copy of the queue, but avoids
+ // much more overhead in terms of system calls invoked
+ // by the IOHook.
+ //
+ // The length limit of 1024 is to prevent merging strings
+ // more than once when writes begin to block.
+ std::string tmp;
+ tmp.reserve(1280);
+ while (!sendq.empty() && tmp.length() < 1024)
+ {
+ tmp.append(sendq.front());
+ sendq.pop_front();
+ }
+ sendq.push_front(tmp);
+ }
+ std::string& front = sendq.front();
+ int itemlen = front.length();
+ if (GetIOHook())
+ {
+ rv = GetIOHook()->OnStreamSocketWrite(this, front);
+ if (rv > 0)
+ {
+ // consumed the entire string, and is ready for more
+ sendq_len -= itemlen;
+ sendq.pop_front();
+ }
+ else if (rv == 0)
+ {
+ // socket has blocked. Stop trying to send data.
+ // IOHook has requested unblock notification from the socketengine
+
+ // Since it is possible that a partial write took place, adjust sendq_len
+ sendq_len = sendq_len - itemlen + front.length();
+ return;
+ }
+ else
+ {
+ SetError("Write Error"); // will not overwrite a better error message
+ return;
+ }
}
+#ifdef DISABLE_WRITEV
else
{
- std::string temp = outbuffer[0].substr(result);
- outbuffer[0] = temp;
+ rv = SocketEngine::Send(this, front.data(), itemlen, 0);
+ if (rv == 0)
+ {
+ SetError("Connection closed");
+ return;
+ }
+ else if (rv < 0)
+ {
+ if (errno == EINTR || SocketEngine::IgnoreError())
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
+ else
+ SetError(SocketEngine::LastError());
+ return;
+ }
+ else if (rv < itemlen)
+ {
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK);
+ front = front.substr(rv);
+ sendq_len -= rv;
+ return;
+ }
+ else
+ {
+ sendq_len -= itemlen;
+ sendq.pop_front();
+ if (sendq.empty())
+ SocketEngine::ChangeEventMask(this, FD_WANT_EDGE_WRITE);
+ }
}
+#endif
+ }
+ }
+ catch (CoreException& modexcept)
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
+ modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
+ }
+ }
+#ifndef DISABLE_WRITEV
+ else
+ {
+ // don't even try if we are known to be blocking
+ if (GetEventMask() & FD_WRITE_WILL_BLOCK)
+ return;
+ // start out optimistic - we won't need to write any more
+ int 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();
+
+ // cap the number of buffers at MYIOV_MAX
+ if (bufcount > MYIOV_MAX)
+ {
+ bufcount = MYIOV_MAX;
}
- else if ((result == -1) && (errno != EAGAIN))
+
+ int rv_max = 0;
+ iovec* iovecs = new iovec[bufcount];
+ for(int i=0; i < bufcount; i++)
+ {
+ iovecs[i].iov_base = const_cast<char*>(sendq[i].data());
+ iovecs[i].iov_len = sendq[i].length();
+ rv_max += sendq[i].length();
+ }
+ int rv = writev(fd, iovecs, bufcount);
+ delete[] iovecs;
+
+ if (rv == (int)sendq_len)
{
- this->Instance->Log(DEBUG,"Write error on socket: %s",strerror(errno));
- this->OnError(I_ERR_WRITE);
- this->state = I_ERROR;
- return true;
+ // it's our lucky day, everything got written out. Fast cleanup.
+ // This won't ever happen if the number of buffers got capped.
+ sendq_len = 0;
+ sendq.clear();
}
+ else if (rv > 0)
+ {
+ // Partial write. Clean out strings from the sendq
+ if (rv < rv_max)
+ {
+ // it's going to block now
+ eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
+ }
+ sendq_len -= rv;
+ while (rv > 0 && !sendq.empty())
+ {
+ std::string& front = sendq.front();
+ if (front.length() <= (size_t)rv)
+ {
+ // this string got fully written out
+ rv -= front.length();
+ sendq.pop_front();
+ }
+ else
+ {
+ // stopped in the middle of this string
+ front = front.substr(rv);
+ rv = 0;
+ }
+ }
+ }
+ else if (rv == 0)
+ {
+ error = "Connection closed";
+ }
+ else if (SocketEngine::IgnoreError())
+ {
+ eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
+ }
+ else if (errno == EINTR)
+ {
+ // restart interrupted syscall
+ errno = 0;
+ }
+ else
+ {
+ error = SocketEngine::LastError();
+ }
+ }
+ if (!error.empty())
+ {
+ // error - kill all events
+ SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+ }
+ else
+ {
+ SocketEngine::ChangeEventMask(this, eventChange);
}
}
- return (fd < 0);
+#endif
}
-void SocketTimeout::Tick(time_t now)
+void StreamSocket::WriteData(const std::string &data)
{
- if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
+ if (fd < 0)
{
- ServerInstance->Log(DEBUG,"No FD or socket ref");
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to write data to dead socket: %s",
+ data.c_str());
return;
}
+ /* Append the data to the back of the queue ready for writing */
+ sendq.push_back(data);
+ sendq_len += data.length();
+
+ SocketEngine::ChangeEventMask(this, FD_ADD_TRIAL_WRITE);
+}
+
+bool SocketTimeout::Tick(time_t)
+{
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SocketTimeout::Tick");
+
+ if (SocketEngine::GetRef(this->sfd) != this->sock)
+ {
+ delete this;
+ return false;
+ }
+
if (this->sock->state == I_CONNECTING)
{
- ServerInstance->Log(DEBUG,"Timed out, current=%lu",now);
- // for non-listening sockets, the timeout can occur
+ // 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);
- this->sock->timeout = true;
this->sock->state = I_ERROR;
- ServerInstance->SE->DelFd(this->sock);
- this->sock->Close();
- delete this->sock;
- return;
- }
- this->sock->FlushWriteBuffer();
-}
-
-bool InspSocket::Poll()
-{
- if (this->Instance->SE->GetRef(this->fd) != this)
- return false;
- int incoming = -1;
- bool n = true;
-
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
- return false;
-
- switch (this->state)
- {
- case I_CONNECTING:
- this->Instance->Log(DEBUG,"State = I_CONNECTING");
- /* Our socket was in write-state, so delete it and re-add it
- * in read-state.
- */
- if (this->fd > -1)
- {
- this->Instance->SE->DelFd(this);
- this->SetState(I_CONNECTED);
- if (!this->Instance->SE->AddFd(this))
- return false;
- }
- return this->OnConnected();
- break;
- case I_LISTENING:
- length = sizeof (client);
- incoming = accept (this->fd, (sockaddr*)&client,&length);
- this->SetQueues(incoming);
-#ifdef IPV6
- this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin6_addr));
-#else
- this->OnIncomingConnection(incoming,(char*)insp_ntoa(client.sin_addr));
-#endif
- return true;
- break;
- case I_CONNECTED:
-
- if (this->WaitingForWriteEvent)
- {
- /* Switch back to read events */
- this->Instance->SE->DelFd(this);
- this->WaitingForWriteEvent = false;
- if (!this->Instance->SE->AddFd(this))
- return false;
-
- /* Trigger the write event */
- n = this->OnWriteReady();
- }
- else
- {
- /* Process the read event */
- n = this->OnDataReady();
- }
- /* Flush any pending, but not till after theyre done with the event
- * so there are less write calls involved.
- * Both FlushWriteBuffer AND the return result of OnDataReady must
- * return true for this to be ok.
- */
- if (this->FlushWriteBuffer())
- return false;
- return n;
- break;
- default:
- break;
+ ServerInstance->GlobalCulls.AddItem(sock);
}
- return true;
-}
-void InspSocket::SetState(InspSocketState s)
-{
- this->Instance->Log(DEBUG,"Socket state change");
- this->state = s;
+ this->sock->Timeout = NULL;
+ delete this;
+ return false;
}
-InspSocketState InspSocket::GetState()
-{
- return this->state;
-}
+void BufferedSocket::OnConnected() { }
+void BufferedSocket::OnTimeout() { return; }
-int InspSocket::GetFd()
+void BufferedSocket::DoWrite()
{
- return this->fd;
+ if (state == I_CONNECTING)
+ {
+ state = I_CONNECTED;
+ this->OnConnected();
+ if (!GetIOHook())
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
+ }
+ this->StreamSocket::DoWrite();
}
-bool InspSocket::OnConnected() { return true; }
-void InspSocket::OnError(InspSocketError e) { return; }
-int InspSocket::OnDisconnect() { return 0; }
-int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; }
-bool InspSocket::OnDataReady() { return true; }
-bool InspSocket::OnWriteReady() { return true; }
-void InspSocket::OnTimeout() { return; }
-void InspSocket::OnClose() { return; }
-
-InspSocket::~InspSocket()
+BufferedSocket::~BufferedSocket()
{
this->Close();
+ if (Timeout)
+ {
+ // The timer is removed from the TimerManager in Timer::~Timer()
+ delete Timeout;
+ }
}
-void InspSocket::HandleEvent(EventType et)
+void StreamSocket::HandleEvent(EventType et, int errornum)
{
- if (!this->Poll())
+ if (!error.empty())
+ return;
+ BufferedSocketError errcode = I_ERR_OTHER;
+ try {
+ switch (et)
+ {
+ case EVENT_ERROR:
+ {
+ if (errornum == 0)
+ SetError("Connection closed");
+ else
+ SetError(SocketEngine::GetError(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;
+ }
+ }
+ }
+ catch (CoreException& ex)
{
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
+ ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Caught exception in socket processing on FD %d - '%s'",
+ fd, ex.GetReason().c_str());
+ SetError(ex.GetReason());
+ }
+ if (!error.empty())
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
+ OnError(errcode);
}
}
-