diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/caller.h | 9 | ||||
| -rw-r--r-- | include/inspircd.h | 25 |
2 files changed, 14 insertions, 20 deletions
diff --git a/include/caller.h b/include/caller.h index 9f251d16c..396a5ba5a 100644 --- a/include/caller.h +++ b/include/caller.h @@ -237,5 +237,14 @@ template <typename ReturnType, typename Param1, typename Param2, typename Param3 } }; +#define DEFINE_HANDLER0(NAME, RETURN) \ + class CoreExport NAME : public HandlerBase0<RETURN> { InspIRCd* Server; public: NAME(InspIRCd* Srv) : Server(Srv) { } virtual ~NAME() { } virtual RETURN Call(); }; + +#define DEFINE_HANDLER1(NAME, RETURN, V1) \ + class CoreExport NAME : public HandlerBase1<RETURN, V1> { InspIRCd* Server; public: NAME(InspIRCd* Srv) : Server(Srv) { } virtual ~NAME() { } virtual RETURN Call(V1); }; + +#define DEFINE_HANDLER2(NAME, RETURN, V1, V2) \ + class CoreExport NAME : public HandlerBase2<RETURN, V1, V2> { InspIRCd* Server; public: NAME(InspIRCd* Srv) : Server(Srv) { } virtual ~NAME() { } virtual RETURN Call(V2); }; + #endif diff --git a/include/inspircd.h b/include/inspircd.h index c2ea3f048..13b66ade7 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -239,24 +239,9 @@ 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(IsNickHandler, bool, const char*); +DEFINE_HANDLER1(IsIdentHandler, bool, const char*); +DEFINE_HANDLER1(FindDescriptorHandler, userrec*, int); /* Forward declaration - required */ class XLineManager; @@ -399,8 +384,8 @@ class CoreExport InspIRCd : public classbase /**** Functors ****/ IsNickHandler HandleIsNick; - IsIdentHandler HandleIsIdent; + FindDescriptorHandler HandleFindDescriptor; /** InspSocket classes pending deletion after being closed. * We don't delete these immediately as this may cause a segmentation fault. @@ -886,7 +871,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 |