* | Inspire 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.
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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 "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 % 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;
-}
-
-bool MatchCIDR(const char* address, const char* cidr_mask)
+/** 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)
{
- unsigned char addr_raw[16];
- unsigned char mask_raw[16];
- unsigned int bits = 0;
- char* mask = strdup(cidr_mask);
-
- in_addr address_in4;
- in_addr mask_in4;
+ /* 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);
- char* bits_chars = strchr(mask,'/');
+ int ret, size;
- if (bits_chars)
- {
- bits = atoi(bits_chars + 1);
- *bits_chars = 0;
- }
-
-#ifdef SUPPORT_IP6LINKS
- in6_addr address_in6;
- in6_addr mask_in6;
+ if (*addr == '*')
+ addr = "";
- if (inet_pton(AF_INET6, address, &address_in6) > 0)
+#ifdef IPV6
+ if (*addr)
{
- if (inet_pton(AF_INET6, mask, &mask_in6) > 0)
+ /* There is an address here. Is it ipv6? */
+ if (strchr(addr,':'))
{
- memcpy(&addr_raw, &address_in6.s6_addr, 16);
- memcpy(&mask_raw, &mask_in6.s6_addr, 16);
+ /* Yes it is */
+ in6_addr addy;
+ if (inet_pton(AF_INET6, addr, &addy) < 1)
+ {
+ delete[] servaddr;
+ return false;
+ }
+
+ ((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
{
- free(mask);
- return false;
+ /* No, its not */
+ in_addr addy;
+ if (inet_pton(AF_INET, addr, &addy) < 1)
+ {
+ delete[] servaddr;
+ return false;
+ }
+
+ ((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
-#endif
- if (inet_pton(AF_INET, address, &address_in4) > 0)
{
- if (inet_pton(AF_INET, mask, &mask_in4) > 0)
+ if (port == -1)
{
- memcpy(&addr_raw, &address_in4.s_addr, 4);
- memcpy(&mask_raw, &mask_in4.s_addr, 4);
+ /* 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
{
- 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
- {
- free(mask);
- return false;
- }
-
- free(mask);
- return MatchCIDRBits(addr_raw, mask_raw, bits);
-}
-
-/** 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)
-{
- memset(&server,0,sizeof(server));
- insp_inaddr addy;
-
- if (*addr == '*')
- *addr = 0;
-
- if ((*addr) && (insp_aton(addr,&addy) < 1))
- {
- log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
- return false;;
- }
-
-#ifdef IPV6
- server.sin6_family = AF_FAMILY;
#else
- server.sin_family = AF_FAMILY;
-#endif
- if (!*addr)
+ /* If we aren't built with ipv6, the choice becomes simple */
+ ((sockaddr_in*)servaddr)->sin_family = AF_INET;
+ if (*addr)
{
-#ifdef IPV6
- memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
-#else
- server.sin_addr.s_addr = htonl(INADDR_ANY);
-#endif
+ /* 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;
}
else
{
-#ifdef IPV6
- memcpy(&addy, &server.sin6_addr, 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
{
- 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 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 (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
{
- log(DEFAULT,"Error creating TCP socket: %s",strerror(errno));
- return (ERROR);
+ 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);
}
}
-bool HasPort(int port, char* addr)
-{
- for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++)
- {
- if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
- {
- return true;
- }
- }
- return false;
-}
-
-int BindPorts(bool bail)
+// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
+int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
- insp_sockaddr client, server;
- int clientportcount = 0;
- int BoundPortCount = 0;
+ int bound = 0;
+ bool started_with_nothing = (Config->ports.size() == 0);
+ std::vector<std::pair<std::string, int> > old_ports;
- if (!bail)
- {
- int InitialPortCount = ServerInstance->stats->BoundPortCount;
- log(DEBUG,"Initial port count: %d",InitialPortCount);
+ /* XXX: Make a copy of the old ip/port pairs here */
+ for (std::vector<ListenSocketBase *>::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++)
+ for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "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);
+
+ 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")))
{
- 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"))) && (!HasPort(atoi(configToken),Addr)))
+ irc::portparser portrange(configToken, false);
+ int portno = -1;
+ while (0 != (portno = portrange.GetToken()))
{
- // 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++)
- {
- if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR)
- {
- log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]);
- return ERROR;
- }
- if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
+ bool skip = false;
+ for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
{
- log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+ 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;
+ }
+ }
+ }
}
- else
+ if (!skip)
{
- /* Associate the new open port with a slot in the socket engine */
- if (Config->openSockfd[count] > -1)
+ ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
+ if (ll->GetFd() > -1)
{
- ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
- BoundPortCount++;
+ bound++;
+ Config->ports.push_back(ll);
}
+ else
+ {
+ failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
+ }
+ ports_found++;
}
}
- 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++)
+ /* XXX: Here, anything left in our copy list, close as removed */
+ if (!started_with_nothing)
{
- 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")))
+ for (size_t k = 0; k < old_ports.size(); ++k)
{
- // 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);
- }
- }
-
- int PortCount = clientportcount;
-
- for (int count = 0; count < PortCount; count++)
- {
- 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]))
- {
- log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
- }
- else
- {
- /* well we at least bound to one socket so we'll continue */
- BoundPortCount++;
+ for (std::vector<ListenSocketBase *>::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;
+ }
+ }
}
}
- /* if we didn't bind to anything then abort */
- if (!BoundPortCount)
- {
- log(DEFAULT,"No ports bound, bailing!");
- printf("\nERROR: Could not bind any of %d ports! Please check your configuration.\n\n", PortCount);
- return ERROR;
- }
-
- return BoundPortCount;
+ return bound;
}
-const char* insp_ntoa(insp_inaddr n)
+const char* irc::sockets::insp_ntoa(insp_inaddr n)
{
static char buf[1024];
inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
return buf;
}
-int insp_aton(const char* a, insp_inaddr* n)
+int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
{
return inet_pton(AF_FAMILY, a, n);
}
+
projects / user / henk / code / inspircd.git / blobdiff