-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-/* $Core: libIRCDsocket */
#include "inspircd.h"
#include "socket.h"
#include "socketengine.h"
-#include "wildcard.h"
-
-using namespace irc::sockets;
+using irc::sockets::sockaddrs;
-/* Private static member data must be initialized in this manner */
-unsigned int ListenSocket::socketcount = 0;
-sockaddr* ListenSocket::sock_us = NULL;
-sockaddr* ListenSocket::client = NULL;
-sockaddr* ListenSocket::raddr = NULL;
-
-/* 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.
+/** 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'.
*/
-const unsigned 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 */
-};
-
-
-ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
{
- this->SetFd(OpenTCPSocket(addr));
- if (this->GetFd() > -1)
- {
- if (!Instance->BindSocket(this->fd,port,addr))
- this->fd = -1;
-#ifdef IPV6
- if ((!*addr) || (strchr(addr,':')))
- this->family = AF_INET6;
- else
-#endif
- this->family = AF_INET;
- Instance->SE->AddFd(this);
- }
- /* Saves needless allocations */
- if (socketcount == 0)
- {
- /* All instances of ListenSocket share these, so reference count it */
- sock_us = new sockaddr[2];
- client = new sockaddr[2];
- raddr = new sockaddr[2];
- }
- socketcount++;
-}
+ sockaddrs servaddr;
+ int ret;
-ListenSocket::~ListenSocket()
-{
- if (this->GetFd() > -1)
- {
- ServerInstance->SE->DelFd(this);
- ServerInstance->Logs->Log("SOCKET", DEBUG,"Shut down listener on fd %d", this->fd);
- if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this))
- ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
- this->fd = -1;
- }
- socketcount--;
- if (socketcount == 0)
+ if ((*addr == '*' || *addr == '\0') && port == -1)
{
- delete[] sock_us;
- delete[] client;
- delete[] raddr;
+ /* Port -1: Means UDP IPV4 port binding - Special case
+ * used by DNS engine.
+ */
+ memset(&servaddr, 0, sizeof(servaddr));
+ servaddr.in4.sin_family = AF_INET;
}
-}
+ else if (!irc::sockets::aptosa(addr, port, servaddr))
+ return false;
-void ListenSocket::HandleEvent(EventType, int)
-{
- socklen_t uslen, length; // length of our port number
- int incomingSockfd, in_port;
+ ret = SE->Bind(sockfd, servaddr);
-#ifdef IPV6
- if (this->family == AF_INET6)
+ if (ret < 0)
{
- uslen = sizeof(sockaddr_in6);
- length = sizeof(sockaddr_in6);
+ return false;
}
else
-#endif
{
- uslen = sizeof(sockaddr_in);
- length = sizeof(sockaddr_in);
- }
-
- incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
-
- if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
- {
- char buf[MAXBUF];
- char target[MAXBUF];
-
- *target = *buf = '\0';
-
-#ifdef IPV6
- if (this->family == AF_INET6)
+ if (dolisten)
{
- in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
- inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
- socklen_t raddrsz = sizeof(sockaddr_in6);
- if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
- inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target));
+ if (SE->Listen(sockfd, Config->MaxConn) == -1)
+ {
+ this->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s",strerror(errno));
+ return false;
+ }
else
- ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+ {
+ this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d with listen: %s:%d", sockfd, addr, port);
+ SE->NonBlocking(sockfd);
+ return true;
+ }
}
else
-#endif
{
- inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
- in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
- socklen_t raddrsz = sizeof(sockaddr_in);
- if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
- inet_ntop(AF_INET, &((const sockaddr_in*)raddr)->sin_addr, target, sizeof(target));
- else
- ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
-
+ this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d without listen: %s:%d", sockfd, addr, port);
+ return true;
}
-
- ServerInstance->SE->NonBlocking(incomingSockfd);
-
- ServerInstance->stats->statsAccept++;
- ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client, target);
- }
- else
- {
- ServerInstance->SE->Shutdown(incomingSockfd, 2);
- ServerInstance->SE->Close(incomingSockfd);
- ServerInstance->stats->statsRefused++;
}
}
-/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
-bool irc::sockets::MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits)
+int InspIRCd::BindPorts(FailedPortList &failed_ports)
{
- unsigned int divisor = mask_bits / 8; /* Number of whole bytes in the mask */
- unsigned int modulus = mask_bits % 8; /* Remaining bits in the mask after whole bytes are dealt with */
+ int bound = 0;
+ std::vector<ListenSocket*> old_ports(ports.begin(), ports.end());
- /* First (this is faster) compare the odd bits with logic ops */
- if (modulus)
- if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus]))
- /* If they dont match, return false */
- return false;
+ ConfigTagList tags = ServerInstance->Config->ConfTags("bind");
+ for(ConfigIter i = tags.first; i != tags.second; ++i)
+ {
+ ConfigTag* tag = i->second;
+ std::string porttag = tag->getString("port");
+ std::string Addr = tag->getString("address");
- /* Secondly (this is slower) compare the whole bytes */
- if (memcmp(address, mask, divisor))
- return false;
+ if (strncasecmp(Addr.c_str(), "::ffff:", 7) == 0)
+ this->Logs->Log("SOCKET", LOG_DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
- /* The address matches the mask, to mask_bits bits of mask */
- return true;
-}
+ irc::portparser portrange(porttag, false);
+ int portno = -1;
+ while (0 != (portno = portrange.GetToken()))
+ {
+ irc::sockets::sockaddrs bindspec;
+ if (!irc::sockets::aptosa(Addr, portno, bindspec))
+ continue;
+ std::string bind_readable = bindspec.str();
-/* Match CIDR, but dont attempt to match() against leading *!*@ sections */
-bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask)
-{
- return MatchCIDR(address, cidr_mask, false);
-}
+ bool skip = false;
+ for (std::vector<ListenSocket*>::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
+ (*n)->ResetIOHookProvider();
-/* 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 irc::sockets::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@<mask>/bits.
- * Chop off the ident@ portion, use match() on it
- * seperately.
- */
- if (match_with_username)
+ skip = true;
+ old_ports.erase(n);
+ break;
+ }
+ }
+ if (!skip)
+ {
+ ListenSocket* ll = new ListenSocket(tag, bindspec);
+
+ if (ll->GetFd() > -1)
+ {
+ bound++;
+ ports.push_back(ll);
+ }
+ else
+ {
+ failed_ports.push_back(std::make_pair(bind_readable, strerror(errno)));
+ delete ll;
+ }
+ }
+ }
+ }
+
+ std::vector<ListenSocket*>::iterator n = ports.begin();
+ for (std::vector<ListenSocket*>::iterator o = old_ports.begin(); o != old_ports.end(); ++o)
{
- /* 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)
+ while (n != ports.end() && *n != *o)
+ n++;
+ if (n == ports.end())
{
- /* Zero out the location of the @ symbol */
- *username_mask_pos = *username_addr_pos = 0;
+ 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_desc.c_str());
+ delete *n;
- /* 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));
+ // this keeps the iterator valid, pointing to the next element
+ n = ports.erase(n);
+ }
- /* Free the stuff we created */
- free(address_dupe);
- free(cidr_dupe);
+ return bound;
+}
- /* Return a result */
- return result;
+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 (ServerInstance->Config->WildcardIPv6)
+ {
+ sa.in6.sin6_family = AF_INET6;
+ sa.in6.sin6_port = htons(port);
}
else
{
- /* One or both didnt have an @ in,
- * just match as CIDR
- */
- free(address_dupe);
- free(cidr_dupe);
- mask = strdup(cidr_mask);
+ sa.in4.sin_family = AF_INET;
+ sa.in4.sin_port = htons(port);
}
+ return true;
}
- else
+ else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0)
{
- /* Make a copy of the cidr mask string,
- * we're going to change it
- */
- mask = strdup(cidr_mask);
+ 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;
+}
- in_addr address_in4;
- in_addr mask_in4;
-
-
- /* Use strrchr for this, its nearer to the right */
- char* bits_chars = strrchr(mask,'/');
+int irc::sockets::sockaddrs::port() const
+{
+ if (sa.sa_family == AF_INET)
+ return ntohs(in4.sin_port);
+ if (sa.sa_family == AF_INET6)
+ return ntohs(in6.sin6_port);
+ return -1;
+}
- if (bits_chars)
+std::string irc::sockets::sockaddrs::addr() const
+{
+ char addrv[INET6_ADDRSTRLEN+1];
+ if (sa.sa_family == AF_INET)
{
- bits = atoi(bits_chars + 1);
- *bits_chars = 0;
+ if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv)))
+ return "";
+ return addrv;
}
- else
+ else if (sa.sa_family == AF_INET6)
{
- /* No 'number of bits' field! */
- free(mask);
- return false;
+ if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv)))
+ return "";
+ return addrv;
}
+ return "";
+}
-#ifdef SUPPORT_IP6LINKS
- in6_addr address_in6;
- in6_addr mask_in6;
+bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port)
+{
+ port = sa.port();
+ addr = sa.addr();
+ return !addr.empty();
+}
- if (inet_pton(AF_INET6, address, &address_in6) > 0)
- {
- if (inet_pton(AF_INET6, mask, &mask_in6) > 0)
- {
- memcpy(&addr_raw, &address_in6.s6_addr, 16);
- memcpy(&mask_raw, &mask_in6.s6_addr, 16);
+static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 };
- if (bits > 128)
- bits = 128;
- }
- else
- {
- /* The address was valid ipv6, but the mask
- * that goes with it wasnt.
- */
- free(mask);
- return false;
- }
- }
- else
-#endif
- if (inet_pton(AF_INET, address, &address_in4) > 0)
+std::string irc::sockets::sockaddrs::str() const
+{
+ if (sa.sa_family == AF_INET)
{
- 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;
- }
+ char ipaddr[INET_ADDRSTRLEN];
+ inet_ntop(AF_INET, &in4.sin_addr, ipaddr, sizeof(ipaddr));
+ return InspIRCd::Format("%s:%u", ipaddr, ntohs(in4.sin_port));
}
- else
+
+ if (sa.sa_family == AF_INET6)
{
- /* The address was neither ipv4 or ipv6 */
- free(mask);
- return false;
+ char ipaddr[INET6_ADDRSTRLEN];
+ inet_ntop(AF_INET6, &in6.sin6_addr, ipaddr, sizeof(ipaddr));
+ return InspIRCd::Format("[%s]:%u", ipaddr, ntohs(in6.sin6_port));
}
- /* Low-level-match the bits in the raw data */
- free(mask);
- return MatchCIDRBits(addr_raw, mask_raw, bits);
+ // This should never happen.
+ return "<unknown>";
}
-/** 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 InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
+int irc::sockets::sockaddrs::sa_size() const
{
- /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
- sockaddr* servaddr = new sockaddr[2];
- memset(servaddr,0,sizeof(sockaddr)*2);
-
- int ret, size;
+ if (sa.sa_family == AF_INET)
+ return sizeof(in4);
+ if (sa.sa_family == AF_INET6)
+ return sizeof(in6);
+ return 0;
+}
- if (*addr == '*')
- addr = "";
+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));
+}
-#ifdef IPV6
- if (*addr)
- {
- /* There is an address here. Is it ipv6? */
- if (strchr(addr,':'))
- {
- /* Yes it is */
- in6_addr addy;
- if (inet_pton(AF_INET6, addr, &addy) < 1)
- {
- delete[] servaddr;
- return false;
- }
+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;
- ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
- memcpy(&(((sockaddr_in6*)servaddr)->sin6_addr), &addy, sizeof(in6_addr));
- ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
- size = sizeof(sockaddr_in6);
- }
- else
- {
- /* No, its not */
- in_addr addy;
- if (inet_pton(AF_INET, addr, &addy) < 1)
- {
- delete[] servaddr;
- return false;
- }
+ memset(cidr.bits, 0, sizeof(cidr.bits));
- ((sockaddr_in*)servaddr)->sin_family = AF_INET;
- ((sockaddr_in*)servaddr)->sin_addr = addy;
- ((sockaddr_in*)servaddr)->sin_port = htons(port);
- size = sizeof(sockaddr_in);
- }
- }
- else
+ if (cidr.type == AF_INET)
{
- if (port == -1)
- {
- /* Port -1: Means UDP IPV4 port binding - Special case
- * used by DNS engine.
- */
- ((sockaddr_in*)servaddr)->sin_family = AF_INET;
- ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
- ((sockaddr_in*)servaddr)->sin_port = 0;
- size = sizeof(sockaddr_in);
- }
- else
- {
- /* Theres no address here, default to ipv6 bind to all */
- ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
- memset(&(((sockaddr_in6*)servaddr)->sin6_addr), 0, sizeof(in6_addr));
- ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
- size = sizeof(sockaddr_in6);
- }
+ target_byte = sizeof(sa.in4.sin_addr);
+ base = (unsigned char*)&sa.in4.sin_addr;
+ if (range > 32)
+ range = 32;
}
-#else
- /* If we aren't built with ipv6, the choice becomes simple */
- ((sockaddr_in*)servaddr)->sin_family = AF_INET;
- if (*addr)
+ else if (cidr.type == AF_INET6)
{
- /* There is an address here. */
- in_addr addy;
- if (inet_pton(AF_INET, addr, &addy) < 1)
- {
- delete[] servaddr;
- return false;
- }
- ((sockaddr_in*)servaddr)->sin_addr = addy;
+ target_byte = sizeof(sa.in6.sin6_addr);
+ base = (unsigned char*)&sa.in6.sin6_addr;
+ if (range > 128)
+ range = 128;
}
else
{
- /* Bind ipv4 to all */
- ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
- }
- /* Bind ipv4 port number */
- ((sockaddr_in*)servaddr)->sin_port = htons(port);
- size = sizeof(sockaddr_in);
-#endif
- ret = SE->Bind(sockfd, servaddr, size);
- delete[] servaddr;
-
- if (ret < 0)
- {
- return false;
+ cidr.length = 0;
+ return;
}
- else
+ cidr.length = range;
+ unsigned int border = range / 8;
+ unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF;
+ for(unsigned int i=0; i < target_byte; i++)
{
- if (dolisten)
- {
- if (SE->Listen(sockfd, Config->MaxConn) == -1)
- {
- this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
- return false;
- }
- else
- {
- this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
- SE->NonBlocking(sockfd);
- return true;
- }
- }
+ if (i < border)
+ cidr.bits[i] = base[i];
+ else if (i == border)
+ cidr.bits[i] = base[i] & bitmask;
else
- {
- this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
- return true;
- }
+ return;
}
}
-// Open a TCP Socket
-int irc::sockets::OpenTCPSocket(char* addr, int socktype)
+irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, int range)
{
- int sockfd;
- int on = 1;
- addr = addr;
- struct linger linger = { 0, 0 };
-#ifdef IPV6
- if (strchr(addr,':') || (!*addr))
- sockfd = socket (PF_INET6, socktype, 0);
- else
- sockfd = socket (PF_INET, socktype, 0);
- if (sockfd < 0)
-#else
- if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
-#endif
+ 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 (bits_chars == std::string::npos)
{
- return ERROR;
+ irc::sockets::aptosa(mask, 0, sa);
+ sa2cidr(*this, sa, 128);
}
else
{
- setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&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, (char*)&linger,sizeof(linger));
- return (sockfd);
+ int range = ConvToInt(mask.substr(bits_chars + 1));
+ irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa);
+ sa2cidr(*this, sa, range);
}
}
-int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
+std::string irc::sockets::cidr_mask::str() const
{
- char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
- int bound = 0;
- bool started_with_nothing = (Config->ports.size() == 0);
- std::vector<std::pair<std::string, int> > old_ports;
-
- /* XXX: Make a copy of the old ip/port pairs here */
- for (std::vector<ListenSocket*>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
- old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
-
- for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
+ irc::sockets::sockaddrs sa;
+ sa.sa.sa_family = type;
+ unsigned char* base;
+ int len;
+ if (type == AF_INET)
{
- 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 (strncmp(Addr, "::ffff:", 7) == 0)
- this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
-
- if ((!*Type) || (!strcmp(Type,"clients")))
- {
- irc::portparser portrange(configToken, false);
- int portno = -1;
- while ((portno = portrange.GetToken()))
- {
- if (*Addr == '*')
- *Addr = 0;
-
- bool skip = false;
- for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
- {
- if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
- {
- skip = true;
- /* XXX: Here, erase from our copy of the list */
- for (std::vector<std::pair<std::string, int> >::iterator k = old_ports.begin(); k != old_ports.end(); ++k)
- {
- if ((k->first == Addr) && (k->second == portno))
- {
- old_ports.erase(k);
- break;
- }
- }
- }
- }
- if (!skip)
- {
- ListenSocket* ll = new ListenSocket(this, portno, Addr);
- if (ll->GetFd() > -1)
- {
- bound++;
- Config->ports.push_back(ll);
- }
- else
- {
- failed_ports.push_back(std::make_pair(Addr, portno));
- }
- ports_found++;
- }
- }
- }
+ base = (unsigned char*)&sa.in4.sin_addr;
+ len = 4;
}
-
- /* XXX: Here, anything left in our copy list, close as removed */
- if (!started_with_nothing)
+ else if (type == AF_INET6)
{
- for (size_t k = 0; k < old_ports.size(); ++k)
- {
- for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
- {
- if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
- {
- this->Logs->Log("SOCKET",DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
- delete *n;
- Config->ports.erase(n);
- break;
- }
- }
- }
+ base = (unsigned char*)&sa.in6.sin6_addr;
+ len = 16;
}
+ else
+ return "";
+ memcpy(base, bits, len);
+ return sa.addr() + "/" + ConvToStr((int)length);
+}
- return bound;
+bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const
+{
+ return type == other.type && length == other.length &&
+ 0 == memcmp(bits, other.bits, 16);
}
-const char* irc::sockets::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;
+ if (type != other.type)
+ return type < other.type;
+ if (length != other.length)
+ return length < other.length;
+ return memcmp(bits, other.bits, 16) < 0;
}
-int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
+bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const
{
- return inet_pton(AF_FAMILY, a, n);
+ if (addr.sa.sa_family != type)
+ return false;
+ irc::sockets::cidr_mask tmp(addr, length);
+ return tmp == *this;
}
projects / user / henk / code / inspircd.git / blobdiff