X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=dc0c5bebafc7e519f22252f9f683837de4066e83;hb=5ee83046945a0ca415f49a43b5563b4696f9ee7a;hp=3c30fd6e80387991162ec5a4cacf4e427aeacf50;hpb=37a53f1ac69315f1915aae67a447fb7b813e8217;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 3c30fd6e8..dc0c5beba 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -12,7 +12,6 @@ */ #include "socket.h" -#include "configreader.h" #include "inspstring.h" #include "socketengine.h" #include "inspircd.h" @@ -79,6 +78,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 +106,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->OnError(I_ERR_CONNECT); this->Close(); this->fd = -1; this->state = I_ERROR; - this->OnError(I_ERR_RESOLVE); return; } else @@ -131,10 +127,10 @@ 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; } } @@ -152,8 +148,8 @@ void InspSocket::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()); } /* Most irc servers require you to specify the ip you want to bind to. @@ -180,8 +176,9 @@ bool InspSocket::BindAddr(const std::string &ip) std::string IP = 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() || ((IP != "*") && (IP != "127.0.0.1") && (!IP.empty()) && (IP != "::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) @@ -189,7 +186,7 @@ bool InspSocket::BindAddr(const std::string &ip) in6_addr n; if (inet_pton(AF_INET6, IP.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); @@ -202,6 +199,7 @@ bool InspSocket::BindAddr(const std::string &ip) } } else +#endif { in_addr n; if (inet_aton(IP.c_str(), &n) > 0) @@ -217,23 +215,8 @@ bool InspSocket::BindAddr(const std::string &ip) continue; } } -#else - in_addr n; - if (insp_aton(IP.c_str(), &n) > 0) - { - ((sockaddr_in*)s)->sin_addr = n; - ((sockaddr_in*)s)->sin_port = 0; - ((sockaddr_in*)s)->sin_family = AF_INET; - } - else - { - delete[] s; - j++; - continue; - } -#endif - 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); @@ -253,6 +236,7 @@ bool InspSocket::BindAddr(const std::string &ip) bool InspSocket::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 @@ -273,6 +257,7 @@ bool InspSocket::DoConnect() } } else +#endif { this->fd = socket(AF_INET, SOCK_STREAM, 0); if (this->fd > -1) @@ -284,17 +269,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) { @@ -317,6 +291,7 @@ bool InspSocket::DoConnect() } } else +#endif { in_addr addy; if (inet_aton(this->host, &addy) > 0) @@ -326,20 +301,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); + +#ifdef WIN32 + /* UGH for the LOVE OF ZOMBIE JESUS SOMEONE FIX THIS!!!!!!!!!!! */ + Instance->SE->Blocking(this->fd); +#endif - if (connect(this->fd, (sockaddr*)addr, size) == -1) + if (Instance->SE->Connect(this, (sockaddr*)addr, size) == -1) { if (errno != EINPROGRESS) { @@ -352,6 +322,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) { @@ -388,9 +362,12 @@ void InspSocket::Close() Instance->Log(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; } @@ -402,7 +379,7 @@ std::string InspSocket::GetIP() char* InspSocket::Read() { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + if (!Instance->SE->BoundsCheckFd(this)) return NULL; int n = 0; @@ -477,28 +454,11 @@ 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) { @@ -515,7 +475,8 @@ 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()) @@ -539,6 +500,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); @@ -582,23 +549,21 @@ void SocketTimeout::Tick(time_t now) if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end()) ServerInstance->SocketCull[this->sock] = this->sock; - - return; - } - else - { - this->sock->Timeout = NULL; } + + this->sock->Timeout = NULL; } bool InspSocket::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) @@ -607,15 +572,19 @@ 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->Log(DEBUG,"Hook for raw connect"); try { Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd); @@ -629,6 +598,7 @@ bool InspSocket::Poll() 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; @@ -636,7 +606,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, ':')) { @@ -644,12 +614,10 @@ bool InspSocket::Poll() recvip = inet_ntop(AF_INET6, &((sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); } else - { - recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); - } -#else - recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); #endif + Instance->SE->NonBlocking(incoming); + + recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); this->OnIncomingConnection(incoming, (char*)recvip.c_str()); if (this->IsIOHooked) @@ -719,6 +687,23 @@ void InspSocket::HandleEvent(EventType et, int errornum) switch (et) { case EVENT_ERROR: + switch (errornum) + { + case ETIMEDOUT: + this->OnError(I_ERR_TIMEOUT); + break; + case ECONNREFUSED: + case 0: + this->OnError(this->state == I_CONNECTING ? I_ERR_CONNECT : I_ERR_WRITE); + break; + case EADDRINUSE: + this->OnError(I_ERR_BIND); + break; + case EPIPE: + case EIO: + this->OnError(I_ERR_WRITE); + break; + } if (this->Instance->SocketCull.find(this) == this->Instance->SocketCull.end()) this->Instance->SocketCull[this] = this; return;