X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=63964c1eaecf1831bcd1a56811a7bbf89b8456f3;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=4aff8f4c56123d748fa82ac108b6b49e4ec49fc1;hpb=87c6e2cf20584c745508fff5802deea1c61727a9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 4aff8f4c5..63964c1ea 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -18,8 +18,6 @@ #include "inspircd.h" using irc::sockets::OpenTCPSocket; -using irc::sockets::insp_inaddr; -using irc::sockets::insp_sockaddr; bool InspSocket::Readable() { @@ -28,6 +26,7 @@ bool InspSocket::Readable() InspSocket::InspSocket(InspIRCd* SI) { + this->Timeout = NULL; this->state = I_DISCONNECTED; this->fd = -1; this->WaitingForWriteEvent = false; @@ -37,6 +36,7 @@ InspSocket::InspSocket(InspIRCd* SI) InspSocket::InspSocket(InspIRCd* SI, int newfd, const char* ip) { + this->Timeout = NULL; this->fd = newfd; this->state = I_CONNECTED; strlcpy(this->IP,ip,MAXBUF); @@ -47,13 +47,15 @@ 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) +InspSocket::InspSocket(InspIRCd* SI, const std::string &ipaddr, int aport, bool listening, unsigned long maxtime, const std::string &connectbindip) { + this->cbindip = connectbindip; this->fd = -1; this->Instance = SI; strlcpy(host,ipaddr.c_str(),MAXBUF); this->WaitingForWriteEvent = false; this->IsIOHooked = false; + this->Timeout = NULL; if (listening) { if ((this->fd = OpenTCPSocket(host)) == ERROR) @@ -77,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)) @@ -104,30 +107,33 @@ 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 { strlcpy(this->IP,host,MAXBUF); timeout_val = maxtime; - this->DoConnect(); + if (!this->DoConnect()) + { + this->OnError(I_ERR_CONNECT); + this->Close(); + this->fd = -1; + this->state = I_ERROR; + return; + } } } } @@ -143,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 void *)&sendbuf,sizeof(sendbuf)); - setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const void *)&recvbuf,sizeof(sendbuf)); + setsockopt(nfd,SOL_SOCKET,SO_SNDBUF,(const char *)&sendbuf,sizeof(sendbuf)); + setsockopt(nfd,SOL_SOCKET,SO_RCVBUF,(const char *)&recvbuf,sizeof(sendbuf)); } /* Most irc servers require you to specify the ip you want to bind to. @@ -155,24 +161,23 @@ 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() +bool InspSocket::BindAddr(const std::string &ip) { 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 - for (int j =0; j < Conf.Enumerate("bind"); j++) + int j = 0; + while (j < Conf.Enumerate("bind") || (!ip.empty())) { - std::string Type = Conf.ReadValue("bind","type",j); - std::string IP = Conf.ReadValue("bind","address",j); - if (Type == "servers") + std::string IP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip; + if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers") { - if ((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 @@ -182,37 +187,33 @@ bool InspSocket::BindAddr() if (inet_pton(AF_INET6, IP.c_str(), &n) > 0) { memcpy(&((sockaddr_in6*)s)->sin6_addr, &n, sizeof(n)); + ((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) { ((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) @@ -228,6 +229,7 @@ bool InspSocket::BindAddr() return true; } } + j++; } return true; } @@ -246,7 +248,7 @@ bool InspSocket::DoConnect() this->fd = socket(AF_INET6, SOCK_STREAM, 0); if ((this->fd > -1) && ((strstr(this->IP,"::ffff:") != (char*)&this->IP) && (strstr(this->IP,"::FFFF:") != (char*)&this->IP))) { - if (!this->BindAddr()) + if (!this->BindAddr(this->cbindip)) { delete[] addr; return false; @@ -254,12 +256,18 @@ bool InspSocket::DoConnect() } } else +#endif { this->fd = socket(AF_INET, SOCK_STREAM, 0); + if (this->fd > -1) + { + if (!this->BindAddr(this->cbindip)) + { + delete[] addr; + return false; + } + } } -#else - this->fd = socket(AF_INET, SOCK_STREAM, 0); -#endif if (this->fd == -1) { @@ -282,6 +290,7 @@ bool InspSocket::DoConnect() } } else +#endif { in_addr addy; if (inet_aton(this->host, &addy) > 0) @@ -291,19 +300,13 @@ 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); - +#else + unsigned long flags = 0; + ioctlsocket(this->fd, FIONBIO, &flags); +#endif if (connect(this->fd, (sockaddr*)addr, size) == -1) { if (errno != EINPROGRESS) @@ -367,7 +370,11 @@ std::string InspSocket::GetIP() char* InspSocket::Read() { +#ifdef WINDOWS + if ((fd < 0) || (m_internalFd > MAX_DESCRIPTORS)) +#else if ((fd < 0) || (fd > MAX_DESCRIPTORS)) +#endif return NULL; int n = 0; @@ -445,7 +452,7 @@ bool InspSocket::FlushWriteBuffer() 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()) + if ((unsigned int)result >= outbuffer[0].length()) { outbuffer.pop_front(); } @@ -480,10 +487,14 @@ 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 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, @@ -538,20 +549,27 @@ 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; + + if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end()) + ServerInstance->SocketCull[this->sock] = this->sock; } + + this->sock->Timeout = NULL; } 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; @@ -559,13 +577,14 @@ bool InspSocket::Poll() if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; - +#endif switch (this->state) { case I_CONNECTING: /* 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); @@ -573,6 +592,9 @@ bool InspSocket::Poll() if (!this->Instance->SE->AddFd(this)) return false; } +#else + this->SetState(I_CONNECTED); +#endif if (Instance->Config->GetIOHook(this)) { try @@ -595,8 +617,7 @@ bool InspSocket::Poll() if ((!*this->host) || strchr(this->host, ':')) length = sizeof(sockaddr_in6); #endif - incoming = accept (this->fd, client, &length); - + incoming = _accept (this->fd, client, &length); #ifdef IPV6 if ((!*this->host) || strchr(this->host, ':')) { @@ -604,12 +625,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) @@ -679,17 +696,32 @@ void InspSocket::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; @@ -699,9 +731,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; } } @@ -720,9 +751,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; } }