X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=78b7f2de92214b85731ac6664081f589f26cbad2;hb=f9a663185402b9689c784dc87c317ac204c53f03;hp=58e2c5bad12e3e69b474fa294e4c6d7880514a81;hpb=0f61489ddb2f54d62c6a59e169901e4a17098230;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 58e2c5bad..78b7f2de9 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -1,455 +1,451 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014 Attila Molnar + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2011 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards * - * --------------------------------------------------- + * 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 -#include "configreader.h" -#include "socket.h" + #include "inspircd.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "socketengine.h" -#include "wildcard.h" -#include "message.h" - -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern time_t TIME; - -/* Used when comparing CIDR masks for the modulus bits left over. - * A lot of ircd's seem to do this: - * ((-1) << (8 - (mask % 8))) - * But imho, it sucks in comparison to a nice neat lookup table. - */ -const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used */ - 0x80, /* 10000000 - 1 bits */ - 0xC0, /* 11000000 - 2 bits */ - 0xE0, /* 11100000 - 3 bits */ - 0xF0, /* 11110000 - 4 bits */ - 0xF8, /* 11111000 - 5 bits */ - 0xFC, /* 11111100 - 6 bits */ - 0xFE /* 11111110 - 7 bits */ -}; - -/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */ -bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits) + +bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::vector& old_ports) { - unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */ - unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */ + for (std::vector::iterator n = old_ports.begin(); n != old_ports.end(); ++n) + { + if ((**n).bind_sa == sa) + { + // Replace tag, we know addr and port match, but other info (type, ssl) may not. + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Replacing listener on %s from old tag at %s with new tag from %s", + sa.str().c_str(), (*n)->bind_tag->getTagLocation().c_str(), tag->getTagLocation().c_str()); + (*n)->bind_tag = tag; + (*n)->ResetIOHookProvider(); - /* First compare the whole bytes, if they dont match, return false */ - if (memcmp(address, mask, divisor)) - return false; + old_ports.erase(n); + return true; + } + } - /* Now if there are any remainder bits, we compare them with logic AND */ - if (modulus) - if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus])) - /* If they dont match, return false */ - return false; + ListenSocket* ll = new ListenSocket(tag, sa); + if (!ll->HasFd()) + { + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to listen on %s from tag at %s: %s", + sa.str().c_str(), tag->getTagLocation().c_str(), strerror(errno)); + delete ll; + return false; + } - /* The address matches the mask, to mask_bits bits of mask */ + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Added a listener on %s from tag at %s", sa.str().c_str(), tag->getTagLocation().c_str()); + ports.push_back(ll); return true; } -/* Match CIDR, but dont attempt to match() against leading *!*@ sections */ -bool MatchCIDR(const char* address, const char* cidr_mask) +size_t InspIRCd::BindPorts(FailedPortList& failed_ports) { - return MatchCIDR(address, cidr_mask, false); -} + size_t bound = 0; + std::vector old_ports(ports.begin(), ports.end()); -/* Match CIDR strings, e.g. 127.0.0.1 to 127.0.0.0/8 or 3ffe:1:5:6::8 to 3ffe:1::0/32 - * If you have a lot of hosts to match, youre probably better off building your mask once - * and then using the lower level MatchCIDRBits directly. - * - * This will also attempt to match any leading usernames or nicknames on the mask, using - * match(), when match_with_username is true. - */ -bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username) -{ - unsigned char addr_raw[16]; - unsigned char mask_raw[16]; - unsigned int bits = 0; - char* mask = NULL; - - /* The caller is trying to match ident@/bits. - * Chop off the ident@ portion, use match() on it - * seperately. - */ - if (match_with_username) + ConfigTagList tags = ServerInstance->Config->ConfTags("bind"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { - /* Duplicate the strings, and try to find the position - * of the @ symbol in each */ - char* address_dupe = strdup(address); - char* cidr_dupe = strdup(cidr_mask); - - /* Use strchr not strrchr, because its going to be nearer to the left */ - char* username_mask_pos = strrchr(cidr_dupe, '@'); - char* username_addr_pos = strrchr(address_dupe, '@'); - - /* Both strings have an @ symbol in them */ - if (username_mask_pos && username_addr_pos) + ConfigTag* tag = i->second; + + // Are we creating a TCP/IP listener? + const std::string address = tag->getString("address"); + const std::string portlist = tag->getString("port"); + if (!address.empty() || !portlist.empty()) { - /* Zero out the location of the @ symbol */ - *username_mask_pos = *username_addr_pos = 0; + // InspIRCd supports IPv4 and IPv6 natively; no 4in6 required. + if (strncasecmp(address.c_str(), "::ffff:", 7) == 0) + this->Logs->Log("SOCKET", LOG_DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead."); - /* Try and match() the strings before the @ - * symbols, and recursively call MatchCIDR without - * username matching enabled to match the host part. - */ - bool result = (match(address_dupe, cidr_dupe) && MatchCIDR(username_addr_pos + 1, username_mask_pos + 1, false)); + // A TCP listener with no ports is not very useful. + if (portlist.empty()) + this->Logs->Log("SOCKET", LOG_DEFAULT, "TCP listener on %s at %s has no ports specified!", + address.empty() ? "*" : address.c_str(), tag->getTagLocation().c_str()); - /* Free the stuff we created */ - free(address_dupe); - free(cidr_dupe); + irc::portparser portrange(portlist, false); + for (int port; (port = portrange.GetToken()); ) + { + irc::sockets::sockaddrs bindspec; + if (!irc::sockets::aptosa(address, port, bindspec)) + continue; - /* Return a result */ - return result; - } - else - { - /* One or both didnt have an @ in, - * just match as CIDR - */ - free(address_dupe); - free(cidr_dupe); - mask = strdup(cidr_mask); + if (!BindPort(tag, bindspec, old_ports)) + failed_ports.push_back(FailedPort(errno, bindspec, tag)); + else + bound++; + } + continue; } - } - else - { - /* Make a copy of the cidr mask string, - * we're going to change it - */ - mask = strdup(cidr_mask); - } - in_addr address_in4; - in_addr mask_in4; +#ifndef _WIN32 + // Are we creating a UNIX listener? + const std::string path = tag->getString("path"); + if (!path.empty()) + { + // Expand the path relative to the config directory. + const std::string fullpath = ServerInstance->Config->Paths.PrependData(path); + // UNIX socket paths are length limited to less than PATH_MAX. + irc::sockets::sockaddrs bindspec; + if (fullpath.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path) - 1)) + { + this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path that is too long!", + fullpath.c_str(), tag->getTagLocation().c_str()); + continue; + } - /* Use strrchr for this, its nearer to the right */ - char* bits_chars = strrchr(mask,'/'); + // Check for characters which are problematic in the IRC message format. + if (fullpath.find_first_of("\n\r\t!@: ") != std::string::npos) + { + this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path containing invalid characters!", + fullpath.c_str(), tag->getTagLocation().c_str()); + continue; + } - if (bits_chars) - { - bits = atoi(bits_chars + 1); - *bits_chars = 0; + irc::sockets::untosa(fullpath, bindspec); + if (!BindPort(tag, bindspec, old_ports)) + failed_ports.push_back(FailedPort(errno, bindspec, tag)); + else + bound++; + } +#endif } - else + + std::vector::iterator n = ports.begin(); + for (std::vector::iterator o = old_ports.begin(); o != old_ports.end(); ++o) { - /* No 'number of bits' field! */ - return false; + while (n != ports.end() && *n != *o) + n++; + if (n == ports.end()) + { + this->Logs->Log("SOCKET", LOG_DEFAULT, "Port bindings slipped out of vector, aborting close!"); + break; + } + + this->Logs->Log("SOCKET", LOG_DEFAULT, "Port binding %s was removed from the config file, closing.", + (**n).bind_sa.str().c_str()); + delete *n; + + // this keeps the iterator valid, pointing to the next element + n = ports.erase(n); } -#ifdef SUPPORT_IP6LINKS - in6_addr address_in6; - in6_addr mask_in6; + return bound; +} - if (inet_pton(AF_INET6, address, &address_in6) > 0) +bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa) +{ + memset(&sa, 0, sizeof(sa)); + if (addr.empty() || addr.c_str()[0] == '*') { - if (inet_pton(AF_INET6, mask, &mask_in6) > 0) + if (ServerInstance->Config->WildcardIPv6) { - memcpy(&addr_raw, &address_in6.s6_addr, 16); - memcpy(&mask_raw, &mask_in6.s6_addr, 16); - - if (bits > 128) - bits = 128; + sa.in6.sin6_family = AF_INET6; + sa.in6.sin6_port = htons(port); } else { - /* The address was valid ipv6, but the mask - * that goes with it wasnt. - */ - free(mask); - return false; + sa.in4.sin_family = AF_INET; + sa.in4.sin_port = htons(port); } + return true; } - else -#endif - if (inet_pton(AF_INET, address, &address_in4) > 0) + else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0) { - if (inet_pton(AF_INET, mask, &mask_in4) > 0) - { - memcpy(&addr_raw, &address_in4.s_addr, 4); - memcpy(&mask_raw, &mask_in4.s_addr, 4); - - if (bits > 32) - bits = 32; - } - else - { - /* The address was valid ipv4, - * but the mask that went with it wasnt. - */ - free(mask); - return false; - } + sa.in4.sin_family = AF_INET; + sa.in4.sin_port = htons(port); + return true; } - else + else if (inet_pton(AF_INET6, addr.c_str(), &sa.in6.sin6_addr) > 0) { - /* The address was neither ipv4 or ipv6 */ - free(mask); - return false; + sa.in6.sin6_family = AF_INET6; + sa.in6.sin6_port = htons(port); + return true; } - - /* Low-level-match the bits in the raw data */ - free(mask); - return MatchCIDRBits(addr_raw, mask_raw, bits); + return false; } -inline void Blocking(int s) +bool irc::sockets::untosa(const std::string& path, irc::sockets::sockaddrs& sa) { - int flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags ^ O_NONBLOCK); + memset(&sa, 0, sizeof(sa)); + if (path.length() >= sizeof(sa.un.sun_path)) + return false; + + sa.un.sun_family = AF_UNIX; + memcpy(&sa.un.sun_path, path.c_str(), path.length() + 1); + return true; } -inline void NonBlocking(int s) +bool irc::sockets::isunix(const std::string& file) { - int flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags | O_NONBLOCK); +#ifndef _WIN32 + struct stat sb; + if (stat(file.c_str(), &sb) == 0 && S_ISSOCK(sb.st_mode)) + return true; +#endif + return false; } -/** This will bind a socket to a port. It works for UDP/TCP. - * It can only bind to IP addresses, if you wish to bind to hostnames - * you should first resolve them using class 'Resolver'. - */ -bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) +int irc::sockets::sockaddrs::family() const { - memset(&server,0,sizeof(server)); - insp_inaddr addy; - - if (*addr == '*') - *addr = 0; + return sa.sa_family; +} - if ((*addr) && (insp_aton(addr,&addy) < 1)) +int irc::sockets::sockaddrs::port() const +{ + switch (family()) { - log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr); - return false;; + case AF_INET: + return ntohs(in4.sin_port); + + case AF_INET6: + return ntohs(in6.sin6_port); + + case AF_UNIX: + return 0; } -#ifdef IPV6 - server.sin6_family = AF_FAMILY; -#else - server.sin_family = AF_FAMILY; -#endif - if (!*addr) + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::port(): socket type %d is unknown!", family()); + return 0; +} + +std::string irc::sockets::sockaddrs::addr() const +{ + switch (family()) { -#ifdef IPV6 - memcpy(&addy, &server.sin6_addr, sizeof(in6_addr)); -#else - server.sin_addr.s_addr = htonl(INADDR_ANY); -#endif + case AF_INET: + char ip4addr[INET_ADDRSTRLEN]; + if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, ip4addr, sizeof(ip4addr))) + return "0.0.0.0"; + return ip4addr; + + case AF_INET6: + char ip6addr[INET6_ADDRSTRLEN]; + if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ip6addr, sizeof(ip6addr))) + return "0:0:0:0:0:0:0:0"; + return ip6addr; + + case AF_UNIX: + return un.sun_path; } - else + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::addr(): socket type %d is unknown!", family()); + return ""; +} + +std::string irc::sockets::sockaddrs::str() const +{ + switch (family()) { -#ifdef IPV6 - memcpy(&addy, &server.sin6_addr, sizeof(in6_addr)); -#else - server.sin_addr = addy; -#endif + case AF_INET: + char ip4addr[INET_ADDRSTRLEN]; + if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, ip4addr, sizeof(ip4addr))) + strcpy(ip4addr, "0.0.0.0"); + return InspIRCd::Format("%s:%u", ip4addr, ntohs(in4.sin_port)); + + case AF_INET6: + char ip6addr[INET6_ADDRSTRLEN]; + if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ip6addr, sizeof(ip6addr))) + strcpy(ip6addr, "0:0:0:0:0:0:0:0"); + return InspIRCd::Format("[%s]:%u", ip6addr, ntohs(in6.sin6_port)); + + case AF_UNIX: + return un.sun_path; } -#ifdef IPV6 - server.sin6_port = htons(port); -#else - server.sin_port = htons(port); -#endif - if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0) + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::str(): socket type %d is unknown!", family()); + return ""; +} + +socklen_t irc::sockets::sockaddrs::sa_size() const +{ + switch (family()) { - return false; + case AF_INET: + return sizeof(in4); + + case AF_INET6: + return sizeof(in6); + + case AF_UNIX: + return sizeof(un); } - else + + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::sa_size(): socket type %d is unknown!", family()); + return 0; +} + +bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const +{ + if (family() != other.family()) + return false; + + switch (family()) { - log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); - if (listen(sockfd, Config->MaxConn) == -1) - { - log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); - return false; - } - else - { - NonBlocking(sockfd); - return true; - } + case AF_INET: + return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr); + + case AF_INET6: + return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16); + + case AF_UNIX: + return !strcmp(un.sun_path, other.un.sun_path); } -} + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::operator==(): socket type %d is unknown!", family()); + return !memcmp(this, &other, sizeof(*this)); +} -// Open a TCP Socket -int OpenTCPSocket() +static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, unsigned char range) { - int sockfd; - int on = 1; - struct linger linger = { 0 }; - - if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0) + const unsigned char* base; + unsigned char target_byte; + + memset(cidr.bits, 0, sizeof(cidr.bits)); + + cidr.type = sa.family(); + switch (cidr.type) { - log(DEFAULT,"Error creating TCP socket: %s",strerror(errno)); - return (ERROR); + case AF_UNIX: + // XXX: UNIX sockets don't support CIDR. This fix is non-ideal but I can't + // really think of another way to handle it. + cidr.length = 0; + return; + + case AF_INET: + cidr.length = range > 32 ? 32 : range; + target_byte = sizeof(sa.in4.sin_addr); + base = (unsigned char*)&sa.in4.sin_addr; + break; + + case AF_INET6: + cidr.length = range > 128 ? 128 : range; + target_byte = sizeof(sa.in6.sin6_addr); + base = (unsigned char*)&sa.in6.sin6_addr; + break; + + default: + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: sa2cidr(): socket type %d is unknown!", cidr.type); + cidr.length = 0; + return; } - else + + unsigned int border = cidr.length / 8; + unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF; + for(unsigned int i=0; i < target_byte; i++) { - setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */ - linger.l_onoff = 1; - linger.l_linger = 1; - setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger,sizeof(linger)); - return (sockfd); + if (i < border) + cidr.bits[i] = base[i]; + else if (i == border) + cidr.bits[i] = base[i] & bitmask; + else + return; } } -bool HasPort(int port, char* addr) +irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, unsigned char range) { - for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++) - { - if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr))) - { - return true; - } - } - return false; + sa2cidr(*this, sa, range); } -int BindPorts(bool bail) +irc::sockets::cidr_mask::cidr_mask(const std::string& mask) { - char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; - insp_sockaddr client, server; - int clientportcount = 0; - int BoundPortCount = 0; + std::string::size_type bits_chars = mask.rfind('/'); + irc::sockets::sockaddrs sa; - if (!bail) + if (bits_chars == std::string::npos) { - int InitialPortCount = ServerInstance->stats->BoundPortCount; - log(DEBUG,"Initial port count: %d",InitialPortCount); - - for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) - { - Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF); - Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF); - Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF); - - if (((!*Type) || (!strcmp(Type,"clients"))) && (!HasPort(atoi(configToken),Addr))) - { - // modules handle server bind types now - Config->ports[clientportcount+InitialPortCount] = atoi(configToken); - if (*Addr == '*') - *Addr = 0; - - strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256); - clientportcount++; - log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type); - } - } - int PortCount = clientportcount; - if (PortCount) - { - for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++) - { - if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR) - { - log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]); - } - else - { - if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count])) - { - log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); - } - else - { - /* Associate the new open port with a slot in the socket engine */ - if (Config->openSockfd[count] > -1) - { - if (!ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN)) - { - log(DEFAULT,"ERK! Failed to add listening port to socket engine!"); - shutdown(Config->openSockfd[count],2); - close(Config->openSockfd[count]); - } - else - BoundPortCount++; - } - } - } - } - return InitialPortCount + BoundPortCount; - } - else - { - log(DEBUG,"There is nothing new to bind!"); - } - return InitialPortCount; + irc::sockets::aptosa(mask, 0, sa); + sa2cidr(*this, sa, 128); } - - for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++) + else { - Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF); - Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF); - Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF); - - if ((!*Type) || (!strcmp(Type,"clients"))) - { - // modules handle server bind types now - Config->ports[clientportcount] = atoi(configToken); - - // If the client put bind "*", this is an unrealism. - // We don't actually support this as documented, but - // i got fed up of people trying it, so now it converts - // it to an empty string meaning the same 'bind to all'. - if (*Addr == '*') - *Addr = 0; - - strlcpy(Config->addrs[clientportcount],Addr,256); - clientportcount++; - log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type); - } + unsigned char range = ConvToNum(mask.substr(bits_chars + 1)); + irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa); + sa2cidr(*this, sa, range); } +} - int PortCount = clientportcount; +std::string irc::sockets::cidr_mask::str() const +{ + irc::sockets::sockaddrs sa; + sa.sa.sa_family = type; - for (int count = 0; count < PortCount; count++) + unsigned char* base; + size_t len; + switch (type) { - if ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR) - { - log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]); - } - else - { - if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count])) - { - log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno)); - } - else - { - /* well we at least bound to one socket so we'll continue */ - BoundPortCount++; - } - } + case AF_INET: + base = (unsigned char*)&sa.in4.sin_addr; + len = 4; + break; + + case AF_INET6: + base = (unsigned char*)&sa.in6.sin6_addr; + len = 16; + break; + + case AF_UNIX: + return sa.un.sun_path; + + default: + // If we have reached this point then we have encountered a bug. + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::cidr_mask::str(): socket type %d is unknown!", type); + return ""; } - return BoundPortCount; + + memcpy(base, bits, len); + return sa.addr() + "/" + ConvToStr((int)length); } -const char* insp_ntoa(insp_inaddr n) +bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const { - static char buf[1024]; - inet_ntop(AF_FAMILY, &n, buf, sizeof(buf)); - return buf; + return type == other.type && length == other.length && + 0 == memcmp(bits, other.bits, 16); } -int insp_aton(const char* a, insp_inaddr* n) +bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const { - return inet_pton(AF_FAMILY, a, n); + 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 +{ + if (addr.family() != type) + return false; + irc::sockets::cidr_mask tmp(addr, length); + return tmp == *this; +}