Fix a bunch of weird indentation and spacing issues.

[user/henk/code/inspircd.git] / src / modules / extra / m_ssl_mbedtls.cpp

diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index c6cbc8a334ee7b71eff4136ca743ff10a6d93761..c3d040ad03b394714e1b3b1403dec5720b70eec1 100644 (file)
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2016-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016-2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2016-2017 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -817,13 +817,13 @@ class mbedTLSIOHook : public SSLIOHook
        bool IsHandshakeDone() const { return (status == ISSL_HANDSHAKEN); }
 };
 
-class mbedTLSIOHookProvider : public IOHookProvider
+class mbedTLSIOHookProvider : public SSLIOHookProvider
 {
        mbedTLS::Profile profile;
 
  public:
-       mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config)
-               : IOHookProvider(mod, "ssl/" + config.name, IOHookProvider::IOH_SSL)
+       mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config)
+               : SSLIOHookProvider(mod, config.name)
                , profile(config)
        {
                ServerInstance->Modules->AddService(*this);
@@ -874,7 +874,7 @@ class ModuleSSLmbedTLS : public Module
                        // No <sslprofile> tags found, create a profile named "mbedtls" from settings in the <mbedtls> block
                        const std::string defname = "mbedtls";
                        ConfigTag* tag = ServerInstance->Config->ConfValue(defname);
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "No <sslprofile> tags found; using settings from the <mbedtls> tag");
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "No <sslprofile> tags found; using settings from the deprecated <mbedtls> tag");
 
                        try
                        {
@@ -888,12 +888,15 @@ class ModuleSSLmbedTLS : public Module
                }
                else
                {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "You have defined an <sslprofile> tag; you should use this in place of \"mbedtls\" when configuring TLS (SSL) connections in <bind:ssl> or <link:ssl>");
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "You have defined an <sslprofile> tag; you should use this in place of \"mbedtls\" when configuring TLS (SSL) connections in <bind:sslprofile> or <link:sslprofile>");
                        for (ConfigIter i = tags.first; i != tags.second; ++i)
                        {
                                ConfigTag* tag = i->second;
                                if (!stdalgo::string::equalsci(tag->getString("provider"), "mbedtls"))
+                               {
+                                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring non-mbedTLS <sslprofile> tag at " + tag->getTagLocation());
                                        continue;
+                               }
 
                                std::string name = tag->getString("name");
                                if (name.empty())
@@ -948,7 +951,7 @@ class ModuleSSLmbedTLS : public Module
                try
                {
                        ReadProfiles();
-                       ServerInstance->SNO->WriteToSnoMask('a', "TLS (SSL) module mbedTLS rehashed.");
+                       ServerInstance->SNO->WriteToSnoMask('a', "mbedTLS TLS (SSL) profiles have been reloaded.");
                }
                catch (ModuleException& ex)
                {