X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fserver.cpp;h=ecdad87f81797babf9e59337412a86786d97c71c;hb=93fa544b2671b078cf81ac04fbb4b48d5e2d1677;hp=30931b90ea3ed59f4d047c200dd22d8545cf4340;hpb=a6433b37967e22e19658967ae4e798febea86356;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp index 30931b90e..ecdad87f8 100644 --- 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" @@ -85,7 +86,7 @@ void CommandServer::HandleExtra(TreeServer* newserver, const std::vectorBeginBurst(ConvToInt(val)); + newserver->BeginBurst(ConvToNum(val)); } } @@ -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 >::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; }