Merge pull request #1351 from SaberUK/master+webirc

[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 39857361692e9170dd77c26001b004202429821b..91c9f3ca88fd27475e605ebecaf48a1a3ed338c4 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -24,10 +24,11 @@
 
 #include "utils.h"
 #include "treeserver.h"
+#include "remoteuser.h"
 
 CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::string>& params)
 {
-       /** Do we have enough parameters:
+       /**
         *      0    1    2    3    4    5        6        7     8        9       (n-1)
         * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
         */
@@ -36,10 +37,10 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        std::string empty;
        const std::string& modestr = params[8];
 
-       /* Is this a valid UID, and not misrouted? */
+       // Check if the length of the uuid is correct and confirm the sid portion of the uuid matches the sid of the server introducing the user
        if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].compare(0, 3, remoteserver->GetID()))
                throw ProtocolException("Bogus UUID");
-       /* Check parameters for validity before introducing the client, discovered by dmb */
+       // Sanity check on mode string: must begin with '+'
        if (modestr[0] != '+')
                throw ProtocolException("Invalid mode string");
 
@@ -49,19 +50,13 @@ 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());
-
-               // Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
-               collideswith->registered &= ~REG_NICK;
-               collideswith->ChangeNick(collideswith->uuid);
+               LocalUser* const localuser = static_cast<LocalUser*>(collideswith);
+               localuser->OverruleNick();
        }
        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
@@ -72,12 +67,10 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                }
        }
 
-       /* IMPORTANT NOTE: For remote users, we pass the UUID in the constructor. This automatically
-        * sets it up in the UUID hash for us.
-        *
+       /* 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];
@@ -101,7 +94,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");
@@ -169,6 +162,6 @@ CommandUID::Builder::Builder(User* user)
        push(user->ident);
        push(user->GetIPString());
        push_int(user->signon);
-       push('+').push_raw(user->FormatModes(true));
+       push(user->GetModeLetters(true));
        push_last(user->fullname);
 }