X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=f29f233516b41311b01c5883b486bb724fa25e02;hb=ab6a7318e36bd8e0a259cd9eef3694a0f0e8684a;hp=1de46e31684213f63e4c0e119837adf56c0663ab;hpb=156c232d1d22568d20ec498c4bd344bf03052e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 1de46e316..f29f23351 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -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; @@ -115,7 +116,7 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool } if (!ipvalid) { - this->Instance->Log(DEBUG,"BUG: Hostname passed to InspSocket, rather than an IP address!"); + this->Instance->Log(DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!"); this->OnError(I_ERR_CONNECT); this->Close(); this->fd = -1; @@ -138,13 +139,13 @@ InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool } } -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; @@ -161,7 +162,7 @@ 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) { ConfigReader Conf(this->Instance); socklen_t size = sizeof(sockaddr_in); @@ -179,6 +180,7 @@ bool InspSocket::BindAddr(const std::string &ip) { 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) @@ -186,7 +188,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); @@ -216,7 +218,7 @@ bool InspSocket::BindAddr(const std::string &ip) } } - 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); @@ -234,8 +236,9 @@ bool InspSocket::BindAddr(const std::string &ip) 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 @@ -300,14 +303,15 @@ bool InspSocket::DoConnect() ((sockaddr_in*)addr)->sin_port = htons(this->port); } } -#ifndef WIN32 - int flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); -#else - unsigned long flags = 0; - ioctlsocket(this->fd, FIONBIO, &flags); + + 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) { @@ -321,9 +325,8 @@ bool InspSocket::DoConnect() this->Instance->Timers->AddTimer(this->Timeout); } #ifdef WIN32 - /* Set nonblocking mode after the connect() call */ - flags = 0; - ioctlsocket(this->fd, FIONBIO, &flags); + /* CRAQ SMOKING STUFF TO BE FIXED */ + Instance->SE->NonBlocking(this->fd); #endif this->state = I_CONNECTING; if (this->fd > -1) @@ -341,7 +344,7 @@ bool InspSocket::DoConnect() } -void InspSocket::Close() +void BufferedSocket::Close() { /* Save this, so we dont lose it, * otherise on failure, error messages @@ -361,8 +364,8 @@ void InspSocket::Close() Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } - shutdown(this->fd,2); - if (close(this->fd) != -1) + Instance->SE->Shutdown(this, 2); + if (Instance->SE->Close(this) != -1) this->OnClose(); if (Instance->SocketCull.find(this) == Instance->SocketCull.end()) @@ -371,12 +374,12 @@ void InspSocket::Close() errno = save; } -std::string InspSocket::GetIP() +std::string BufferedSocket::GetIP() { return this->IP; } -char* InspSocket::Read() +char* BufferedSocket::Read() { if (!Instance->SE->BoundsCheckFd(this)) return NULL; @@ -425,7 +428,7 @@ char* InspSocket::Read() } } -void InspSocket::MarkAsClosed() +void BufferedSocket::MarkAsClosed() { } @@ -433,7 +436,7 @@ void InspSocket::MarkAsClosed() // 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) +int BufferedSocket::Write(const std::string &data) { /* Try and append the data to the back of the queue, and send it on its way */ @@ -442,7 +445,7 @@ int InspSocket::Write(const std::string &data) return (!this->FlushWriteBuffer()); } -bool InspSocket::FlushWriteBuffer() +bool BufferedSocket::FlushWriteBuffer() { errno = 0; if ((this->fd > -1) && (this->state == I_CONNECTED)) @@ -474,11 +477,8 @@ bool InspSocket::FlushWriteBuffer() while (outbuffer.size() && (errno != EAGAIN)) { /* Send a line */ -#ifndef WIN32 - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); -#else - int result = send(this->fd,outbuffer[0].c_str(),outbuffer[0].length(), 0); -#endif + int result = Instance->SE->Send(this, outbuffer[0].c_str(), outbuffer[0].length(), 0); + if (result > 0) { if ((unsigned int)result >= outbuffer[0].length()) @@ -502,6 +502,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); @@ -550,21 +556,18 @@ void SocketTimeout::Tick(time_t now) this->sock->Timeout = NULL; } -bool InspSocket::Poll() +bool BufferedSocket::Poll() { -#ifdef WINDOWS - if(Instance->SE->GetRef(this->fd) != this) - return false; - int incoming = -1; -#else - 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) { case I_CONNECTING: @@ -575,14 +578,12 @@ bool InspSocket::Poll() if (this->fd > -1) { this->Instance->SE->DelFd(this); - this->SetState(I_CONNECTED); if (!this->Instance->SE->AddFd(this)) return false; } -#else - this->SetState(I_CONNECTED); #endif - Instance->Log(DEBUG,"Inspsocket I_CONNECTING state"); + this->SetState(I_CONNECTED); + if (Instance->Config->GetIOHook(this)) { Instance->Log(DEBUG,"Hook for raw connect"); @@ -599,6 +600,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; @@ -606,7 +608,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, ':')) { @@ -615,6 +617,8 @@ bool InspSocket::Poll() } else #endif + Instance->SE->NonBlocking(incoming); + recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); this->OnIncomingConnection(incoming, (char*)recvip.c_str()); @@ -646,31 +650,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 e) { return; } +int BufferedSocket::OnDisconnect() { return 0; } +int BufferedSocket::OnIncomingConnection(int newfd, char* ip) { 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) @@ -680,7 +684,7 @@ InspSocket::~InspSocket() } } -void InspSocket::HandleEvent(EventType et, int errornum) +void BufferedSocket::HandleEvent(EventType et, int errornum) { switch (et) { @@ -730,7 +734,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);