X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_squit.cpp;h=eb224660d58a6d00335d383ba095fd672c74bf70;hb=687778b72e31322a73b2e2e17af6bd0f2a2561bc;hp=6d82f43dba7a5bd8b5cab61f0e483277ef1f8566;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index 6d82f43db..eb224660d 100644
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -17,8 +17,6 @@
  */
 
 
-/* $ModDesc: Provides a spanning tree server link protocol */
-
 #include "inspircd.h"
 #include "socket.h"
 
@@ -27,27 +25,21 @@
 #include "treeserver.h"
 #include "treesocket.h"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parameters, User* user)
+ModResult ModuleSpanningTree::HandleSquit(const CommandBase::Params& parameters, User* user)
 {
 	TreeServer* s = Utils->FindServerMask(parameters[0]);
 	if (s)
 	{
-		if (s == Utils->TreeRoot)
+		if (s->IsRoot())
 		{
 			user->WriteNotice("*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (" + parameters[0] + " matches local server name)");
 			return MOD_RES_DENY;
 		}
 
-		TreeSocket* sock = s->GetSocket();
-
-		if (sock)
+		if (s->IsLocal())
 		{
 			ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0].c_str(),user->nick.c_str());
-			sock->Squit(s,"Server quit by " + user->GetFullRealHost());
-			ServerInstance->SE->DelFd(sock);
-			sock->Close();
+			s->SQuit("Server quit by " + user->GetFullRealHost());
 		}
 		else
 		{
@@ -60,4 +52,3 @@ ModResult ModuleSpanningTree::HandleSquit(const std::vector<std::string>& parame
 	}
 	return MOD_RES_DENY;
 }
-