*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
-#include "wildcard.h"
#include "m_spanningtree/main.h"
#include "m_spanningtree/utils.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 ? "<1ms" : ConvToStr(Current->rtt)) + "ms]");
+ return (" [Up: " + TimeToStr(secs_up) + " Lag: " + (Current->rtt == 0 ? "<1" : ConvToStr(Current->rtt)) + "ms]");
}
-
+
// WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
-void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, char matrix[128][128], float &totusers, float &totservers)
+void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, char matrix[250][250], float &totusers, float &totservers)
{
ServerInstance->Logs->Log("map",DEBUG,"ShowMap depth %d totusers %0.2f totservers %0.2f", depth, totusers, totservers);
- if (line < 128)
- {
+ if (line < 250)
+ {
for (int t = 0; t < depth; t++)
{
- ServerInstance->Logs->Log("map",DEBUG,"Zero to depth");
matrix[line][t] = ' ';
}
-
+
// For Aligning, we need to work out exactly how deep this thing is, and produce
// a 'Spacer' String to compensate.
- char spacer[40];
- memset(spacer,' ',40);
- if ((40 - Current->GetName().length() - depth) > 1) {
- spacer[40 - Current->GetName().length() - depth] = '\0';
+ 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';
- }
+ }
float percent;
- char text[128];
+ char text[250];
/* Neat and tidy default values, as we're dealing with a matrix not a simple string */
- memset(text, 0, 128);
+ memset(text, 0, sizeof(text));
if (ServerInstance->Users->clientlist->size() == 0)
{
}
const std::string operdata = IS_OPER(user) ? MapOperInfo(Current) : "";
- snprintf(text, 126, "%s (%s)%s%5d [%5.2f%%]%s", Current->GetName().c_str(), Current->GetID().c_str(), spacer, Current->GetUserCount(), percent, operdata.c_str());
+ 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,126);
+ strlcpy(&matrix[line][depth], text, 249);
line++;
- ServerInstance->Logs->Log("map",DEBUG,"Increment line to %d, ChildCount %d", line, Current->ChildCount());
-
for (unsigned int q = 0; q < Current->ChildCount(); q++)
{
- ServerInstance->Logs->Log("map",DEBUG,"Hidden? %d HideULines? %d GetName %s", Current->GetChild(q)->Hidden, Utils->HideULines, Current->GetChild(q)->GetName().c_str());
if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str()))))
{
- if (*user->oper)
+ if (IS_OPER(user))
{
- ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
- ServerInstance->Logs->Log("map",DEBUG,"Show to oper");
+ ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!IS_OPER(user))) ? depth : depth+2,matrix,totusers,totservers);
}
- ServerInstance->Logs->Log("map",DEBUG,"Fall through");
}
else
{
- ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
- ServerInstance->Logs->Log("map",DEBUG,"Show to non oper");
+ ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!IS_OPER(user))) ? depth : depth+2,matrix,totusers,totservers);
}
}
- ServerInstance->Logs->Log("map",DEBUG,"After loop");
}
}
// 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 char* const* parameters, int pcnt, User* user)
+int ModuleSpanningTree::HandleMap(const std::vector<std::string>& parameters, User* user)
{
- if (pcnt > 0)
+ if (parameters.size() > 0)
{
/* Remote MAP, the server is within the 1st parameter */
TreeServer* s = Utils->FindServerMask(parameters[0]);
bool ret = false;
if (!s)
{
- user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
+ user->WriteNumeric(ERR_NOSUCHSERVER, "%s %s :No such server", user->nick.c_str(), parameters[0].c_str());
ret = true;
}
else if (s && s != Utils->TreeRoot)
// client does not provide for a proper terminal.
float totusers = 0;
float totservers = 0;
- static char matrix[128][128];
+ static char matrix[250][250];
- for (unsigned int t = 0; t < 128; t++)
+ for (unsigned int t = 0; t < 250; t++)
{
matrix[t][0] = '\0';
}
ShowMap(Utils->TreeRoot,user,0,matrix,totusers,totservers);
// Process each line one by one. The algorithm has a limit of
- // 128 servers (which is far more than a spanning tree should have
+ // 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, 128 rows taking 10k of memory.
+ // the character matrix deeper, 250 rows taking 100k of memory.
for (int l = 1; l < line; l++)
{
// scan across the line looking for the start of the
ServerInstance->Logs->Log("map",DEBUG,"local");
for (int t = 0; t < line; t++)
{
- user->WriteNumeric(6, "%s :%s",user->nick,&matrix[t][0]);
+ user->WriteNumeric(RPL_MAP, "%s :%s",user->nick.c_str(),&matrix[t][0]);
}
- user->WriteNumeric(270, "%s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users);
- user->WriteNumeric(7, "%s :End of /MAP",user->nick);
+ 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_ENDMAP, "%s :End of /MAP",user->nick.c_str());
}
else
{
-
- //void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string &rawline)
- //
ServerInstance->Logs->Log("map", DEBUG, "remote dump lines=%d", line);
+ // XXX: annoying that we have to use hardcoded numerics here..
for (int t = 0; t < line; t++)
{
- ServerInstance->Logs->Log("map",DEBUG,"Dump %d", line);
ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 006 " + user->nick + " :" + &matrix[t][0]);
}
projects / user / henk / code / inspircd.git / blobdiff