X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=565b6b6d87dd3749d04c96712161a74a3f3a65ef;hb=689996cb8856af43a033eb5ca1cb9df7475c0854;hp=ca518c59e429417ca157a24b917587682c882735;hpb=5384ddf545575bc27904b3534fb9d2340de7a1d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index ca518c59e..565b6b6d8 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -28,9 +28,10 @@
 
 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);
 
@@ -55,10 +56,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)
@@ -76,15 +77,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);
 		this->fd = -1;
 		errno = errstore;
 	}
 	else
 	{
-		ServerInstance->SE->NonBlocking(this->fd);
+		SocketEngine::NonBlocking(this->fd);
 		ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+
+		this->ResetIOHookProvider();
 	}
 }
 
@@ -94,8 +97,8 @@ ListenSocket::~ListenSocket()
 	{
 		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;
 	}
@@ -108,7 +111,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)
@@ -137,8 +140,8 @@ void ListenSocket::AcceptInternal()
 	if (incomingSockfd >= ServerInstance->SE->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;
 	}
@@ -173,7 +176,7 @@ void ListenSocket::AcceptInternal()
 		}
 	}
 
-	ServerInstance->SE->NonBlocking(incomingSockfd);
+	SocketEngine::NonBlocking(incomingSockfd);
 
 	ModResult res;
 	FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server));
@@ -195,7 +198,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);
 	}
 }
 
@@ -214,3 +217,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);
+}