X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=0350858e7ce693ad391825570d3237fe0c466f42;hb=0ed3ef9dee2cb8f4b0c37da218a2fd1eee8c31f6;hp=c096d9076faf2ab26eb07dc94c017e39079909e1;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index c096d9076..0350858e7 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,18 +11,14 @@ * --------------------------------------------------- */ -/* $Core */ - +#include "inspircd.h" #include "socket.h" #include "inspstring.h" #include "socketengine.h" -#include "inspircd.h" - -using irc::sockets::OpenTCPSocket; bool BufferedSocket::Readable() { - return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false)); + return (this->state != I_CONNECTING); } BufferedSocket::BufferedSocket(InspIRCd* SI) @@ -30,9 +26,7 @@ BufferedSocket::BufferedSocket(InspIRCd* SI) this->Timeout = NULL; this->state = I_DISCONNECTED; this->fd = -1; - this->WaitingForWriteEvent = false; - this->Instance = SI; - this->IsIOHooked = false; + this->ServerInstance = SI; } BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip) @@ -41,122 +35,77 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip) this->fd = newfd; this->state = I_CONNECTED; strlcpy(this->IP,ip,MAXBUF); - this->WaitingForWriteEvent = false; - this->Instance = SI; - this->IsIOHooked = false; + this->ServerInstance = SI; if (this->fd > -1) - this->Instance->SE->AddFd(this); + this->ServerInstance->SE->AddFd(this); } -BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip) +BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip) { this->cbindip = connectbindip; this->fd = -1; - this->Instance = SI; + this->ServerInstance = SI; strlcpy(host,ipaddr.c_str(),MAXBUF); - this->WaitingForWriteEvent = false; - this->IsIOHooked = false; this->Timeout = NULL; - if (listening) + + strlcpy(this->host,ipaddr.c_str(),MAXBUF); + this->port = aport; + + irc::sockets::sockaddrs testaddr; + if (!irc::sockets::aptosa(host, aport, &testaddr)) { - if ((this->fd = OpenTCPSocket(host)) == ERROR) - { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - return; - } - else - { - if (!SI->BindSocket(this->fd,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; - this->port = aport; - if (this->fd > -1) - { - if (!this->Instance->SE->AddFd(this)) - { - this->Close(); - this->state = I_ERROR; - this->OnError(I_ERR_NOMOREFDS); - } - } - return; - } - } + 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; } else { - strlcpy(this->host,ipaddr.c_str(),MAXBUF); - this->port = aport; - - bool ipvalid = true; -#ifdef IPV6 - if (strchr(host,':')) + strlcpy(this->IP,host,MAXBUF); + if (!this->DoConnect(maxtime)) { - in6_addr n; - if (inet_pton(AF_INET6, host, &n) < 1) - ipvalid = false; - } - else -#endif - { - in_addr n; - if (inet_aton(host,&n) < 1) - ipvalid = false; - } - if (!ipvalid) - { - this->Instance->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; } - else - { - strlcpy(this->IP,host,MAXBUF); - timeout_val = maxtime; - if (!this->DoConnect()) - { - this->OnError(I_ERR_CONNECT); - this->Close(); - this->fd = -1; - this->state = I_ERROR; - return; - } - } } } -void BufferedSocket::WantWrite() -{ - this->Instance->SE->WantWrite(this); - this->WaitingForWriteEvent = true; -} - -void BufferedSocket::SetQueues(int nfd) +void BufferedSocket::SetQueues() { // attempt to increase socket sendq and recvq as high as its possible int sendbuf = 32768; int recvbuf = 32768; - if(setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf))) + 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->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd()); + //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. } } +bool BufferedSocket::DoBindMagic(const std::string ¤t_ip) +{ + irc::sockets::sockaddrs s; + if (!irc::sockets::aptosa(current_ip.c_str(), 0, &s)) + { + errno = EADDRNOTAVAIL; + return false; + } + + if (ServerInstance->SE->Bind(this->fd, &s.sa, sa_size(s)) < 0) + { + this->state = I_ERROR; + this->OnError(I_ERR_BIND); + return false; + } + + 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 @@ -165,157 +114,65 @@ void BufferedSocket::SetQueues(int nfd) * 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) +bool BufferedSocket::BindAddr(const std::string &ip_to_bind) { - ConfigReader Conf(this->Instance); - socklen_t size = sizeof(sockaddr_in); -#ifdef IPV6 - bool v6 = false; - /* Are we looking for a binding to fit an ipv6 host? */ - if ((ip.empty()) || (ip.find(':') != std::string::npos)) - v6 = true; -#endif - int j = 0; - while (j < Conf.Enumerate("bind") || (!ip.empty())) + ConfigReader Conf(this->ServerInstance); + + // Case one: If they provided an IP, try bind it + if (!ip_to_bind.empty()) { - std::string sIP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip; - if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers") - { - if (!ip.empty() || ((sIP != "*") && (sIP != "127.0.0.1") && (!sIP.empty()) && (sIP != "::1"))) - { - /* 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* s = new sockaddr[2]; -#ifdef IPV6 - if (v6) - { - in6_addr n; - if (inet_pton(AF_INET6, sIP.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 - { - delete[] s; - j++; - continue; - } - } - else -#endif - { - in_addr n; - if (inet_aton(sIP.c_str(), &n) > 0) - { - ((sockaddr_in*)s)->sin_addr = n; - ((sockaddr_in*)s)->sin_port = 0; - ((sockaddr_in*)s)->sin_family = AF_INET; - } - else - { - delete[] s; - j++; - continue; - } - } + // And if it fails, don't do anything. + return this->DoBindMagic(ip_to_bind); + } - if (Instance->SE->Bind(this->fd, s, size) < 0) - { - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - this->fd = -1; - delete[] s; - return false; - } + for (int j = 0; j < Conf.Enumerate("bind"); j++) + { + // We only want to try bind to a server ip. + if (Conf.ReadValue("bind","type",j) != "servers") + continue; - delete[] s; - return true; - } - } - j++; + // set current IP to the tag + std::string current_ip = Conf.ReadValue("bind","address",j); + + // Make sure IP is nothing local + if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1") + continue; + + // Try bind, don't fail if it doesn't bind though. + if (this->DoBindMagic(current_ip)) + return true; } - Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!"); + + // 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; } -bool BufferedSocket::DoConnect() +bool BufferedSocket::DoConnect(unsigned long maxtime) { - /* 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))) - { - if (!this->BindAddr(this->cbindip)) - { - delete[] addr; - return false; - } - } - } - else -#endif - { - this->fd = socket(AF_INET, SOCK_STREAM, 0); - if (this->fd > -1) - { - if (!this->BindAddr(this->cbindip)) - { - delete[] addr; - return false; - } - } - } + irc::sockets::sockaddrs addr; + irc::sockets::aptosa(this->host, this->port, &addr); + + this->fd = socket(addr.sa.sa_family, SOCK_STREAM, 0); 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) - { - ((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); - } - } - else -#endif + if (!this->BindAddr(this->cbindip)) { - in_addr addy; - if (inet_aton(this->host, &addy) > 0) - { - ((sockaddr_in*)addr)->sin_family = AF_INET; - ((sockaddr_in*)addr)->sin_addr = addy; - ((sockaddr_in*)addr)->sin_port = htons(this->port); - } + this->Close(); + this->fd = -1; + return false; } - Instance->SE->NonBlocking(this->fd); - -#ifdef WIN32 - /* UGH for the LOVE OF ZOMBIE JESUS SOMEONE FIX THIS!!!!!!!!!!! */ - Instance->SE->Blocking(this->fd); -#endif + ServerInstance->SE->NonBlocking(this->fd); - if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1) + if (ServerInstance->SE->Connect(this, &addr.sa, sa_size(addr)) == -1) { if (errno != EINPROGRESS) { @@ -325,27 +182,24 @@ bool BufferedSocket::DoConnect() return false; } - this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time()); - this->Instance->Timers->AddTimer(this->Timeout); + this->Timeout = new SocketTimeout(this->GetFd(), this->ServerInstance, this, maxtime, this->ServerInstance->Time()); + this->ServerInstance->Timers->AddTimer(this->Timeout); } -#ifdef WIN32 - /* CRAQ SMOKING STUFF TO BE FIXED */ - Instance->SE->NonBlocking(this->fd); -#endif + this->state = I_CONNECTING; if (this->fd > -1) { - if (!this->Instance->SE->AddFd(this)) + if (!this->ServerInstance->SE->AddFd(this)) { this->OnError(I_ERR_NOMOREFDS); this->Close(); this->state = I_ERROR; return false; } - this->SetQueues(this->fd); + this->SetQueues(); } - Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success"); + ServerInstance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success"); return true; } @@ -359,24 +213,23 @@ void BufferedSocket::Close() int save = errno; if (this->fd > -1) { - if (this->IsIOHooked && Instance->Config->GetIOHook(this)) + if (this->GetIOHook()) { try { - if (this->state != I_LISTENING) - Instance->Config->GetIOHook(this)->OnRawSocketClose(this->fd); + this->GetIOHook()->OnRawSocketClose(this->fd); } catch (CoreException& modexcept) { - Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } - Instance->SE->Shutdown(this, 2); - if (Instance->SE->Close(this) != -1) + ServerInstance->SE->Shutdown(this, 2); + if (ServerInstance->SE->Close(this) != -1) this->OnClose(); - if (Instance->SocketCull.find(this) == Instance->SocketCull.end()) - Instance->SocketCull[this] = this; + if (ServerInstance->SocketCull.find(this) == ServerInstance->SocketCull.end()) + ServerInstance->SocketCull[this] = this; } errno = save; } @@ -388,23 +241,23 @@ std::string BufferedSocket::GetIP() const char* BufferedSocket::Read() { - if (!Instance->SE->BoundsCheckFd(this)) + if (!ServerInstance->SE->BoundsCheckFd(this)) return NULL; int n = 0; - char* ReadBuffer = Instance->GetReadBuffer(); + char* ReadBuffer = ServerInstance->GetReadBuffer(); - if (this->IsIOHooked) + if (this->GetIOHook()) { int result2 = 0; int MOD_RESULT = 0; try { - MOD_RESULT = Instance->Config->GetIOHook(this)->OnRawSocketRead(this->fd, ReadBuffer, Instance->Config->NetBufferSize, result2); + MOD_RESULT = this->GetIOHook()->OnRawSocketRead(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, result2); } catch (CoreException& modexcept) { - Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + ServerInstance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } if (MOD_RESULT < 0) { @@ -418,7 +271,7 @@ const char* BufferedSocket::Read() } else { - n = recv(this->fd, ReadBuffer, Instance->Config->NetBufferSize, 0); + n = recv(this->fd, ReadBuffer, ServerInstance->Config->NetBufferSize, 0); } /* @@ -460,7 +313,7 @@ void BufferedSocket::Write(const std::string &data) outbuffer.push_back(data); /* Mark ourselves as wanting write */ - this->Instance->SE->WantWrite(this); + this->ServerInstance->SE->WantWrite(this); } bool BufferedSocket::FlushWriteBuffer() @@ -468,7 +321,7 @@ bool BufferedSocket::FlushWriteBuffer() errno = 0; if ((this->fd > -1) && (this->state == I_CONNECTED)) { - if (this->IsIOHooked) + if (this->GetIOHook()) { while (outbuffer.size() && (errno != EAGAIN)) { @@ -477,12 +330,12 @@ bool BufferedSocket::FlushWriteBuffer() /* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to * implement their own buffering mechanisms */ - Instance->Config->GetIOHook(this)->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length()); + this->GetIOHook()->OnRawSocketWrite(this->fd, outbuffer[0].c_str(), outbuffer[0].length()); outbuffer.pop_front(); } catch (CoreException& modexcept) { - Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); return true; } } @@ -495,7 +348,7 @@ bool BufferedSocket::FlushWriteBuffer() while (outbuffer.size() && (errno != EAGAIN)) { /* Send a line */ - int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0); + int result = ServerInstance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0); if (result > 0) { @@ -522,7 +375,7 @@ bool BufferedSocket::FlushWriteBuffer() } else if (result == 0) { - this->Instance->SE->DelFd(this); + this->ServerInstance->SE->DelFd(this); this->Close(); return true; } @@ -530,7 +383,7 @@ bool BufferedSocket::FlushWriteBuffer() { this->OnError(I_ERR_WRITE); this->state = I_ERROR; - this->Instance->SE->DelFd(this); + this->ServerInstance->SE->DelFd(this); this->Close(); return true; } @@ -540,7 +393,7 @@ bool BufferedSocket::FlushWriteBuffer() if ((errno == EAGAIN) && (fd > -1)) { - this->Instance->SE->WantWrite(this); + this->ServerInstance->SE->WantWrite(this); } return (fd < 0); @@ -555,13 +408,12 @@ void SocketTimeout::Tick(time_t) 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; /* NOTE: We must set this AFTER DelFd, as we added * this socket whilst writeable. This means that we @@ -576,103 +428,27 @@ void SocketTimeout::Tick(time_t) this->sock->Timeout = NULL; } -bool BufferedSocket::Poll() +bool BufferedSocket::InternalMarkConnected() { - int incoming = -1; - -#ifndef WINDOWS - if (!Instance->SE->BoundsCheckFd(this)) - return false; -#endif - - if (Instance->SE->GetRef(this->fd) != this) - return false; + /* Our socket was in write-state, so delete it and re-add it + * in read-state. + */ + this->SetState(I_CONNECTED); - switch (this->state) + if (this->GetIOHook()) { - case I_CONNECTING: - /* Our socket was in write-state, so delete it and re-add it - * in read-state. - */ -#ifndef WINDOWS - if (this->fd > -1) - { - this->Instance->SE->DelFd(this); - if (!this->Instance->SE->AddFd(this)) - return false; - } -#endif - this->SetState(I_CONNECTED); - - if (Instance->Config->GetIOHook(this)) - { - Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect"); - try - { - Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd); - } - catch (CoreException& modexcept) - { - Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - } - } - return this->OnConnected(); - break; - case I_LISTENING: + ServerInstance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect"); + try { - /* 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* client = new sockaddr[2]; - length = sizeof (sockaddr_in); - std::string recvip; -#ifdef IPV6 - if ((!*this->host) || strchr(this->host, ':')) - length = sizeof(sockaddr_in6); -#endif - incoming = Instance->SE->Accept(this, client, &length); -#ifdef IPV6 - if ((!*this->host) || strchr(this->host, ':')) - { - char buf[1024]; - recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); - } - else -#endif - { - // FIX: we were doing this for IPv6 connections as well, which was fucking recvip.. - // Add brackets to make this a bit clearer. -- w00t (Jan 15, 2008) - recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); - } - - Instance->SE->NonBlocking(incoming); - - this->OnIncomingConnection(incoming, (char*)recvip.c_str()); - - if (this->IsIOHooked) - { - try - { - Instance->Config->GetIOHook(this)->OnRawSocketAccept(incoming, recvip.c_str(), this->port); - } - catch (CoreException& modexcept) - { - Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); - } - } - - this->SetQueues(incoming); - - delete[] client; - return true; + this->GetIOHook()->OnRawSocketConnect(this->fd); + } + catch (CoreException& modexcept) + { + ServerInstance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + return false; } - break; - case I_CONNECTED: - /* Process the read event */ - return this->OnDataReady(); - break; - default: - break; } - return true; + return this->OnConnected(); } void BufferedSocket::SetState(BufferedSocketState s) @@ -685,17 +461,15 @@ BufferedSocketState BufferedSocket::GetState() return this->state; } -int BufferedSocket::GetFd() -{ - return this->fd; -} - bool BufferedSocket::OnConnected() { return true; } void BufferedSocket::OnError(BufferedSocketError) { return; } int BufferedSocket::OnDisconnect() { return 0; } -int BufferedSocket::OnIncomingConnection(int, char*) { return 0; } bool BufferedSocket::OnDataReady() { return true; } -bool BufferedSocket::OnWriteReady() { return true; } +bool BufferedSocket::OnWriteReady() +{ + // Default behaviour: just try write some. + return !this->FlushWriteBuffer(); +} void BufferedSocket::OnTimeout() { return; } void BufferedSocket::OnClose() { return; } @@ -704,7 +478,7 @@ BufferedSocket::~BufferedSocket() this->Close(); if (Timeout) { - Instance->Timers->DelTimer(Timeout); + ServerInstance->Timers->DelTimer(Timeout); Timeout = NULL; } } @@ -714,67 +488,63 @@ void BufferedSocket::HandleEvent(EventType et, int errornum) switch (et) { case EVENT_ERROR: + { switch (errornum) { case ETIMEDOUT: this->OnError(I_ERR_TIMEOUT); - break; + break; case ECONNREFUSED: case 0: this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE); - break; + break; case EADDRINUSE: this->OnError(I_ERR_BIND); - break; + break; case EPIPE: case EIO: this->OnError(I_ERR_WRITE); - break; + break; } - if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) - this->Instance->SocketCull[this] = this; + + if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end()) + this->ServerInstance->SocketCull[this] = this; return; - break; + break; + } case EVENT_READ: - if (!this->Poll()) + { + if (!this->OnDataReady()) { - if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) - this->Instance->SocketCull[this] = this; + if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end()) + this->ServerInstance->SocketCull[this] = this; return; } - break; + break; + } case EVENT_WRITE: - if (this->WaitingForWriteEvent) + { + if (this->state == I_CONNECTING) { - this->WaitingForWriteEvent = false; - if (!this->OnWriteReady()) + if (!this->InternalMarkConnected()) { - if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) - this->Instance->SocketCull[this] = this; + if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end()) + this->ServerInstance->SocketCull[this] = 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 - * BufferedSocket used to work regarding write buffering in previous - * versions of InspIRCd. - Brain - */ - this->HandleEvent(EVENT_READ); return; } else { - if (this->FlushWriteBuffer()) + if (!this->OnWriteReady()) { - if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) - this->Instance->SocketCull[this] = this; + if (this->ServerInstance->SocketCull.find(this) == this->ServerInstance->SocketCull.end()) + this->ServerInstance->SocketCull[this] = this; return; } } - break; + break; + } } }