From: Sadie Powell <sadie@witchery.services>
Date: Wed, 10 Mar 2021 03:43:56 +0000 (+0000)
Subject: Rename `<bind:ssl>` to `<bind:sslprofile>`.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=e0dc7691c4cff3a38bc12adf10b3709d8c4901ba;p=user%2Fhenk%2Fcode%2Finspircd.git

Rename `<bind:ssl>` to `<bind:sslprofile>`.
---

diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index cdfb6f3c2..f07f21cdd 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -141,7 +141,7 @@
       # to this bind section.
       type="clients"
 
-      # ssl: If you want the port(s) in this bind tag to use TLS (SSL), set this
+      # sslprofile: If you want the port(s) in this bind tag to use TLS (SSL), set this
       # to the name of a custom <sslprofile> tag that you have defined. See the
       # docs page for the TLS (SSL) module you are using for more details:
       #
@@ -151,7 +151,7 @@
       #
       # You will need to load the ssl_openssl module for OpenSSL, ssl_gnutls
       # for GnuTLS and ssl_mbedtls for mbedTLS.
-      ssl="Clients"
+      sslprofile="Clients"
 
       # defer: When this is non-zero, connections will not be handed over to
       # the daemon from the operating system before data is ready.
diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf.example
index 7ced7170e..19d770d35 100644
--- a/docs/conf/links.conf.example
+++ b/docs/conf/links.conf.example
@@ -10,7 +10,7 @@
 <bind address="1.2.3.4"
       port="7005"
       type="servers"
-      ssl="Servers">
+      sslprofile="Servers">
 
 # Plaintext listener that binds on a TCP/IP endpoint:
 <bind address=""
@@ -100,7 +100,7 @@
       port="7000"
       allowmask="203.0.113.0/24 127.0.0.0/8 2001:db8::/32"
       timeout="5m"
-      ssl="Servers"
+      sslprofile="Servers"
       bind="1.2.3.4"
       statshidden="no"
       hidden="no"
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index d236d6cb9..0b149775b 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1119,7 +1119,7 @@
 # a <bind> tag with type "httpd", and load at least one of the other
 # httpd_* modules to provide pages to display.
 # <bind address="127.0.0.1" port="8067" type="httpd">
-# <bind address="127.0.0.1" port="8097" type="httpd" ssl="gnutls">
+# <bind address="127.0.0.1" port="8097" type="httpd" sslprofile="Clients">
 #
 # You can adjust the timeout for HTTP connections below. All HTTP
 # connections will be closed after (roughly) this time period.
diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index d6703872e..19e429a95 100644
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -126,7 +126,7 @@ void CommandStats::DoStats(Stats::Context& stats)
 				if (!hook.empty())
 					portentry << ", hook: " << hook;
 
-				const std::string sslprofile = ls->bind_tag->getString("ssl");
+				const std::string sslprofile = ls->bind_tag->getString("sslprofile", ls->bind_tag->getString("ssl"));
 				if (!sslprofile.empty())
 					portentry << ", ssl profile: " << sslprofile;
 
diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 844a1a9c6..f14db773a 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -97,7 +97,8 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 	}
 
 	// 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
@@ -240,7 +241,7 @@ 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/");
 
diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp
index e65e6dace..c2a965687 100644
--- a/src/modules/m_flashpolicyd.cpp
+++ b/src/modules/m_flashpolicyd.cpp
@@ -127,7 +127,7 @@ class ModuleFlashPD : public Module
 				if (!stdalgo::string::equalsci(ls->bind_tag->getString("type", "clients", 1), "clients"))
 					continue;
 
-				if (!ls->bind_tag->getString("ssl").empty())
+				if (!ls->bind_tag->getString("sslprofile", ls->bind_tag->getString("ssl")).empty())
 					continue;
 
 				to_ports.append(ConvToStr(ls->bind_sa.port())).push_back(',');
diff --git a/src/modules/m_ircv3_sts.cpp b/src/modules/m_ircv3_sts.cpp
index c75da3fc0..9b9d625f6 100644
--- a/src/modules/m_ircv3_sts.cpp
+++ b/src/modules/m_ircv3_sts.cpp
@@ -142,7 +142,7 @@ class ModuleIRCv3STS : public Module
 				continue;
 
 			// Is this listener using TLS (SSL)?
-			if (ls->bind_tag->getString("ssl").empty())
+			if (ls->bind_tag->getString("sslprofile", ls->bind_tag->getString("ssl")).empty())
 				continue;
 
 			// TODO: Add a way to check if a listener's TLS cert is CA-verified.
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index a96851c93..c7aaa5c11 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -161,7 +161,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 			{
 				ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Non-existent I/O hook '%s' in <bind:%s> tag at %s",
 					iohookprovref.GetProvider().c_str(),
-					i == via->iohookprovs.begin() ? "hook" : "ssl",
+					i == via->iohookprovs.begin() ? "hook" : "sslprofile",
 					via->bind_tag->getTagLocation().c_str());
 				this->QuitUser(New, "Internal error handling connection");
 				return;