summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-06 01:32:44 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-06 01:32:44 +0000
commit627d16303b347fb0ff566866e14d2822afeb4d87 (patch)
treedbf3eb83870899f3f32c4b124e039b86122f213c /src/modules
parent64fec23cc76f86650860a24e5dae1d49e27f9111 (diff)
Back out rsquit: wasn't meant to be committed yet.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8642 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_spanningtree/rsquit.cpp77
1 files changed, 52 insertions, 25 deletions
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 79a5f896a..62f22bc4f 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -33,46 +33,73 @@
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> [reason]";
+ syntax = "<remote-server-mask> [target-server-mask]";
}
CmdResult cmd_rsquit::Handle (const char** parameters, int pcnt, User *user)
{
- TreeServer *server_target; // one to squit
- TreeServer *server_linked; // one it's linked to
-
- server_target = Utils->FindServerMask(parameters[0]);
- if (!server_target)
+ if (IS_LOCAL(user))
{
- user->WriteServ("NOTICE %s :*** RSQUIT: Server \002%s\002 isn't connected to the network!", user->nick, parameters[0]);
- return CMD_FAILURE;
+ if (!Utils->FindServerMask(parameters[0]))
+ {
+ user->WriteServ("NOTICE %s :*** RSQUIT: Server \002%s\002 isn't connected to the network!", user->nick, parameters[0]);
+ return CMD_FAILURE;
+ }
+ if (pcnt > 1)
+ user->WriteServ("NOTICE %s :*** RSQUIT: Sending remote squit to \002%s\002 to squit server \002%s\002.",user->nick,parameters[0],parameters[1]);
+ else
+ user->WriteServ("NOTICE %s :*** RSQUIT: Sending remote squit for server \002%s\002.",user->nick,parameters[0]);
}
- server_linked = server_target->GetParent();
- user->WriteServ("NOTICE %s :*** RSQUIT: Sending instruction to squit server \002%s\002 to parent server \002%s\002.",user->nick, server_target->GetName().c_str(), server_linked->GetName().c_str());
+ TreeServer* s = (pcnt > 1) ? Utils->FindServerMask(parameters[1]) : Utils->FindServerMask(parameters[0]);
- if (server_linked == Utils->TreeRoot)
+ if (pcnt > 1)
{
- // I have been asked to remove the server.
- if (server_target == Utils->TreeRoot)
+ if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameters[0]))
{
- NoticeUser(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! ("+ConvToStr(parameters[0])+" matches local server name)");
- return CMD_FAILURE;
+ 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;
+ }
}
-
- TreeSocket* sock = server_target->GetSocket();
- if (sock)
+ }
+ else
+ {
+ if (s)
{
- const char *reason = pcnt == 2 ? parameters[1] : "No reason";
- ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0], user->nick, reason);
- sock->Squit(server_target, std::string("Server quit by ") + user->GetFullRealHost() + " (" + reason + ")");
- ServerInstance->SE->DelFd(sock);
- sock->Close();
- return CMD_LOCALONLY;
+ if (s == Utils->TreeRoot)
+ {
+ 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)
+ {
+ 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;
+ }
}
}
- // Route the RSQUIT, no match yet.
return CMD_SUCCESS;
}