X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=96f07b6e40f8502f4da364ddff7a2b0c21de29c7;hb=bb35a0fa9cbebe51fa636f707c12ca4a7033dd9a;hp=be2d99a62c03a9bed3ee33231f0cf8fedffe8300;hpb=badadc427a99e5483402c21bf5b7ae64722930e9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index be2d99a62..96f07b6e4 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -79,6 +79,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,16 +107,12 @@ 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!"); @@ -152,8 +149,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 char *)&sendbuf,sizeof(sendbuf)); - setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&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,7 +177,7 @@ 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"))) { sockaddr* s = new sockaddr[2]; #ifdef IPV6 @@ -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,21 +215,6 @@ 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) { @@ -273,6 +256,7 @@ bool InspSocket::DoConnect() } } else +#endif { this->fd = socket(AF_INET, SOCK_STREAM, 0); if (this->fd > -1) @@ -284,17 +268,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 +290,7 @@ bool InspSocket::DoConnect() } } else +#endif { in_addr addy; if (inet_aton(this->host, &addy) > 0) @@ -326,15 +300,6 @@ 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 #ifndef WIN32 int flags = fcntl(this->fd, F_GETFL, 0); fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); @@ -355,6 +320,11 @@ 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 + /* Set nonblocking mode after the connect() call */ + flags = 0; + ioctlsocket(this->fd, FIONBIO, &flags); +#endif this->state = I_CONNECTING; if (this->fd > -1) { @@ -391,9 +361,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); + if (close(this->fd) != -1) + this->OnClose(); + + if (Instance->SocketCull.find(this) == Instance->SocketCull.end()) + Instance->SocketCull[this] = this; } errno = save; } @@ -405,11 +378,7 @@ std::string InspSocket::GetIP() char* InspSocket::Read() { -#ifdef WINDOWS - if ((fd < 0) || (m_internalFd > MAX_DESCRIPTORS)) -#else - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) -#endif + if (!Instance->SE->BoundsCheckFd(this)) return NULL; int n = 0; @@ -484,28 +453,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) { @@ -600,19 +552,16 @@ void SocketTimeout::Tick(time_t now) bool InspSocket::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: @@ -623,15 +572,15 @@ 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 + this->SetState(I_CONNECTED); + if (Instance->Config->GetIOHook(this)) { + Instance->Log(DEBUG,"Hook for raw connect"); try { Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd); @@ -652,6 +601,8 @@ bool InspSocket::Poll() if ((!*this->host) || strchr(this->host, ':')) length = sizeof(sockaddr_in6); #endif + void* m_acceptEvent = NULL; + GetExt("windows_acceptevent", m_acceptEvent); incoming = _accept (this->fd, client, &length); #ifdef IPV6 if ((!*this->host) || strchr(this->host, ':')) @@ -660,12 +611,8 @@ 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 + recvip = inet_ntoa(((sockaddr_in*)client)->sin_addr); this->OnIncomingConnection(incoming, (char*)recvip.c_str()); if (this->IsIOHooked)