X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=e73a8f4cee9b9fa89df7c2e082c9a5f4182ea253;hb=a5ca8b892c384d5926bf03353ef878023f0f573d;hp=466b91c8bb56643ae40a170f9f617833eb217971;hpb=b36ce84c7da93f680fc397bcb4c877abe063eaaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 466b91c8b..e73a8f4ce 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -22,22 +22,22 @@
 #include "socket.h"
 #include "socketengine.h"
 
+#ifndef _WIN32
+#include <netinet/tcp.h>
+#endif
+
 ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to)
 	: bind_tag(tag)
+	, iohookprov(NULL, std::string())
 {
 	irc::sockets::satoap(bind_to, bind_addr, bind_port);
-	bind_desc = irc::sockets::satouser(bind_to);
+	bind_desc = bind_to.str();
 
 	fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0);
 
 	if (this->fd == -1)
 		return;
 
-	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);
-
 #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
@@ -48,24 +48,46 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	if (bind_to.sa.sa_family == AF_INET6)
 	{
 		std::string addr = tag->getString("address");
-		const char enable = (addr.empty() || addr == "*") ? 0 : 1;
-		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable));
+		/* 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
 	}
 #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)
+	{
+#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
+	}
+
 	if (rv < 0)
 	{
 		int errstore = errno;
-		ServerInstance->SE->Shutdown(this, 2);
-		ServerInstance->SE->Close(this);
+		SocketEngine::Shutdown(this, 2);
+		SocketEngine::Close(this->GetFd());
 		this->fd = -1;
 		errno = errstore;
 	}
 	else
 	{
-		ServerInstance->SE->NonBlocking(this->fd);
-		ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+		SocketEngine::NonBlocking(this->fd);
+		SocketEngine::AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+
+		this->ResetIOHookProvider();
 	}
 }
 
@@ -73,12 +95,10 @@ ListenSocket::~ListenSocket()
 {
 	if (this->GetFd() > -1)
 	{
-		ServerInstance->SE->DelFd(this);
 		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd);
-		ServerInstance->SE->Shutdown(this, 2);
-		if (ServerInstance->SE->Close(this) != 0)
+		SocketEngine::Shutdown(this, 2);
+		if (SocketEngine::Close(this) != 0)
 			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to cancel listener: %s", strerror(errno));
-		this->fd = -1;
 	}
 }
 
@@ -89,7 +109,7 @@ void ListenSocket::AcceptInternal()
 	irc::sockets::sockaddrs server;
 
 	socklen_t length = sizeof(client);
-	int incomingSockfd = ServerInstance->SE->Accept(this, &client.sa, &length);
+	int incomingSockfd = SocketEngine::Accept(this, &client.sa, &length);
 
 	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
 	if (incomingSockfd < 0)
@@ -115,11 +135,11 @@ void ListenSocket::AcceptInternal()
 	 * 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())
+	if (incomingSockfd >= SocketEngine::GetMaxFds())
 	{
 		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Server is full");
-		ServerInstance->SE->Shutdown(incomingSockfd, 2);
-		ServerInstance->SE->Close(incomingSockfd);
+		SocketEngine::Shutdown(incomingSockfd, 2);
+		SocketEngine::Close(incomingSockfd);
 		ServerInstance->stats->statsRefused++;
 		return;
 	}
@@ -154,7 +174,7 @@ void ListenSocket::AcceptInternal()
 		}
 	}
 
-	ServerInstance->SE->NonBlocking(incomingSockfd);
+	SocketEngine::NonBlocking(incomingSockfd);
 
 	ModResult res;
 	FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server));
@@ -176,7 +196,7 @@ void ListenSocket::AcceptInternal()
 		ServerInstance->stats->statsRefused++;
 		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");
-		ServerInstance->SE->Close(incomingSockfd);
+		SocketEngine::Close(incomingSockfd);
 	}
 }
 
@@ -195,3 +215,16 @@ void ListenSocket::HandleEvent(EventType e, int err)
 			break;
 	}
 }
+
+bool ListenSocket::ResetIOHookProvider()
+{
+	std::string provname = bind_tag->getString("ssl");
+	if (!provname.empty())
+		provname.insert(0, "ssl/");
+
+	// Set the new provider name, dynref handles the rest
+	iohookprov.SetProvider(provname);
+
+	// Return true if no provider was set, or one was set and it was also found
+	return (provname.empty() || iohookprov);
+}