X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=e045df1f99610a38db7b6df0f3af34d94a25033b;hb=da074814501f23680b579feb1ad649c86e8a1348;hp=b68de7159764198b90325539934ea8f80883625d;hpb=69c3a32784b8c638ea10c269c3f63ede86b8aaa0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index b68de7159..e045df1f9 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -2,26 +2,22 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * 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. + * the file COPYING for details. * * --------------------------------------------------- */ -#include -#include "configreader.h" -#include "socket.h" +/* $Core: libIRCDsocket */ + #include "inspircd.h" +#include "socket.h" #include "socketengine.h" #include "wildcard.h" -using namespace std; using namespace irc::sockets; /* Used when comparing CIDR masks for the modulus bits left over. @@ -29,7 +25,7 @@ using namespace irc::sockets; * ((-1) << (8 - (mask % 8))) * But imho, it sucks in comparison to a nice neat lookup table. */ -const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used */ +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 */ @@ -40,70 +36,104 @@ const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used }; -ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance) +ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port) +{ + this->SetFd(OpenTCPSocket(addr)); + if (this->GetFd() > -1) + { + if (!Instance->BindSocket(this->fd,port,addr)) + this->fd = -1; +#ifdef IPV6 + if ((!*addr) || (strchr(addr,':'))) + this->family = AF_INET6; + else +#endif + this->family = AF_INET; + Instance->SE->AddFd(this); + } +} + +ListenSocket::~ListenSocket() { - this->SetFd(sockfd); - Instance->Log(DEBUG,"Binding to port %s:%d",addr,port); - if (!Instance->BindSocket(this->fd,client,server,port,addr)) + if (this->GetFd() > -1) { - Instance->Log(DEBUG,"Binding failed!"); + ServerInstance->SE->DelFd(this); + 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) { - insp_sockaddr sock_us; // our port number - socklen_t uslen; // length of our port number - insp_sockaddr client; - socklen_t length; + socklen_t uslen, length; // length of our port number int incomingSockfd, in_port; - ServerInstance->Log(DEBUG,"Handle ListenSocket event"); + if (!setup_sock) + { + sock_us = new sockaddr[2]; + client = new sockaddr[2]; + setup_sock = true; + } - 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 + 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))) + { + char buf[MAXBUF]; #ifdef IPV6 - in_port = ntohs(sock_us.sin6_port); -#else - in_port = ntohs(sock_us.sin_port); + if (this->family == AF_INET6) + { + inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); + in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port); + } + else #endif - ServerInstance->Log(DEBUG,"Accepted socket %d",incomingSockfd); - NonBlocking(incomingSockfd); + { + inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf)); + in_port = ntohs(((sockaddr_in*)sock_us)->sin_port); + } + + ServerInstance->SE->NonBlocking(incomingSockfd); + if (ServerInstance->Config->GetIOHook(in_port)) { 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 + ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, buf, in_port); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - ServerInstance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); + ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } } ServerInstance->stats->statsAccept++; -#ifdef IPV6 - ServerInstance->Log(DEBUG,"Add ipv6 client"); - userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin6_addr); -#else - ServerInstance->Log(DEBUG,"Add ipv4 client"); - userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin_addr); -#endif - ServerInstance->Log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd); + ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client); } else { - ServerInstance->Log(DEBUG,"Accept failed on fd %d: %s",incomingSockfd,strerror(errno)); - shutdown(incomingSockfd,2); - close(incomingSockfd); + ServerInstance->SE->Shutdown(incomingSockfd, 2); + ServerInstance->SE->Close(incomingSockfd); ServerInstance->stats->statsRefused++; } } @@ -111,19 +141,19 @@ void ListenSocket::HandleEvent(EventType et, int errornum) /* 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; } @@ -275,217 +305,244 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma return MatchCIDRBits(addr_raw, mask_raw, bits); } -inline void irc::sockets::Blocking(int s) -{ - int flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags ^ O_NONBLOCK); -} - -inline 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) +bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten) { - memset(&server,0,sizeof(server)); - insp_inaddr addy; + /* 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) && (insp_aton(addr,&addy) < 1)) +#ifdef IPV6 + if (*addr) { - this->Log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr); - return false;; - } + /* There is an address here. Is it ipv6? */ + if (strchr(addr,':')) + { + /* Yes it is */ + in6_addr addy; + if (inet_pton(AF_INET6, addr, &addy) < 1) + { + delete[] servaddr; + return false; + } -#ifdef IPV6 - server.sin6_family = AF_FAMILY; -#else - server.sin_family = AF_FAMILY; -#endif - if (!*addr) + ((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 + { + /* 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 { -#ifdef IPV6 - memcpy(&addy, &server.sin6_addr, sizeof(in6_addr)); + if (port == -1) + { + /* 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 + { + /* 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 - server.sin_addr.s_addr = htonl(INADDR_ANY); -#endif + /* 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 { -#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 { - this->Log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); - 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(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 { 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) +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; - - ports_found = 0; + int bound = 0; + bool started_with_nothing = (Config->ports.size() == 0); + std::vector > old_ports; - int InitialPortCount = stats->BoundPortCount; - this->Log(DEBUG,"Initial port count: %d",InitialPortCount); + /* XXX: Make a copy of the old ip/port pairs here */ + for (std::vector::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++) { 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); - long portno = -1; - while (portno = portrange.GetToken()) + irc::portparser portrange(configToken, false); + int portno = -1; + while ((portno = portrange.GetToken())) { - if (!HasPort(portno, Addr)) - { - ports_found++; - Config->ports[clientportcount+InitialPortCount] = portno; - if (*Addr == '*') - *Addr = 0; - - strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256); - clientportcount++; - this->Log(DEBUG,"NEW binding %s:%d [%s] from config",Addr, portno, Type); - } - } - } + if (*Addr == '*') + *Addr = 0; - if (!bail) - { - int PortCount = clientportcount; - if (PortCount) - { - BoundPortCount = stats->BoundPortCount; - for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++) + bool skip = false; + for (std::vector::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n) { - int fd = OpenTCPSocket(); - if (fd == ERROR) + if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno)) { - this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,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 >::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]; + old_ports.erase(k); + break; } - else - BoundPortCount++; } } } - return InitialPortCount + BoundPortCount; - } - else - { - this->Log(DEBUG,"There is nothing new to bind!"); + if (!skip) + { + ListenSocket* ll = new ListenSocket(this, portno, Addr); + if (ll->GetFd() > -1) + { + bound++; + Config->ports.push_back(ll); + } + else + { + failed_ports.push_back(std::make_pair(Addr, portno)); + } + ports_found++; + } } - 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) - { - this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,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::iterator n = Config->ports.begin(); n != Config->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; + Config->ports.erase(n); + break; + } } } } - return BoundPortCount; + + return bound; } const char* irc::sockets::insp_ntoa(insp_inaddr n)