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

[user/henk/code/inspircd.git] / src / listensocket.cpp

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index d7217650e4ffba86e1cedb8a1805c7bcbe422e55..f14db773a2675a40cd970f28e23476d5653fcd07 100644 (file)
--- 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>
@@ -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
@@ -207,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);
@@ -240,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);
 }