X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=f14db773a2675a40cd970f28e23476d5653fcd07;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=40639ba15f0d4f3c1107d049b062fa47dbc90f89;hpb=aa692dc1039b63deef7886e914ec499abe7facaf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 40639ba15..f14db773a 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -1,9 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2019-2020 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013, 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2013 Adam <Adam@anope.org>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
@@ -48,8 +48,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	}
 
 	fd = socket(bind_to.family(), SOCK_STREAM, 0);
-
-	if (this->fd == -1)
+	if (!HasFd())
 		return;
 
 #ifdef IPV6_V6ONLY
@@ -84,6 +83,11 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 #endif
 	}
 
+	SocketEngine::SetReuse(fd);
+	int rv = SocketEngine::Bind(this->fd, bind_to);
+	if (rv >= 0)
+		rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn);
+
 	if (bind_to.family() == AF_UNIX)
 	{
 		const std::string permissionstr = tag->getString("permissions");
@@ -92,13 +96,9 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 			chmod(bind_to.str().c_str(), permissions);
 	}
 
-	SocketEngine::SetReuse(fd);
-	int rv = SocketEngine::Bind(this->fd, bind_to);
-	if (rv >= 0)
-		rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn);
-
 	// Default defer to on for TLS listeners because in TLS the client always speaks first
-	int timeout = tag->getDuration("defer", (tag->getString("ssl").empty() ? 0 : 3));
+	unsigned int timeoutdef = tag->getString("sslprofile", tag->getString("ssl")).empty() ? 0 : 3;
+	int timeout = tag->getDuration("defer", timeoutdef, 0, 60);
 	if (timeout && !rv)
 	{
 #if defined TCP_DEFER_ACCEPT
@@ -130,7 +130,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 
 ListenSocket::~ListenSocket()
 {
-	if (this->GetFd() > -1)
+	if (this->HasFd())
 	{
 		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd);
 		SocketEngine::Shutdown(this, 2);
@@ -208,7 +208,7 @@ void ListenSocket::OnEventHandlerRead()
 	FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server));
 	if (res == MOD_RES_PASSTHRU)
 	{
-		std::string type = bind_tag->getString("type", "clients");
+		const std::string type = bind_tag->getString("type", "clients", 1);
 		if (stdalgo::string::equalsci(type, "clients"))
 		{
 			ServerInstance->Users->AddUser(incomingSockfd, this, &client, &server);
@@ -241,10 +241,10 @@ void ListenSocket::ResetIOHookProvider()
 			curr.SetProvider(std::string());
 	}
 
-	std::string provname = bind_tag->getString("ssl");
+	std::string provname = bind_tag->getString("sslprofile",  bind_tag->getString("ssl"));
 	if (!provname.empty())
 		provname.insert(0, "ssl/");
 
-	// SSL should be the last
+	// TLS (SSL) should be the last
 	iohookprovs.back().SetProvider(provname);
 }