Add basic stuff for protocol interface and implement a couple of the methods. It...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / rsquit.cpp

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 979dd1bae016601b8516b482495e35b81c523b95..a4158a20d54376a4330daa293b3155b96545ed6e 100644 (file)
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
@@ -34,13 +30,13 @@
 
 /* $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/rsquit.h */
 
-cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : command_t(Instance, "RSQUIT", 'o', 1), Creator(Callback), Utils(Util)
+cmd_rsquit::cmd_rsquit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RSQUIT", "o", 1), Creator(Callback), Utils(Util)
 {
        this->source = "m_spanningtree.so";
        syntax = "<remote-server-mask> [target-server-mask]";
 }
 
-CmdResult cmd_rsquit::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_rsquit::Handle (const char* const* parameters, int pcnt, User *user)
 {
        if (IS_LOCAL(user))
        {
@@ -60,42 +56,65 @@ CmdResult cmd_rsquit::Handle (const char** parameters, int pcnt, userrec *user)
        if (pcnt > 1)
        {
                if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameters[0]))
+               {
+                       if (s)
+                       {
+                               if (s == Utils->TreeRoot)
+                               {
+                                       NoticeUser(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! ("+ConvToStr(parameters[1])+" matches local server name)");
+                                       return CMD_FAILURE;
+                               }
+                               TreeSocket* sock = s->GetSocket();
+                               if (!sock)
+                               {
+                                       NoticeUser(user, "*** RSQUIT: Server \002"+ConvToStr(parameters[1])+"\002 isn't connected to \002"+ConvToStr(parameters[0])+"\002.");
+                                       return CMD_FAILURE;
+                               }
+                               ServerInstance->SNO->WriteToSnoMask('l',"Remote SQUIT from %s matching \002%s\002, squitting server \002%s\002",user->nick,parameters[0],parameters[1]);
+                               const char* para[1];
+                               para[0] = parameters[1];
+                               std::string original_command = std::string("SQUIT ") + parameters[1];
+                               Creator->OnPreCommand("SQUIT", para, 1, user, true, original_command);
+                               return CMD_LOCALONLY;
+                       }
+               }
+       }
+       else
+       {
+               if (s)
                {
                        if (s == Utils->TreeRoot)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: %s told me to SQUIT myself! (%s matches local server name)",user->nick,parameters[1]);
+                               NoticeUser(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! ("+ConvToStr(parameters[0])+" matches local server name)");
                                return CMD_FAILURE;
                        }
                        TreeSocket* sock = s->GetSocket();
-                       if (!sock)
+                       if (sock)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: %s told me to SQUIT \002%s\002 but the server isn't linked here.",user->nick,parameters[1]);
-                               return CMD_FAILURE;
+                               ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
+                               sock->Squit(s,std::string("Server quit by ") + user->GetFullRealHost());
+                               ServerInstance->SE->DelFd(sock);
+                               sock->Close();
+                               return CMD_LOCALONLY;
                        }
-                       ServerInstance->SNO->WriteToSnoMask('l',"Remote SQUIT from %s matching \002%s\002, squitting server \002%s\002",user->nick,parameters[0],parameters[1]);
-                       const char* para[1];
-                       para[0] = parameters[1];
-                       std::string original_command = std::string("SQUIT ") + parameters[1];
-                       Creator->OnPreCommand("SQUIT", para, 1, user, true, original_command);
                }
        }
+
+       return CMD_SUCCESS;
+}
+
+void cmd_rsquit::NoticeUser(User* user, const std::string &msg)
+{
+       if (IS_LOCAL(user))
+       {
+               user->WriteServ("NOTICE %s :%s",user->nick,msg.c_str());
+       }
        else
        {
-               if (s == Utils->TreeRoot)
-               {
-                       user->WriteServ("NOTICE %s :*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]);
-                       return CMD_FAILURE;
-               }
-               TreeSocket* sock = s->GetSocket();
-               if (sock)
-               {
-                       ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
-                       sock->Squit(s,std::string("Server quit by ") + user->GetFullRealHost());
-                       ServerInstance->SE->DelFd(sock);
-                       sock->Close();
-                       delete sock;
-               }
+               std::deque<std::string> params;
+               params.push_back(user->nick);
+               params.push_back("NOTICE "+ConvToStr(user->nick)+" :"+msg);
+               Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", params, user->server);
        }
-
-       return CMD_SUCCESS;
 }
+