Forward port r9782: show IP (not unknown) for unauthed connections

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

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 5c7c0a9773bff1dcaa6e7e5170f8453a30f2ec8c..b0065f0658bc49ce5161ae640e57c1adc6a033dd 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -131,7 +131,7 @@ class MsgFlood : public ModeHandler
                                int nsecs = atoi(secs);
                                if ((nlines<1) || (nsecs<1))
                                {
-                                       source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick,channel->name);
+                                       source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
                                        parameter.clear();
                                        return MODEACTION_DENY;
                                }
@@ -177,7 +177,7 @@ class MsgFlood : public ModeHandler
                        }
                        else
                        {
-                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick,channel->name);
+                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
                                parameter.clear();
                                return MODEACTION_DENY;
                        }
@@ -232,21 +232,24 @@ class ModuleMsgFlood : public Module
                                f->clear(user);
                                if (f->ban)
                                {
-                                       const char* parameters[3];
-                                       parameters[0] = dest->name;
-                                       parameters[1] = "+b";
-                                       parameters[2] = user->MakeWildHost();
-                                       ServerInstance->SendMode(parameters,3,user);
+                                       std::vector<std::string> parameters(3);
+                                       parameters.push_back(dest->name);
+                                       parameters.push_back("+b");
+                                       parameters.push_back(user->MakeWildHost());
+                                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
 
-                                       ServerInstance->PI->SendMode(dest->name, std::string("+b ") + user->MakeWildHost());
+                                       ServerInstance->PI->SendModeStr(dest->name, std::string("+b ") + user->MakeWildHost());
                                }
+
                                char kickmessage[MAXBUF];
                                snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+
                                if (!dest->ServerKickUser(user, kickmessage, true))
                                {
                                        delete dest;
-                                       return 1;
                                }
+
+                               return 1;
                        }
                }