X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=456d0f5aa1f8b408b19ab22f78e431a139506016;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=4934c3d610f0d9d0bee777a0863ebe0267c3a173;hpb=b36ce84c7da93f680fc397bcb4c877abe063eaaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 4934c3d61..456d0f5aa 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -21,11 +21,10 @@
  */
 
 
-/* $ModDesc: Provides a spanning tree server link protocol */
-
 #include "inspircd.h"
 #include "socket.h"
 #include "xline.h"
+#include "iohook.h"
 
 #include "resolvers.h"
 #include "main.h"
@@ -73,10 +72,10 @@ void ModuleSpanningTree::init()
 	Implementation eventlist[] =
 	{
 		I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostTopicChange,
-		I_OnWallops, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
+		I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
 		I_OnChangeHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule,
-		I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, I_OnPreRehash,
-		I_OnOper, I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats,
+		I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRehash, I_OnPreRehash,
+		I_OnOper, I_OnAddLine, I_OnDelLine, I_OnLoadModule, I_OnStats,
 		I_OnSetAway, I_OnPostCommand, I_OnUserConnect, I_OnAcceptConnection
 	};
 	ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
@@ -454,16 +453,6 @@ void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std:
 	Utils->DoOneToMany(user->uuid,"TOPIC",params);
 }
 
-void ModuleSpanningTree::OnWallops(User* user, const std::string &text)
-{
-	if (IS_LOCAL(user))
-	{
-		parameterlist params;
-		params.push_back(":"+text);
-		Utils->DoOneToMany(user->uuid,"WALLOPS",params);
-	}
-}
-
 void ModuleSpanningTree::LocalMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list, const char* message_type)
 {
 	/* Server or remote origin, dest should always be non-null */
@@ -592,8 +581,7 @@ void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
 
 void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
 {
-	// only occurs for local clients
-	if (user->registered != REG_ALL)
+	if ((user->registered != REG_ALL) || (!IS_LOCAL(user)))
 		return;
 
 	parameterlist params;
@@ -677,21 +665,6 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
 	}
 }
 
-void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason)
-{
-	if (!IS_LOCAL(source))
-		return; // Only start routing if we're origin.
-
-	ServerInstance->OperQuit.set(dest, operreason);
-	parameterlist params;
-	params.push_back(":"+operreason);
-	Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
-	params.clear();
-	params.push_back(dest->uuid);
-	params.push_back(":"+reason);
-	Utils->DoOneToMany(source->uuid,"KILL",params);
-}
-
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
 	if (loopCall)
@@ -751,7 +724,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
 	{
 		TreeServer* srv = Utils->TreeRoot->GetChild(x);
 		TreeSocket* sock = srv->GetSocket();
-		if (sock && sock->GetIOHook() == mod)
+		if (sock && sock->GetIOHook() && sock->GetIOHook()->creator == mod)
 		{
 			sock->SendError("SSL module unloaded");
 			sock->Close();
@@ -818,33 +791,6 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
 	}
 }
 
-void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const parameterlist &text, const std::vector<TranslateType> &translate)
-{
-	if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
-	{
-		parameterlist params;
-		std::string output_text;
-
-		ServerInstance->Parser->TranslateUIDs(translate, text, output_text);
-
-		if (target_type == TYPE_USER)
-		{
-			User* u = (User*)dest;
-			params.push_back(u->uuid);
-			params.push_back(output_text);
-			Utils->DoOneToMany(user->uuid, "MODE", params);
-		}
-		else
-		{
-			Channel* c = (Channel*)dest;
-			params.push_back(c->name);
-			params.push_back(ConvToStr(c->age));
-			params.push_back(output_text);
-			Utils->DoOneToMany(user->uuid, "FMODE", params);
-		}
-	}
-}
-
 ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
 	if (IS_LOCAL(user))
@@ -864,9 +810,7 @@ ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const parameterlist &modeline, const std::vector<TranslateType> &translate)
 {
 	TreeSocket* s = (TreeSocket*)opaque;
-	std::string output_text;
-
-	ServerInstance->Parser->TranslateUIDs(translate, modeline, output_text);
+	std::string output_text = CommandParser::TranslateUIDs(translate, modeline);
 
 	if (target)
 	{
@@ -898,7 +842,8 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con
 
 CullResult ModuleSpanningTree::cull()
 {
-	Utils->cull();
+	if (Utils)
+		Utils->cull();
 	return this->Module::cull();
 }