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 c2ea3f0482192628b8c9d0807681a2fc36e99cbd..34a2564022fa3c5491c9c0507a14c74a405b25ea 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -62,8 +62,6 @@
  */
 #define IS_SINGLE(x,y) ( (*x == y) && (*(x+1) == 0) )
 
-
-
 /** Delete a pointer, and NULL its value
  */
 template<typename T> inline void DELETE(T* x)
@@ -239,24 +237,11 @@ typedef std::map<irc::string, unsigned int> clonemap;
 
 class InspIRCd;
 
-class CoreExport IsNickHandler : public HandlerBase1<bool, const char*>
-{
-       InspIRCd* Server;
- public:
-       IsNickHandler(InspIRCd* Srv) : Server(Srv) { }
-       virtual ~IsNickHandler() { }
-       virtual bool Call(const char*);
-};
-
-class CoreExport IsIdentHandler : public HandlerBase1<bool, const char*>
-{
-       InspIRCd* Server;
- public:
-       IsIdentHandler(InspIRCd* Srv) : Server(Srv) { }
-       virtual ~IsIdentHandler() { }
-       virtual bool Call(const char*);
-};
-
+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;
@@ -389,6 +374,10 @@ class CoreExport InspIRCd : public classbase
         */
        int time_delta;
 
+#ifdef WIN32
+       IPC* WindowsIPC;
+#endif
+
  public:
 
        /** Global cull list, will be processed on next iteration
@@ -398,9 +387,11 @@ class CoreExport InspIRCd : public classbase
 
        /**** 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.
@@ -505,6 +496,10 @@ class CoreExport InspIRCd : public classbase
         */
        time_t next_call;
 
+       /** Set to the current signal recieved
+        */
+       int s_signal;
+
        /** Get the current time
         * Because this only calls time() once every time around the mainloop,
         * it is much faster than calling time() directly.
@@ -545,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
@@ -689,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.
@@ -699,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.
@@ -886,7 +890,7 @@ class CoreExport InspIRCd : public classbase
         * @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
@@ -1195,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,
@@ -1238,6 +1242,11 @@ class CoreExport InspIRCd : public classbase
         * be culled.
         */
        void InspSocketCull();
+
+       char* GetReadBuffer()
+       {
+               return this->ReadBuffer;
+       }
 };
 
 #endif