X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=95d11980008a84e0ea8c44669a86693791b7ef43;hb=89fc6ca9c66198fe54cce19d59279cd454fc1bd0;hp=b9d31845fb33d958fc86ab7b53e019c51d1513a5;hpb=1a2623a51bcec6ffd692c6e1d9b333c11d23d51d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index b9d31845f..95d119800 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,20 +11,21 @@ * --------------------------------------------------- */ +/* $Core: libIRCDinspsocket */ + #include "socket.h" -#include "configreader.h" #include "inspstring.h" #include "socketengine.h" #include "inspircd.h" using irc::sockets::OpenTCPSocket; -bool InspSocket::Readable() +bool BufferedSocket::Readable() { return ((this->state != I_CONNECTING) && (this->WaitingForWriteEvent == false)); } -InspSocket::InspSocket(InspIRCd* SI) +BufferedSocket::BufferedSocket(InspIRCd* SI) { this->Timeout = NULL; this->state = I_DISCONNECTED; @@ -34,7 +35,7 @@ InspSocket::InspSocket(InspIRCd* SI) this->IsIOHooked = false; } -InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip) +BufferedSocket::BufferedSocket(InspIRCd* SI, int newfd, const char* ip) { this->Timeout = NULL; this->fd = newfd; @@ -47,7 +48,7 @@ InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip) this->Instance->SE->AddFd(this); } -InspSocket::InspSocket(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, bool listening, unsigned long maxtime, const std::string &connectbindip) { this->cbindip = connectbindip; this->fd = -1; @@ -79,6 +80,7 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool else { this->state = I_LISTENING; + this->port = aport; if (this->fd > -1) { if (!this->Instance->SE->AddFd(this)) @@ -106,23 +108,19 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool ipvalid = false; } else +#endif { in_addr n; if (inet_aton(host,&n) < 1) ipvalid = false; } -#else - in_addr n; - if (inet_aton(host,&n) < 1) - ipvalid = false; -#endif if (!ipvalid) { - this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!"); + 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; - this->OnError(I_ERR_RESOLVE); return; } else @@ -131,29 +129,32 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool timeout_val = maxtime; if (!this->DoConnect()) { + this->OnError(I_ERR_CONNECT); this->Close(); this->fd = -1; this->state = I_ERROR; - this->OnError(I_ERR_CONNECT); return; } } } } -void InspSocket::WantWrite() +void BufferedSocket::WantWrite() { this->Instance->SE->WantWrite(this); this->WaitingForWriteEvent = true; } -void InspSocket::SetQueues(int nfd) +void BufferedSocket::SetQueues(int nfd) { // 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(setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)) || setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf))) + { + //this->Instance->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. + } } /* Most irc servers require you to specify the ip you want to bind to. @@ -164,68 +165,63 @@ void InspSocket::SetQueues(int nfd) * This is easier to configure when you have a lot of links and a lot * of servers to configure. */ -bool InspSocket::BindAddr(const std::string &ip) +bool BufferedSocket::BindAddr(const std::string &ip) { - Instance->Log(DEBUG,"BindAddr(%s)", ip.c_str()); ConfigReader Conf(this->Instance); - bool bindfail = false; socklen_t size = sizeof(sockaddr_in); #ifdef IPV6 bool v6 = false; /* Are we looking for a binding to fit an ipv6 host? */ - if ((!*this->host) || strchr(this->host, ':')) + if ((ip.empty()) || (ip.find(':') != std::string::npos)) v6 = true; #endif int j = 0; while (j < Conf.Enumerate("bind") || (!ip.empty())) { - std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip; + std::string sIP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip; if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers") { - if (!ip.empty() || ((IP != "*") && (IP != "127.0.0.1") && (IP != "") && (IP != "::1"))) + 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, IP.c_str(), &n) > 0) + if (inet_pton(AF_INET6, sIP.c_str(), &n) > 0) { - memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(n)); + 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 - bindfail = true; + { + delete[] s; + j++; + continue; + } } else +#endif { in_addr n; - if (inet_aton(IP.c_str(), &n) > 0) + 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 - bindfail = true; - } -#else - in_addr n; - if (insp_aton(IP.c_str(), &n) > 0) - { - ((sockaddr_in*)s)->sin_addr = n; - ((sockaddr_in*)s)->sin_family = AF_INET; - } - else - bindfail = true; -#endif - if (bindfail) - { - delete[] s; - return false; + { + delete[] s; + j++; + continue; + } } - if (bind(this->fd, s, size) < 0) + if (Instance->SE->Bind(this->fd, s, size) < 0) { this->state = I_ERROR; this->OnError(I_ERR_BIND); @@ -240,11 +236,13 @@ bool InspSocket::BindAddr(const std::string &ip) } j++; } + Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!"); return true; } -bool InspSocket::DoConnect() +bool BufferedSocket::DoConnect() { + /* 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 @@ -265,6 +263,7 @@ bool InspSocket::DoConnect() } } else +#endif { this->fd = socket(AF_INET, SOCK_STREAM, 0); if (this->fd > -1) @@ -276,17 +275,6 @@ bool InspSocket::DoConnect() } } } -#else - this->fd = socket(AF_INET, SOCK_STREAM, 0); - if (this->fd > -1) - { - if (!this->BindAddr(this->cbindip)) - { - delete[] addr; - return false; - } - } -#endif if (this->fd == -1) { @@ -309,6 +297,7 @@ bool InspSocket::DoConnect() } } else +#endif { in_addr addy; if (inet_aton(this->host, &addy) > 0) @@ -318,20 +307,15 @@ bool InspSocket::DoConnect() ((sockaddr_in*)addr)->sin_port = htons(this->port); } } -#else - 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); - } -#endif - int flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); + Instance->SE->NonBlocking(this->fd); - if (connect(this->fd, (sockaddr*)addr, size) == -1) +#ifdef WIN32 + /* UGH for the LOVE OF ZOMBIE JESUS SOMEONE FIX THIS!!!!!!!!!!! */ + Instance->SE->Blocking(this->fd); +#endif + + if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1) { if (errno != EINPROGRESS) { @@ -344,6 +328,10 @@ bool InspSocket::DoConnect() this->Timeout = new SocketTimeout(this->GetFd(), this->Instance, this, timeout_val, this->Instance->Time()); this->Instance->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) { @@ -356,11 +344,13 @@ bool InspSocket::DoConnect() } this->SetQueues(this->fd); } + + Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success"); return true; } -void InspSocket::Close() +void BufferedSocket::Close() { /* Save this, so we dont lose it, * otherise on failure, error messages @@ -377,24 +367,27 @@ void InspSocket::Close() } catch (CoreException& modexcept) { - Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); + Instance->SE->Shutdown(this, 2); + if (Instance->SE->Close(this) != -1) + this->OnClose(); + + if (Instance->SocketCull.find(this) == Instance->SocketCull.end()) + Instance->SocketCull[this] = this; } errno = save; } -std::string InspSocket::GetIP() +std::string BufferedSocket::GetIP() { return this->IP; } -char* InspSocket::Read() +const char* BufferedSocket::Read() { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + if (!Instance->SE->BoundsCheckFd(this)) return NULL; int n = 0; @@ -409,7 +402,7 @@ char* InspSocket::Read() } catch (CoreException& modexcept) { - Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } if (MOD_RESULT < 0) { @@ -441,24 +434,28 @@ char* InspSocket::Read() } } -void InspSocket::MarkAsClosed() -{ -} - -// 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) +/* + * 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) { - /* Try and append the data to the back of the queue, and send it on its way - */ + /* Append the data to the back of the queue ready for writing */ outbuffer.push_back(data); + + /* Mark ourselves as wanting write */ this->Instance->SE->WantWrite(this); - return (!this->FlushWriteBuffer()); } -bool InspSocket::FlushWriteBuffer() +bool BufferedSocket::FlushWriteBuffer() { errno = 0; if ((this->fd > -1) && (this->state == I_CONNECTED)) @@ -469,32 +466,15 @@ bool InspSocket::FlushWriteBuffer() { 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; - } + /* 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()); + outbuffer.pop_front(); } catch (CoreException& modexcept) { - Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); return true; } } @@ -507,10 +487,11 @@ bool InspSocket::FlushWriteBuffer() while (outbuffer.size() && (errno != EAGAIN)) { /* Send a line */ - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); + int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0); + if (result > 0) { - if ((unsigned int)result == outbuffer[0].length()) + if ((unsigned int)result >= outbuffer[0].length()) { /* The whole block was written (usually a line) * Pop the block off the front of the queue, @@ -531,6 +512,12 @@ bool InspSocket::FlushWriteBuffer() errno = EAGAIN; } } + else if (result == 0) + { + this->Instance->SE->DelFd(this); + this->Close(); + return true; + } else if ((result == -1) && (errno != EAGAIN)) { this->OnError(I_ERR_WRITE); @@ -551,8 +538,10 @@ bool InspSocket::FlushWriteBuffer() return (fd < 0); } -void SocketTimeout::Tick(time_t now) +void SocketTimeout::Tick(time_t) { + ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick"); + if (ServerInstance->SE->GetRef(this->sfd) != this->sock) return; @@ -565,30 +554,30 @@ void SocketTimeout::Tick(time_t now) 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; - } - else - { - this->sock->Timeout = NULL; + + if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end()) + ServerInstance->SocketCull[this->sock] = this->sock; } + + this->sock->Timeout = NULL; } -bool InspSocket::Poll() +bool BufferedSocket::Poll() { - if (this->Instance->SE->GetRef(this->fd) != this) - return false; - int incoming = -1; - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) +#ifndef WINDOWS + if (!Instance->SE->BoundsCheckFd(this)) + return false; +#endif + + if (Instance->SE->GetRef(this->fd) != this) return false; switch (this->state) @@ -597,28 +586,33 @@ bool InspSocket::Poll() /* 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); - this->SetState(I_CONNECTED); 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->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } return this->OnConnected(); break; case I_LISTENING: { + /* 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; @@ -626,7 +620,7 @@ bool InspSocket::Poll() if ((!*this->host) || strchr(this->host, ':')) length = sizeof(sockaddr_in6); #endif - incoming = accept (this->fd, client, &length); + incoming = Instance->SE->Accept(this, client, &length); #ifdef IPV6 if ((!*this->host) || strchr(this->host, ':')) { @@ -634,12 +628,15 @@ bool InspSocket::Poll() 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); } -#else - recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); -#endif + + Instance->SE->NonBlocking(incoming); + this->OnIncomingConnection(incoming, (char*)recvip.c_str()); if (this->IsIOHooked) @@ -650,7 +647,7 @@ bool InspSocket::Poll() } catch (CoreException& modexcept) { - Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } @@ -670,31 +667,31 @@ bool InspSocket::Poll() return true; } -void InspSocket::SetState(InspSocketState s) +void BufferedSocket::SetState(BufferedSocketState s) { this->state = s; } -InspSocketState InspSocket::GetState() +BufferedSocketState BufferedSocket::GetState() { return this->state; } -int InspSocket::GetFd() +int BufferedSocket::GetFd() { return this->fd; } -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; } +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; } +void BufferedSocket::OnTimeout() { return; } +void BufferedSocket::OnClose() { return; } -InspSocket::~InspSocket() +BufferedSocket::~BufferedSocket() { this->Close(); if (Timeout) @@ -704,22 +701,37 @@ InspSocket::~InspSocket() } } -void InspSocket::HandleEvent(EventType et, int errornum) +void BufferedSocket::HandleEvent(EventType et, int errornum) { switch (et) { case EVENT_ERROR: - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + 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; + } + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; return; break; case EVENT_READ: if (!this->Poll()) { - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; return; } break; @@ -729,9 +741,8 @@ void InspSocket::HandleEvent(EventType et, int errornum) this->WaitingForWriteEvent = false; if (!this->OnWriteReady()) { - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; return; } } @@ -740,7 +751,7 @@ void InspSocket::HandleEvent(EventType et, int errornum) /* 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 + * BufferedSocket used to work regarding write buffering in previous * versions of InspIRCd. - Brain */ this->HandleEvent(EVENT_READ); @@ -750,9 +761,8 @@ void InspSocket::HandleEvent(EventType et, int errornum) { if (this->FlushWriteBuffer()) { - this->Instance->SE->DelFd(this); - this->Close(); - delete this; + if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) + this->Instance->SocketCull[this] = this; return; } }