m_spanningtree SVSNICK needs 3 parameters

[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 5152ef274185e8938994b2f4e936c6ea6823c438..4a73eb80c2d69c1d4a070c4d1014401d3808180f 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "commands.h"
 
@@ -33,13 +41,15 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        time_t age_t = ConvToInt(params[1]);
        time_t signon = ConvToInt(params[7]);
        std::string empty;
-       std::string nick(params[2]);
        std::string modestr(params[8]);
 
        TreeServer* remoteserver = Utils->FindServer(serversrc->server);
 
        if (!remoteserver)
                return CMD_INVALID;
+       /* Is this a valid UID, and not misrouted? */
+       if (params[0].length() != 9 || params[0].substr(0,3) != serversrc->uuid)
+               return CMD_INVALID;
        /* Check parameters for validity before introducing the client, discovered by dmb */
        if (!age_t)
                return CMD_INVALID;
@@ -50,20 +60,24 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
 
        /* check for collision */
-       user_hash::iterator iter = ServerInstance->Users->clientlist->find(nick);
+       user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
 
        if (iter != ServerInstance->Users->clientlist->end())
        {
                /*
                 * Nick collision.
                 */
-               int collide = sock->DoCollision(iter->second, age_t, params[5], modestr, params[0]);
+               int collide = sock->DoCollision(iter->second, age_t, params[5], params[6], params[0]);
                ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
                if (collide != 1)
                {
-                       /* remote client changed, make sure we change their nick for the hash too */
-                       nick = params[0];
+                       /* remote client lost, make sure we change their nick for the hash too
+                        *
+                        * This alters the line that will be sent to other servers, which
+                        * commands normally shouldn't do; hence the required const_cast.
+                        */
+                       const_cast<parameterlist&>(params)[2] = params[0];
                }
        }
 
@@ -77,10 +91,11 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        }
        catch (...)
        {
+               ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
                return CMD_INVALID;
        }
-       (*(ServerInstance->Users->clientlist))[nick] = _new;
-       _new->nick = nick;
+       (*(ServerInstance->Users->clientlist))[params[2]] = _new;
+       _new->nick = params[2];
        _new->host = params[3];
        _new->dhost = params[4];
        _new->ident = params[5];
@@ -97,9 +112,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
        unsigned int paramptr = 9;
        for (std::string::iterator v = modestr.begin(); v != modestr.end(); v++)
        {
-               if (*v == '+')
-                       continue;
-
                /* For each mode thats set, increase counter */
                ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
 
@@ -142,7 +154,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
                dosend = false;
 
        if (dosend)
-               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server.c_str(), _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
+               ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s]", _new->server.c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString(), _new->fullname.c_str());
 
        FOREACH_MOD(I_OnPostConnect,OnPostConnect(_new));