X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_map.cpp;h=989ee8900f5b19ae69c871ac978e1e2abd102123;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=48050b7af61eb726caf7dad2d63b24b485fa3678;hpb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;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 48050b7af..989ee8900 100644 --- a/src/modules/m_spanningtree/override_map.cpp +++ b/src/modules/m_spanningtree/override_map.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -14,80 +14,60 @@ /* $ModDesc: Provides a spanning tree server link protocol */ #include "inspircd.h" -#include "wildcard.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]"); } -// WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS. -void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, char matrix[250][250], float &totusers, float &totservers) +void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, int &line, char* names, int &maxnamew, char* stats) { - ServerInstance->Logs->Log("map",DEBUG,"ShowMap depth %d totusers %0.2f totservers %0.2f", depth, totusers, totservers); - if (line < 250) + ServerInstance->Logs->Log("map",DEBUG,"ShowMap depth %d on line %d", depth, line); + float percent; + + if (ServerInstance->Users->clientlist->size() == 0) { - for (int t = 0; t < depth; t++) - { - matrix[line][t] = ' '; - } + // If there are no users, WHO THE HELL DID THE /MAP?!?!?! + percent = 0; + } + else + { + percent = Current->GetUserCount() * 100.0 / ServerInstance->Users->clientlist->size(); + } - // For Aligning, we need to work out exactly how deep this thing is, and produce - // a 'Spacer' String to compensate. - char spacer[80]; - memset(spacer,' ',sizeof(spacer)); - if ((80 - Current->GetName().length() - depth) > 1) { - spacer[80 - Current->GetName().length() - depth] = '\0'; - } - else - { - spacer[5] = '\0'; - } + const std::string operdata = IS_OPER(user) ? MapOperInfo(Current) : ""; - float percent; - char text[250]; - /* Neat and tidy default values, as we're dealing with a matrix not a simple string */ - memset(text, 0, sizeof(text)); + 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()); + memset(myname + w, ' ', 100 - w); + if (w > maxnamew) + maxnamew = w; + snprintf(mystat, 49, "%5d [%5.2f%%]%s", Current->GetUserCount(), percent, operdata.c_str()); - if (ServerInstance->Users->clientlist->size() == 0) - { - // If there are no users, WHO THE HELL DID THE /MAP?!?!?! - percent = 0; - } - else - { - percent = ((float)Current->GetUserCount() / (float)ServerInstance->Users->clientlist->size()) * 100; - } + line++; - const std::string operdata = IS_OPER(user) ? MapOperInfo(Current) : ""; - snprintf(text, 249, "%s (%s)%s%5d [%5.2f%%]%s", Current->GetName().c_str(), Current->GetID().c_str(), spacer, Current->GetUserCount(), percent, operdata.c_str()); - totusers += Current->GetUserCount(); - totservers++; - strlcpy(&matrix[line][depth], text, 249); - line++; - - for (unsigned int q = 0; q < Current->ChildCount(); q++) - { - if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str())))) - { - if (IS_OPER(user)) - { - ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!IS_OPER(user))) ? depth : depth+2,matrix,totusers,totservers); - } - } - else - { - ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!IS_OPER(user))) ? depth : depth+2,matrix,totusers,totservers); - } + if (IS_OPER(user) || !Utils->FlatLinks) + depth = depth + 2; + for (unsigned int q = 0; q < Current->ChildCount(); q++) + { + TreeServer* child = Current->GetChild(q); + if (!IS_OPER(user)) { + if (child->Hidden) + continue; + if ((Utils->HideULines) && (ServerInstance->ULine(child->GetName().c_str()))) + continue; } + ShowMap(child, user, depth, line, names, maxnamew, stats); } } @@ -114,7 +94,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(); @@ -127,36 +107,30 @@ int ModuleSpanningTree::HandleMap(const std::vector& parameters, Us return 1; } - // This array represents a virtual screen which we will + // These arrays represent a virtual screen which we will // "scratch" draw to, as the console device of an irc // client does not provide for a proper terminal. - float totusers = 0; - float totservers = 0; - static char matrix[250][250]; - - for (unsigned int t = 0; t < 250; t++) - { - matrix[t][0] = '\0'; - } - - line = 0; + int totusers = ServerInstance->Users->clientlist->size(); + int totservers = this->CountServs(); + int maxnamew = 0; + int line = 0; + char* names = new char[totservers * 100]; + char* stats = new char[totservers * 50]; // The only recursive bit is called here. - ShowMap(Utils->TreeRoot,user,0,matrix,totusers,totservers); + ShowMap(Utils->TreeRoot,user,0,line,names,maxnamew,stats); - // Process each line one by one. The algorithm has a limit of - // 250 servers (which is far more than a spanning tree should have - // anyway, so we're ok). This limit can be raised simply by making - // the character matrix deeper, 250 rows taking 100k of memory. + // Process each line one by one. for (int l = 1; l < line; l++) { + char* myname = names + 100 * l; // scan across the line looking for the start of the // servername (the recursive part of the algorithm has placed // the servers at indented positions depending on what they // are related to) int first_nonspace = 0; - while (matrix[l][first_nonspace] == ' ') + while (myname[first_nonspace] == ' ') { first_nonspace++; } @@ -167,20 +141,20 @@ int ModuleSpanningTree::HandleMap(const std::vector& parameters, Us // another L shape passing along the same vertical pane, becoming // a |- (branch) section instead. - matrix[l][first_nonspace] = '-'; - matrix[l][first_nonspace-1] = '`'; + myname[first_nonspace] = '-'; + myname[first_nonspace-1] = '`'; int l2 = l - 1; // Draw upwards until we hit the parent server, causing possibly // other corners (`-) to become branches (|-) - while ((matrix[l2][first_nonspace-1] == ' ') || (matrix[l2][first_nonspace-1] == '`')) + while ((names[l2 * 100 + first_nonspace-1] == ' ') || (names[l2 * 100 + first_nonspace-1] == '`')) { - matrix[l2][first_nonspace-1] = '|'; + names[l2 * 100 + first_nonspace-1] = '|'; l2--; } } - float avg_users = totusers / totservers; + float avg_users = totusers * 1.0 / totservers; // dump the whole lot to the user. if (IS_LOCAL(user)) @@ -188,9 +162,11 @@ int ModuleSpanningTree::HandleMap(const std::vector& parameters, Us ServerInstance->Logs->Log("map",DEBUG,"local"); for (int t = 0; t < line; t++) { - user->WriteNumeric(RPL_MAP, "%s :%s",user->nick.c_str(),&matrix[t][0]); + // 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 :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick.c_str(),totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users); + 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()); } else @@ -200,12 +176,18 @@ int ModuleSpanningTree::HandleMap(const std::vector& parameters, Us // XXX: annoying that we have to use hardcoded numerics here.. for (int t = 0; t < line; t++) { - ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 006 " + user->nick + " :" + &matrix[t][0]); + // 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; }