X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=ae11c3b48238b3155cfb2b52c9de0f2dac97ecb2;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=663f912e63ec2b86fd14dd841668d5e83d88203f;hpb=c4cb1f9477b1fbf8662bedb1c36f84ff6f87e1f3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 663f912e6..ae11c3b48 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -1,78 +1,111 @@ -/* +------------------------------------+ - * | 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" -/* Private static member data must be declared in this manner */ -irc::sockets::sockaddrs ListenSocketBase::client; -irc::sockets::sockaddrs ListenSocketBase::server; - -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 = irc::sockets::satouser(bind_to); - bind_addr = addr; - bind_port = port; + fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0); - // canonicalize address if it is defined - if (!addr.empty() && irc::sockets::aptosa(addr.c_str(), port, &bind_to)) - irc::sockets::satoap(&bind_to, bind_addr, bind_port); + if (this->fd == -1) + return; - this->SetFd(irc::sockets::OpenTCPSocket(bind_addr.c_str())); - if (this->GetFd() > -1) +#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,bind_addr.c_str())) - this->fd = -1; - Instance->SE->AddFd(this); + 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 + + 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; + } + else + { + ServerInstance->SE->NonBlocking(this->fd); + ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); } } -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; } } /* Just seperated into another func for tidiness really.. */ -void ListenSocketBase::AcceptInternal() +void ListenSocket::AcceptInternal() { - 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 = ServerInstance->SE->Accept(this, &client.sa, &length); + 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 - @@ -112,25 +145,44 @@ 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); + + 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) + { + ServerInstance->stats->statsAccept++; + } + else + { + 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); + } } -void ListenSocketBase::HandleEvent(EventType e, int err) +void ListenSocket::HandleEvent(EventType e, int err) { switch (e) { @@ -145,8 +197,3 @@ void ListenSocketBase::HandleEvent(EventType e, int err) break; } } - -void ClientListenSocket::OnAcceptReady(int nfd) -{ - ServerInstance->Users->AddUser(ServerInstance, nfd, this, &client, &server); -}