X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=fb9f2a0eff6e313ef01caced913462fa1033d6e1;hb=8dbd80610aee01b8064ca813e1dd7ca44ab3f7b6;hp=df252f18bd8aa27d8505f09720303c991db64192;hpb=06e0d5c7f0f78c489090fe5f0c18a91e8cb41ae8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/listensocket.cpp b/src/listensocket.cpp index df252f18b..fb9f2a0ef 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -1,102 +1,125 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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" +#include "iohook.h" -/* Private static member data must be declared in this manner */ -irc::sockets::sockaddrs ListenSocketBase::client; -irc::sockets::sockaddrs ListenSocketBase::server; +#ifndef _WIN32 +#include +#endif -ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr) : ServerInstance(Instance), desc("plaintext") +ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to) + : bind_tag(tag) { - irc::sockets::sockaddrs bind_to; + irc::sockets::satoap(bind_to, bind_addr, bind_port); + bind_desc = bind_to.str(); + + fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0); + + if (this->fd == -1) + return; - // canonicalize address if it is defined - if (irc::sockets::aptosa(addr.c_str(), port, &bind_to)) +#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) { - irc::sockets::satoap(&bind_to, bind_addr, bind_port); - bind_desc = irc::sockets::satouser(&bind_to); + 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 } - else +#endif + + SocketEngine::SetReuse(fd); + int rv = SocketEngine::Bind(this->fd, bind_to); + if (rv >= 0) + rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn); + + int timeout = tag->getInt("defer", 0); + if (timeout && !rv) { - bind_addr = addr; - bind_port = port; - bind_desc = addr + ":" + ConvToStr(port); +#if defined TCP_DEFER_ACCEPT + setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &timeout, sizeof(timeout)); +#elif defined SO_ACCEPTFILTER + struct accept_filter_arg afa; + memset(&afa, 0, sizeof(afa)); + strcpy(afa.af_name, "dataready"); + setsockopt(fd, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa)); +#endif } - this->SetFd(irc::sockets::OpenTCPSocket(bind_addr.c_str())); - if (this->GetFd() > -1) + if (rv < 0) + { + int errstore = errno; + SocketEngine::Shutdown(this, 2); + SocketEngine::Close(this->GetFd()); + this->fd = -1; + errno = errstore; + } + else { - if (!Instance->BindSocket(this->fd,port,bind_addr.c_str())) - this->fd = -1; - Instance->SE->AddFd(this); + SocketEngine::NonBlocking(this->fd); + SocketEngine::AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); + + this->ResetIOHookProvider(); } } -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->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno)); - this->fd = -1; + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd); + SocketEngine::Shutdown(this, 2); + if (SocketEngine::Close(this) != 0) + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to cancel listener: %s", strerror(errno)); } } -/* Just seperated into another func for tidiness really.. */ -void ListenSocketBase::AcceptInternal() +void ListenSocket::OnEventHandlerRead() { - ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensoket"); - int incomingSockfd; + irc::sockets::sockaddrs client; + irc::sockets::sockaddrs server; socklen_t length = sizeof(client); - incomingSockfd = ServerInstance->SE->Accept(this, &client.sa, &length); + int incomingSockfd = SocketEngine::Accept(this, &client.sa, &length); + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Accepting connection on socket %s fd %d", bind_desc.c_str(), incomingSockfd); if (incomingSockfd < 0) { - ServerInstance->SE->Shutdown(incomingSockfd, 2); - ServerInstance->SE->Close(incomingSockfd); - ServerInstance->stats->statsRefused++; + ServerInstance->stats.Refused++; return; } socklen_t sz = sizeof(server); if (getsockname(incomingSockfd, &server.sa, &sz)) - ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno)); - - /* - * XXX - - * this is done as a safety check to keep the file descriptors within range of fd_ref_table. - * its a pretty big but for the moment valid assumption: - * file descriptors are handed out starting at 0, and are recycled as theyre freed. - * therefore if there is ever an fd over 65535, 65536 clients must be connected to the - * irc server at once (or the irc server otherwise initiating this many connections, files etc) - * which for the time being is a physical impossibility (even the largest networks dont have more - * than about 10,000 users on ONE server!) - */ - if (incomingSockfd >= ServerInstance->SE->GetMaxFds()) { - ServerInstance->Logs->Log("SOCKET", DEBUG, "Server is full"); - ServerInstance->SE->Shutdown(incomingSockfd, 2); - ServerInstance->SE->Close(incomingSockfd); - ServerInstance->stats->statsRefused++; - return; + ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Can't get peername: %s", strerror(errno)); + irc::sockets::aptosa(bind_addr, bind_port, server); } if (client.sa.sa_family == AF_INET6) @@ -118,41 +141,60 @@ void ListenSocketBase::AcceptInternal() { // recreate as a sockaddr_in using the IPv4 IP uint16_t sport = client.in6.sin6_port; - uint32_t addr = *reinterpret_cast(client.in6.sin6_addr.s6_addr + 12); client.in4.sin_family = AF_INET; client.in4.sin_port = sport; - client.in4.sin_addr.s_addr = addr; + memcpy(&client.in4.sin_addr.s_addr, client.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t)); sport = server.in6.sin6_port; - addr = *reinterpret_cast(server.in6.sin6_addr.s6_addr + 12); server.in4.sin_family = AF_INET; server.in4.sin_port = sport; - server.in4.sin_addr.s_addr = addr; + memcpy(&server.in4.sin_addr.s_addr, server.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t)); } } - ServerInstance->SE->NonBlocking(incomingSockfd); - ServerInstance->stats->statsAccept++; - this->OnAcceptReady(incomingSockfd); -} + SocketEngine::NonBlocking(incomingSockfd); -void ListenSocketBase::HandleEvent(EventType e, int err) -{ - switch (e) + ModResult res; + FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server)); + if (res == MOD_RES_PASSTHRU) + { + std::string type = bind_tag->getString("type", "clients"); + if (type == "clients") + { + ServerInstance->Users->AddUser(incomingSockfd, this, &client, &server); + res = MOD_RES_ALLOW; + } + } + if (res == MOD_RES_ALLOW) { - case EVENT_ERROR: - ServerInstance->Logs->Log("SOCKET",DEFAULT,"ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err)); - break; - case EVENT_WRITE: - ServerInstance->Logs->Log("SOCKET",DEBUG,"*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!"); - break; - case EVENT_READ: - this->AcceptInternal(); - break; + ServerInstance->stats.Accept++; + } + else + { + ServerInstance->stats.Refused++; + ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Refusing connection on %s - %s", + bind_desc.c_str(), res == MOD_RES_DENY ? "Connection refused by module" : "Module for this port not found"); + SocketEngine::Close(incomingSockfd); } } -void ClientListenSocket::OnAcceptReady(int nfd) +void ListenSocket::ResetIOHookProvider() { - ServerInstance->Users->AddUser(ServerInstance, nfd, this, &client, &server); + iohookprovs[0].SetProvider(bind_tag->getString("hook")); + + // Check that all non-last hooks support being in the middle + for (IOHookProvList::iterator i = iohookprovs.begin(); i != iohookprovs.end()-1; ++i) + { + IOHookProvRef& curr = *i; + // Ignore if cannot be in the middle + if ((curr) && (!curr->IsMiddle())) + curr.SetProvider(std::string()); + } + + std::string provname = bind_tag->getString("ssl"); + if (!provname.empty()) + provname.insert(0, "ssl/"); + + // SSL should be the last + iohookprovs.back().SetProvider(provname); }