Merge pull request #53 from SaberUK/clang-analyze

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

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index fe08b9ee2d082622a3f7cc0f75a4b9ec5ac55429..fda150012f1f845a5db01b3c8c3fc1fcd0db5b1d 100644 (file)
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,53 +12,41 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "xline.h"
-#include "../transport.h"
-#include "socketengine.h"
 
 #include "main.h"
 #include "utils.h"
-#include "treeserver.h"
-#include "treesocket.h"
+#include "commands.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-/** Because Andy insists that services-compatible servers must
- * implement SVSNICK and SVSJOIN, that's exactly what we do :p
- */
-bool TreeSocket::ForceNick(const std::string &prefix, parameterlist &params)
+CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, User *user)
 {
-       if (params.size() < 3)
-               return true;
-
-       User* u = this->ServerInstance->FindNick(params[0]);
+       User* u = ServerInstance->FindNick(parameters[0]);
 
-       if (u)
+       if (u && IS_LOCAL(u))
        {
-               Utils->DoOneToAllButSender(prefix,"SVSNICK",params,prefix);
+               std::string nick = parameters[1];
+               if (isdigit(nick[0]))
+                       nick = u->uuid;
 
-               if (IS_LOCAL(u))
+               if (!u->ForceNickChange(nick.c_str()))
                {
-                       parameterlist par;
-                       par.push_back(params[1]);
-
-                       if (!u->ForceNickChange(params[1].c_str()))
+                       /* buh. UID them */
+                       if (!u->ForceNickChange(u->uuid.c_str()))
                        {
-                               /* buh. UID them */
-                               if (!u->ForceNickChange(u->uuid.c_str()))
-                               {
-                                       this->ServerInstance->Users->QuitUser(u, "Nickname collision");
-                                       return true;
-                               }
+                               ServerInstance->Users->QuitUser(u, "Nickname collision");
+                               return CMD_SUCCESS;
                        }
-
-                       u->age = atoi(params[2].c_str());
                }
+
+               u->age = atoi(parameters[2].c_str());
        }
 
-       return true;
+       return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSNick::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+       User* u = ServerInstance->FindNick(parameters[0]);
+       if (u)
+               return ROUTE_OPT_UCAST(u->server);
+       return ROUTE_LOCALONLY;
+}