* | 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-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 "inspstring.h"
-#include "helperfuncs.h"
+#include "socket.h"
#include "socketengine.h"
-#include "message.h"
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
/** This will bind a socket to a port. It works for UDP/TCP.
- * If a hostname is given to bind to, the function will first
- * attempt to resolve the hostname, then bind to the IP the
- * hostname resolves to. This is a blocking lookup blocking for
- * a maximum of one second before it times out, using the DNS
- * server specified in the configuration file.
- */
-bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
+ * 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)
{
- memset(&server,0,sizeof(server));
- insp_inaddr addy;
- bool resolved = false;
- char resolved_addr[128];
+ /* 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);
+
+ int ret, size;
if (*addr == '*')
- *addr = 0;
+ addr = "";
- if (*addr && !inet_aton(addr,&addy))
+#ifdef IPV6
+ if (*addr)
{
- /* If they gave a hostname, bind to the IP it resolves to */
- if (CleanAndResolve(resolved_addr, addr, true, 1))
+ /* There is an address here. Is it ipv6? */
+ if (strchr(addr,':'))
{
- inet_aton(resolved_addr,&addy);
- log(DEFAULT,"Resolved binding '%s' -> '%s'",addr,resolved_addr);
- server.sin_addr = addy;
- resolved = true;
+ /* 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
{
- log(DEFAULT,"WARNING: Could not resolve '%s' to an IP for binding to on port %d",addr,port);
- 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);
}
}
- server.sin_family = AF_INET;
- if (!resolved)
+ else
{
- if (!*addr)
+ if (port == -1)
{
- server.sin_addr.s_addr = htonl(INADDR_ANY);
+ /* 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
{
- server.sin_addr = addy;
+ /* 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
+ /* If we aren't built with ipv6, the choice becomes simple */
+ ((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[] servaddr;
+ return false;
}
+ ((sockaddr_in*)servaddr)->sin_addr = addy;
+ }
+ else
+ {
+ /* Bind ipv4 to all */
+ ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
}
- server.sin_port = htons(port);
- if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0)
+ /* Bind ipv4 port number */
+ ((sockaddr_in*)servaddr)->sin_port = htons(port);
+ size = sizeof(sockaddr_in);
+#endif
+ 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_INET, SOCK_STREAM, 0)) < 0)
+ addr = addr;
+ struct linger linger = { 0, 0 };
+#ifdef IPV6
+ if (!*addr)
{
- log(DEFAULT,"Error creating TCP socket: %s",strerror(errno));
- return (ERROR);
+ 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
{
- setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+ return ERROR;
+ }
+ else
+ {
+ 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(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 = (ports.size() == 0);
+ std::vector<std::pair<std::string, int> > old_ports;
+
+ /* 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()));
- if (!bail)
+ for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
{
- int InitialPortCount = ServerInstance->stats->BoundPortCount;
- log(DEBUG,"Initial port count: %d",InitialPortCount);
+ Config->ConfValue("bind", "port", count, configToken, MAXBUF);
+ Config->ConfValue("bind", "address", count, Addr, MAXBUF);
+ Config->ConfValue("bind", "type", count, Type, MAXBUF);
- 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"))) && (!HasPort(atoi(configToken),Addr)))
+ if ((!*Type) || (!strcmp(Type,"clients")))
+ {
+ 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)
+ bool skip = false;
+ for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
{
- 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]))
- {
- 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)
+ {
+ bound++;
+ ports.push_back(ll);
+ }
+ else
{
- ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
- BoundPortCount++;
+ failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
}
}
}
- 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);
+ for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != 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;
+ ports.erase(n);
+ break;
+ }
+ }
}
}
- int PortCount = clientportcount;
+ return bound;
+}
- 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;
- }
+const char* irc::sockets::insp_ntoa(insp_inaddr n)
+{
+ static char buf[1024];
+ inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
+ return buf;
+}
- 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++;
- }
+int irc::sockets::insp_aton(const char* a, 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;
+}
- /* if we didn't bind to anything then abort */
- if (!BoundPortCount)
+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)
{
- 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_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;
+}
- return BoundPortCount;
+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;
}