Compile fixes and message updates

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11767 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/conf/modules.conf.example b/conf/modules.conf.example
index b9edaeacc96e611461d9270fc3c38355daf0a944..d5b4053f048d4219480bf81cd0862766636b2bdc 100644 (file)
--- a/conf/modules.conf.example
+++ b/conf/modules.conf.example
@@ -1367,27 +1367,6 @@
 # RPC test module: A test of the RPC API
 #<module name="m_rpctest.so">
 
-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Provide /LIST throttling (to prevent flooding) and /LIST safety to
-# prevent excess flood when the list is large.
-#<module name="m_safelist.so">
-#
-#-#-#-#-#-#-#-#-#-#-# SAFELIST CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-#
-#
-# When using Safelist, you may set the following values;
-#
-# The first value, 'throttle', sets the amount of time in seconds a user
-# must wait between LIST commands. For example, if this is set to 60
-# (the default) then the user may not /LIST more than once a minute.
-# If not defined, the default value is 60 seconds.
-#
-# The second value, 'maxlisters', indicates the maximum number of users
-# which may be retrieving a LIST at once. It is not recommended you raise
-# this value, as increasing it too high can make your network vulnerable
-# to floodbots which waste your bandwidth and CPU time with LIST requests.
-#
-#<safelist throttle="60" maxlisters="50">
-
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # SAJOIN module: Adds the /SAJOIN command
 # This module is oper-only.

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 004d679ed37aaeb3279bbf91d405103193a0e054..a46907ca58bb15dcc5925f4eb279cca8d615748d 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -437,7 +437,10 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
        {
                case EVENT_ERROR:
                {
-                       SetError(strerror(errornum));
+                       if (errornum == 0)
+                               SetError("Connection closed");
+                       else
+                               SetError(strerror(errornum));
                        switch (errornum)
                        {
                                case ETIMEDOUT:

diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 4389ad6858db42da6c6fae90fb25bedeabc5f181..7828477361fa471b7acc2a626f98e4c92f958e8f 100644 (file)
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -39,7 +39,7 @@ private:
        pcre* regex;
 
 public:
-       PCRERegex(const std::string& rx, ) : Regex(rx, Me)
+       PCRERegex(const std::string& rx) : Regex(rx)
        {
                const char* error;
                int erroffset;
@@ -96,7 +96,7 @@ public:
                {
                        RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
                        std::string rx = rfr->GetRegex();
-                       rfr->result = new PCRERegex(rx, ServerInstance);
+                       rfr->result = new PCRERegex(rx);
                        return "OK";
                }
                return NULL;

diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index 5fe4db29fb35d8835b56030802ae06a2419d534b..7afaad076b62ad22230f6fda2e16f93b7c84e95c 100644 (file)
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -34,7 +34,7 @@ private:
        regex_t regbuf;
 
 public:
-       POSIXRegex(const std::string& rx, bool extended) : Regex(rx, Me)
+       POSIXRegex(const std::string& rx, bool extended) : Regex(rx)
        {
                int flags = (extended ? REG_EXTENDED : 0) | REG_NOSUB;
                int errcode;
@@ -109,7 +109,7 @@ public:
                {
                        RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
                        std::string rx = rfr->GetRegex();
-                       rfr->result = new POSIXRegex(rx, ServerInstance, extended);
+                       rfr->result = new POSIXRegex(rx, extended);
                        return "OK";
                }
                return NULL;

diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 1ed35605b7d2d11efd5fe76dc5d403b99cad40d1..41aaec31c44db42fbc7ad62f8ce584f1d53b3754 100644 (file)
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -36,7 +36,7 @@ private:
        regex_t regbuf;
 
 public:
-       TRERegex(const std::string& rx, ) : Regex(rx, Me)
+       TRERegex(const std::string& rx) : Regex(rx)
        {
                int flags = REG_EXTENDED | REG_NOSUB;
                int errcode;
@@ -102,7 +102,7 @@ public:
                {
                        RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
                        std::string rx = rfr->GetRegex();
-                       rfr->result = new TRERegex(rx, ServerInstance);
+                       rfr->result = new TRERegex(rx);
                        return "OK";
                }
                return NULL;

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 1fe84649f57b00578fc3c3add315da3ccb7cafb5..813ae9e9b1a57fa278e107dc38bab8de7878c9d2 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -261,7 +261,7 @@ class ModuleSSLGnuTLS : public Module
                if((ret = gnutls_certificate_set_x509_crl_file (x509_cred, crlfile.c_str(), GNUTLS_X509_FMT_PEM)) < 0)
                        ServerInstance->Logs->Log("m_ssl_gnutls",DEBUG, "m_ssl_gnutls.so: Failed to set X.509 CRL file '%s': %s", crlfile.c_str(), gnutls_strerror(ret));
 
-               FileReader reader(ServerInstance);
+               FileReader reader;
 
                reader.LoadFile(certfile);
                std::string cert_string = reader.Contents();

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 1cddc5012805d94fb88508cc68152db80dce422e..a2e9692cdbf2c38b7c814d2fd01f33e26bd139b5 100644 (file)
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -33,7 +33,7 @@ class CommandClose : public Command
        {
        flags_needed = 'o'; }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *src)
        {
                std::map<std::string,int> closed;
 
@@ -52,13 +52,13 @@ class CommandClose : public Command
                int total = 0;
                for (std::map<std::string,int>::iterator ci = closed.begin(); ci != closed.end(); ci++)
                {
-                       user->WriteServ("NOTICE %s :*** Closed %d unknown connection%s from [%s]",user->nick.c_str(),(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str());
+                       src->WriteServ("NOTICE %s :*** Closed %d unknown connection%s from [%s]",src->nick.c_str(),(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str());
                        total += (*ci).second;
                }
                if (total)
-                       user->WriteServ("NOTICE %s :*** %i unknown connection%s closed",user->nick.c_str(),total,(total>1)?"s":"");
+                       src->WriteServ("NOTICE %s :*** %i unknown connection%s closed",src->nick.c_str(),total,(total>1)?"s":"");
                else
-                       user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str());
+                       src->WriteServ("NOTICE %s :*** No unknown connections found",src->nick.c_str());
 
                return CMD_SUCCESS;
        }

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 5e2d704bb6c404ac8ffb58643daa42ff6a41ec0b..a83e9dc1b5ba4a3c126624f465908451d4fdcfa1 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -82,13 +82,6 @@ class ModuleSecureList : public Module
        {
                output.append(" SECURELIST");
        }
-
-       void Prioritize()
-       {
-               Module* safelist = ServerInstance->Modules->Find("m_safelist.so");
-               ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &safelist);
-       }
-
 };
 
 MODULE_INIT(ModuleSecureList)

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index eacfc0fbf1be46e0e871a66c020a98cca7e5d52a..b35558a70809e048e4fd53ec09a2aee8543775ce 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -32,7 +32,7 @@ SelectEngine::~SelectEngine()
        delete[] ref;
 }
 
-bool SelectEngine::AddFd(EventHandler* eh, int)
+bool SelectEngine::AddFd(EventHandler* eh, int event_mask)
 {
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > GetMaxFds() - 1))
@@ -128,13 +128,13 @@ int SelectEngine::DispatchEvents()
                                if (FD_ISSET (i, &rfdset))
                                {
                                        ReadEvents++;
-                                       SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK);
+                                       SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
                                        ev->HandleEvent(EVENT_READ);
                                }
                                if (FD_ISSET (i, &wfdset))
                                {
                                        WriteEvents++;
-                                       SetEventMask(eh, eh->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
+                                       SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
                                        ev->HandleEvent(EVENT_WRITE);
                                }
                        }