X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=04fa4bcab31b53a61aaaab3b6b5e9abd3c25c102;hb=ee5e5aa77574a8e2cf9d142ccecf76de1fe72eb6;hp=c5816ca0a6ff008ba2b62595311aac234e1c5618;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp index c5816ca0a..04fa4bcab 100644 --- a/src/modules/m_spanningtree/override_map.cpp +++ b/src/modules/m_spanningtree/override_map.cpp @@ -1,31 +1,39 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2008 Robin Burchell * - * 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 . */ + /* $ModDesc: Provides a spanning tree server link protocol */ #include "inspircd.h" -#include "m_spanningtree/main.h" -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/treesocket.h" +#include "main.h" +#include "utils.h" +#include "treeserver.h" +#include "treesocket.h" /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */ const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current) { time_t secs_up = ServerInstance->Time() - Current->age; - return (" [Up: " + TimeToStr(secs_up) + " Lag: " + (Current->rtt == 0 ? "<1" : ConvToStr(Current->rtt)) + "ms]"); + return " [Up: " + TimeToStr(secs_up) + (Current->rtt == 0 ? "]" : " Lag: " + ConvToStr(Current->rtt) + "ms]"); } void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int &line, char* names, int &maxnamew, char* stats) @@ -48,7 +56,17 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int char* myname = names + 100 * line; char* mystat = stats + 50 * line; memset(myname, ' ', depth); - int w = depth + snprintf(myname + depth, 99 - depth, "%s (%s)", Current->GetName().c_str(), Current->GetID().c_str()); + int w = depth; + + std::string servername = Current->GetName(); + if (IS_OPER(user)) + { + w += snprintf(myname + depth, 99 - depth, "%s (%s)", servername.c_str(), Current->GetID().c_str()); + } + else + { + w += snprintf(myname + depth, 99 - depth, "%s", servername.c_str()); + } memset(myname + w, ' ', 100 - w); if (w > maxnamew) maxnamew = w; @@ -64,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); @@ -80,7 +98,7 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int // and divisons, we instead render the map onto a backplane of characters // (a character matrix), then draw the branches as a series of "L" shapes // from the nodes. This is not only friendlier on CPU it uses less stack. -int ModuleSpanningTree::HandleMap(const std::vector& parameters, User* user) +bool ModuleSpanningTree::HandleMap(const std::vector& parameters, User* user) { if (parameters.size() > 0) { @@ -94,7 +112,7 @@ int ModuleSpanningTree::HandleMap(const std::vector& parameters, Us } else if (s && s != Utils->TreeRoot) { - std::deque params; + parameterlist params; params.push_back(parameters[0]); params[0] = s->GetName(); @@ -104,7 +122,7 @@ int ModuleSpanningTree::HandleMap(const std::vector& parameters, Us // Don't return if s == Utils->TreeRoot (us) if (ret) - return 1; + return true; } // These arrays represent a virtual screen which we will @@ -154,41 +172,25 @@ int ModuleSpanningTree::HandleMap(const std::vector& parameters, Us } } - float avg_users = totusers * 1.0 / totservers; + float avg_users = totusers * 1.0 / line; - // dump the whole lot to the user. - if (IS_LOCAL(user)) + ServerInstance->Logs->Log("map",DEBUG,"local"); + for (int t = 0; t < line; t++) { - ServerInstance->Logs->Log("map",DEBUG,"local"); - for (int t = 0; t < line; t++) - { - // terminate the string at maxnamew characters - names[100 * t + maxnamew] = '\0'; - user->WriteNumeric(RPL_MAP, "%s :%s %s",user->nick.c_str(),names + 100 * t, stats + 50 * t); - } - user->WriteNumeric(RPL_MAPUSERS, "%s :%d server%s and %d user%s, average %.2f users per server",user->nick.c_str(),totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users); - user->WriteNumeric(RPL_ENDMAP, "%s :End of /MAP",user->nick.c_str()); + // terminate the string at maxnamew characters + names[100 * t + maxnamew] = '\0'; + user->SendText(":%s %03d %s :%s %s", ServerInstance->Config->ServerName.c_str(), + RPL_MAP, user->nick.c_str(), names + 100 * t, stats + 50 * t); } - else - { - ServerInstance->Logs->Log("map", DEBUG, "remote dump lines=%d", line); + 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); + user->SendText(":%s %03d %s :End of /MAP", ServerInstance->Config->ServerName.c_str(), + RPL_ENDMAP, user->nick.c_str()); - // XXX: annoying that we have to use hardcoded numerics here.. - for (int t = 0; t < line; t++) - { - // terminate the string at maxnamew characters - char* name = names + 100 * t; - char* stat = stats + 50 * t; - name[maxnamew] = '\0'; - ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 006 " + user->nick + " :" + name + " " + stat); - } - - ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 270 " + user->nick + " :" + ConvToStr(totservers) + " server"+(totservers > 1 ? "s" : "") + " and " + ConvToStr(totusers) + " user"+(totusers > 1 ? "s" : "") + ", average " + ConvToStr(avg_users) + " users per server"); - ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 007 " + user->nick + " :End of /MAP"); - } delete[] names; delete[] stats; - return 1; + return true; }