X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=f560ad277e0e378853571f6f03483e9191c2f7e2;hb=2b3b0ce142c16d50462e644821983c525874f10e;hp=9b69b53ff3a3fc35aec3fff81c2bd3bfc6721b1a;hpb=6a7de2b21f0fe12ac2f22ed278488e047df93f77;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 9b69b53ff..f560ad277 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -19,15 +19,17 @@
 
 
 #include "inspircd.h"
-#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);
 
@@ -52,10 +54,10 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	}
 #endif
 
-	ServerInstance->SE->SetReuse(fd);
-	int rv = ServerInstance->SE->Bind(this->fd, bind_to);
+	SocketEngine::SetReuse(fd);
+	int rv = SocketEngine::Bind(this->fd, bind_to);
 	if (rv >= 0)
-		rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn);
+		rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn);
 
 	int timeout = tag->getInt("defer", 0);
 	if (timeout && !rv)
@@ -73,15 +75,17 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	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();
 	}
 }
 
@@ -89,28 +93,25 @@ 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;
 	}
 }
 
-/* Just seperated into another func for tidiness really.. */
-void ListenSocket::AcceptInternal()
+void ListenSocket::OnEventHandlerRead()
 {
 	irc::sockets::sockaddrs client;
 	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);
+	ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Accepting connection on socket %s fd %d", bind_desc.c_str(), incomingSockfd);
 	if (incomingSockfd < 0)
 	{
-		ServerInstance->stats->statsRefused++;
+		ServerInstance->stats.Refused++;
 		return;
 	}
 
@@ -121,25 +122,6 @@ void ListenSocket::AcceptInternal()
 		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.
-	 * 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", LOG_DEBUG, "Server is full");
-		ServerInstance->SE->Shutdown(incomingSockfd, 2);
-		ServerInstance->SE->Close(incomingSockfd);
-		ServerInstance->stats->statsRefused++;
-		return;
-	}
-
 	if (client.sa.sa_family == AF_INET6)
 	{
 		/*
@@ -170,7 +152,7 @@ void ListenSocket::AcceptInternal()
 		}
 	}
 
-	ServerInstance->SE->NonBlocking(incomingSockfd);
+	SocketEngine::NonBlocking(incomingSockfd);
 
 	ModResult res;
 	FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server));
@@ -185,29 +167,23 @@ void ListenSocket::AcceptInternal()
 	}
 	if (res == MOD_RES_ALLOW)
 	{
-		ServerInstance->stats->statsAccept++;
+		ServerInstance->stats.Accept++;
 	}
 	else
 	{
-		ServerInstance->stats->statsRefused++;
+		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");
-		ServerInstance->SE->Close(incomingSockfd);
+		SocketEngine::Close(incomingSockfd);
 	}
 }
 
-void ListenSocket::HandleEvent(EventType e, int err)
+void ListenSocket::ResetIOHookProvider()
 {
-	switch (e)
-	{
-		case EVENT_ERROR:
-			ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err));
-			break;
-		case EVENT_WRITE:
-			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!");
-			break;
-		case EVENT_READ:
-			this->AcceptInternal();
-			break;
-	}
+	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);
 }