diff options
| -rw-r--r-- | src/bancache.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/rsquit.cpp | 77 | ||||
| -rw-r--r-- | src/xline.cpp | 4 |
3 files changed, 31 insertions, 53 deletions
diff --git a/src/bancache.cpp b/src/bancache.cpp index 24578b379..e8accb404 100644 --- a/src/bancache.cpp +++ b/src/bancache.cpp @@ -87,9 +87,10 @@ unsigned int BanCacheManager::RemoveEntries(const std::string &type, bool positi /* Safe to delete items here through iterator 'n' */ if (b->Type == type) { - if ((positive && !b->Reason.empty()) || b->Reason.empty()) + if ((positive && !b->Reason.empty()) || !positive && b->Reason.empty()) { /* we need to remove this one. */ + ServerInstance->Log(DEBUG, "BanCacheManager::RemoveEntries(): Removing a hit on " + b->IP); delete b; b = NULL; BanHash->erase(n); // WORD TO THE WISE: don't use RemoveHit here, because we MUST remove the iterator in a safe way. diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp index 62f22bc4f..79a5f896a 100644 --- a/src/modules/m_spanningtree/rsquit.cpp +++ b/src/modules/m_spanningtree/rsquit.cpp @@ -33,73 +33,46 @@ 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]"; + syntax = "<remote-server-mask> [reason]"; } CmdResult cmd_rsquit::Handle (const char** parameters, int pcnt, User *user) { - if (IS_LOCAL(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 (!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]); + user->WriteServ("NOTICE %s :*** RSQUIT: Server \002%s\002 isn't connected to the network!", user->nick, parameters[0]); + return CMD_FAILURE; } - TreeServer* s = (pcnt > 1) ? Utils->FindServerMask(parameters[1]) : Utils->FindServerMask(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()); - if (pcnt > 1) + if (server_linked == Utils->TreeRoot) { - if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameters[0])) + // I have been asked to remove the server. + if (server_target == Utils->TreeRoot) { - 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; - } + NoticeUser(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! ("+ConvToStr(parameters[0])+" matches local server name)"); + return CMD_FAILURE; } - } - else - { - if (s) + + TreeSocket* sock = server_target->GetSocket(); + if (sock) { - 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; - } + 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; } } + // Route the RSQUIT, no match yet. return CMD_SUCCESS; } diff --git a/src/xline.cpp b/src/xline.cpp index 59f94ce88..dc054dc70 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -151,6 +151,8 @@ bool XLineManager::AddLine(XLine* line, User* user) { /*IdentHostPair ih = IdentSplit(hostmask);*/ + ServerInstance->BanCache->RemoveEntries(line->type, true); + if (DelLine(line->Displayable(), line->type, user, true)) return false; @@ -181,6 +183,8 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* if (simulate) return true; + ServerInstance->BanCache->RemoveEntries(y->second->type, false); + FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second)); y->second->Unset(); |