X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=9bfc6a73e33104bf0ff64d1df9c4b80000aa98e4;hb=dfc00bf4adad93cf7b51646186ccbb6ce2ff0443;hp=678583ed0c3b6025c8d7bc67afabc4df79d1461d;hpb=21b5d0d5bd1e7d7de5bf34e9a1fc950fe9e1d6ec;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 678583ed0..9bfc6a73e 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -1,612 +1,539 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2009 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2006-2007 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ -#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; - this->IsIOHooked = false; + 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; - this->IsIOHooked = false; - 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; - this->IsIOHooked = 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); - return; - } - else - { - if (!SI->BindSocket(this->fd,this->client,this->server,aport,(char*)ipaddr.c_str())) - { - 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); - } - } - return; - } - } - } - else - { - strlcpy(this->host,ipaddr.c_str(),MAXBUF); - this->port = aport; - - if (insp_aton(host,&addy) < 1) - { - this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!"); - this->Close(); - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_RESOLVE); - return; - } - else - { - strlcpy(this->IP,host,MAXBUF); - timeout_val = maxtime; - this->DoConnect(); - } + state = I_ERROR; + SetError(SocketEngine::LastError()); + OnError(err); } } -void InspSocket::WantWrite() -{ - this->Instance->SE->WantWrite(this); - this->WaitingForWriteEvent = true; -} - -void InspSocket::SetQueues(int nfd) +BufferedSocketError BufferedSocket::BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip) { - // 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)); -} + irc::sockets::sockaddrs addr, bind; + if (!irc::sockets::aptosa(ipaddr, aport, addr)) + { + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!"); + return I_ERR_CONNECT; + } -/* 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); - 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 != "") && (IP != "::1")) - { - insp_sockaddr s; - - if (insp_aton(IP.c_str(),&n) > 0) - { -#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->state = I_ERROR; - this->OnError(I_ERR_BIND); - this->fd = -1; - return false; - } - return true; - } - } + return I_ERR_BIND; } } - 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) { - if ((this->fd = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) - { - 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; } - 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) + SocketEngine::NonBlocking(fd); + + if (SocketEngine::Connect(this, &dest.sa, dest.sa_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->Instance, this, timeout_val, this->Instance->Time()); - this->Instance->Timers->AddTimer(this->Timeout); + return I_ERR_CONNECT; } + this->state = I_CONNECTING; - if (this->fd > -1) - { - if (!this->Instance->SE->AddFd(this)) - { - this->OnError(I_ERR_NOMOREFDS); - this->Close(); - this->state = I_ERROR; - return false; - } - this->SetQueues(this->fd); - } - return true; -} + 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); -void InspSocket::Close() + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BufferedSocket::DoConnect success"); + return I_ERR_NONE; +} + +void StreamSocket::Close() { - /* Save this, so we dont lose it, - * otherise on failure, error messages - * might be inaccurate. - */ - int save = errno; if (this->fd > -1) { - if (this->IsIOHooked && Instance->Config->GetIOHook(this)) + // final chance, dump as much of the sendq as we can + DoWrite(); + + IOHook* hook = GetIOHook(); + DelIOHook(); + while (hook) { - try - { - Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd); - } - catch (CoreException& modexcept) - { - Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - } + hook->OnStreamSocketClose(this); + IOHook* const nexthook = GetNextHook(hook); + delete hook; + hook = nexthook; } - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); + SocketEngine::Shutdown(this, 2); + SocketEngine::Close(this); } - errno = save; } -std::string InspSocket::GetIP() +CullResult StreamSocket::cull() { - return this->IP; + Close(); + return EventHandler::cull(); } -char* InspSocket::Read() +bool StreamSocket::GetNextLine(std::string& line, char delim) { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return NULL; + 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; +} - int n = 0; +int StreamSocket::HookChainRead(IOHook* hook, std::string& rq) +{ + if (!hook) + return ReadToRecvQ(rq); - if (this->IsIOHooked) + IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook); + if (iohm) { - int result2 = 0; - int MOD_RESULT = 0; - try + // 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); +} + +void StreamSocket::DoRead() +{ + const std::string::size_type prevrecvqsize = recvq.size(); + + const int result = HookChainRead(GetIOHook(), recvq); + if (result < 0) + { + SetError("Read Error"); // will not overwrite a better error message + return; + } + + 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) + { + SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ); + rq.append(ReadBuffer, n); + } + else if (n > 0) { - MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd,this->ibuf,sizeof(this->ibuf),result2); + SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ); + rq.append(ReadBuffer, n); } - catch (CoreException& modexcept) + else if (n == 0) { - Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + error = "Connection closed"; + SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE); + return -1; } - if (MOD_RESULT < 0) + else if (SocketEngine::IgnoreError()) { - n = -1; - errno = EAGAIN; + 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 { - n = result2; + error = SocketEngine::LastError(); + SocketEngine::ChangeEventMask(this, FD_WANT_NO_READ | FD_WANT_NO_WRITE); + return -1; } - } - else - { - n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); - } + return n; +} - if ((n > 0) && (n <= (int)sizeof(this->ibuf))) +/* 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 StreamSocket::DoWrite() +{ + if (getSendQSize() == 0) + return; + if (!error.empty() || fd < 0) { - 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) - return ""; - else - return NULL; - } -} + int rv = hook->OnStreamSocketWrite(this, *psendq); + psendq = NULL; -void InspSocket::MarkAsClosed() -{ -} + // rv == 0 means the socket has blocked. Stop trying to send data. + // IOHook has requested unblock notification from the socketengine. + if (rv == 0) + break; -// 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 (rv < 0) + { + SetError("Write Error"); // will not overwrite a better error message + break; + } + + IOHookMiddle* const iohm = IOHookMiddle::ToMiddleHook(hook); + hook = NULL; + if (iohm) + { + psendq = &iohm->GetSendQ(); + hook = iohm->GetNextHook(); + } + } + + if (psendq) + FlushSendQ(*psendq); } -bool InspSocket::FlushWriteBuffer() +void StreamSocket::FlushSendQ(SendQueue& sq) { - errno = 0; - if ((this->fd > -1) && (this->state == I_CONNECTED)) - { - if (this->IsIOHooked) + // 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 - { - int result = Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length()); - if (result > 0) - { - if ((unsigned int)result == outbuffer[0].length()) - { - outbuffer.pop_front(); - } - else - { - std::string temp = outbuffer[0].substr(result); - outbuffer[0] = temp; - errno = EAGAIN; - } - } - else if (((result == -1) && (errno != EAGAIN)) || (result == 0)) - { - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; - this->Instance->SE->DelFd(this); - this->Close(); - return true; - } - } - 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++) { - Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - return true; + const SendQueue::Element& elem = *i; + iovecs[j].iov_base = const_cast(elem.data()); + iovecs[j].iov_len = elem.length(); + rv_max += elem.length(); } + 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)) + + if (rv == (int)sq.bytes()) { - /* Send a line */ - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); - if (result > 0) + // 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) + { + // it's going to block now + eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK; + } + while (rv > 0 && !sq.empty()) { - if ((unsigned int)result == outbuffer[0].length()) + 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 == -1) && (errno != EAGAIN)) - { - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; - this->Instance->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); + } +} - if ((errno == EAGAIN) && (fd > -1)) +void StreamSocket::WriteData(const std::string &data) +{ + if (fd < 0) { - 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) - return; + 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) { - // 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; +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) - { - case 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; - } - if (Instance->Config->GetIOHook(this)) - { - try - { - Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd); - } - catch (CoreException& modexcept) - { - Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - } - } - return this->OnConnected(); - break; - case I_LISTENING: - length = sizeof (client); - incoming = accept (this->fd, (sockaddr*)&client,&length); - -#ifdef IPV6 - this->OnIncomingConnection(incoming, (char*)insp_ntoa(client.sin6_addr)); -#else - this->OnIncomingConnection(incoming, (char*)insp_ntoa(client.sin_addr)); -#endif - - if (this->IsIOHooked) - { - try - { -#ifdef IPV6 - Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, insp_ntoa(client.sin6_addr), this->port); -#else - Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, insp_ntoa(client.sin_addr), this->port); -#endif - } - catch (CoreException& modexcept) - { - Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - } - } + if (errornum == 0) + SetError("Connection closed"); + else + SetError(SocketEngine::GetError(errornum)); - this->SetQueues(incoming); - return true; - break; - case I_CONNECTED: - /* Process the read event */ - return this->OnDataReady(); - break; - default: - break; + BufferedSocketError errcode = I_ERR_OTHER; + 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; } - return true; + + // Log and call OnError() + CheckError(errcode); } -void InspSocket::SetState(InspSocketState 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); } -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; } - -InspSocket::~InspSocket() +IOHook* StreamSocket::GetModHook(Module* mod) const { - this->Close(); + for (IOHook* curr = GetIOHook(); curr; curr = GetNextHook(curr)) + { + if (curr->prov->creator == mod) + return curr; + } + return NULL; } -void InspSocket::HandleEvent(EventType et, int errornum) +void StreamSocket::AddIOHook(IOHook* newhook) { - switch (et) + IOHook* curr = GetIOHook(); + if (!curr) + { + iohook = newhook; + return; + } + + IOHookMiddle* lasthook; + while (curr) { - case EVENT_ERROR: - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + lasthook = IOHookMiddle::ToMiddleHook(curr); + if (!lasthook) return; - break; - 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; + 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; +}