X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=0350858e7ce693ad391825570d3237fe0c466f42;hb=0ed3ef9dee2cb8f4b0c37da218a2fd1eee8c31f6;hp=0087b681aff4e0e21b7decc95a353dcab5fe8da4;hpb=9e29535857e1bd55a25737e7846f095e182dede2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 0087b681a..0350858e7 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. @@ -11,12 +11,10 @@ * --------------------------------------------------- */ -/* $Core */ - +#include "inspircd.h" #include "socket.h" #include "inspstring.h" #include "socketengine.h" -#include "inspircd.h" bool BufferedSocket::Readable() { @@ -53,22 +51,8 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int apor strlcpy(this->host,ipaddr.c_str(),MAXBUF); this->port = aport; - bool ipvalid = true; -#ifdef IPV6 - if (strchr(host,':')) - { - in6_addr n; - if (inet_pton(AF_INET6, host, &n) < 1) - ipvalid = false; - } - else -#endif - { - in_addr n; - if (inet_aton(host,&n) < 1) - ipvalid = false; - } - if (!ipvalid) + irc::sockets::sockaddrs testaddr; + if (!irc::sockets::aptosa(host, aport, &testaddr)) { this->ServerInstance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!"); this->OnError(I_ERR_CONNECT); @@ -103,6 +87,25 @@ void BufferedSocket::SetQueues() } } +bool BufferedSocket::DoBindMagic(const std::string ¤t_ip) +{ + irc::sockets::sockaddrs s; + if (!irc::sockets::aptosa(current_ip.c_str(), 0, &s)) + { + errno = EADDRNOTAVAIL; + return false; + } + + if (ServerInstance->SE->Bind(this->fd, &s.sa, sa_size(s)) < 0) + { + this->state = I_ERROR; + this->OnError(I_ERR_BIND); + return false; + } + + 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,159 +114,71 @@ 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; -#endif - int j = 0; - while (j < Conf.Enumerate("bind") || (!ip.empty())) + + // Case one: If they provided an IP, try bind it + if (!ip_to_bind.empty()) { - 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]; -#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 -#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; - } - } + // And if it fails, don't do anything. + return this->DoBindMagic(ip_to_bind); + } - 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; - } + for (int j = 0; j < Conf.Enumerate("bind"); j++) + { + // We only want to try bind to a server ip. + if (Conf.ReadValue("bind","type",j) != "servers") + continue; - delete[] s; - return true; - } - } - j++; + // set current IP to the tag + std::string current_ip = Conf.ReadValue("bind","address",j); + + // Make sure IP is nothing local + if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1") + continue; + + // Try bind, don't fail if it doesn't bind though. + if (this->DoBindMagic(current_ip)) + 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; } bool BufferedSocket::DoConnect(unsigned long maxtime) { - /* 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 - bool v6 = false; - if ((!*this->host) || strchr(this->host, ':')) - v6 = true; - - if (v6) - { - 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(this->cbindip)) - { - delete[] addr; - return false; - } - } - } - else -#endif - { - this->fd = socket(AF_INET, SOCK_STREAM, 0); - if (this->fd > -1) - { - if (!this->BindAddr(this->cbindip)) - { - delete[] addr; - return false; - } - } - } + irc::sockets::sockaddrs addr; + irc::sockets::aptosa(this->host, this->port, &addr); + + this->fd = socket(addr.sa.sa_family, SOCK_STREAM, 0); if (this->fd == -1) { this->state = I_ERROR; this->OnError(I_ERR_SOCKET); - delete[] addr; return false; } -#ifdef IPV6 - if (v6) - { - in6_addr addy; - if (inet_pton(AF_INET6, this->host, &addy) > 0) - { - ((sockaddr_in6*)addr)->sin6_family = AF_INET6; - memcpy(&((sockaddr_in6*)addr)->sin6_addr, &addy, sizeof(addy)); - ((sockaddr_in6*)addr)->sin6_port = htons(this->port); - size = sizeof(sockaddr_in6); - } - } - else -#endif + if (!this->BindAddr(this->cbindip)) { - 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); - } + this->Close(); + this->fd = -1; + return false; } ServerInstance->SE->NonBlocking(this->fd); - if (ServerInstance->SE->Connect(this, (sockaddr*)addr, size) == -1) + if (ServerInstance->SE->Connect(this, &addr.sa, sa_size(addr)) == -1) { if (errno != EINPROGRESS) { this->OnError(I_ERR_CONNECT); this->Close(); this->state = I_ERROR; - delete[] addr; return false; } @@ -272,7 +187,6 @@ bool BufferedSocket::DoConnect(unsigned long maxtime) } this->state = I_CONNECTING; - delete[] addr; if (this->fd > -1) { if (!this->ServerInstance->SE->AddFd(this))