diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/coremods/core_stats.cpp | 2 | ||||
| -rw-r--r-- | src/listensocket.cpp | 5 | ||||
| -rw-r--r-- | src/modules/m_flashpolicyd.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_ircv3_sts.cpp | 2 | ||||
| -rw-r--r-- | src/usermanager.cpp | 2 |
5 files changed, 7 insertions, 6 deletions
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; |