/* $ModDesc: Provides a spanning tree server link protocol */
#include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
-#include "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.h"
+
#include "m_spanningtree/main.h"
#include "m_spanningtree/utils.h"
#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rconnect.h"
-#include "m_spanningtree/rsquit.h"
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.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: "+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)
-{
+{
+ ServerInstance->Logs->Log("map",DEBUG,"ShowMap depth %d totusers %0.2f totservers %0.2f", depth, totusers, totservers);
if (line < 128)
{
for (int t = 0; t < depth; t++)
{
+ ServerInstance->Logs->Log("map",DEBUG,"Zero to depth");
matrix[line][t] = ' ';
}
}
const std::string operdata = IS_OPER(user) ? MapOperInfo(Current) : "";
- snprintf(text, 126, "%s %s%5d [%5.2f%%]%s", Current->GetName().c_str(), spacer, Current->GetUserCount(), percent, operdata.c_str());
+ 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());
totusers += Current->GetUserCount();
totservers++;
strlcpy(&matrix[line][depth],text,126);
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);
+ ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!IS_OPER(user))) ? depth : depth+2,matrix,totusers,totservers);
+ ServerInstance->Logs->Log("map",DEBUG,"Show to oper");
}
+ ServerInstance->Logs->Log("map",DEBUG,"Fall through");
}
else
{
- ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
+ ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!IS_OPER(user))) ? depth : depth+2,matrix,totusers,totservers);
+ ServerInstance->Logs->Log("map",DEBUG,"Show to non oper");
}
}
+ 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)
{
- ServerInstance->Logs->Log("remotemap", DEBUG, "remote map request for %s", parameters[0]);
-
/* Remote MAP, the server is within the 1st parameter */
TreeServer* s = Utils->FindServerMask(parameters[0]);
bool ret = false;
if (!s)
{
- ServerInstance->Logs->Log("remotemap", DEBUG, "lolnoserver %s", parameters[0]);
- user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
+ user->WriteServ( "402 %s %s :No such server", user->nick.c_str(), parameters[0].c_str());
ret = true;
}
else if (s && s != Utils->TreeRoot)
{
- ServerInstance->Logs->Log("remotemap", DEBUG, "lol routing to %s", parameters[0]);
std::deque<std::string> params;
params.push_back(parameters[0]);
Utils->DoOneToOne(user->uuid, "MAP", params, s->GetName());
ret = true;
}
- else
- {
- ServerInstance->Logs->Log("remotemap", DEBUG, "lol it's me");
- }
// Don't return if s == Utils->TreeRoot (us)
if (ret)
// client does not provide for a proper terminal.
float totusers = 0;
float totservers = 0;
- char matrix[128][128];
+ static char matrix[128][128];
for (unsigned int t = 0; t < 128; t++)
{
// dump the whole lot to the user.
if (IS_LOCAL(user))
{
+ 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(6, "%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(270, "%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(7, "%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);
for (int t = 0; t < line; t++)
{
- ServerInstance->PI->PushToClient(user, std::string("6 ") + user->nick + " :" + &matrix[t][0]);
+ ServerInstance->Logs->Log("map",DEBUG,"Dump %d", line);
+ ServerInstance->PI->PushToClient(user, std::string("::") + ServerInstance->Config->ServerName + " 006 " + user->nick + " :" + &matrix[t][0]);
}
- ServerInstance->PI->PushToClient(user, std::string("270 ") + user->nick + " :" + ConvToStr(totservers) + (totservers > 1 ? "s" : "") + " and " + ConvToStr(totusers) + (totusers > 1 ? "s" : "") + ", average " + ConvToStr(avg_users) + " users per server");
- ServerInstance->PI->PushToClient(user, std::string("7 ") + user->nick + " :End of /MAP");
+ 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");
}
return 1;
projects / user / henk / code / inspircd.git / blobdiff