m_spanningtree Fix rare desync when a KILL crosses a message that has the killed...

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

diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 7d09d939fea7dfef252953a9ba652b01f0901023..04fa4bcab31b53a61aaaab3b6b5e9abd3c25c102 100644 (file)
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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/>.
  */
 
+
 /* $ModDesc: Provides a spanning tree server link protocol */
 
 #include "inspircd.h"
@@ -50,13 +58,14 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int
        memset(myname, ' ', depth);
        int w = depth;
 
+       std::string servername = Current->GetName();
        if (IS_OPER(user))
        {
-               w += snprintf(myname + depth, 99 - depth, "%s (%s)", Current->GetName().c_str(), Current->GetID().c_str());
+               w += snprintf(myname + depth, 99 - depth, "%s (%s)", servername.c_str(), Current->GetID().c_str());
        }
        else
        {
-               w += snprintf(myname + depth, 99 - depth, "%s", Current->GetName().c_str());
+               w += snprintf(myname + depth, 99 - depth, "%s", servername.c_str());
        }
        memset(myname + w, ' ', 100 - w);
        if (w > maxnamew)
@@ -73,7 +82,7 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int
                if (!IS_OPER(user)) {
                        if (child->Hidden)
                                continue;
-                       if ((Utils->HideULines) && (ServerInstance->ULine(child->GetName().c_str())))
+                       if ((Utils->HideULines) && (ServerInstance->ULine(child->GetName())))
                                continue;
                }
                ShowMap(child, user, depth, line, names, maxnamew, stats);
@@ -170,13 +179,13 @@ bool ModuleSpanningTree::HandleMap(const std::vector<std::string>& parameters, U
        {
                // terminate the string at maxnamew characters
                names[100 * t + maxnamew] = '\0';
-               ServerInstance->DumpText(user, ":%s %d %s :%s %s", ServerInstance->Config->ServerName.c_str(),
+               user->SendText(":%s %03d %s :%s %s", ServerInstance->Config->ServerName.c_str(),
                        RPL_MAP, user->nick.c_str(), names + 100 * t, stats + 50 * t);
        }
-       ServerInstance->DumpText(user, ":%s %d %s :%d server%s and %d user%s, average %.2f users per server",
+       user->SendText(":%s %03d %s :%d server%s and %d user%s, average %.2f users per server",
                ServerInstance->Config->ServerName.c_str(), RPL_MAPUSERS, user->nick.c_str(),
                line, (line > 1 ? "s" : ""), totusers, (totusers > 1 ? "s" : ""), avg_users);
-       ServerInstance->DumpText(user, ":%s %d %s :End of /MAP", ServerInstance->Config->ServerName.c_str(),
+       user->SendText(":%s %03d %s :End of /MAP", ServerInstance->Config->ServerName.c_str(),
                RPL_ENDMAP, user->nick.c_str());
 
        delete[] names;