Update user-facing text and comments of SSL to TLS.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 8c5fda59af0731b290b09ab8b89d23a56d4e0245..4bbffe0c01434f11733215ee7a18fae2048d1ed1 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -83,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");
@@ -91,11 +96,6 @@ 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));
        if (timeout && !rv)
@@ -207,7 +207,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);
@@ -244,6 +244,6 @@ void ListenSocket::ResetIOHookProvider()
        if (!provname.empty())
                provname.insert(0, "ssl/");
 
-       // SSL should be the last
+       // TLS (SSL) should be the last
        iohookprovs.back().SetProvider(provname);
 }