X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=ae11c3b48238b3155cfb2b52c9de0f2dac97ecb2;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=313396ed7829b52a448b61069eaada1df711d274;hpb=50234923b292122bb19296952b947d55b1760c62;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 313396ed7..ae11c3b48 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -1,105 +1,112 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core */ #include "inspircd.h" #include "socket.h" #include "socketengine.h" +ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to) + : bind_tag(tag) +{ + irc::sockets::satoap(bind_to, bind_addr, bind_port); + bind_desc = irc::sockets::satouser(bind_to); -/* Private static member data must be initialized in this manner */ -unsigned int ListenSocketBase::socketcount = 0; -sockaddr* ListenSocketBase::sock_us = NULL; -sockaddr* ListenSocketBase::client = NULL; -sockaddr* ListenSocketBase::raddr = NULL; + fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0); -ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port) -{ - this->SetFd(irc::sockets::OpenTCPSocket(addr.c_str())); - if (this->GetFd() > -1) + if (this->fd == -1) + return; + +#ifdef IPV6_V6ONLY + /* This OS supports IPv6 sockets that can also listen for IPv4 + * connections. If our address is "*" or empty, enable both v4 and v6 to + * allow for simpler configuration on dual-stack hosts. Otherwise, if it + * is "::" or an IPv6 address, disable support so that an IPv4 bind will + * work on the port (by us or another application). + */ + if (bind_to.sa.sa_family == AF_INET6) { - if (!Instance->BindSocket(this->fd,port,addr.c_str())) - this->fd = -1; -#ifdef IPV6 - if ((!*addr.c_str()) || (strchr(addr.c_str(),':'))) - this->family = AF_INET6; - else + std::string addr = tag->getString("address"); + /* This must be >= sizeof(DWORD) on Windows */ + const int enable = (addr.empty() || addr == "*") ? 0 : 1; + /* This must be before bind() */ + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast(&enable), sizeof(enable)); + // errors ignored intentionally + } #endif - this->family = AF_INET; - Instance->SE->AddFd(this); + + ServerInstance->SE->SetReuse(fd); + int rv = ServerInstance->SE->Bind(this->fd, bind_to); + if (rv >= 0) + rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn); + + if (rv < 0) + { + int errstore = errno; + ServerInstance->SE->Shutdown(this, 2); + ServerInstance->SE->Close(this); + this->fd = -1; + errno = errstore; } - /* Saves needless allocations */ - if (socketcount == 0) + else { - /* 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]; + ServerInstance->SE->NonBlocking(this->fd); + ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); } - socketcount++; } -ListenSocketBase::~ListenSocketBase() +ListenSocket::~ListenSocket() { if (this->GetFd() > -1) { 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->SE->Shutdown(this, 2); + if (ServerInstance->SE->Close(this) != 0) ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno)); this->fd = -1; } - socketcount--; - if (socketcount == 0) - { - delete[] sock_us; - delete[] client; - delete[] raddr; - } } /* Just seperated into another func for tidiness really.. */ -void ListenSocketBase::AcceptInternal() +void ListenSocket::AcceptInternal() { - ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensoket"); - socklen_t uslen, length; // length of our port number - int incomingSockfd; - -#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); - } + irc::sockets::sockaddrs client; + irc::sockets::sockaddrs server; - incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length); + socklen_t length = sizeof(client); + int incomingSockfd = ServerInstance->SE->Accept(this, &client.sa, &length); - if (incomingSockfd < 0 || - ServerInstance->SE->GetSockName(this, sock_us, &uslen) == -1) + ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd); + if (incomingSockfd < 0) { - ServerInstance->SE->Shutdown(incomingSockfd, 2); - ServerInstance->SE->Close(incomingSockfd); ServerInstance->stats->statsRefused++; return; } + + socklen_t sz = sizeof(server); + if (getsockname(incomingSockfd, &server.sa, &sz)) + { + ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno)); + irc::sockets::aptosa(bind_addr, bind_port, server); + } + /* * XXX - * this is done as a safety check to keep the file descriptors within range of fd_ref_table. @@ -119,42 +126,63 @@ void ListenSocketBase::AcceptInternal() return; } - static char buf[MAXBUF]; - static char target[MAXBUF]; + if (client.sa.sa_family == AF_INET6) + { + /* + * This case is the be all and end all patch to catch and nuke 4in6 + * instead of special-casing shit all over the place and wreaking merry + * havoc with crap, instead, we just recreate sockaddr and strip ::ffff: prefix + * if it's a 4in6 IP. + * + * This is, of course, much improved over the older way of handling this + * (pretend it doesn't exist + hack around it -- yes, both were done!) + * + * Big, big thanks to danieldg for his work on this. + * -- w00t + */ + static const unsigned char prefix4in6[12] = { 0,0,0,0, 0,0,0,0, 0,0,0xFF,0xFF }; + if (!memcmp(prefix4in6, &client.in6.sin6_addr, 12)) + { + // recreate as a sockaddr_in using the IPv4 IP + uint16_t sport = client.in6.sin6_port; + client.in4.sin_family = AF_INET; + client.in4.sin_port = sport; + memcpy(&client.in4.sin_addr.s_addr, client.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t)); + + sport = server.in6.sin6_port; + server.in4.sin_family = AF_INET; + server.in4.sin_port = sport; + memcpy(&server.in4.sin_addr.s_addr, server.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t)); + } + } - *target = *buf = '\0'; + ServerInstance->SE->NonBlocking(incomingSockfd); -#ifdef IPV6 - if (this->family == AF_INET6) + ModResult res; + FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server)); + if (res == MOD_RES_PASSTHRU) { - inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf)); - if (!strncmp(buf, "::ffff:", 7)) + std::string type = bind_tag->getString("type", "clients"); + if (type == "clients") { - memmove(buf, buf+7, sizeof(buf)-7); + ServerInstance->Users->AddUser(incomingSockfd, this, &client, &server); + res = MOD_RES_ALLOW; } - 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)); + } + if (res == MOD_RES_ALLOW) + { + ServerInstance->stats->statsAccept++; } else -#endif { - inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf)); - 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->stats->statsRefused++; + ServerInstance->Logs->Log("SOCKET",DEFAULT,"Refusing connection on %s - %s", + bind_desc.c_str(), res == MOD_RES_DENY ? "Connection refused by module" : "Module for this port not found"); + ServerInstance->SE->Close(incomingSockfd); } - - ServerInstance->SE->NonBlocking(incomingSockfd); - ServerInstance->stats->statsAccept++; - this->OnAcceptReady(target, incomingSockfd, buf); } -void ListenSocketBase::HandleEvent(EventType e, int err) +void ListenSocket::HandleEvent(EventType e, int err) { switch (e) { @@ -169,8 +197,3 @@ void ListenSocketBase::HandleEvent(EventType e, int err) break; } } - -void ClientListenSocket::OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip) -{ - ServerInstance->Users->AddUser(ServerInstance, nfd, bind_port, false, this->family, client, ipconnectedto); -}