-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * 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) 2006-2007 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- * the file COPYING for details.
+ * 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/>.
*/
-/* $Core */
-#include "socket.h"
-#include "inspstring.h"
-#include "socketengine.h"
#include "inspircd.h"
+#include "iohook.h"
-bool BufferedSocket::Readable()
+static IOHook* GetNextHook(IOHook* hook)
{
- return (this->state != I_CONNECTING);
+ IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook);
+ if (iohm)
+ return iohm->GetNextHook();
+ return NULL;
}
-BufferedSocket::BufferedSocket(InspIRCd* SI)
+BufferedSocket::BufferedSocket()
{
- this->Timeout = NULL;
- this->state = I_DISCONNECTED;
- this->fd = -1;
- this->ServerInstance = SI;
+ Timeout = NULL;
+ state = I_ERROR;
}
-BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip)
+BufferedSocket::BufferedSocket(int newfd)
{
- this->Timeout = NULL;
+ 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);
+ if (HasFd())
+ SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
}
-BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip)
+void BufferedSocket::DoConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int maxtime)
{
- 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,':'))
+ BufferedSocketError err = BeginConnect(dest, bind, maxtime);
+ if (err != I_ERR_NONE)
{
- in6_addr n;
- if (inet_pton(AF_INET6, host, &n) < 1)
- ipvalid = false;
+ state = I_ERROR;
+ SetError(SocketEngine::LastError());
+ OnError(err);
}
- else
-#endif
+}
+
+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)
{
- in_addr n;
- if (inet_aton(host,&n) < 1)
- ipvalid = false;
+ if (SocketEngine::Bind(fd, bind) < 0)
+ return I_ERR_BIND;
}
- if (!ipvalid)
+
+ SocketEngine::NonBlocking(fd);
+
+ if (SocketEngine::Connect(this, dest) == -1)
{
- 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;
+ if (errno != EINPROGRESS)
+ return I_ERR_CONNECT;
}
- else
+
+ 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())
{
- strlcpy(this->IP,host,MAXBUF);
- if (!this->DoConnect(maxtime))
+ // final chance, dump as much of the sendq as we can
+ DoWrite();
+
+ IOHook* hook = GetIOHook();
+ DelIOHook();
+ while (hook)
{
- this->OnError(I_ERR_CONNECT);
- this->Close();
- this->fd = -1;
- this->state = I_ERROR;
- return;
+ hook->OnStreamSocketClose(this);
+ IOHook* const nexthook = GetNextHook(hook);
+ delete hook;
+ hook = nexthook;
}
+ SocketEngine::Shutdown(this, 2);
+ SocketEngine::Close(this);
}
}
-void BufferedSocket::SetQueues()
+void StreamSocket::Close(bool writeblock)
{
- // 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.
- }
+ if (getSendQSize() != 0 && writeblock)
+ closeonempty = true;
+ else
+ Close();
}
-bool BufferedSocket::DoBindMagic(const std::string ¤t_ip, bool v6)
+CullResult StreamSocket::cull()
{
- /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */
- socklen_t size = sizeof(sockaddr_in);
- sockaddr* s = new sockaddr[2];
-#ifdef IPV6
- if (v6)
- {
- in6_addr n;
- if (inet_pton(AF_INET6, current_ip.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
- {
- // Well, this is as good as it's gonna get.
- errno = EADDRNOTAVAIL;
- delete[] s;
- return false;
- }
- }
- else
-#endif
- {
- in_addr n;
- if (inet_aton(current_ip.c_str(), &n) > 0)
- {
- ((sockaddr_in*)s)->sin_addr = n;
- ((sockaddr_in*)s)->sin_port = 0;
- ((sockaddr_in*)s)->sin_family = AF_INET;
- }
- else
- {
- // Well, this is as good as it's gonna get.
- errno = EADDRNOTAVAIL;
- delete[] s;
- return false;
- }
- }
+ Close();
+ return EventHandler::cull();
+}
- if (ServerInstance->SE->Bind(this->fd, s, size) < 0)
- {
- this->state = I_ERROR;
- this->OnError(I_ERR_BIND);
- delete[] s;
+bool StreamSocket::GetNextLine(std::string& line, char delim)
+{
+ std::string::size_type i = recvq.find(delim);
+ if (i == std::string::npos)
return false;
- }
-
- delete[] s;
+ line.assign(recvq, 0, i);
+ recvq.erase(0, i + 1);
return true;
}
-/* 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_to_bind)
+int StreamSocket::HookChainRead(IOHook* hook, std::string& rq)
{
- ConfigReader Conf(this->ServerInstance);
- bool v6 = false;
-#ifdef IPV6
- /* Are we looking for a binding to fit an ipv6 host? */
- if ((ip_to_bind.empty()) || (ip_to_bind.find(':') != std::string::npos))
- v6 = true;
-#endif
-
- // Case one: If they provided an IP, try bind it
- if (!ip_to_bind.empty())
- {
- // And if it fails, don't do anything.
- return this->DoBindMagic(ip_to_bind, v6);
- }
+ if (!hook)
+ return ReadToRecvQ(rq);
- for (int j = 0; j < Conf.Enumerate("bind"); j++)
+ IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook);
+ if (iohm)
{
- // We only want to try bind to a server ip.
- if (Conf.ReadValue("bind","type",j) != "servers")
- continue;
-
- // set current IP to the <bind> tag
- std::string current_ip = Conf.ReadValue("bind","address",j);
+ // 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);
+}
- // Make sure IP is nothing local
- if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1")
- continue;
+void StreamSocket::DoRead()
+{
+ const std::string::size_type prevrecvqsize = recvq.size();
- // Try bind, don't fail if it doesn't bind though.
- if (this->DoBindMagic(current_ip, v6))
- return true;
+ const int result = HookChainRead(GetIOHook(), recvq);
+ if (result < 0)
+ {
+ SetError("Read Error"); // will not overwrite a better error message
+ return;
}
- // NOTE: You may wonder WTF we are returning *true* here, but that is because there were no custom binds setup, and so we have nothing to do
- // (remember, outgoing connections without binding are perfectly ok).
- ServerInstance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
- return true;
+ if (recvq.size() > prevrecvqsize)
+ OnDataReady();
}
-bool BufferedSocket::DoConnect(unsigned long maxtime)
+int StreamSocket::ReadToRecvQ(std::string& rq)
{
- /* 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)))
+ char* ReadBuffer = ServerInstance->GetReadBuffer();
+ int n = SocketEngine::Recv(this, ReadBuffer, ServerInstance->Config->NetBufferSize, 0);
+ if (n == ServerInstance->Config->NetBufferSize)
{
- if (!this->BindAddr(this->cbindip))
- {
- this->Close();
- this->fd = -1;
- delete[] addr;
- return false;
- }
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
+ rq.append(ReadBuffer, n);
}
- }
- else
-#endif
- {
- this->fd = socket(AF_INET, SOCK_STREAM, 0);
- if (this->fd > -1)
+ else if (n > 0)
{
- if (!this->BindAddr(this->cbindip))
- {
- this->Close();
- this->fd = -1;
- delete[] addr;
- return false;
- }
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ);
+ rq.append(ReadBuffer, n);
}
- }
-
- 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)
+ else if (n == 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);
+ error = "Connection closed";
+ SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+ return -1;
}
- }
- else
-#endif
- {
- in_addr addy;
- if (inet_aton(this->host, &addy) > 0)
+ else if (SocketEngine::IgnoreError())
{
- ((sockaddr_in*)addr)->sin_family = AF_INET;
- ((sockaddr_in*)addr)->sin_addr = addy;
- ((sockaddr_in*)addr)->sin_port = htons(this->port);
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_READ_WILL_BLOCK);
+ return 0;
}
- }
-
- ServerInstance->SE->NonBlocking(this->fd);
-
- if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1)
- {
- if (errno != EINPROGRESS)
+ else if (errno == EINTR)
{
- this->OnError(I_ERR_CONNECT);
- this->Close();
- this->state = I_ERROR;
- delete[] addr;
- return false;
+ SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ);
+ return 0;
}
-
- this->Timeout = new SocketTimeout(this->GetFd(), this->ServerInstance, this, maxtime, this->ServerInstance->Time());
- this->ServerInstance->Timers->AddTimer(this->Timeout);
- }
-
- this->state = I_CONNECTING;
- delete[] addr;
- if (this->fd > -1)
- {
- if (!this->ServerInstance->SE->AddFd(this))
+ else
{
- this->OnError(I_ERR_NOMOREFDS);
- this->Close();
- this->state = I_ERROR;
- return false;
+ error = SocketEngine::LastError();
+ SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE);
+ return -1;
}
- this->SetQueues();
- }
-
- ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
- return true;
+ 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 BufferedSocket::Close()
+void StreamSocket::DoWrite()
{
- /* Save this, so we dont lose it,
- * otherise on failure, error messages
- * might be inaccurate.
- */
- int save = errno;
- if (this->fd > -1)
+ if (getSendQSize() == 0)
{
- 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 (closeonempty)
+ Close();
- if (ServerInstance->SocketCull.find(this) == ServerInstance->SocketCull.end())
- ServerInstance->SocketCull[this] = this;
+ return;
+ }
+ if (!error.empty() || !HasFd())
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "DoWrite on errored or closed socket");
+ return;
}
- errno = save;
-}
-
-std::string BufferedSocket::GetIP()
-{
- return this->IP;
-}
-const char* BufferedSocket::Read()
-{
- if (!ServerInstance->SE->BoundsCheckFd(this))
- return NULL;
+ SendQueue* psendq = &sendq;
+ IOHook* hook = GetIOHook();
+ while (hook)
+ {
+ int rv = hook->OnStreamSocketWrite(this, *psendq);
+ psendq = NULL;
- int n = 0;
- char* ReadBuffer = ServerInstance->GetReadBuffer();
+ // 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 (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)
+ if (rv < 0)
{
- ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
- }
- if (MOD_RESULT < 0)
- {
- n = -1;
- errno = EAGAIN;
+ SetError("Write Error"); // will not overwrite a better error message
+ break;
}
- else
+
+ IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook);
+ hook = NULL;
+ if (iohm)
{
- n = result2;
+ psendq = &iohm->GetSendQ();
+ hook = iohm->GetNextHook();
}
}
- 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;
- }
-}
+ if (psendq)
+ FlushSendQ(*psendq);
-/*
- * 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);
+ if (getSendQSize() == 0 && closeonempty)
+ Close();
}
-bool BufferedSocket::FlushWriteBuffer()
+void StreamSocket::FlushSendQ(SendQueue& sq)
{
- errno = 0;
- if ((this->fd > -1) && (this->state == I_CONNECTED))
- {
- if (this->GetIOHook())
+ // 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)
{
- while (outbuffer.size() && (errno != EAGAIN))
+ // 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)
{
- 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)
+ 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++)
{
- ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
- return true;
+ 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;
}
+ rv = SocketEngine::WriteV(this, iovecs, bufcount);
}
- }
- 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 (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)
{
- if ((unsigned int)result >= outbuffer[0].length())
+ // 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)
{
- /* 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();
+ // this string got fully written out
+ rv -= front.length();
+ sq.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;
+ // stopped in the middle of this string
+ sq.erase_front(rv);
+ rv = 0;
}
}
- 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;
- }
+ }
+ 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);
+ }
+}
+
+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->ServerInstance->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)
+bool SocketTimeout::Tick(time_t)
{
- ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "SocketTimeout::Tick");
- if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
- return;
+ if (SocketEngine::GetRef(this->sfd) != this->sock)
+ {
+ delete this;
+ return false;
+ }
if (this->sock->state == I_CONNECTING)
{
// 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;
+ ServerInstance->GlobalCulls.AddItem(sock);
}
this->sock->Timeout = NULL;
+ delete this;
+ return false;
+}
+
+void BufferedSocket::OnConnected() { }
+void BufferedSocket::OnTimeout() { return; }
+
+void BufferedSocket::OnEventHandlerWrite()
+{
+ 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();
+}
+
+BufferedSocket::~BufferedSocket()
+{
+ this->Close();
+ // The timer is removed from the TimerManager in Timer::~Timer()
+ delete Timeout;
}
-bool BufferedSocket::InternalMarkConnected()
+void StreamSocket::OnEventHandlerError(int errornum)
{
- /* Our socket was in write-state, so delete it and re-add it
- * in read-state.
- */
- this->SetState(I_CONNECTED);
+ if (!error.empty())
+ return;
- if (this->GetIOHook())
+ if (errornum == 0)
+ SetError("Connection closed");
+ else
+ SetError(SocketEngine::GetError(errornum));
+
+ BufferedSocketError errcode = I_ERR_OTHER;
+ switch (errornum)
{
- 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;
- }
+ 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 this->OnConnected();
+
+ // Log and call OnError()
+ CheckError(errcode);
}
-void BufferedSocket::SetState(BufferedSocketState s)
+void StreamSocket::OnEventHandlerRead()
{
- 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);
}
-BufferedSocketState BufferedSocket::GetState()
+void StreamSocket::OnEventHandlerWrite()
{
- return this->state;
+ if (!error.empty())
+ return;
+
+ DoWrite();
+ CheckError(I_ERR_OTHER);
}
-bool BufferedSocket::OnConnected() { return true; }
-void BufferedSocket::OnError(BufferedSocketError) { return; }
-int BufferedSocket::OnDisconnect() { return 0; }
-bool BufferedSocket::OnDataReady() { return true; }
-bool BufferedSocket::OnWriteReady()
+void StreamSocket::CheckError(BufferedSocketError errcode)
{
- // Default behaviour: just try write some.
- return !this->FlushWriteBuffer();
+ if (!error.empty())
+ {
+ ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
+ OnError(errcode);
+ }
}
-void BufferedSocket::OnTimeout() { return; }
-void BufferedSocket::OnClose() { return; }
-BufferedSocket::~BufferedSocket()
+IOHook* StreamSocket::GetModHook(Module* mod) const
{
- this->Close();
- if (Timeout)
+ for (IOHook* curr = GetIOHook(); curr; curr = GetNextHook(curr))
{
- ServerInstance->Timers->DelTimer(Timeout);
- Timeout = NULL;
+ if (curr->prov->creator == mod)
+ return curr;
}
+ return NULL;
+}
+
+IOHook* StreamSocket::GetLastHook() const
+{
+ IOHook* curr = GetIOHook();
+ IOHook* last = curr;
+
+ for (; curr; curr = GetNextHook(curr))
+ last = curr;
+
+ return last;
}
-void BufferedSocket::HandleEvent(EventType et, int errornum)
+
+void StreamSocket::AddIOHook(IOHook* newhook)
{
- switch (et)
+ IOHook* curr = GetIOHook();
+ if (!curr)
{
- 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;
- }
+ iohook = newhook;
+ return;
+ }
- if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end())
- this->ServerInstance->SocketCull[this] = this;
+ 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;
- }
- 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;
- }
+
+ 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