X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=dba38d272733e3ea3ddef7e380c4f65c2e706487;hb=d98358886d190079bbc55b72eb67d4d217d9c687;hp=c1c6379a490c6edd9690e6d1be9044f696d3d759;hpb=e48c7e038abe2954ecec30f465c811f017793332;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index c1c6379a4..dba38d272 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -234,6 +234,9 @@ DEFINE_HANDLER1(IsNickHandler, bool, const char*);
 DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
 DEFINE_HANDLER1(FindDescriptorHandler, User*, int);
 DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
+DEFINE_HANDLER1(IsChannelHandler, bool, const char*);
+DEFINE_HANDLER1(IsSIDHandler, bool, const std::string&);
+DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 
 /* Forward declaration - required */
 class XLineManager;
@@ -345,6 +348,9 @@ class CoreExport InspIRCd : public classbase
 	IsIdentHandler HandleIsIdent;
 	FindDescriptorHandler HandleFindDescriptor;
 	FloodQuitUserHandler HandleFloodQuitUser;
+	IsChannelHandler HandleIsChannel;
+	IsSIDHandler HandleIsSID;
+	RehashHandler HandleRehash;
 
 	/** BufferedSocket classes pending deletion after being closed.
 	 * We don't delete these immediately as this may cause a segmentation fault.
@@ -579,16 +585,16 @@ class CoreExport InspIRCd : public classbase
 	 * @param chname A channel name to verify
 	 * @return True if the name is valid
 	 */
-	bool IsChannel(const char *chname);
+	caller1<bool, const char*> IsChannel;
 
 	/** Return true if str looks like a server ID
 	 * @param string to check against
 	 */
-	bool IsSID(const std::string &str);
+	caller1<bool, const std::string&> IsSID;
 
 	/** Rehash the local server
 	 */
-	void Rehash();
+	caller1<void, const std::string&> Rehash;
 
 	/** Handles incoming signals after being set
 	 * @param signal the signal recieved
@@ -673,7 +679,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param pcnt The number of items you have given in the first parameter
 	 * @param user The user to send error messages to
 	 */
-	void SendMode(const char* const* parameters, int pcnt, User *user);
+	void SendMode(const std::vector<std::string>& parameters, User *user);
 
 	/** Match two strings using pattern matching.
 	 * This operates identically to the global function match(),
@@ -691,7 +697,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param user The user to execute the command as
 	 * @return True if the command handler was called successfully
 	 */
-	CmdResult CallCommandHandler(const std::string &commandname, const char* const* parameters, int pcnt, User* user);
+	CmdResult CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user);
 
 	/** Return true if the command is a module-implemented command and the given parameters are valid for it
 	 * @param parameters The mode parameters
@@ -800,23 +806,6 @@ class CoreExport InspIRCd : public classbase
 	 */
 	InspIRCd(int argc, char** argv);
 
-	/** Output a log message to the ircd.log file
-	 * The text will only be output if the current loglevel
-	 * is less than or equal to the level you provide
-	 * @param level A log level from the DebugLevel enum
-	 * @param text Format string of to write to the log
-	 * @param ... Format arguments of text to write to the log
-	 */
-	void Log(int level, const char* text, ...) CUSTOM_PRINTF(3, 4);
-
-	/** Output a log message to the ircd.log file
-	 * The text will only be output if the current loglevel
-	 * is less than or equal to the level you provide
-	 * @param level A log level from the DebugLevel enum
-	 * @param text Text to write to the log
-	 */
-	void Log(int level, const std::string &text);
-
 	/** Send a line of WHOIS data to a user.
 	 * @param user user to send the line to
 	 * @param dest user being WHOISed