-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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 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/>.
*/
-#include <string>
-#include "configreader.h"
-#include "socket.h"
+
#include "inspircd.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
+#include "socket.h"
#include "socketengine.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 */
-
-char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits */
- 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 */
-};
-
-bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits)
-{
- unsigned int modulus = mask_bits & 0x07; /* Number of whole bytes in the mask */
- unsigned int divisor = mask_bits >> 0x04; /* Remaining bits in the mask after whole bytes are dealt with */
-
- /* First compare the whole bytes, if they dont match, return false */
- if (memcmp(address, mask, divisor))
- return false;
-
- /* 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;
-
- /* The address matches the mask, to mask_bits bits of mask */
- return true;
-}
+using irc::sockets::sockaddrs;
/** 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)
+ */
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
{
- memset(&server,0,sizeof(server));
- insp_inaddr addy;
-
- if (*addr == '*')
- *addr = 0;
+ sockaddrs servaddr;
+ int ret;
- if ((*addr) && (insp_aton(addr,&addy) < 1))
+ if ((*addr == '*' || *addr == '\0') && port == -1)
{
- log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
- return false;;
+ /* 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;
-#ifdef IPV6
- server.sin6_family = AF_FAMILY;
-#else
- server.sin_family = AF_FAMILY;
-#endif
- if (!*addr)
- {
-#ifdef IPV6
- memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
-#else
- server.sin_addr.s_addr = htonl(INADDR_ANY);
-#endif
- }
- else
- {
-#ifdef IPV6
- memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
-#else
- server.sin_addr = addy;
-#endif
- }
-#ifdef IPV6
- server.sin6_port = htons(port);
-#else
- server.sin_port = htons(port);
-#endif
- if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0)
+ ret = SE->Bind(sockfd, servaddr);
+
+ if (ret < 0)
{
return false;
}
else
{
- log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port);
- if (listen(sockfd, Config->MaxConn) == -1)
+ if (dolisten)
{
- log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
- return false;
+ 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;
+ }
}
else
{
- NonBlocking(sockfd);
+ this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
return true;
}
}
}
-
-// Open a TCP Socket
-int OpenTCPSocket()
+int InspIRCd::BindPorts(FailedPortList &failed_ports)
{
- int sockfd;
- int on = 1;
- struct linger linger = { 0 };
-
- if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0)
- {
- log(DEFAULT,"Error creating TCP socket: %s",strerror(errno));
- return (ERROR);
- }
- else
- {
- 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);
- }
-}
+ int bound = 0;
+ std::vector<ListenSocket*> old_ports(ports.begin(), ports.end());
-bool HasPort(int port, char* addr)
-{
- for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++)
+ ConfigTagList tags = ServerInstance->Config->ConfTags("bind");
+ for(ConfigIter i = tags.first; i != tags.second; ++i)
{
- if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
- {
- return true;
- }
- }
- return false;
-}
+ ConfigTag* tag = i->second;
+ std::string porttag = tag->getString("port");
+ std::string Addr = tag->getString("address");
-int BindPorts(bool bail)
-{
- char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
- insp_sockaddr client, server;
- int clientportcount = 0;
- int BoundPortCount = 0;
-
- if (!bail)
- {
- int InitialPortCount = ServerInstance->stats->BoundPortCount;
- log(DEBUG,"Initial port count: %d",InitialPortCount);
+ if (strncasecmp(Addr.c_str(), "::ffff:", 7) == 0)
+ this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
- for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
+ irc::portparser portrange(porttag, false);
+ int portno = -1;
+ while (0 != (portno = portrange.GetToken()))
{
- 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);
+ irc::sockets::sockaddrs bindspec;
+ if (!irc::sockets::aptosa(Addr, portno, bindspec))
+ continue;
+ std::string bind_readable = bindspec.str();
- 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++)
+ bool skip = false;
+ for (std::vector<ListenSocket*>::iterator n = old_ports.begin(); n != old_ports.end(); ++n)
{
- if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR)
+ if ((**n).bind_desc == bind_readable)
{
- log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]);
- return ERROR;
+ (*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;
}
- if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
+ }
+ if (!skip)
+ {
+ ListenSocket* ll = new ListenSocket(tag, bindspec);
+
+ if (ll->GetFd() > -1)
{
- log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+ bound++;
+ ports.push_back(ll);
}
else
{
- /* Associate the new open port with a slot in the socket engine */
- if (Config->openSockfd[count] > -1)
- {
- ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
- BoundPortCount++;
- }
+ failed_ports.push_back(std::make_pair(bind_readable, strerror(errno)));
+ delete ll;
}
}
- return InitialPortCount + BoundPortCount;
- }
- else
- {
- log(DEBUG,"There is nothing new to bind!");
}
- return InitialPortCount;
}
- for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
+ std::vector<ListenSocket*>::iterator n = ports.begin();
+ for (std::vector<ListenSocket*>::iterator o = old_ports.begin(); o != old_ports.end(); ++o)
{
- 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")))
+ while (n != ports.end() && *n != *o)
+ n++;
+ if (n == ports.end())
{
- // 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);
+ this->Logs->Log("SOCKET",DEFAULT,"Port bindings slipped out of vector, aborting close!");
+ break;
}
+
+ this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.",
+ (**n).bind_desc.c_str());
+ delete *n;
+
+ // this keeps the iterator valid, pointing to the next element
+ n = ports.erase(n);
}
- int PortCount = clientportcount;
+ return bound;
+}
- for (int count = 0; count < PortCount; count++)
+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 ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
- {
- log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]);
- return ERROR;
- }
-
- if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
+ if (ServerInstance->Config->WildcardIPv6)
{
- log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+ sa.in6.sin6_family = AF_INET6;
+ sa.in6.sin6_port = htons(port);
}
else
{
- /* well we at least bound to one socket so we'll continue */
- BoundPortCount++;
+ 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)
+ {
+ 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;
+}
- /* if we didn't bind to anything then abort */
- if (!BoundPortCount)
+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;
+}
+
+std::string irc::sockets::sockaddrs::addr() const
+{
+ char addrv[INET6_ADDRSTRLEN+1];
+ if (sa.sa_family == AF_INET)
+ {
+ if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv)))
+ return "";
+ return addrv;
+ }
+ else if (sa.sa_family == AF_INET6)
{
- log(DEFAULT,"No ports bound, bailing!");
- printf("\nERROR: Could not bind any of %d ports! Please check your configuration.\n\n", PortCount);
- return ERROR;
+ if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv)))
+ return "";
+ return addrv;
}
+ return "";
+}
- return BoundPortCount;
+bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port)
+{
+ port = sa.port();
+ addr = sa.addr();
+ return !addr.empty();
}
-const char* insp_ntoa(insp_inaddr n)
+std::string irc::sockets::sockaddrs::str() const
{
- static char buf[1024];
- inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
- return buf;
+ char buffer[MAXBUF];
+ if (sa.sa_family == AF_INET)
+ {
+ const uint8_t* bits = reinterpret_cast<const uint8_t*>(&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)
+ {
+ buffer[0] = '[';
+ if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10))
+ return "<unknown>"; // 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 "<unknown>";
+ return std::string(buffer);
}
-int insp_aton(const char* a, insp_inaddr* n)
+int irc::sockets::sockaddrs::sa_size() const
{
- return inet_pton(AF_FAMILY, a, n);
+ if (sa.sa_family == AF_INET)
+ return sizeof(in4);
+ if (sa.sa_family == AF_INET6)
+ return sizeof(in6);
+ 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
+ {
+ 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 < target_byte; i++)
+ {
+ 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, int 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 (bits_chars == std::string::npos)
+ {
+ irc::sockets::aptosa(mask, 0, sa);
+ sa2cidr(*this, sa, 128);
+ }
+ else
+ {
+ int range = ConvToInt(mask.substr(bits_chars + 1));
+ irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa);
+ sa2cidr(*this, sa, range);
+ }
+}
+
+std::string irc::sockets::cidr_mask::str() const
+{
+ irc::sockets::sockaddrs sa;
+ sa.sa.sa_family = type;
+ unsigned char* base;
+ int len;
+ if (type == AF_INET)
+ {
+ base = (unsigned char*)&sa.in4.sin_addr;
+ len = 4;
+ }
+ else if (type == AF_INET6)
+ {
+ base = (unsigned char*)&sa.in6.sin6_addr;
+ len = 16;
+ }
+ else
+ return "";
+ memcpy(base, bits, len);
+ return sa.addr() + "/" + ConvToStr((int)length);
+}
+
+bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const
+{
+ return type == other.type && length == other.length &&
+ 0 == memcmp(bits, other.bits, 16);
+}
+
+bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const
+{
+ 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.sa.sa_family != type)
+ return false;
+ irc::sockets::cidr_mask tmp(addr, length);
+ return tmp == *this;
}
projects / user / henk / code / inspircd.git / blobdiff