X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=f075aecc6ab8bae42dba2b27717e3d46e32f97e7;hb=78db7544d26cdeffeb2bd8045529fe90bd5d852d;hp=6a0fbc556b579861f483f60fd5730a0dc8f745b9;hpb=ab46b96db4d457e6a4f2e978c38b79762cdeb9d5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 6a0fbc556..f075aecc6 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -1,519 +1,575 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * 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 + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2018 Dylan Frank + * Copyright (C) 2013-2016 Attila Molnar + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards * - * --------------------------------------------------- + * 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 -#include -#include -#include -#include -#include "inspircd_config.h" -#include "socket.h" -#include "configreader.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "socketengine.h" -#include "message.h" -#include "inspircd.h" +#include "inspircd.h" +#include "iohook.h" -extern time_t TIME; -extern Server* MyServer; +static IOHook* GetNextHook(IOHook* hook) +{ + 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->ClosePending = 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->ClosePending = false; - this->Instance = SI; - if (this->fd > -1) + if (HasFd()) + SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE); +} + +void BufferedSocket::DoConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int maxtime) +{ + BufferedSocketError err = BeginConnect(dest, bind, maxtime); + if (err != I_ERR_NONE) { - this->ClosePending = (!this->Instance->SE->AddFd(this->fd,true,X_ESTAB_MODULE)); - this->Instance->socket_ref[this->fd] = this; + state = I_ERROR; + SetError(SocketEngine::LastError()); + OnError(err); } } -InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime) : fd(-1) +BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int timeout) { - this->Instance = SI; - strlcpy(host,ipaddr.c_str(),MAXBUF); - this->ClosePending = false; - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) - { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - this->ClosePending = true; - log(DEBUG,"OpenTCPSocket() error"); - return; - } - else - { - if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ipaddr.c_str())) - { - 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->fd,true,X_ESTAB_MODULE)) - { - this->Close(); - this->state = I_ERROR; - this->OnError(I_ERR_NOMOREFDS); - this->ClosePending = true; - } - this->Instance->socket_ref[this->fd] = this; - } - log(DEBUG,"New socket now in I_LISTENING state"); - return; - } - } - } - else + 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) - { - 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); - this->ClosePending = true; - return; - } - else - { - log(DEBUG,"No need to resolve %s",this->host); - strlcpy(this->IP,host,MAXBUF); - timeout_end = time(NULL) + maxtime; - this->DoConnect(); - } + 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 InspSocket::WantWrite() +void StreamSocket::Close() { - /** 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->WaitingForWriteEvent = true; - this->Instance->SE->DelFd(this->fd); - if (!this->Instance->SE->AddFd(this->fd,false,X_ESTAB_MODULE)) + if (closing) + return; + + closing = true; + if (HasFd()) { - this->Close(); - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_NOMOREFDS); - this->ClosePending = true; + // final chance, dump as much of the sendq as we can + DoWrite(); + + IOHook* hook = GetIOHook(); + DelIOHook(); + while (hook) + { + hook->OnStreamSocketClose(this); + IOHook* const nexthook = GetNextHook(hook); + delete hook; + hook = nexthook; + } + SocketEngine::Shutdown(this, 2); + SocketEngine::Close(this); } } -void InspSocket::SetQueues(int nfd) +void StreamSocket::Close(bool writeblock) { - // 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)); + if (getSendQSize() != 0 && writeblock) + closeonempty = true; + else + Close(); } -/* 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() +CullResult StreamSocket::cull() { - insp_inaddr n; - ConfigReader Conf; - - 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; + Close(); + return EventHandler::cull(); +} - if (insp_aton(IP.c_str(),&n) > 0) - { - 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) - { - log(DEBUG,"Cant bind()"); - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - this->fd = -1; - return false; - } - log(DEBUG,"bind() reports outbound fd bound to ip %s",IP.c_str()); - return true; - } - else - { - log(DEBUG,"Address '%s' was not an IP address",IP.c_str()); - } - } - } - } - log(DEBUG,"Found no suitable IPs to bind, binding INADDR_ANY"); +bool StreamSocket::GetNextLine(std::string& line, char delim) +{ + 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) { - 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) { - log(DEBUG,"Cant socket()"); - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - this->fd = -1; - 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); +} + +void StreamSocket::DoRead() +{ + const std::string::size_type prevrecvqsize = recvq.size(); - if ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP)) + 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; } - 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) { - log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); - this->OnError(I_ERR_CONNECT); - this->Close(); - this->state = I_ERROR; - this->fd = -1; - this->ClosePending = true; - return false; + SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ | FD_ADD_TRIAL_READ); + rq.append(ReadBuffer, n); } - } - this->state = I_CONNECTING; - if (this->fd > -1) - { - if (!this->Instance->SE->AddFd(this->fd,false,X_ESTAB_MODULE)) + else if (n > 0) { - this->OnError(I_ERR_NOMOREFDS); - this->Close(); - this->fd = -1; - this->state = I_ERROR; - this->ClosePending = true; - return false; + SocketEngine::ChangeEventMask(this, FD_WANT_FAST_READ); + rq.append(ReadBuffer, n); } - this->Instance->socket_ref[this->fd] = this; - this->SetQueues(this->fd); - } - 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); - this->Instance->socket_ref[this->fd] = NULL; - this->ClosePending = true; - this->fd = -1; - } -} + 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) { - if (errno == 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) { - log(DEBUG,"EOF or error on socket: %s",strerror(errno)); - return NULL; + psendq = &iohm->GetSendQ(); + hook = iohm->GetNextHook(); } } -} -void InspSocket::MarkAsClosed() -{ - log(DEBUG,"Marked as closed"); - this->ClosePending = true; + if (psendq) + FlushSendQ(*psendq); + + if (getSendQSize() == 0 && closeonempty) + Close(); } -// 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::FlushSendQ(SendQueue& sq) { - if (this->ClosePending) - return false; - - /*int result = write(this->fd,data.c_str(),data.length()); - if (result < 1) - return false; - return true;*/ + // 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) + { + // Prepare a writev() call to write all buffers efficiently + int bufcount = sq.size(); - /* Try and append the data to the back of the queue, and send it on its way - */ - outbuffer.push_back(data); - return (!this->FlushWriteBuffer()); -} + // cap the number of buffers at MYIOV_MAX + if (bufcount > MYIOV_MAX) + { + bufcount = MYIOV_MAX; + } -bool InspSocket::FlushWriteBuffer() -{ - if (this->ClosePending) - return true; + 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++) + { + const SendQueue::Element& elem = *i; + iovecs[j].iov_base = const_cast(elem.data()); + iovecs[j].iov_len = elem.length(); + rv_max += iovecs[j].iov_len; + } + rv = SocketEngine::WriteV(this, iovecs, bufcount); + } - if ((this->fd > -1) && (this->state == I_CONNECTED)) - { - if (outbuffer.size()) - { - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); - if (result > 0) + if (rv == (int)sq.bytes()) { - if ((unsigned int)result == outbuffer[0].length()) + // 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) { - /* The whole block was written (usually a line) - * Pop the block off the front of the queue - */ - outbuffer.pop_front(); + // it's going to block now + eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK; } - else + while (rv > 0 && !sq.empty()) { - std::string temp = outbuffer[0].substr(result); - outbuffer[0] = temp; + 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 ((result == -1) && (errno != EAGAIN)) + else if (rv == 0) + { + error = "Connection closed"; + } + else if (SocketEngine::IgnoreError()) + { + eventChange = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK; + } + else if (errno == EINTR) { - log(DEBUG,"Write error on socket: %s",strerror(errno)); - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; - this->ClosePending = true; - return true; + // restart interrupted syscall + errno = 0; + } + else + { + error = SocketEngine::LastError(); } } - } - return (fd < 0); + 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; } -bool InspSocket::Timeout(time_t current) +void StreamSocket::WriteData(const std::string &data) { - if (!this->Instance->socket_ref[this->fd] || !this->Instance->SE->HasFd(this->fd)) + if (!HasFd()) { - log(DEBUG,"No FD or socket ref"); - return false; + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Attempt to write data to dead socket: %s", + data.c_str()); + return; } - if (this->ClosePending) + /* Append the data to the back of the queue ready for writing */ + sendq.push_back(data); + + 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) { - log(DEBUG,"Close is pending"); - return true; + delete this; + return false; } - if ((this->state == I_CONNECTING) && (current > timeout_end)) + if (this->sock->state == I_CONNECTING) { - log(DEBUG,"Timed out, current=%lu timeout_end=%lu"); - // 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->OnTimeout(); - this->OnError(I_ERR_TIMEOUT); - timeout = true; - this->state = I_ERROR; - this->ClosePending = true; - return true; + this->sock->OnTimeout(); + this->sock->OnError(I_ERR_TIMEOUT); + this->sock->state = I_ERROR; + + ServerInstance->GlobalCulls.AddItem(sock); } - return this->FlushWriteBuffer(); + + this->sock->Timeout = NULL; + delete this; + return false; } -bool InspSocket::Poll() +void BufferedSocket::OnConnected() { } +void BufferedSocket::OnTimeout() { return; } + +void BufferedSocket::OnEventHandlerWrite() { - if (!this->Instance->socket_ref[this->fd] || !this->Instance->SE->HasFd(this->fd)) - 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) || (this->ClosePending)) - 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: - log(DEBUG,"State = I_CONNECTING"); - this->SetState(I_CONNECTED); - /* 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->fd); - if (!this->Instance->SE->AddFd(this->fd,true,X_ESTAB_MODULE)) - 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->fd); - if (!this->Instance->SE->AddFd(this->fd,true,X_ESTAB_MODULE)) - 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; + } - /* 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; + // Log and call OnError() + CheckError(errcode); +} + +void StreamSocket::OnEventHandlerRead() +{ + if (!error.empty()) + return; + + try + { + DoRead(); } - return true; + 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); } -void InspSocket::SetState(InspSocketState s) +void StreamSocket::OnEventHandlerWrite() { - log(DEBUG,"Socket state change"); - this->state = s; + if (!error.empty()) + return; + + DoWrite(); + CheckError(I_ERR_OTHER); } -InspSocketState InspSocket::GetState() +void StreamSocket::CheckError(BufferedSocketError errcode) { - return this->state; + if (!error.empty()) + { + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Error on FD %d - '%s'", fd, error.c_str()); + OnError(errcode); + } } -int InspSocket::GetFd() +IOHook* StreamSocket::GetModHook(Module* mod) const { - return this->fd; + for (IOHook* curr = GetIOHook(); curr; curr = GetNextHook(curr)) + { + if (curr->prov->creator == mod) + return curr; + } + return NULL; } -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::GetLastHook() const +{ + IOHook* curr = GetIOHook(); + IOHook* last = curr; + + for (; curr; curr = GetNextHook(curr)) + last = curr; + + return last; +} -InspSocket::~InspSocket() + +void StreamSocket::AddIOHook(IOHook* newhook) { - this->Close(); + IOHook* curr = GetIOHook(); + if (!curr) + { + 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); }