X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=78b7f2de92214b85731ac6664081f589f26cbad2;hb=c71361e8e4f22cb4f72881399bce2832eb080b0e;hp=1b657e568179452af0a8baf901d63e66cd1b89f0;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 1b657e568..78b7f2de9 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -1,423 +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 . */ -using namespace std; - -#include "inspircd_config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "socket.h" + #include "inspircd.h" -#include "inspircd_io.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "socketengine.h" +bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::vector& old_ports) +{ + 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(); -extern InspIRCd* ServerInstance; -extern ServerConfig* Config; -extern time_t TIME; + old_ports.erase(n); + return true; + } + } -InspSocket* socket_ref[MAX_DESCRIPTORS]; + 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; + } -InspSocket::InspSocket() -{ - this->state = I_DISCONNECTED; - this->fd = -1; - this->ClosePending = false; + 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; } -InspSocket::InspSocket(int newfd, char* ip) +size_t InspIRCd::BindPorts(FailedPortList& failed_ports) { - this->fd = newfd; - this->state = I_CONNECTED; - strlcpy(this->IP,ip,MAXBUF); - this->ClosePending = false; - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; -} + size_t bound = 0; + std::vector old_ports(ports.begin(), ports.end()); -InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsigned long maxtime) : fd(-1) -{ - strlcpy(host,ahost.c_str(),MAXBUF); - this->ClosePending = false; - if (listening) { - if ((this->fd = OpenTCPSocket()) == ERROR) + ConfigTagList tags = ServerInstance->Config->ConfTags("bind"); + for (ConfigIter i = tags.first; i != tags.second; ++i) + { + 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()) { - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - this->ClosePending = true; - log(DEBUG,"OpenTCPSocket() error"); - return; + // 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."); + + // 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()); + + irc::portparser portrange(portlist, false); + for (int port; (port = portrange.GetToken()); ) + { + irc::sockets::sockaddrs bindspec; + if (!irc::sockets::aptosa(address, port, bindspec)) + continue; + + if (!BindPort(tag, bindspec, old_ports)) + failed_ports.push_back(FailedPort(errno, bindspec, tag)); + else + bound++; + } + continue; } - else + +#ifndef _WIN32 + // Are we creating a UNIX listener? + const std::string path = tag->getString("path"); + if (!path.empty()) { - if (!BindSocket(this->fd,this->client,this->server,aport,(char*)ahost.c_str())) + // 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->Close(); - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_BIND); - this->ClosePending = true; - log(DEBUG,"BindSocket() error %s",strerror(errno)); - return; + 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; } - else + + // Check for characters which are problematic in the IRC message format. + if (fullpath.find_first_of("\n\r\t!@: ") != std::string::npos) { - this->state = I_LISTENING; - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - log(DEBUG,"New socket now in I_LISTENING state"); - return; + 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; } - } - } - else - { - strlcpy(this->host,ahost.c_str(),MAXBUF); - this->port = aport; - if (!inet_aton(host,&addy)) - { - log(DEBUG,"Attempting to resolve %s",this->host); - /* Its not an ip, spawn the resolver */ - this->dns.SetNS(std::string(Config->DNSServer)); - this->dns.ForwardLookupWithFD(host,fd); - timeout_end = time(NULL) + maxtime; - timeout = false; - this->state = I_RESOLVING; - socket_ref[this->fd] = this; + irc::sockets::untosa(fullpath, bindspec); + if (!BindPort(tag, bindspec, old_ports)) + failed_ports.push_back(FailedPort(errno, bindspec, tag)); + else + bound++; } - else +#endif + } + + std::vector::iterator n = ports.begin(); + for (std::vector::iterator o = old_ports.begin(); o != old_ports.end(); ++o) + { + while (n != ports.end() && *n != *o) + n++; + if (n == ports.end()) { - log(DEBUG,"No need to resolve %s",this->host); - strlcpy(this->IP,host,MAXBUF); - timeout_end = time(NULL) + maxtime; - this->DoConnect(); + 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); } -} -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)); + return bound; } -bool InspSocket::DoResolve() +bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa) { - log(DEBUG,"In DoResolve(), trying to resolve IP"); - if (this->dns.HasResult()) + memset(&sa, 0, sizeof(sa)); + if (addr.empty() || addr.c_str()[0] == '*') { - log(DEBUG,"Socket has result"); - std::string res_ip = dns.GetResultIP(); - if (res_ip != "") + if (ServerInstance->Config->WildcardIPv6) { - log(DEBUG,"Socket result set to %s",res_ip.c_str()); - strlcpy(this->IP,res_ip.c_str(),MAXBUF); - socket_ref[this->fd] = NULL; + sa.in6.sin6_family = AF_INET6; + sa.in6.sin6_port = htons(port); } else { - log(DEBUG,"Socket DNS failure"); - this->Close(); - this->state = I_ERROR; - this->OnError(I_ERR_RESOLVE); - this->fd = -1; - this->ClosePending = true; - return false; + sa.in4.sin_family = AF_INET; + sa.in4.sin_port = htons(port); } - return this->DoConnect(); + return true; } - log(DEBUG,"No result for socket yet!"); - return true; + else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0) + { + sa.in4.sin_family = AF_INET; + sa.in4.sin_port = htons(port); + return true; + } + else if (inet_pton(AF_INET6, addr.c_str(), &sa.in6.sin6_addr) > 0) + { + sa.in6.sin6_family = AF_INET6; + sa.in6.sin6_port = htons(port); + return true; + } + return false; } -bool InspSocket::DoConnect() +bool irc::sockets::untosa(const std::string& path, irc::sockets::sockaddrs& sa) { - log(DEBUG,"In DoConnect()"); - if ((this->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - log(DEBUG,"Cant socket()"); - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - this->fd = -1; + memset(&sa, 0, sizeof(sa)); + if (path.length() >= sizeof(sa.un.sun_path)) return false; - } - log(DEBUG,"Part 2 DoConnect() %s",this->IP); - inet_aton(this->IP,&addy); - addr.sin_family = AF_INET; - addr.sin_addr = addy; - addr.sin_port = htons(this->port); - - int flags; - flags = fcntl(this->fd, F_GETFL, 0); - fcntl(this->fd, F_SETFL, flags | O_NONBLOCK); - - if (connect(this->fd, (sockaddr*)&this->addr,sizeof(this->addr)) == -1) - { - if (errno != EINPROGRESS) - { - log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno)); - this->OnError(I_ERR_CONNECT); - this->Close(); - this->state = I_ERROR; - this->fd = -1; - this->ClosePending = true; - return false; - } - } - this->state = I_CONNECTING; - ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE); - socket_ref[this->fd] = this; - this->SetQueues(this->fd); - log(DEBUG,"Returning true from InspSocket::DoConnect"); + sa.un.sun_family = AF_UNIX; + memcpy(&sa.un.sun_path, path.c_str(), path.length() + 1); return true; } - -void InspSocket::Close() +bool irc::sockets::isunix(const std::string& file) { - if (this->fd != -1) - { - this->OnClose(); - shutdown(this->fd,2); - close(this->fd); - socket_ref[this->fd] = NULL; - this->ClosePending = true; - this->fd = -1; - } +#ifndef _WIN32 + struct stat sb; + if (stat(file.c_str(), &sb) == 0 && S_ISSOCK(sb.st_mode)) + return true; +#endif + return false; } -std::string InspSocket::GetIP() + +int irc::sockets::sockaddrs::family() const { - return this->IP; + return sa.sa_family; } -char* InspSocket::Read() +int irc::sockets::sockaddrs::port() const { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return NULL; - int n = recv(this->fd,this->ibuf,sizeof(this->ibuf),0); - if ((n > 0) && (n <= (int)sizeof(this->ibuf))) + switch (family()) { - ibuf[n] = 0; - return ibuf; + case AF_INET: + return ntohs(in4.sin_port); + + case AF_INET6: + return ntohs(in6.sin6_port); + + case AF_UNIX: + return 0; } - else + + // 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()) { - if (errno == EAGAIN) - { - return ""; - } - else - { - log(DEBUG,"EOF or error on socket: %s",strerror(errno)); - return NULL; - } + 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; } + + // 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 ""; } -void InspSocket::MarkAsClosed() +std::string irc::sockets::sockaddrs::str() const { - log(DEBUG,"Marked as closed"); - this->ClosePending = true; + switch (family()) + { + 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; + } + + // 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 ""; } -// There are two possible outcomes to this function. -// It will either write all of the data, or an undefined amount. -// If an undefined amount is written the connection has failed -// and should be aborted. -int InspSocket::Write(const std::string &data) +socklen_t irc::sockets::sockaddrs::sa_size() const { - if (this->ClosePending) - return false; + switch (family()) + { + case AF_INET: + return sizeof(in4); - /*int result = write(this->fd,data.c_str(),data.length()); - if (result < 1) - return false; - return true;*/ + case AF_INET6: + return sizeof(in6); + + case AF_UNIX: + return sizeof(un); + } - /* Try and append the data to the back of the queue, and send it on its way - */ - outbuffer.push_back(data); - return (!this->FlushWriteBuffer()); + // 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 InspSocket::FlushWriteBuffer() +bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const { - if (this->ClosePending) - return true; + if (family() != other.family()) + return false; - if ((this->fd > -1) && (this->state == I_CONNECTED)) + switch (family()) { - if (outbuffer.size()) - { - int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length()); - if (result > 0) - { - if ((unsigned int)result == outbuffer[0].length()) - { - /* The whole block was written (usually a line) - * Pop the block off the front of the queue - */ - outbuffer.pop_front(); - } - else - { - std::string temp = outbuffer[0].substr(result); - outbuffer[0] = temp; - } - } - else if ((result == -1) && (errno != EAGAIN)) - { - log(DEBUG,"Write error on socket: %s",strerror(errno)); - this->OnError(I_ERR_WRITE); - this->state = I_ERROR; - this->ClosePending = true; - 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); } - return (fd < 0); + + // 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)); } -bool InspSocket::Timeout(time_t current) +static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, unsigned char range) { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) + const unsigned char* base; + unsigned char target_byte; + + memset(cidr.bits, 0, sizeof(cidr.bits)); + + cidr.type = sa.family(); + switch (cidr.type) { - log(DEBUG,"No FD or socket ref"); - return false; + 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; } - if (this->ClosePending) + unsigned int border = cidr.length / 8; + unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF; + for(unsigned int i=0; i < target_byte; i++) { - log(DEBUG,"Close is pending"); - return true; + if (i < border) + cidr.bits[i] = base[i]; + else if (i == border) + cidr.bits[i] = base[i] & bitmask; + else + return; } +} + +irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, unsigned char range) +{ + sa2cidr(*this, sa, range); +} + +irc::sockets::cidr_mask::cidr_mask(const std::string& mask) +{ + std::string::size_type bits_chars = mask.rfind('/'); + irc::sockets::sockaddrs sa; - if (((this->state == I_RESOLVING) || (this->state == I_CONNECTING)) && (current > timeout_end)) + if (bits_chars == std::string::npos) { - log(DEBUG,"Timed out, current=%lu timeout_end=%lu"); - // for non-listening sockets, the timeout can occur - // which causes termination of the connection after - // the given number of seconds without a successful - // connection. - this->OnTimeout(); - this->OnError(I_ERR_TIMEOUT); - timeout = true; - this->state = I_ERROR; - this->ClosePending = true; - return true; + irc::sockets::aptosa(mask, 0, sa); + sa2cidr(*this, sa, 128); + } + else + { + unsigned char range = ConvToNum(mask.substr(bits_chars + 1)); + irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa); + sa2cidr(*this, sa, range); } - return this->FlushWriteBuffer(); } -bool InspSocket::Poll() +std::string irc::sockets::cidr_mask::str() const { - if (!socket_ref[this->fd] || !ServerInstance->SE->HasFd(this->fd)) - return false; + irc::sockets::sockaddrs sa; + sa.sa.sa_family = type; - int incoming = -1; - bool n = true; + unsigned char* base; + size_t len; + switch (type) + { + case AF_INET: + base = (unsigned char*)&sa.in4.sin_addr; + len = 4; + break; - if ((fd < 0) || (fd > MAX_DESCRIPTORS) || (this->ClosePending)) - return false; + case AF_INET6: + base = (unsigned char*)&sa.in6.sin6_addr; + len = 16; + break; + + case AF_UNIX: + return sa.un.sun_path; - switch (this->state) - { - case I_RESOLVING: - log(DEBUG,"State = I_RESOLVING, calling DoResolve()"); - return this->DoResolve(); - break; - case I_CONNECTING: - log(DEBUG,"State = I_CONNECTING"); - this->SetState(I_CONNECTED); - /* Our socket was in write-state, so delete it and re-add it - * in read-state. - */ - ServerInstance->SE->DelFd(this->fd); - ServerInstance->SE->AddFd(this->fd,true,X_ESTAB_MODULE); - return this->OnConnected(); - break; - case I_LISTENING: - length = sizeof (client); - incoming = accept (this->fd, (sockaddr*)&client,&length); - this->SetQueues(incoming); - this->OnIncomingConnection(incoming,inet_ntoa(client.sin_addr)); - return true; - break; - case I_CONNECTED: - n = this->OnDataReady(); - /* Flush any pending, but not till after theyre done with the event - * so there are less write calls involved. - * Both FlushWriteBuffer AND the return result of OnDataReady must - * return true for this to be ok. - */ - if (this->FlushWriteBuffer()) - return false; - return n; - break; default: - break; + // 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 true; -} -void InspSocket::SetState(InspSocketState s) -{ - log(DEBUG,"Socket state change"); - this->state = s; + memcpy(base, bits, len); + return sa.addr() + "/" + ConvToStr((int)length); } -InspSocketState InspSocket::GetState() +bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const { - return this->state; + return type == other.type && length == other.length && + 0 == memcmp(bits, other.bits, 16); } -int InspSocket::GetFd() +bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const { - return this->fd; + if (type != other.type) + return type < other.type; + if (length != other.length) + return length < other.length; + return memcmp(bits, other.bits, 16) < 0; } -bool InspSocket::OnConnected() { return true; } -void InspSocket::OnError(InspSocketError e) { return; } -int InspSocket::OnDisconnect() { return 0; } -int InspSocket::OnIncomingConnection(int newfd, char* ip) { return 0; } -bool InspSocket::OnDataReady() { return true; } -void InspSocket::OnTimeout() { return; } -void InspSocket::OnClose() { return; } - -InspSocket::~InspSocket() +bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const { - this->Close(); + if (addr.family() != type) + return false; + irc::sockets::cidr_mask tmp(addr, length); + return tmp == *this; }