X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=95d11980008a84e0ea8c44669a86693791b7ef43;hb=7dadb07a19280936147b91144f27d8528ba35c7c;hp=be90b6e8491391287829e8de7986a8ed6ffcffba;hpb=81a15c60c009fa23687944df01942ac9abc8cabc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index be90b6e84..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; @@ -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->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!"); this->OnError(I_ERR_CONNECT); this->Close(); this->fd = -1; @@ -138,19 +139,22 @@ 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; 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))) - this->Instance->Log(DEFAULT, "Could not increase SO_SNDBUF/SO_RCVBUF for socket %u", GetFd()); + { + //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. @@ -161,7 +165,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); @@ -174,10 +178,10 @@ bool InspSocket::BindAddr(const std::string &ip) 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.empty()) && (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]; @@ -185,7 +189,7 @@ bool InspSocket::BindAddr(const std::string &ip) 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(sockaddr_in6)); ((sockaddr_in6*)s)->sin6_port = 0; @@ -203,7 +207,7 @@ bool InspSocket::BindAddr(const std::string &ip) #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; @@ -232,10 +236,11 @@ 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]; @@ -339,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 @@ -360,7 +367,7 @@ 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()); } } Instance->SE->Shutdown(this, 2); @@ -373,12 +380,12 @@ void InspSocket::Close() errno = save; } -std::string InspSocket::GetIP() +std::string BufferedSocket::GetIP() { return this->IP; } -char* InspSocket::Read() +const char* BufferedSocket::Read() { if (!Instance->SE->BoundsCheckFd(this)) return NULL; @@ -395,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) { @@ -427,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)) @@ -463,7 +474,7 @@ bool InspSocket::FlushWriteBuffer() } 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; } } @@ -501,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); @@ -521,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; @@ -549,7 +568,7 @@ void SocketTimeout::Tick(time_t now) this->sock->Timeout = NULL; } -bool InspSocket::Poll() +bool BufferedSocket::Poll() { int incoming = -1; @@ -579,14 +598,14 @@ bool InspSocket::Poll() if (Instance->Config->GetIOHook(this)) { - Instance->Log(DEBUG,"Hook for raw connect"); + 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(); @@ -610,7 +629,14 @@ bool InspSocket::Poll() } else #endif - recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); + { + // 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) @@ -621,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()); } } @@ -641,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) @@ -675,7 +701,7 @@ InspSocket::~InspSocket() } } -void InspSocket::HandleEvent(EventType et, int errornum) +void BufferedSocket::HandleEvent(EventType et, int errornum) { switch (et) { @@ -725,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);