Windows specific data types in EventHandler are now Extensible items

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

diff --git a/include/inspircd.h b/include/inspircd.h
index b7aa7628b7d32c8fe5ef8dba092f6cb8af8da01a..34a2564022fa3c5491c9c0507a14c74a405b25ea 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -38,6 +38,7 @@
 #include "snomasks.h"
 #include "cull_list.h"
 #include "filelogger.h"
+#include "caller.h"
 
 /**
  * Used to define the maximum number of parameters a command may have.
@@ -53,7 +54,6 @@
  */
 #define ETIREDHAMSTERS EAGAIN
 
-
 /**
  * This define is used in place of strcmp when we
  * want to check if a char* string contains only one
@@ -235,6 +235,14 @@ typedef std::vector<std::pair<std::string, long> > FailedPortList;
 /** A list of ip addresses cross referenced against clone counts */
 typedef std::map<irc::string, unsigned int> clonemap;
 
+class InspIRCd;
+
+DEFINE_HANDLER1(ProcessUserHandler, void, userrec*);
+DEFINE_HANDLER1(IsNickHandler, bool, const char*);
+DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
+DEFINE_HANDLER1(FindDescriptorHandler, userrec*, int);
+DEFINE_HANDLER1(FloodQuitUserHandler, void, userrec*);
+
 /* Forward declaration - required */
 class XLineManager;
 
@@ -366,8 +374,25 @@ class CoreExport InspIRCd : public classbase
         */
        int time_delta;
 
+#ifdef WIN32
+       IPC* WindowsIPC;
+#endif
+
  public:
 
+       /** Global cull list, will be processed on next iteration
+        */
+       CullList GlobalCulls;
+
+
+       /**** Functors ****/
+
+       ProcessUserHandler HandleProcessUser;
+       IsNickHandler HandleIsNick;
+       IsIdentHandler HandleIsIdent;
+       FindDescriptorHandler HandleFindDescriptor;
+       FloodQuitUserHandler HandleFloodQuitUser;
+
        /** InspSocket classes pending deletion after being closed.
         * We don't delete these immediately as this may cause a segmentation fault.
         */
@@ -471,9 +496,9 @@ class CoreExport InspIRCd : public classbase
         */
        time_t next_call;
 
-       /** Global cull list, will be processed on next iteration
+       /** Set to the current signal recieved
         */
-       CullList GlobalCulls;
+       int s_signal;
 
        /** Get the current time
         * Because this only calls time() once every time around the mainloop,
@@ -515,7 +540,7 @@ class CoreExport InspIRCd : public classbase
         * @return There is no actual return value, however upon exit, the user 'cu' may have been
         * marked for deletion in the global CullList.
         */
-       void ProcessUser(userrec* cu);
+       caller1<void, userrec*> ProcessUser;
 
        /** Get the total number of currently loaded modules
         * @return The number of loaded modules
@@ -659,9 +684,18 @@ class CoreExport InspIRCd : public classbase
        bool IsChannel(const char *chname);
 
        /** Rehash the local server
-        * @param status This value is unused, and required for signal handler functions
         */
-       static void Rehash(int status);
+       void Rehash();
+
+       /** Handles incoming signals after being set
+        * @param signal the signal recieved
+        */
+       void SignalHandler(int signal);
+
+       /** Sets the signal recieved    
+        * @param signal the signal recieved
+        */
+       static void SetSignal(int signal);
 
        /** Causes the server to exit after unloading modules and
         * closing all open file descriptors.
@@ -669,7 +703,7 @@ class CoreExport InspIRCd : public classbase
         * @param The exit code to give to the operating system
         * (See the ExitStatus enum for valid values)
         */
-       static void Exit(int status);
+       void Exit(int status);
 
        /** Causes the server to exit immediately with exit code 0.
         * The status code is required for signal handlers, and ignored.
@@ -843,20 +877,20 @@ class CoreExport InspIRCd : public classbase
         * @param n A nickname to verify
         * @return True if the nick is valid
         */
-       bool IsNick(const char* n);
+       caller1<bool, const char*> IsNick;
 
        /** Return true if an ident is valid
         * @param An ident to verify
         * @return True if the ident is valid
         */
-       bool IsIdent(const char* n);
+       caller1<bool, const char*> IsIdent;
 
        /** Find a username by their file descriptor.
         * It is preferred to use this over directly accessing the fd_ref_table array.
         * @param socket The file descriptor of a user
         * @return A pointer to the user if the user exists locally on this descriptor
         */
-       userrec* FindDescriptor(int socket);
+       caller1<userrec*, int> FindDescriptor;
 
        /** Add a new mode to this server's mode parser
         * @param mh The modehandler to add
@@ -1165,7 +1199,7 @@ class CoreExport InspIRCd : public classbase
         * fully registered yet, temporarily zline their IP.
         * @param current user to quit
         */
-       void FloodQuitUser(userrec* current);
+       caller1<void, userrec*> FloodQuitUser;
 
        /** Restart the server.
         * This function will not return. If an error occurs,
@@ -1208,6 +1242,11 @@ class CoreExport InspIRCd : public classbase
         * be culled.
         */
        void InspSocketCull();
+
+       char* GetReadBuffer()
+       {
+               return this->ReadBuffer;
+       }
 };
 
 #endif