Move OnStats from the core to a cross-module event.

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index cbd43da43fc396f4cfbea7c7f960f21fe0597f17..0f73f192fe2e5540d8761b561d51dc91a90a80e3 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -68,7 +68,6 @@ struct fakederef
 #include "convto.h"
 #include "dynref.h"
 #include "consolecolors.h"
-#include "caller.h"
 #include "cull_list.h"
 #include "extensible.h"
 #include "fileutils.h"
@@ -89,6 +88,7 @@ struct fakederef
 #include "socketengine.h"
 #include "snomasks.h"
 #include "filelogger.h"
+#include "message.h"
 #include "modules.h"
 #include "threadengine.h"
 #include "configreader.h"
@@ -165,8 +165,6 @@ class serverstats
        }
 };
 
-DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
-
 /** The main class of the irc server.
  * This class contains instances of all the other classes in this software.
  * Amongst other things, it contains a ModeParser, a DNS object, a CommandParser
@@ -209,9 +207,6 @@ class CoreExport InspIRCd
        /** Actions that must happen outside of the current call stack */
        ActionList AtomicActions;
 
-       /**** Functors ****/
-       GenRandomHandler HandleGenRandom;
-
        /** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
         * Reason for it:
         * kludge alert!
@@ -339,7 +334,14 @@ class CoreExport InspIRCd
        unsigned long GenRandomInt(unsigned long max);
 
        /** Fill a buffer with random bits */
-       caller2<void, char*, size_t> GenRandom;
+       TR1NS::function<void(char*, size_t)> GenRandom;
+
+       /** Fills the output buffer with the specified number of random characters.
+        * This is the default function for InspIRCd::GenRandom.
+        * @param output The output buffer to store random characters in.
+        * @param max The maximum number of random characters to put in the buffer.
+        */
+       static void DefaultGenRandom(char* output, size_t max);
 
        /** Bind all ports specified in the configuration file.
         * @return The number of ports bound without error
@@ -373,7 +375,7 @@ class CoreExport InspIRCd
 
        /** Determines whether a channel name is valid according to the RFC 1459 rules.
         * This is the default function for InspIRCd::IsChannel.
-        * @param nick The channel name to validate.
+        * @param channel The channel name to validate.
         * @return True if the channel name is valid according to RFC 1459 rules; otherwise, false.
        */
        static bool DefaultIsChannel(const std::string& channel);
@@ -401,18 +403,13 @@ class CoreExport InspIRCd
         */
        void Exit(int status);
 
-       /** Causes the server to exit immediately with exit code 0.
-        * The status code is required for signal handlers, and ignored.
-        */
-       static void QuickExit(int status);
-
        /** Formats the input string with the specified arguments.
        * @param formatString The string to format
        * @param ... A variable number of format arguments.
        * @return The formatted string
        */
-       static const char* Format(const char* formatString, ...) CUSTOM_PRINTF(1, 2);
-       static const char* Format(va_list &vaList, const char* formatString) CUSTOM_PRINTF(2, 0);
+       static std::string Format(const char* formatString, ...) CUSTOM_PRINTF(1, 2);
+       static std::string Format(va_list& vaList, const char* formatString) CUSTOM_PRINTF(2, 0);
 
        /** Determines whether a nickname is valid. */
        TR1NS::function<bool(const std::string&)> IsNick;
@@ -429,7 +426,7 @@ class CoreExport InspIRCd
 
        /** Determines whether a ident is valid according to the RFC 1459 rules.
         * This is the default function for InspIRCd::IsIdent.
-        * @param nick The ident to validate.
+        * @param ident The ident to validate.
         * @return True if the ident is valid according to RFC 1459 rules; otherwise, false.
        */
        static bool DefaultIsIdent(const std::string& ident);
@@ -581,4 +578,3 @@ inline void stdalgo::culldeleter::operator()(classbase* item)
 
 #include "numericbuilder.h"
 #include "modules/whois.h"
-#include "modules/stats.h"