X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=e73d01af9c37ed37fbdd1909b95dd83dbba0e5af;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=eb47c9cc8286dea74331485bf66ae1129f4292c4;hpb=9c67795e733c553ff6b05398501d402c46349199;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index eb47c9cc8..e73d01af9 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -1,16 +1,26 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "socket.h" #include "socketengine.h" @@ -36,7 +46,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten) else if (!irc::sockets::aptosa(addr, port, servaddr)) return false; - ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr)); + ret = SE->Bind(sockfd, servaddr); if (ret < 0) { @@ -86,14 +96,16 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) while (0 != (portno = portrange.GetToken())) { irc::sockets::sockaddrs bindspec; - irc::sockets::aptosa(Addr, portno, bindspec); - std::string bind_readable = irc::sockets::satouser(bindspec); + if (!irc::sockets::aptosa(Addr, portno, bindspec)) + continue; + std::string bind_readable = bindspec.str(); bool skip = false; for (std::vector::iterator n = old_ports.begin(); n != old_ports.end(); ++n) { if ((**n).bind_desc == bind_readable) { + (*n)->bind_tag = tag; // Replace tag, we know addr and port match, but other info (type, ssl) may not skip = true; old_ports.erase(n); break; @@ -101,7 +113,8 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) } if (!skip) { - ListenSocket *ll = new ListenSocket(tag, Addr, portno); + ListenSocket* ll = new ListenSocket(tag, bindspec); + if (ll->GetFd() > -1) { bound++; @@ -123,7 +136,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports) n++; if (n == ports.end()) { - this->Logs->Log("SOCKET",ERROR,"Port bindings slipped out of vector, aborting close!"); + this->Logs->Log("SOCKET",DEFAULT,"Port bindings slipped out of vector, aborting close!"); break; } @@ -143,13 +156,16 @@ bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::socka memset(&sa, 0, sizeof(sa)); if (addr.empty() || addr.c_str()[0] == '*') { -#ifdef IPV6 - sa.in6.sin6_family = AF_INET6; - sa.in6.sin6_port = htons(port); -#else - sa.in4.sin_family = AF_INET; - sa.in4.sin_port = htons(port); -#endif + if (ServerInstance->Config->WildcardIPv6) + { + sa.in6.sin6_family = AF_INET6; + sa.in6.sin6_port = htons(port); + } + else + { + sa.in4.sin_family = AF_INET; + sa.in4.sin_port = htons(port); + } return true; } else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0) @@ -201,42 +217,22 @@ bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, return !addr.empty(); } -static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 }; - std::string irc::sockets::sockaddrs::str() const { char buffer[MAXBUF]; if (sa.sa_family == AF_INET) { -#ifndef IPV6 - if (in4.sin_addr.s_addr == 0) - { - sprintf(buffer, "*:%u", ntohs(in4.sin_port)); - } - else -#endif - { - const uint8_t* bits = reinterpret_cast(&in4.sin_addr); - sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port)); - } + const uint8_t* bits = reinterpret_cast(&in4.sin_addr); + sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port)); } else if (sa.sa_family == AF_INET6) { -#ifdef IPV6 - if (!memcmp(all_zero, &in6.sin6_addr, 16)) - { - sprintf(buffer, "*:%u", ntohs(in6.sin6_port)); - } - else -#endif - { - buffer[0] = '['; - if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10)) - return ""; // should never happen, buffer is large enough - int len = strlen(buffer); - // no need for snprintf, buffer has at least 9 chars left, max short len = 5 - sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port)); - } + buffer[0] = '['; + if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10)) + return ""; // should never happen, buffer is large enough + int len = strlen(buffer); + // no need for snprintf, buffer has at least 9 chars left, max short len = 5 + sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port)); } else return ""; @@ -252,38 +248,55 @@ int irc::sockets::sockaddrs::sa_size() const return 0; } +bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const +{ + if (sa.sa_family != other.sa.sa_family) + return false; + if (sa.sa_family == AF_INET) + return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr); + if (sa.sa_family == AF_INET6) + return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16); + return !memcmp(this, &other, sizeof(*this)); +} + static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range) { const unsigned char* base; + unsigned char target_byte; cidr.type = sa.sa.sa_family; + + memset(cidr.bits, 0, sizeof(cidr.bits)); + if (cidr.type == AF_INET) { + target_byte = sizeof(sa.in4.sin_addr); base = (unsigned char*)&sa.in4.sin_addr; if (range > 32) range = 32; } else if (cidr.type == AF_INET6) { + target_byte = sizeof(sa.in6.sin6_addr); base = (unsigned char*)&sa.in6.sin6_addr; if (range > 128) range = 128; } else { - base = (unsigned char*)""; - range = 0; + cidr.length = 0; + return; } cidr.length = range; unsigned int border = range / 8; unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF; - for(unsigned int i=0; i < 16; i++) + for(unsigned int i=0; i < target_byte; i++) { if (i < border) cidr.bits[i] = base[i]; else if (i == border) cidr.bits[i] = base[i] & bitmask; else - cidr.bits[i] = 0; + return; } } @@ -304,7 +317,7 @@ irc::sockets::cidr_mask::cidr_mask(const std::string& mask) } else { - int range = atoi(mask.substr(bits_chars + 1).c_str()); + int range = ConvToInt(mask.substr(bits_chars + 1)); irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa); sa2cidr(*this, sa, range); } @@ -329,7 +342,7 @@ std::string irc::sockets::cidr_mask::str() const else return ""; memcpy(base, bits, len); - return sa.addr() + "/" + ConvToStr(length); + return sa.addr() + "/" + ConvToStr((int)length); } bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const @@ -340,8 +353,11 @@ bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const { - return type < other.type || length < other.length || - memcmp(bits, other.bits, 16) < 0; + if (type != other.type) + return type < other.type; + if (length != other.length) + return length < other.length; + return memcmp(bits, other.bits, 16) < 0; } bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const