X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fmodules%2Fm_spanningtree%2Foverride_stats.cpp;h=76522a3dd0c93e561ebe1095e157943430f49207;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=d9dca2827142c17536fe557f93047b6aa7a09fa2;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index d9dca2827..76522a3dd 100644
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
@@ -12,36 +12,31 @@
  */
 
 /* $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 */
+#include "xline.h"
+#include "../transport.h"
+
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleStats(const char** parameters, int pcnt, User* user)
+int ModuleSpanningTree::HandleStats(const std::vector<std::string>& parameters, User* user)
 {
-	if (pcnt > 1)
+	if (parameters.size() > 1)
 	{
-		if (match(ServerInstance->Config->ServerName, parameters[1]))
+		if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[1]))
 			return 0;
 
 		/* Remote STATS, the server is within the 2nd parameter */
-		std::deque<std::string> params;
+		parameterlist params;
 		params.push_back(parameters[0]);
 		params.push_back(parameters[1]);
 		/* Send it out remotely, generate no reply yet */
@@ -54,7 +49,7 @@ int ModuleSpanningTree::HandleStats(const char** parameters, int pcnt, User* use
 		}
 		else
 		{
-			user->WriteServ( "402 %s %s :No such server", user->nick, parameters[1]);
+			user->WriteServ( "402 %s %s :No such server", user->nick.c_str(), parameters[1].c_str());
 		}
 		return 1;
 	}
@@ -71,8 +66,6 @@ int ModuleSpanningTree::OnStats(char statschar, User* user, string_list &results
 			if (statschar == 'c')
 				results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i].Name.c_str());
 		}
-		results.push_back(std::string(ServerInstance->Config->ServerName)+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
-		ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
 		return 1;
 	}
 
@@ -82,15 +75,15 @@ int ModuleSpanningTree::OnStats(char statschar, User* user, string_list &results
 
 		for (unsigned int i = 0; i < Utils->Bindings.size(); i++)
 		{
-			std::string ip = Utils->Bindings[i]->IP;
+			std::string ip = Utils->Bindings[i]->GetIP();
 			if (ip.empty())
 				ip = "*";
 
 			std::string transport("plaintext");
-			if (Utils->Bindings[i]->GetHook())
-				transport = InspSocketNameRequest(this, Utils->Bindings[i]->GetHook()).Send();
+			if (Utils->Bindings[i]->GetIOHook())
+				transport = BufferedSocketNameRequest(this, Utils->Bindings[i]->GetIOHook()).Send();
 
-			results.push_back(ConvToStr(ServerInstance->Config->ServerName) + " 249 "+user->nick+" :" + ip + ":" + ConvToStr(Utils->Bindings[i]->port)+
+			results.push_back(ConvToStr(ServerInstance->Config->ServerName) + " 249 "+user->nick+" :" + ip + ":" + ConvToStr(Utils->Bindings[i]->GetPort())+
 				" (server, " + transport + ")");
 		}
 	}