X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=fa00902a49a3dab07904f08ab72243345b147ede;hb=9de86c34d41fcbcedf7b332746b7f0e8c37c7c45;hp=8c31b19605661aa7263612790aeb105dd08b2a4c;hpb=df2cbbe6e7f63a36e4f71b353769e5568eaa9e73;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 8c31b1960..fa00902a4 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -67,6 +67,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef _WIN32
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+#endif
 #include <sstream>
 #include <string>
 #include <vector>
@@ -76,8 +81,7 @@
 #include <bitset>
 #include <set>
 #include <time.h>
-#include "inspircd_config.h"
-#include "inspircd_version.h"
+#include "config.h"
 #include "typedefs.h"
 #include "consolecolors.h"
 
@@ -263,12 +267,10 @@ class serverstats
 	}
 };
 
-DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t);
+DEFINE_HANDLER2(IsNickHandler, bool, const std::string&, size_t);
 DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
-DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
-DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
-DEFINE_HANDLER2(IsChannelHandler, bool, const char*, size_t);
-DEFINE_HANDLER1(IsSIDHandler, bool, const std::string&);
+DEFINE_HANDLER1(IsIdentHandler, bool, const std::string&);
+DEFINE_HANDLER2(IsChannelHandler, bool, const std::string&, size_t);
 DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 DEFINE_HANDLER3(OnCheckExemptionHandler, ModResult, User*, Channel*, const std::string&);
 
@@ -336,10 +338,8 @@ class CoreExport InspIRCd
 
 	IsNickHandler HandleIsNick;
 	IsIdentHandler HandleIsIdent;
-	FloodQuitUserHandler HandleFloodQuitUser;
 	OnCheckExemptionHandler HandleOnCheckExemption;
 	IsChannelHandler HandleIsChannel;
-	IsSIDHandler HandleIsSID;
 	RehashHandler HandleRehash;
 	GenRandomHandler HandleGenRandom;
 
@@ -570,12 +570,12 @@ class CoreExport InspIRCd
 	 * @param chname A channel name to verify
 	 * @return True if the name is valid
 	 */
-	caller2<bool, const char*, size_t> IsChannel;
+	caller2<bool, const std::string&, size_t> IsChannel;
 
 	/** Return true if str looks like a server ID
 	 * @param string to check against
 	 */
-	caller1<bool, const std::string&> IsSID;
+	static bool IsSID(const std::string& sid);
 
 	/** Rehash the local server
 	 */
@@ -618,13 +618,13 @@ class CoreExport InspIRCd
 	 * @param n A nickname to verify
 	 * @return True if the nick is valid
 	 */
-	caller2<bool, const char*, size_t> IsNick;
+	caller2<bool, const std::string&, size_t> IsNick;
 
 	/** Return true if an ident is valid
 	 * @param An ident to verify
 	 * @return True if the ident is valid
 	 */
-	caller1<bool, const char*> IsIdent;
+	caller1<bool, const std::string&> IsIdent;
 
 	/** Add a dns Resolver class to this server's active set
 	 * @param r The resolver to add
@@ -688,22 +688,6 @@ class CoreExport InspIRCd
 	static bool MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
 	static bool MatchCIDR(const  char *str, const char *mask, unsigned const char *map = NULL);
 
-	/** Call the handler for a given command.
-	 * @param commandname The command whos handler you wish to call
-	 * @param parameters The mode parameters
-	 * @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 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 commandname The command name to check
-	 * @param pcnt The parameter count
-	 * @param user The user to test-execute the command as
-	 * @return True if the command handler is a module command, and there are enough parameters and the user has permission to the command
-	 */
-	bool IsValidModuleCommand(const std::string &commandname, int pcnt, User* user);
-
 	/** Return true if the given parameter is a valid nick!user\@host mask
 	 * @param mask A nick!user\@host masak to match against
 	 * @return True i the mask is valid
@@ -750,7 +734,7 @@ class CoreExport InspIRCd
 	 * (one year, two weeks, three days, four hours, six minutes and five seconds)
 	 * @return The total number of seconds
 	 */
-	long Duration(const std::string &str);
+	static unsigned long Duration(const std::string& str);
 
 	/** Attempt to compare a password to a string from the config file.
 	 * This will be passed to handling modules which will compare the data
@@ -816,12 +800,6 @@ class CoreExport InspIRCd
 	 */
 	void DoWhois(User* user, User* dest,unsigned long signon, unsigned long idle, const char* nick);
 
-	/** Quit a user for excess flood, and if they are not
-	 * fully registered yet, temporarily zline their IP.
-	 * @param current user to quit
-	 */
-	caller1<void, User*> FloodQuitUser;
-
 	/** Called to check whether a channel restriction mode applies to a user
 	 * @param User that is attempting some action
 	 * @param Channel that the action is being performed on
@@ -843,17 +821,6 @@ class CoreExport InspIRCd
 	 */
 	void Cleanup();
 
-	/** This copies the user and channel hash_maps into new hash maps.
-	 * This frees memory used by the hash_map allocator (which it neglects
-	 * to free, most of the time, using tons of ram)
-	 */
-	void RehashUsersAndChans();
-
-	/** Resets the cached max bans value on all channels.
-	 * Called by rehash.
-	 */
-	void ResetMaxBans();
-
 	/** Return a time_t as a human-readable string.
 	 */
 	std::string TimeString(time_t curtime);
@@ -900,3 +867,4 @@ class CommandModule : public Module
 };
 
 #endif
+