-/* +------------------------------------+
- * | 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) 2020 Matt Schatz <genius3000@g3k.solutions>
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
+ * Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013 Adam <Adam@anope.org>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 John Brooks <special@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
*
- * ---------------------------------------------------
+ * 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"
-using irc::sockets::OpenTCPSocket;
-using irc::sockets::insp_inaddr;
-using irc::sockets::insp_sockaddr;
+#include "inspircd.h"
+#include "iohook.h"
-bool InspSocket::Readable()
+static IOHook* GetNextHook(IOHook* hook)
{
- return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false));
+ IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook);
+ if (iohm)
+ return iohm->GetNextHook();
+ return NULL;
}
-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 (HasFd())
+ 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 irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int maxtime)
{
- this->fd = -1;
- this->Instance = SI;
- strlcpy(host,ipaddr.c_str(),MAXBUF);
- this->WaitingForWriteEvent = false;
- if (listening)
+ BufferedSocketError err = BeginConnect(dest, bind, maxtime);
+ 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;
- }
- }
+ state = I_ERROR;
+ SetError(SocketEngine::LastError());
+ OnError(err);
}
- else
+}
+
+BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int timeout)
+{
+ if (!HasFd())
+ fd = socket(dest.family(), SOCK_STREAM, 0);
+
+ if (!HasFd())
+ return I_ERR_SOCKET;
+
+ if (bind.family() != 0)
{
- strlcpy(this->host,ipaddr.c_str(),MAXBUF);
- this->port = aport;
+ if (SocketEngine::Bind(fd, bind) < 0)
+ return I_ERR_BIND;
+ }
- 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
+ SocketEngine::NonBlocking(fd);
+
+ if (SocketEngine::Connect(this, dest) == -1)
+ {
+ if (errno != EINPROGRESS)
+ 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 (closing)
+ return;
+
+ closing = true;
+ if (HasFd())
+ {
+ // final chance, dump as much of the sendq as we can
+ DoWrite();
+
+ IOHook* hook = GetIOHook();
+ DelIOHook();
+ while (hook)
{
- this->Instance->Log(DEBUG,"No need to resolve %s",this->host);
- strlcpy(this->IP,host,MAXBUF);
- timeout_val = maxtime;
- this->DoConnect();
+ hook->OnStreamSocketClose(this);
+ IOHook* const nexthook = GetNextHook(hook);
+ delete hook;
+ hook = nexthook;
}
+ SocketEngine::Shutdown(this, 2);
+ SocketEngine::Close(this);
}
}
-void InspSocket::WantWrite()
+void StreamSocket::Close(bool writeblock)
{
- this->Instance->SE->WantWrite(this);
- this->WaitingForWriteEvent = true;
+ if (getSendQSize() != 0 && writeblock)
+ closeonempty = true;
+ else
+ Close();
}
-void InspSocket::SetQueues(int nfd)
+CullResult StreamSocket::cull()
{
- // 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));
+ Close();
+ return EventHandler::cull();
}
-/* 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()
+bool StreamSocket::GetNextLine(std::string& line, char delim)
{
- insp_inaddr n;
- ConfigReader Conf(this->Instance);
-
- this->Instance->Log(DEBUG,"In InspSocket::BindAddr()");
- for (int j =0; j < Conf.Enumerate("bind"); j++)
- {
- std::string Type = Conf.ReadValue("bind","type",j);
- std::string IP = Conf.ReadValue("bind","address",j);
- if (Type == "servers")
- {
- 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());
- }
- }
- }
- }
- this->Instance->Log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY");
+ std::string::size_type i = recvq.find(delim);
+ if (i == std::string::npos)
+ return false;
+ line.assign(recvq, 0, i);
+ recvq.erase(0, i + 1);
return true;
}
-bool InspSocket::DoConnect()
+int StreamSocket::HookChainRead(IOHook* hook, std::string& rq)
{
- this->Instance->Log(DEBUG,"In DoConnect()");
- if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
+ if (!hook)
+ return ReadToRecvQ(rq);
+
+ IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook);
+ if (iohm)
{
- this->Instance->Log(DEBUG,"Cant socket()");
- this->state = I_ERROR;
- this->OnError(I_ERR_SOCKET);
- return false;
+ // Call the next hook to put data into the recvq of the current hook
+ const int ret = HookChainRead(iohm->GetNextHook(), iohm->GetRecvQ());
+ if (ret <= 0)
+ return ret;
}
+ return hook->OnStreamSocketRead(this, rq);
+}
- if ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP))
+void StreamSocket::DoRead()
+{
+ const std::string::size_type prevrecvqsize = recvq.size();
+
+ const int result = HookChainRead(GetIOHook(), recvq);
+ if (result < 0)
{
- if (!this->BindAddr())
- return false;
+ SetError("Read Error"); // will not overwrite a better error message
+ return;
}
- 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);
-
- if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1)
- {
- if (errno != EINPROGRESS)
+ if (recvq.size() > prevrecvqsize)
+ OnDataReady();
+}
+
+int StreamSocket::ReadToRecvQ(std::string& rq)
+{
+ char* ReadBuffer = ServerInstance->GetReadBuffer();
+ int n = SocketEngine::Recv(this, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+ if (n == ServerInstance->Config->NetBufferSize)
{
- 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;
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
+ rq.append(ReadBuffer, n);
}
-
- this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time());
- this->Instance->Timers->AddTimer(this->Timeout);
- }
- this->state = I_CONNECTING;
- if (this->fd > -1)
- {
- if (!this->Instance->SE->AddFd(this))
+ else if (n > 0)
{
- this->OnError(I_ERR_NOMOREFDS);
- this->Close();
- this->state = I_ERROR;
- return false;
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ);
+ rq.append(ReadBuffer, n);
}
- this->SetQueues(this->fd);
- }
- this->Instance->Log(DEBUG,"Returning true from InspSocket::DoConnect");
- return true;
+ else if (n == 0)
+ {
+ error = "Connection closed";
+ SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+ return -1;
+ }
+ else if (SocketEngine::IgnoreError())
+ {
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
+ return 0;
+ }
+ else if (errno == EINTR)
+ {
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
+ return 0;
+ }
+ else
+ {
+ error = SocketEngine::LastError();
+ SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+ return -1;
+ }
+ return n;
}
+/* 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;
-void InspSocket::Close()
+void StreamSocket::DoWrite()
{
- if (this->fd > -1)
+ if (getSendQSize() == 0)
{
- this->OnClose();
- shutdown(this->fd,2);
- close(this->fd);
- }
-}
+ if (closeonempty)
+ Close();
-std::string InspSocket::GetIP()
-{
- return this->IP;
-}
-
-char* InspSocket::Read()
-{
- 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)))
+ return;
+ }
+ if (!error.empty() || !HasFd())
{
- ibuf[n] = 0;
- return ibuf;
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DoWrite on errored or closed socket");
+ return;
}
- else
+
+ SendQueue* psendq = &sendq;
+ IOHook* hook = GetIOHook();
+ while (hook)
{
- int err = errno;
- if (err == EAGAIN)
+ int rv = hook->OnStreamSocketWrite(this, *psendq);
+ psendq = NULL;
+
+ // rv == 0 means the socket has blocked. Stop trying to send data.
+ // IOHook has requested unblock notification from the socketengine.
+ if (rv == 0)
+ break;
+
+ if (rv < 0)
{
- return "";
+ SetError("Write Error"); // will not overwrite a better error message
+ break;
}
- else
+
+ IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook);
+ hook = NULL;
+ if (iohm)
{
- 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;
+ psendq = &iohm->GetSendQ();
+ hook = iohm->GetNextHook();
}
}
-}
-void InspSocket::MarkAsClosed()
-{
- this->Instance->Log(DEBUG,"Marked as closed");
-}
+ if (psendq)
+ FlushSendQ(*psendq);
-// 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)
-{
- /* Try and append the data to the back of the queue, and send it on its way
- */
- outbuffer.push_back(data);
- this->Instance->SE->WantWrite(this);
- return (!this->FlushWriteBuffer());
+ if (getSendQSize() == 0 && closeonempty)
+ Close();
}
-bool InspSocket::FlushWriteBuffer()
+void StreamSocket::FlushSendQ(SendQueue& sq)
{
- errno = 0;
- if ((this->fd > -1) && (this->state == I_CONNECTED))
- {
- /* If we have multiple lines, try to send them all,
- * not just the first one -- Brain
- */
- while (outbuffer.size() && (errno != EAGAIN))
+ // 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() && !sq.empty() && eventChange == FD_WANT_EDGE_WRITE)
{
- /* Send a line */
- int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
- if (result > 0)
+ // Prepare a writev() call to write all buffers efficiently
+ int bufcount = sq.size();
+
+ // cap the number of buffers at MYIOV_MAX
+ if (bufcount > MYIOV_MAX)
{
- if ((unsigned int)result == outbuffer[0].length())
+ bufcount = MYIOV_MAX;
+ }
+
+ int rv_max = 0;
+ int rv;
+ {
+ SocketEngine::IOVector iovecs[MYIOV_MAX];
+ size_t j = 0;
+ for (SendQueue::const_iterator i = sq.begin(), end = i+bufcount; i != end; ++i, j++)
{
- /* 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();
+ const SendQueue::Element& elem = *i;
+ iovecs[j].iov_base = const_cast<char*>(elem.data());
+ iovecs[j].iov_len = elem.length();
+ rv_max += iovecs[j].iov_len;
}
- else
+ rv = SocketEngine::WriteV(this, iovecs, bufcount);
+ }
+
+ if (rv == (int)sq.bytes())
+ {
+ // it's our lucky day, everything got written out. Fast cleanup.
+ // This won't ever happen if the number of buffers got capped.
+ sq.clear();
+ }
+ else if (rv > 0)
+ {
+ // Partial write. Clean out strings from the sendq
+ if (rv < rv_max)
{
- 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;
+ // it's going to block now
+ eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
}
+ while (rv > 0 && !sq.empty())
+ {
+ const SendQueue::Element& front = sq.front();
+ if (front.length() <= (size_t)rv)
+ {
+ // this string got fully written out
+ rv -= front.length();
+ sq.pop_front();
+ }
+ else
+ {
+ // stopped in the middle of this string
+ sq.erase_front(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 ((result == -1) && (errno != EAGAIN))
+ else if (errno == EINTR)
{
- this->Instance->Log(DEBUG,"Write error on socket: %s",strerror(errno));
- this->OnError(I_ERR_WRITE);
- this->state = I_ERROR;
- this->Instance->SE->DelFd(this);
- this->Close();
- return true;
+ // 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);
+ }
+}
+
+bool StreamSocket::OnSetEndPoint(const irc::sockets::sockaddrs& local, const irc::sockets::sockaddrs& remote)
+{
+ return false;
+}
- if ((errno == EAGAIN) && (fd > -1))
+void StreamSocket::WriteData(const std::string &data)
+{
+ if (!HasFd())
{
- this->Instance->SE->WantWrite(this);
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to write data to dead socket: %s",
+ data.c_str());
+ return;
}
- return (fd < 0);
+ /* Append the data to the back of the queue ready for writing */
+ sendq.push_back(data);
+
+ SocketEngine::ChangeEventMask(this, FD_ADD_TRIAL_WRITE);
}
-void SocketTimeout::Tick(time_t now)
+bool SocketTimeout::Tick(time_t)
{
- if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SocketTimeout::Tick");
+
+ if (SocketEngine::GetRef(this->sfd) != this->sock)
{
- ServerInstance->Log(DEBUG,"Our socket has been deleted before the timeout was reached.");
- return;
+ 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;
- ServerInstance->SE->DelFd(this->sock);
- /* 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;
- this->sock->Close();
- delete this->sock;
- return;
+
+ ServerInstance->GlobalCulls.AddItem(sock);
}
+
+ this->sock->Timeout = NULL;
+ delete this;
+ return false;
}
-bool InspSocket::Poll()
+void BufferedSocket::OnConnected() { }
+void BufferedSocket::OnTimeout() { return; }
+
+void BufferedSocket::OnEventHandlerWrite()
{
- if (this->Instance->SE->GetRef(this->fd) != this)
- return false;
+ if (state == I_CONNECTING)
+ {
+ state = I_CONNECTED;
+ this->OnConnected();
+ if (!GetIOHook())
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
+ }
+ this->StreamSocket::OnEventHandlerWrite();
+}
- int incoming = -1;
- bool n = true;
+BufferedSocket::~BufferedSocket()
+{
+ this->Close();
+ // The timer is removed from the TimerManager in Timer::~Timer()
+ delete Timeout;
+}
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
- return false;
+void StreamSocket::OnEventHandlerError(int errornum)
+{
+ if (!error.empty())
+ return;
- switch (this->state)
+ if (errornum == 0)
+ SetError("Connection closed");
+ else
+ SetError(SocketEngine::GetError(errornum));
+
+ BufferedSocketError errcode = I_ERR_OTHER;
+ switch (errornum)
{
- 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:
- /* Process the read event */
- return this->OnDataReady();
- break;
- default:
- break;
+ 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;
}
- return true;
+
+ // Log and call OnError()
+ CheckError(errcode);
}
-void InspSocket::SetState(InspSocketState s)
+void StreamSocket::OnEventHandlerRead()
{
- this->Instance->Log(DEBUG,"Socket state change");
- this->state = s;
+ if (!error.empty())
+ return;
+
+ try
+ {
+ DoRead();
+ }
+ catch (CoreException& ex)
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Caught exception in socket processing on FD %d - '%s'", fd, ex.GetReason().c_str());
+ SetError(ex.GetReason());
+ }
+ CheckError(I_ERR_OTHER);
}
-InspSocketState InspSocket::GetState()
+void StreamSocket::OnEventHandlerWrite()
{
- return this->state;
+ if (!error.empty())
+ return;
+
+ DoWrite();
+ CheckError(I_ERR_OTHER);
}
-int InspSocket::GetFd()
+void StreamSocket::CheckError(BufferedSocketError errcode)
{
- return this->fd;
+ if (!error.empty())
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
+ OnError(errcode);
+ }
}
-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; }
+IOHook* StreamSocket::GetModHook(Module* mod) const
+{
+ for (IOHook* curr = GetIOHook(); curr; curr = GetNextHook(curr))
+ {
+ if (curr->prov->creator == mod)
+ return curr;
+ }
+ return NULL;
+}
-InspSocket::~InspSocket()
+IOHook* StreamSocket::GetLastHook() const
{
- this->Close();
+ IOHook* curr = GetIOHook();
+ IOHook* last = curr;
+
+ for (; curr; curr = GetNextHook(curr))
+ last = curr;
+
+ return last;
}
-void InspSocket::HandleEvent(EventType et)
+
+void StreamSocket::AddIOHook(IOHook* newhook)
{
- switch (et)
+ IOHook* curr = GetIOHook();
+ if (!curr)
{
- case EVENT_READ:
- if (!this->Poll())
- {
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
- return;
- }
- break;
- case EVENT_WRITE:
- if (this->WaitingForWriteEvent)
- {
- this->WaitingForWriteEvent = false;
- if (!this->OnWriteReady())
- {
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
- return;
- }
- }
- if (this->state == I_CONNECTING)
- {
- /* This might look wrong as if we should be actually calling
- * with EVENT_WRITE, but trust me it is correct. There are some
- * writeability-state things in the read code, because of how
- * InspSocket used to work regarding write buffering in previous
- * versions of InspIRCd. - Brain
- */
- this->HandleEvent(EVENT_READ);
- return;
- }
- else
- {
- if (this->FlushWriteBuffer())
- {
- this->Instance->SE->DelFd(this);
- this->Close();
- delete this;
- return;
- }
- }
- break;
+ iohook = newhook;
+ return;
+ }
+
+ IOHookMiddle* lasthook;
+ while (curr)
+ {
+ lasthook = IOHookMiddle::ToMiddleHook(curr);
+ if (!lasthook)
+ return;
+ curr = lasthook->GetNextHook();
}
+
+ lasthook->SetNextHook(newhook);
}
+size_t StreamSocket::getSendQSize() const
+{
+ size_t ret = sendq.bytes();
+ IOHook* curr = GetIOHook();
+ while (curr)
+ {
+ const IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(curr);
+ if (!iohm)
+ break;
+
+ ret += iohm->GetSendQ().bytes();
+ curr = iohm->GetNextHook();
+ }
+ return ret;
+}
+
+void StreamSocket::SwapInternals(StreamSocket& other)
+{
+ if (type != other.type)
+ return;
+
+ EventHandler::SwapInternals(other);
+ std::swap(closeonempty, other.closeonempty);
+ std::swap(closing, other.closing);
+ std::swap(error, other.error);
+ std::swap(iohook, other.iohook);
+ std::swap(recvq, other.recvq);
+ std::swap(sendq, other.sendq);
+}
projects / user / henk / code / inspircd.git / blobdiff