m_spanningtree Refuse topic changes that would result in desync

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

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 72361af382377ba9cea33357f7dd83b47b9a1fb2..a41fe408d990a3525cd6d97863a878f2720a4c64 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -24,6 +24,7 @@
 
 #include "utils.h"
 #include "treeserver.h"
+#include "remoteuser.h"
 
 CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::string>& params)
 {
@@ -50,7 +51,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                // User that the incoming user is colliding with is not fully registered, we force nick change the
                // unregistered user to their uuid and tell them what happened
                collideswith->WriteFrom(collideswith, "NICK %s", collideswith->uuid.c_str());
-               collideswith->WriteNumeric(ERR_NICKNAMEINUSE, "%s :Nickname overruled.", collideswith->nick.c_str());
+               collideswith->WriteNumeric(ERR_NICKNAMEINUSE, collideswith->nick, "Nickname overruled.");
 
                // Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
                collideswith->registered &= ~REG_NICK;
@@ -59,9 +60,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        else if (collideswith)
        {
                // The user on this side is registered, handle the collision
-               bool they_change = Utils->DoCollision(collideswith, remoteserver, age_t, params[5], params[6], params[0]);
-               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Collision on %s %d", params[2].c_str(), they_change);
-
+               bool they_change = Utils->DoCollision(collideswith, remoteserver, age_t, params[5], params[6], params[0], "UID");
                if (they_change)
                {
                        // The client being introduced needs to change nick to uuid, change the nick in the message before
@@ -75,7 +74,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        /* For remote users, we pass the UUID they sent to the constructor.
         * If the UUID already exists User::User() throws an exception which causes this connection to be closed.
         */
-       RemoteUser* _new = new RemoteUser(params[0], remoteserver);
+       RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver);
        ServerInstance->Users->clientlist[params[2]] = _new;
        _new->nick = params[2];
        _new->host = params[3];
@@ -99,7 +98,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                if (!mh)
                        throw ProtocolException("Unrecognised mode '" + std::string(1, *v) + "'");
 
-               if (mh->GetNumParams(true))
+               if (mh->NeedsParam(true))
                {
                        if (paramptr >= params.size() - 1)
                                throw ProtocolException("Out of parameters while processing modes");