Fix invalid iterator in select socketengine, clean up its memory use a bit too

[user/henk/code/inspircd.git] / src / snomasks.cpp

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 6c3824ae74e31f17ba86dc676607aa3902c9af56..889457ade88ba82e5cff1fbbff4f7c1a503bf1e0 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -73,6 +73,13 @@ void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
        }
 }
 
+void SnomaskManager::WriteGlobalSno(char letter, const std::string& text)
+{
+       WriteToSnoMask(letter, text);
+       letter = toupper(letter);
+       ServerInstance->PI->SendSNONotice(std::string(1, letter), text);
+}
+
 void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
 {
        char textbuffer[MAXBUF];
@@ -85,6 +92,18 @@ void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
        this->WriteToSnoMask(letter, std::string(textbuffer));
 }
 
+void SnomaskManager::WriteGlobalSno(char letter, const char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteGlobalSno(letter, std::string(textbuffer));
+}
+
 bool SnomaskManager::IsEnabled(char letter)
 {
        return (SnoMasks.find(letter) != SnoMasks.end());
@@ -102,7 +121,8 @@ void SnomaskManager::SetupDefaults()
        this->EnableSnomask('L',"REMOTELINK");                  /* Remote linking notices */
        this->EnableSnomask('o',"OPER");                        /* Oper up/down notices */
        this->EnableSnomask('O',"REMOTEOPER");                  /* Remote oper up/down notices */
-       this->EnableSnomask('A',"ANNOUNCEMENT");        /* formerly WriteOpers() - generic notices to all opers */
+       this->EnableSnomask('a',"ANNOUNCEMENT");        /* formerly WriteOpers() - generic notices to all opers */
+       this->EnableSnomask('A',"REMOTEANNOUNCEMENT");  /* 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 */
@@ -119,13 +139,13 @@ void Snomask::SendMessage(const std::string &message)
                LastMessage = message;
 
                std::string desc = this->Description;
-               int MOD_RESULT = 0;
+               ModResult MOD_RESULT;
                char mysnomask = MySnomask;
                ServerInstance->Logs->Log("snomask", DEFAULT, "%s: %s", desc.c_str(), message.c_str());
 
-               FOREACH_RESULT(I_OnSendSnotice, OnSendSnotice(mysnomask, desc, message));
+               FIRST_MOD_RESULT(ServerInstance, OnSendSnotice, MOD_RESULT, (mysnomask, desc, message));
 
-               LastBlocked = (MOD_RESULT == 1); // 1 blocks the message
+               LastBlocked = (MOD_RESULT == MOD_RES_DENY);
 
                if (!LastBlocked)
                {