summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/snomasks.h13
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp28
-rw-r--r--src/snomasks.cpp44
3 files changed, 14 insertions, 71 deletions
diff --git a/include/snomasks.h b/include/snomasks.h
index d4bd8a22c..6e3f75d7a 100644
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -24,11 +24,10 @@ class Snomask : public Extensible
std::string Description;
std::string LastMessage;
unsigned int Count;
- bool LocalOnly; // whether or not messages are netwide
/** Create a new Snomask
*/
- Snomask(InspIRCd* Instance, char snomask, const std::string &description, bool local) : ServerInstance(Instance), MySnomask(snomask), Description(description), LastMessage(""), Count(0), LocalOnly(local)
+ Snomask(InspIRCd* Instance, char snomask, const std::string &description) : ServerInstance(Instance), MySnomask(snomask), Description(description), LastMessage(""), Count(0)
{
}
@@ -78,11 +77,10 @@ class CoreExport SnomaskManager : public Extensible
* their list, and users may add this letter to their list.
* @param description The descriptive text sent along with any
* server notices, at the start of the notice, e.g. "GLOBOPS".
- * @param local Whether or not messages should be locally broadcast only (default off)
* @return True if the snomask was enabled, false if it already
* exists.
*/
- bool EnableSnomask(char letter, const std::string &description, bool local = false);
+ bool EnableSnomask(char letter, const std::string &description);
/** Disable a snomask.
* @param letter The snomask letter to disable.
@@ -91,13 +89,6 @@ class CoreExport SnomaskManager : public Extensible
*/
bool DisableSnomask(char letter);
- /** Set the local only message state of a given snomask.
- * This is used by remote stuff to prevent endless recursion in sending
- * XXX this is currently a really shit way to do it, as it effectively
- * bypasses snomask compression!
- */
- bool SetLocalOnly(char letter, bool local);
-
/** Write to all users with a given snomask.
* @param letter The snomask letter to write to
* @param text The text to send to the users
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 915158f8d..5d2471b2c 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -488,34 +488,10 @@ bool TreeSocket::ProcessLine(std::string &line)
{
if (params.size() >= 2)
{
- /*
- * XXX:
- * The SetLocalOnly stuff here is to work around a bit of a nasty recursion bug.
- * WriteToSnoMask() sends global snotices out globally, but of course this is a problem
- * when triggering it from an already global snotice (yay loops).
- *
- * The current (horrible) solution I'm implementing here because nobody else seems to
- * want to look at this except me, sets the snotice local-only temporarily, sends the snotice
- * and then flushes the snomask.
- *
- * This works, but it is total and utter garbage, as it bypasses the snotice compression
- * totally for this snomask (and may well trigger other snotices to send too early.....)
- * but at least it won't crash the server.
- *
- * Master of hacks, we salute you!
- * -- w00t
- */
-
- // If we get a SNONOTICE, it must have been global... so set it local
- Instance->SNO->SetLocalOnly(*(params[0].c_str()), true);
- // send the message
Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
- // flush the queue
- Instance->SNO->FlushSnotices();
- // set it global again
- Instance->SNO->SetLocalOnly(*(params[0].c_str()), true);
+ return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
- return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
+
}
else if (command == "BURST")
{
diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 98001e952..2309b9ac0 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -40,24 +40,11 @@ void SnomaskManager::FlushSnotices()
}
}
-bool SnomaskManager::SetLocalOnly(char letter, bool local)
-{
- SnoList::iterator n = SnoMasks.find(letter);
- if (n != SnoMasks.end())
- {
- n->second->LocalOnly = local;
- return n->second->LocalOnly;
- }
-
- ServerInstance->Logs->Log("SNOMASK", DEFAULT, "Snomask %d not found, unmatched modules?", letter);
- return true;
-}
-
-bool SnomaskManager::EnableSnomask(char letter, const std::string &type, bool local)
+bool SnomaskManager::EnableSnomask(char letter, const std::string &type)
{
if (SnoMasks.find(letter) == SnoMasks.end())
{
- Snomask *s = new Snomask(ServerInstance, letter, type, local);
+ Snomask *s = new Snomask(ServerInstance, letter, type);
SnoMasks[letter] = s;
return true;
}
@@ -105,16 +92,16 @@ bool SnomaskManager::IsEnabled(char letter)
void SnomaskManager::SetupDefaults()
{
- this->EnableSnomask('c',"CONNECT", true); /* Local connect notices */
- this->EnableSnomask('C',"REMOTECONNECT", true); /* Remote connect notices */
- this->EnableSnomask('q',"QUIT", true); /* Local quit notices */
- this->EnableSnomask('Q',"REMOTEQUIT", true); /* Remote quit notices */
- this->EnableSnomask('k',"KILL", true); /* Kill notices */
- this->EnableSnomask('K',"REMOTEKILL"); /* Remote kill notices */
+ this->EnableSnomask('c',"CONNECT"); /* Local connect notices */
+ this->EnableSnomask('C',"REMOTECONNECT"); /* Remote connect notices */
+ this->EnableSnomask('q',"QUIT"); /* Local quit notices */
+ this->EnableSnomask('Q',"REMOTEQUIT"); /* Remote quit notices */
+ this->EnableSnomask('k',"KILL"); /* Kill notices */
+ this->EnableSnomask('K',"REMOTEKILL"); /* Remote kill notices */
this->EnableSnomask('l',"LINK"); /* Link notices */
this->EnableSnomask('o',"OPER"); /* Oper up/down notices */
- this->EnableSnomask('A',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */
- this->EnableSnomask('d',"DEBUG", true); /* Debug notices */
+ this->EnableSnomask('A',"ANNOUNCEMENT"); /* formerly WriteOpers() - generic notices to all opers */
+ this->EnableSnomask('d',"DEBUG"); /* Debug notices */
this->EnableSnomask('x',"XLINE"); /* Xline notice (g/z/q/k/e) */
this->EnableSnomask('t',"STATS"); /* Local or remote stats request */
this->EnableSnomask('f',"FLOOD"); /* Flooding notices */
@@ -155,17 +142,6 @@ void Snomask::Flush()
}
}
- if (!LocalOnly)
- {
- // XXX this is a bit ugly.
- std::string sno;
- sno += MySnomask;
-
- ServerInstance->PI->SendSNONotice(sno, this->Description + ": " + this->LastMessage);
- if (Count > 1)
- ServerInstance->PI->SendSNONotice(sno, this->Description + ": (last message repeated " + ConvToStr(Count) + " times)");
- }
-
LastMessage = "";
Count = 1;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-19 13:39:45 +0000