* ---------------------------------------------------
*/
-/* $Core: libIRCDsocket */
+/* $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.
- */
-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 */
-};
+/* 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;
ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
{
- this->SetFd(OpenTCPSocket(addr));
+ this->SetFd(irc::sockets::OpenTCPSocket(addr));
if (this->GetFd() > -1)
{
if (!Instance->BindSocket(this->fd,port,addr))
this->family = AF_INET;
Instance->SE->AddFd(this);
}
+ /* Saves needless allocations */
+ if (socketcount == 0)
+ {
+ /* All instances of ListenSocket share these, so reference count it */
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"Allocate sockaddr structures");
+ sock_us = new sockaddr[2];
+ client = new sockaddr[2];
+ raddr = new sockaddr[2];
+ }
+ socketcount++;
}
ListenSocket::~ListenSocket()
ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
this->fd = -1;
}
-}
-
-
-// XXX this is a bit of an untidy way to avoid reallocating this constantly. also, we leak it on shutdown.. but that's kinda minor - w
-static sockaddr *sock_us;
-static sockaddr *client;
-static bool setup_sock = false;
-
-void ListenSocket::HandleEvent(EventType, int)
-{
- socklen_t uslen, length; // length of our port number
- int incomingSockfd, in_port;
-
- if (!setup_sock)
- {
- sock_us = new sockaddr[2];
- client = new sockaddr[2];
- setup_sock = true;
- }
-
-#ifdef IPV6
- if (this->family == AF_INET6)
- {
- uslen = sizeof(sockaddr_in6);
- length = sizeof(sockaddr_in6);
- }
- 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)))
+ socketcount--;
+ if (socketcount == 0)
{
- char buf[MAXBUF];
- char target[MAXBUF];
-
- *target = *buf = '\0';
-
- sockaddr* raddr = new sockaddr[2];
-
-#ifdef IPV6
- if (this->family == AF_INET6)
- {
- 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));
- else
- ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
- }
- 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));
-
- }
-
+ delete[] sock_us;
+ delete[] client;
delete[] raddr;
-
- 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)
+void ListenSocket::HandleEvent(EventType e, int err)
{
- 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 */
-
- /* 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;
-
- /* Secondly (this is slower) compare the whole bytes */
- if (memcmp(address, mask, divisor))
- 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)
+ switch (e)
{
- /* 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)
+ case EVENT_ERROR:
+ ServerInstance->Logs->Log("SOCKET",DEFAULT,"ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err));
+ break;
+ case EVENT_WRITE:
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!");
+ break;
+ case EVENT_READ:
{
- /* 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));
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensoket");
+ socklen_t uslen, length; // length of our port number
+ int incomingSockfd, in_port;
- /* Free the stuff we created */
- free(address_dupe);
- free(cidr_dupe);
-
- /* 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);
- }
- }
- 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,'/');
+#ifdef IPV6
+ if (this->family == AF_INET6)
+ {
+ uslen = sizeof(sockaddr_in6);
+ length = sizeof(sockaddr_in6);
+ }
+ else
+#endif
+ {
+ uslen = sizeof(sockaddr_in);
+ length = sizeof(sockaddr_in);
+ }
- if (bits_chars)
- {
- bits = atoi(bits_chars + 1);
- *bits_chars = 0;
- }
- else
- {
- /* No 'number of bits' field! */
- free(mask);
- return false;
- }
+ incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
-#ifdef SUPPORT_IP6LINKS
- in6_addr address_in6;
- in6_addr mask_in6;
+ if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
+ {
+ char buf[MAXBUF];
+ char target[MAXBUF];
- 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);
+ *target = *buf = '\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
+#ifdef IPV6
+ if (this->family == AF_INET6)
+ {
+ 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 (getsockname(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
+ inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target));
+ else
+ ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+ }
+ else
#endif
- if (inet_pton(AF_INET, address, &address_in4) > 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;
+ {
+ 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 (getsockname(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));
+ }
+ ServerInstance->SE->NonBlocking(incomingSockfd);
+ ServerInstance->stats->statsAccept++;
+ ServerInstance->Users->AddUser(ServerInstance, incomingSockfd, in_port, false, this->family, client, target);
+ }
+ else
+ {
+ ServerInstance->SE->Shutdown(incomingSockfd, 2);
+ ServerInstance->SE->Close(incomingSockfd);
+ ServerInstance->stats->statsRefused++;
+ }
}
+ break;
}
- 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);
}
/** This will bind a socket to a port. It works for UDP/TCP.
{
irc::portparser portrange(configToken, false);
int portno = -1;
- while ((portno = portrange.GetToken()))
+ while (0 != (portno = portrange.GetToken()))
{
if (*Addr == '*')
*Addr = 0;
}
else
{
- failed_ports.push_back(std::make_pair(Addr, portno));
+ failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
}
ports_found++;
}
return inet_pton(AF_FAMILY, a, n);
}
+
projects / user / henk / code / inspircd.git / blobdiff