Use CommandBase::Params instead of std::vector<std::string>.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / server.cpp

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index bc43841c1cafefd4a9950605b9b91548413505f0..07004a1e8069468cc8031470d56080eb2ddc72a9 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -19,6 +19,7 @@
 
 
 #include "inspircd.h"
+#include "modules/ssl.h"
 
 #include "main.h"
 #include "utils.h"
@@ -31,7 +32,7 @@
  * Some server somewhere in the network introducing another server.
  *     -- w
  */
-CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, std::vector<std::string>& params)
+CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, Params& params)
 {
        const std::string& servername = params[0];
        const std::string& sid = params[1];
@@ -69,9 +70,9 @@ CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, std::vector<std:
        return CMD_SUCCESS;
 }
 
-void CommandServer::HandleExtra(TreeServer* newserver, const std::vector<std::string>& params)
+void CommandServer::HandleExtra(TreeServer* newserver, Params& params)
 {
-       for (std::vector<std::string>::const_iterator i = params.begin() + 2; i != params.end() - 1; ++i)
+       for (CommandBase::Params::const_iterator i = params.begin() + 2; i != params.end() - 1; ++i)
        {
                const std::string& prop = *i;
                std::string::size_type p = prop.find('=');
@@ -85,11 +86,11 @@ void CommandServer::HandleExtra(TreeServer* newserver, const std::vector<std::st
                }
 
                if (key == "burst")
-                       newserver->BeginBurst(ConvToUInt64(val));
+                       newserver->BeginBurst(ConvToNum<uint64_t>(val));
        }
 }
 
-Link* TreeSocket::AuthRemote(const parameterlist& params)
+Link* TreeSocket::AuthRemote(const CommandBase::Params& params)
 {
        if (params.size() < 5)
        {
@@ -97,7 +98,6 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
                return NULL;
        }
 
-       irc::string servername = params[0].c_str();
        const std::string& sname = params[0];
        const std::string& password = params[1];
        const std::string& sid = params[3];
@@ -114,7 +114,7 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
        for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
                Link* x = *i;
-               if (x->Name != servername && x->Name != "*") // open link allowance
+               if ((!stdalgo::string::equalsci(x->Name, sname)) && (x->Name != "*")) // open link allowance
                        continue;
 
                if (!ComparePass(*x, password))
@@ -127,6 +127,15 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
                        return NULL;
 
                ServerInstance->SNO->WriteToSnoMask('l',"Verified server connection " + linkID + " ("+description+")");
+
+               const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(this);
+               if (ssliohook)
+               {
+                       std::string ciphersuite;
+                       ssliohook->GetCiphersuite(ciphersuite);
+                       ServerInstance->SNO->WriteToSnoMask('l', "Negotiated ciphersuite %s on link %s", ciphersuite.c_str(), x->Name.c_str());
+               }
+
                return x;
        }
 
@@ -139,7 +148,7 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
  * This is used after the other side of a connection has accepted our credentials.
  * They are then introducing themselves to us, BEFORE either of us burst. -- w
  */
-bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
+bool TreeSocket::Outbound_Reply_Server(CommandBase::Params& params)
 {
        const Link* x = AuthRemote(params);
        if (x)
@@ -191,7 +200,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid
  * Someone else is attempting to connect to us if this is called. Validate their credentials etc.
  *             -- w
  */
-bool TreeSocket::Inbound_Server(parameterlist &params)
+bool TreeSocket::Inbound_Server(CommandBase::Params& params)
 {
        const Link* x = AuthRemote(params);
        if (x)