-/* +------------------------------------+
- * | 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 <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-/* $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(int port, const std::string &addr) : 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);
+
+ 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)
{
- // malformed address
- bind_addr = addr;
- bind_port = port;
- bind_desc = addr + ":" + ConvToStr(port);
- this->fd = -1;
+ 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<const char *>(&enable), sizeof(enable));
+ // errors ignored intentionally
}
- else
- {
- irc::sockets::satoap(&bind_to, bind_addr, bind_port);
- bind_desc = irc::sockets::satouser(&bind_to);
+#endif
- this->fd = irc::sockets::OpenTCPSocket(bind_addr.c_str());
- }
+ 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 (this->fd > -1)
+ if (rv < 0)
{
- int rv = ServerInstance->SE->Bind(this->fd, &bind_to.sa, sizeof(bind_to));
- if (rv >= 0)
- rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn);
-
- if (rv < 0)
- {
- ServerInstance->SE->Shutdown(this, 2);
- ServerInstance->SE->Close(this);
- this->fd = -1;
- }
- else
- {
- ServerInstance->SE->NonBlocking(this->fd);
- ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
- }
+ 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 -
{
// recreate as a sockaddr_in using the IPv4 IP
uint16_t sport = client.in6.sin6_port;
- uint32_t addr = *reinterpret_cast<uint32_t*>(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<uint32_t*>(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)
{
break;
}
}
-
-void ClientListenSocket::OnAcceptReady(int nfd)
-{
- ServerInstance->Users->AddUser(nfd, this, &client, &server);
-}
projects / user / henk / code / inspircd.git / blobdiff