X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=566550376d21a79cbec98fb999011587ffbb6fba;hb=9183ebd28c79b12ddf29b3847f59679e480af70a;hp=50dc5c73bbdd3ccfd3ac0e540b255909cb5ac9e8;hpb=ccfcdda27482fe2ac99d0da936ef1a1374223624;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index 50dc5c73b..566550376 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -446,6 +446,10 @@ class CoreExport InspIRCd : public classbase
 	 */
 	ThreadEngine* Threads;
 
+	/** Mutex engine, handles mutexes for threading where required
+	 */
+	MutexFactory* Mutexes;
+
 	/** The thread/class used to read config files in REHASH and on startup
 	 */
 	ConfigReaderThread* ConfigThread;
@@ -712,14 +716,22 @@ class CoreExport InspIRCd : public classbase
 	 */
 	void SendMode(const std::vector<std::string>& parameters, User *user);
 
-	/** Match two strings using pattern matching.
-	 * This operates identically to the global function match(),
-	 * except for that it takes std::string arguments rather than
-	 * const char* ones.
-	 * @param sliteral The literal string to match against
-	 * @param spattern The pattern to match against. CIDR and globs are supported.
+	/** Match two strings using pattern matching, optionally, with a map
+	 * to check case against (may be NULL). If map is null, match will be case insensitive.
+	 * @param str The literal string to match against
+	 * @param mask The glob pattern to match against.
 	 */
-	bool MatchText(const std::string &sliteral, const std::string &spattern);
+	static bool Match(const std::string &str, const std::string &mask, unsigned const char *map = NULL);
+	static bool Match(const  char *str, const char *mask, unsigned const char *map = NULL);
+
+	/** Match two strings using pattern matching, optionally, with a map
+	 * to check case against (may be NULL). If map is null, match will be case insensitive.
+	 * Supports CIDR patterns as well as globs.
+	 * @param str The literal string to match against
+	 * @param mask The glob or CIDR pattern to match against.
+	 */
+	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
@@ -911,4 +923,6 @@ class CoreExport InspIRCd : public classbase
 	}
 };
 
+ENTRYPOINT;
+
 #endif