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

diff --git a/include/inspircd.h b/include/inspircd.h
index 50dc5c73b..3993142c7 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -45,7 +45,7 @@
 #include <deque>
 #include <map>
 #include <bitset>
-
+#include <set>
 
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
@@ -66,7 +66,6 @@ typedef std::vector< KeyVal > KeyValList;
  */
 typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
-
 #include "inspircd_config.h"
 #include "numerics.h"
 #include "uid.h"
@@ -277,13 +276,16 @@ DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 class XLineManager;
 class BanCacheManager;
 
+/** The background thread for config reading, so that reading from executable includes
+ * does not block.
+ */
 class CoreExport ConfigReaderThread : public Thread
 {
 	InspIRCd* ServerInstance;
 	bool do_bail;
-	User* TheUser;
+	std::string TheUserUID;
  public:
-	ConfigReaderThread(InspIRCd* Instance, bool bail, User* user) : Thread(), ServerInstance(Instance), do_bail(bail), TheUser(user)
+	ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid)
 	{
 	}
 
@@ -446,6 +448,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 +718,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.
+	 */
+	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.
 	 */
-	bool MatchText(const std::string &sliteral, const std::string &spattern);
+	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 +925,6 @@ class CoreExport InspIRCd : public classbase
 	}
 };
 
+ENTRYPOINT;
+
 #endif