* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
-#include <string>
-#include "configreader.h"
-#include "socket.h"
+/* $Core: libIRCDsocket */
+
#include "inspircd.h"
+#include "socket.h"
#include "socketengine.h"
#include "wildcard.h"
if ((!*addr) || (strchr(addr,':')))
this->family = AF_INET6;
else
- this->family = AF_INET;
-#else
- this->family = AF_INET;
#endif
+ this->family = AF_INET;
Instance->SE->AddFd(this);
}
}
if (this->GetFd() > -1)
{
ServerInstance->SE->DelFd(this);
- ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
- if (shutdown(this->fd, 2) || close(this->fd))
- ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
+ 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;
}
}
-void ListenSocket::HandleEvent(EventType et, int errornum)
+
+// 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)
{
- sockaddr* sock_us = new sockaddr[2]; // our port number
- sockaddr* client = new sockaddr[2];
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)
{
length = sizeof(sockaddr_in6);
}
else
+#endif
{
uslen = sizeof(sockaddr_in);
length = sizeof(sockaddr_in);
}
-#else
- uslen = sizeof(sockaddr_in);
- length = sizeof(sockaddr_in);
-#endif
- incomingSockfd = _accept (this->GetFd(), (sockaddr*)client, &length);
- if ((incomingSockfd > -1) && (!_getsockname(incomingSockfd, sock_us, &uslen)))
+ incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
+
+ if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
{
char buf[MAXBUF];
#ifdef IPV6
in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
}
else
+#endif
{
inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
}
-#else
- inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
- in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
-#endif
- NonBlocking(incomingSockfd);
+
+ ServerInstance->SE->NonBlocking(incomingSockfd);
+
if (ServerInstance->Config->GetIOHook(in_port))
{
try
}
catch (CoreException& modexcept)
{
- ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
}
ServerInstance->stats->statsAccept++;
- userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
+ ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
}
else
{
- shutdown(incomingSockfd,2);
- close(incomingSockfd);
+ ServerInstance->SE->Shutdown(incomingSockfd, 2);
+ ServerInstance->SE->Close(incomingSockfd);
ServerInstance->stats->statsRefused++;
}
- delete[] client;
- delete[] sock_us;
}
/* 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 */
+ 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 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 */
+ /* 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;
}
return MatchCIDRBits(addr_raw, mask_raw, bits);
}
-void irc::sockets::Blocking(int s)
-{
-#ifndef WIN32
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-#else
- unsigned long opt = 0;
- ioctlsocket(s, FIONBIO, &opt);
-#endif
-}
-
-void irc::sockets::NonBlocking(int s)
-{
-#ifndef WIN32
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags | O_NONBLOCK);
-#else
- unsigned long opt = 1;
- ioctlsocket(s, FIONBIO, &opt);
-#endif
-}
-
/** 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, char* addr, bool dolisten)
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
{
/* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
- sockaddr* server = new sockaddr[2];
- memset(server,0,sizeof(sockaddr)*2);
+ sockaddr* servaddr = new sockaddr[2];
+ memset(servaddr,0,sizeof(sockaddr)*2);
int ret, size;
if (*addr == '*')
- *addr = 0;
+ addr = "";
#ifdef IPV6
if (*addr)
in6_addr addy;
if (inet_pton(AF_INET6, addr, &addy) < 1)
{
- delete[] server;
+ delete[] servaddr;
return false;
}
- ((sockaddr_in6*)server)->sin6_family = AF_INET6;
- memcpy(&(((sockaddr_in6*)server)->sin6_addr), &addy, sizeof(in6_addr));
- ((sockaddr_in6*)server)->sin6_port = htons(port);
+ ((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
in_addr addy;
if (inet_pton(AF_INET, addr, &addy) < 1)
{
- delete[] server;
+ delete[] servaddr;
return false;
}
- ((sockaddr_in*)server)->sin_family = AF_INET;
- ((sockaddr_in*)server)->sin_addr = addy;
- ((sockaddr_in*)server)->sin_port = htons(port);
+ ((sockaddr_in*)servaddr)->sin_family = AF_INET;
+ ((sockaddr_in*)servaddr)->sin_addr = addy;
+ ((sockaddr_in*)servaddr)->sin_port = htons(port);
size = sizeof(sockaddr_in);
}
}
/* Port -1: Means UDP IPV4 port binding - Special case
* used by DNS engine.
*/
- ((sockaddr_in*)server)->sin_family = AF_INET;
- ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
- ((sockaddr_in*)server)->sin_port = 0;
+ ((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*)server)->sin6_family = AF_INET6;
- memset(&(((sockaddr_in6*)server)->sin6_addr), 0, sizeof(in6_addr));
- ((sockaddr_in6*)server)->sin6_port = htons(port);
+ ((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
/* If we aren't built with ipv6, the choice becomes simple */
- ((sockaddr_in*)server)->sin_family = AF_INET;
+ ((sockaddr_in*)servaddr)->sin_family = AF_INET;
if (*addr)
{
/* There is an address here. */
in_addr addy;
if (inet_pton(AF_INET, addr, &addy) < 1)
{
- delete[] server;
+ delete[] servaddr;
return false;
}
- ((sockaddr_in*)server)->sin_addr = addy;
+ ((sockaddr_in*)servaddr)->sin_addr = addy;
}
else
{
/* Bind ipv4 to all */
- ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
+ ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
}
/* Bind ipv4 port number */
- ((sockaddr_in*)server)->sin_port = htons(port);
+ ((sockaddr_in*)servaddr)->sin_port = htons(port);
size = sizeof(sockaddr_in);
#endif
- ret = bind(sockfd, server, size);
- delete[] server;
+ ret = SE->Bind(sockfd, servaddr, size);
+ delete[] servaddr;
if (ret < 0)
{
{
if (dolisten)
{
- if (listen(sockfd, Config->MaxConn) == -1)
+ if (SE->Listen(sockfd, Config->MaxConn) == -1)
{
- this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
+ this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
return false;
}
else
{
- this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
- NonBlocking(sockfd);
+ this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
+ SE->NonBlocking(sockfd);
return true;
}
}
else
{
- this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
+ this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
return true;
}
}
{
int sockfd;
int on = 1;
- struct linger linger = { 0 };
+ addr = addr;
+ struct linger linger = { 0, 0 };
#ifdef IPV6
if (strchr(addr,':') || (!*addr))
sockfd = socket (PF_INET6, socktype, 0);
}
}
-/* XXX: Probably belongs in class InspIRCd */
-int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
+int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
int bound = 0;
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);
{
if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
{
- this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), 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;
projects / user / henk / code / inspircd.git / blobdiff