summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-07 23:58:28 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-04-07 23:58:28 +0000
commit0ad10d75b9817ef26fa3f292c8628d50fa831eca (patch)
treea9d176716e1ab39d058a6824997d0f950f586574
parent9b169c24b1c04123bca3a04d08f8519362b87df4 (diff)
When map says 0ms, make it read "<1ms" instead of 0, 0 doesnt make ANY sense at all, transfer of data is not instant! Also tidy up headers for this file, we include far more of spanningtree than we actually use
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9416 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_spanningtree/override_map.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 01f24eaa1..d978c99cc 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -14,30 +14,20 @@
/* $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 ? "<1ms" : 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)