X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=a46dffec8323f8f63272643c244d361ba72932c8;hb=71f7e47bcd7b72d7999daa9f061c8850b5a6521b;hp=40a72112120969f95719f2dca1cda25f4d3b5655;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 40a721121..a46dffec8 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -103,6 +103,61 @@ void BufferedSocket::SetQueues() } } +bool BufferedSocket::DoBindMagic(const std::string ¤t_ip, bool v6) +{ + /* The [2] is required because we may write a sockaddr_in6 here, and sockaddr_in6 is larger than sockaddr, where sockaddr_in4 is not. */ + socklen_t size = sizeof(sockaddr_in); + sockaddr* s = new sockaddr[2]; +#ifdef IPV6 + if (v6) + { + in6_addr n; + if (inet_pton(AF_INET6, current_ip.c_str(), &n) > 0) + { + 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); + } + else + { + // Well, this is as good as it's gonna get. + errno = EADDRNOTAVAIL; + delete[] s; + return false; + } + } + else +#endif + { + in_addr n; + if (inet_aton(current_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 + { + // Well, this is as good as it's gonna get. + errno = EADDRNOTAVAIL; + delete[] s; + return false; + } + } + + if (ServerInstance->SE->Bind(this->fd, s, size) < 0) + { + this->state = I_ERROR; + this->OnError(I_ERR_BIND); + delete[] s; + return false; + } + + delete[] s; + return true; +} + /* Most irc servers require you to specify the ip you want to bind to. * If you dont specify an IP, they rather dumbly bind to the first IP * of the box (e.g. INADDR_ANY). In InspIRCd, we scan thought the IP @@ -111,77 +166,51 @@ void BufferedSocket::SetQueues() * This is easier to configure when you have a lot of links and a lot * of servers to configure. */ -bool BufferedSocket::BindAddr(const std::string &ip) +bool BufferedSocket::BindAddr(const std::string &ip_to_bind) { ConfigReader Conf(this->ServerInstance); - socklen_t size = sizeof(sockaddr_in); -#ifdef IPV6 bool v6 = false; - /* Are we looking for a binding to fit an ipv6 host? */ - if ((ip.empty()) || (ip.find(':') != std::string::npos)) - v6 = true; + + // Case one: If they provided an IP, try bind it + if (!ip_to_bind.empty()) + { +#ifdef IPV6 + // Check whether or not they are binding to an IPv6 IP.. + if (ip_to_bind.find(':') != std::string::npos) + v6 = true; #endif - int j = 0; - while (j < Conf.Enumerate("bind") || (!ip.empty())) + // And if it fails, don't do anything. + return this->DoBindMagic(ip_to_bind, v6); + } + + for (int j = 0; j < Conf.Enumerate("bind"); j++) { - std::string sIP = ip.empty() ? Conf.ReadValue("bind","address",j) : ip; - if (!ip.empty() || Conf.ReadValue("bind","type",j) == "servers") - { - 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]; + // We only want to try bind to a server ip. + if (Conf.ReadValue("bind","type",j) != "servers") + continue; + + // set current IP to the tag + std::string current_ip = Conf.ReadValue("bind","address",j); + #ifdef IPV6 - if (v6) - { - in6_addr n; - 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; - ((sockaddr_in6*)s)->sin6_family = AF_INET6; - size = sizeof(sockaddr_in6); - } - else - { - delete[] s; - j++; - continue; - } - } - else + // Check whether this is for an ipv6 address + if (current_ip.find(':') != std::string::npos) + v6 = true; + else + v6 = false; #endif - { - in_addr n; - if (inet_aton(sIP.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; - } - } - if (ServerInstance->SE->Bind(this->fd, s, size) < 0) - { - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - this->fd = -1; - delete[] s; - return false; - } + // Make sure IP is nothing local + if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1") + continue; - delete[] s; - return true; - } - } - j++; + // Try bind, don't fail if it doesn't bind though. + if (this->DoBindMagic(current_ip, v6)) + return true; } + + // NOTE: You may wonder WTF we are returning *true* here, but that is because there were no custom binds setup, and so we have nothing to do + // (remember, outgoing connections without binding are perfectly ok). ServerInstance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!"); return true; } @@ -203,6 +232,8 @@ bool BufferedSocket::DoConnect(unsigned long maxtime) { if (!this->BindAddr(this->cbindip)) { + this->Close(); + this->fd = -1; delete[] addr; return false; } @@ -216,6 +247,8 @@ bool BufferedSocket::DoConnect(unsigned long maxtime) { if (!this->BindAddr(this->cbindip)) { + this->Close(); + this->fd = -1; delete[] addr; return false; } @@ -263,6 +296,7 @@ bool BufferedSocket::DoConnect(unsigned long maxtime) this->OnError(I_ERR_CONNECT); this->Close(); this->state = I_ERROR; + delete[] addr; return false; } @@ -271,6 +305,7 @@ bool BufferedSocket::DoConnect(unsigned long maxtime) } this->state = I_CONNECTING; + delete[] addr; if (this->fd > -1) { if (!this->ServerInstance->SE->AddFd(this))