* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* ---------------------------------------------------
*/
-#include <string>
-#include "configreader.h"
-#include "socket.h"
+/* $Core */
+
#include "inspircd.h"
+#include "socket.h"
#include "socketengine.h"
-#include "wildcard.h"
-
-using namespace irc::sockets;
-/* 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 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 sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance), desc("plaintext")
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
{
- this->SetFd(sockfd);
- if (!Instance->BindSocket(this->fd,client,server,port,addr))
- this->fd = -1;
-}
+ /* 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);
-ListenSocket::~ListenSocket()
-{
- if (this->GetFd() > -1)
- {
- shutdown(this->fd, 2);
- close(this->fd);
- this->fd = -1;
- }
-}
+ int ret, size;
+
+ if (*addr == '*')
+ addr = "";
-void ListenSocket::HandleEvent(EventType et, int errornum)
-{
- insp_sockaddr sock_us; // our port number
- socklen_t uslen; // length of our port number
- insp_sockaddr client;
- socklen_t length;
- int incomingSockfd, in_port;
- uslen = sizeof(sock_us);
- length = sizeof(client);
- incomingSockfd = accept (this->GetFd(),(struct sockaddr*)&client, &length);
-
- if ((incomingSockfd > -1) && (!getsockname(incomingSockfd, (sockaddr*)&sock_us, &uslen)))
- {
#ifdef IPV6
- in_port = ntohs(sock_us.sin6_port);
-#else
- in_port = ntohs(sock_us.sin_port);
-#endif
- NonBlocking(incomingSockfd);
- if (ServerInstance->Config->GetIOHook(in_port))
+ if (*addr)
+ {
+ /* There is an address here. Is it ipv6? */
+ if (strchr(addr,':'))
{
- try
- {
-#ifdef IPV6
- ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin6_addr), in_port);
-#else
- ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port);
-#endif
- }
- catch (CoreException& modexcept)
+ /* Yes it is */
+ in6_addr addy;
+ if (inet_pton(AF_INET6, addr, &addy) < 1)
{
- ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ delete[] servaddr;
+ return false;
}
- }
- ServerInstance->stats->statsAccept++;
-#ifdef IPV6
- userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin6_addr);
-#else
- userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin_addr);
-#endif
- }
- else
- {
- shutdown(incomingSockfd,2);
- 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)
-{
- 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 */
-
- /* 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;
-}
-
-/* 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);
-}
-
-/* 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)
- {
- /* 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)
- {
- /* Zero out the location of the @ symbol */
- *username_mask_pos = *username_addr_pos = 0;
-
- /* 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));
-
- /* Free the stuff we created */
- free(address_dupe);
- free(cidr_dupe);
-
- /* Return a result */
- return result;
+ ((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
{
- /* One or both didnt have an @ in,
- * just match as CIDR
- */
- free(address_dupe);
- free(cidr_dupe);
- mask = strdup(cidr_mask);
- }
- }
- 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;
-
-
- /* Use strrchr for this, its nearer to the right */
- char* bits_chars = strrchr(mask,'/');
+ /* No, its not */
+ in_addr addy;
+ if (inet_pton(AF_INET, addr, &addy) < 1)
+ {
+ delete[] servaddr;
+ return false;
+ }
- if (bits_chars)
- {
- bits = atoi(bits_chars + 1);
- *bits_chars = 0;
+ ((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
{
- /* No 'number of bits' field! */
- free(mask);
- return false;
- }
-
-#ifdef SUPPORT_IP6LINKS
- in6_addr address_in6;
- in6_addr mask_in6;
-
- if (inet_pton(AF_INET6, address, &address_in6) > 0)
- {
- if (inet_pton(AF_INET6, mask, &mask_in6) > 0)
+ if (port == -1)
{
- memcpy(&addr_raw, &address_in6.s6_addr, 16);
- memcpy(&mask_raw, &mask_in6.s6_addr, 16);
-
- if (bits > 128)
- bits = 128;
+ /* 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
{
- /* The address was valid ipv6, but the mask
- * that goes with it wasnt.
- */
- free(mask);
- return false;
+ /* 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);
}
}
- else
-#endif
- if (inet_pton(AF_INET, address, &address_in4) > 0)
+#else
+ /* If we aren't built with ipv6, the choice becomes simple */
+ ((sockaddr_in*)servaddr)->sin_family = AF_INET;
+ if (*addr)
{
- 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
+ /* There is an address here. */
+ in_addr addy;
+ if (inet_pton(AF_INET, addr, &addy) < 1)
{
- /* The address was valid ipv4,
- * but the mask that went with it wasnt.
- */
- free(mask);
+ delete[] servaddr;
return false;
}
+ ((sockaddr_in*)servaddr)->sin_addr = addy;
}
else
{
- /* The address was neither ipv4 or ipv6 */
- free(mask);
- return false;
- }
-
- /* Low-level-match the bits in the raw data */
- free(mask);
- return MatchCIDRBits(addr_raw, mask_raw, bits);
-}
-
-void irc::sockets::Blocking(int s)
-{
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-}
-
-void irc::sockets::NonBlocking(int s)
-{
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags | O_NONBLOCK);
-}
-
-/** 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, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
-{
- memset(&server,0,sizeof(server));
- insp_inaddr addy;
-
- if (*addr == '*')
- *addr = 0;
-
- if ((*addr) && (insp_aton(addr,&addy) < 1))
- return false;
-
-#ifdef IPV6
- server.sin6_family = AF_FAMILY;
-#else
- server.sin_family = AF_FAMILY;
-#endif
- if (!*addr)
- {
-#ifdef IPV6
- memset(&server.sin6_addr, 0, sizeof(in6_addr));
-#else
- server.sin_addr.s_addr = htonl(INADDR_ANY);
-#endif
- }
- else
- {
-#ifdef IPV6
- memcpy(&server.sin6_addr, &addy, sizeof(in6_addr));
-#else
- server.sin_addr = addy;
-#endif
+ /* Bind ipv4 to all */
+ ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
}
-#ifdef IPV6
- server.sin6_port = htons(port);
-#else
- server.sin_port = htons(port);
+ /* Bind ipv4 port number */
+ ((sockaddr_in*)servaddr)->sin_port = htons(port);
+ size = sizeof(sockaddr_in);
#endif
- if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0)
+ ret = SE->Bind(sockfd, servaddr, size);
+ delete[] servaddr;
+
+ if (ret < 0)
{
return false;
}
else
{
- if (listen(sockfd, Config->MaxConn) == -1)
+ if (dolisten)
{
- this->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 irc::sockets::OpenTCPSocket()
+int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
{
int sockfd;
int on = 1;
- struct linger linger = { 0 };
-
- if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0)
+ addr = addr;
+ struct linger linger = { 0, 0 };
+#ifdef IPV6
+ if (!*addr)
+ {
+ sockfd = socket (PF_INET6, socktype, 0);
+ if (sockfd < 0)
+ sockfd = socket (PF_INET, socktype, 0);
+ }
+ else if (strchr(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
{
return ERROR;
}
else
{
- setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+ 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, &linger,sizeof(linger));
+ setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger));
return (sockfd);
}
}
-/* XXX: Probably belongs in class InspIRCd */
-bool InspIRCd::HasPort(int port, char* addr)
-{
- for (unsigned long count = 0; count < stats->BoundPortCount; count++)
- {
- if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
- {
- return true;
- }
- }
- return false;
-}
-
-/* XXX: Probably belongs in class InspIRCd */
-int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
+// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
+int InspIRCd::BindPorts(FailedPortList &failed_ports)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
- insp_sockaddr client, server;
- int clientportcount = 0;
- int BoundPortCount = 0;
-
- ports_found = 0;
+ int bound = 0;
+ bool started_with_nothing = (ports.size() == 0);
+ std::vector<std::pair<std::string, int> > old_ports;
- int InitialPortCount = stats->BoundPortCount;
+ /* XXX: Make a copy of the old ip/port pairs here */
+ for (std::vector<ListenSocketBase *>::iterator o = ports.begin(); o != 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++)
+ for (int count = 0; count < Config->ConfValueEnum("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);
+ Config->ConfValue("bind", "port", count, configToken, MAXBUF);
+ Config->ConfValue("bind", "address", count, Addr, MAXBUF);
+ Config->ConfValue("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);
- long portno = -1;
- while ((portno = portrange.GetToken()))
+ int portno = -1;
+ while (0 != (portno = portrange.GetToken()))
{
- if (!HasPort(portno, Addr))
- {
- ports_found++;
- Config->ports[clientportcount+InitialPortCount] = portno;
- if (*Addr == '*')
- *Addr = 0;
+ if (*Addr == '*')
+ *Addr = 0;
- strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
- clientportcount++;
- }
- }
- }
-
- if (!bail)
- {
- int PortCount = clientportcount;
- if (PortCount)
- {
- BoundPortCount = stats->BoundPortCount;
- for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++)
+ bool skip = false;
+ for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
{
- int fd = OpenTCPSocket();
- if (fd == ERROR)
+ if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
{
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
- }
- else
- {
- Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
- if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
+ 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 (!SE->AddFd(Config->openSockfd[BoundPortCount]))
+ if ((k->first == Addr) && (k->second == portno))
{
- this->Log(DEFAULT,"ERK! Failed to add listening port to socket engine!");
- shutdown(Config->openSockfd[BoundPortCount]->GetFd(),2);
- close(Config->openSockfd[BoundPortCount]->GetFd());
- delete Config->openSockfd[BoundPortCount];
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
+ old_ports.erase(k);
+ break;
}
- else
- BoundPortCount++;
}
}
}
- return InitialPortCount + BoundPortCount;
+ if (!skip)
+ {
+ ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
+ if (ll->GetFd() > -1)
+ {
+ bound++;
+ ports.push_back(ll);
+ }
+ else
+ {
+ failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
+ }
+ }
}
- return InitialPortCount;
}
}
- int PortCount = clientportcount;
-
- for (int count = 0; count < PortCount; count++)
+ /* XXX: Here, anything left in our copy list, close as removed */
+ if (!started_with_nothing)
{
- int fd = OpenTCPSocket();
- if (fd == ERROR)
- {
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
- }
- else
+ for (size_t k = 0; k < old_ports.size(); ++k)
{
- Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
- if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
+ for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
{
- BoundPortCount++;
+ 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;
+ ports.erase(n);
+ break;
+ }
}
- else
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
}
}
- return BoundPortCount;
+
+ return bound;
}
const char* irc::sockets::insp_ntoa(insp_inaddr n)
return inet_pton(AF_FAMILY, a, n);
}
+int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+{
+ memset(sa, 0, sizeof(*sa));
+ if (!addr || !*addr)
+ {
+#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
+ return true;
+ }
+ else if (inet_pton(AF_INET, addr, &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, &sa->in6.sin6_addr) > 0)
+ {
+ sa->in6.sin6_family = AF_INET6;
+ sa->in6.sin6_port = htons(port);
+ return true;
+ }
+ return false;
+}
+
+int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+ char addrv[INET6_ADDRSTRLEN+1];
+ if (sa->sa.sa_family == AF_INET)
+ {
+ if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv)))
+ return false;
+ addr = addrv;
+ port = ntohs(sa->in4.sin_port);
+ return true;
+ }
+ else if (sa->sa.sa_family == AF_INET6)
+ {
+ if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv)))
+ return false;
+ addr = addrv;
+ port = ntohs(sa->in6.sin6_port);
+ return true;
+ }
+ return false;
+}
+
+int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
+{
+ if (sa.sa.sa_family == AF_INET)
+ return sizeof(sa.in4);
+ if (sa.sa.sa_family == AF_INET6)
+ return sizeof(sa.in6);
+ return 0;
+}