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

diff --git a/include/inspircd.h b/include/inspircd.h
index 5e5ebce42..3993142c7 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -39,6 +39,33 @@
 #include <cstring>
 #include <climits>
 
+#include <sstream>
+#include <string>
+#include <vector>
+#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;
+
+/** A cached text file stored with its contents as lines
+ */
+typedef std::deque< std::string > file_cache;
+
+/** A configuration key and value pair
+ */
+typedef std::pair< std::string, std::string > KeyVal;
+
+/** A list of related configuration keys and values
+ */
+typedef std::vector< KeyVal > KeyValList;
+
+/** An entire config file, built up of KeyValLists
+ */
+typedef std::multimap< std::string, KeyValList > ConfigDataHash;
+
 #include "inspircd_config.h"
 #include "numerics.h"
 #include "uid.h"
@@ -234,9 +261,6 @@ class serverstats : public classbase
 	}
 };
 
-/** A list of failed port bindings, used for informational purposes on startup */
-typedef std::vector<std::pair<std::string, long> > FailedPortList;
-
 class InspIRCd;
 
 DEFINE_HANDLER1(ProcessUserHandler, void, User*);
@@ -252,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)
 	{
 	}
 
@@ -324,7 +351,8 @@ class CoreExport InspIRCd : public classbase
 	 */
 	time_t OLDTIME;
 
-	/** A 64k buffer used to read client lines into
+	/** A 64k buffer used to read socket data into
+	 * NOTE: update ValidateNetBufferSize if you change this
 	 */
 	char ReadBuffer[65535];
 
@@ -420,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;
@@ -686,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.
 	 */
-	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
@@ -875,10 +915,16 @@ class CoreExport InspIRCd : public classbase
 	 */
 	void BufferedSocketCull();
 
+	/** Adds an extban char to the 005 token.
+	 */
+	void AddExtBanChar(char c);
+
 	char* GetReadBuffer()
 	{
 		return this->ReadBuffer;
 	}
 };
 
+ENTRYPOINT;
+
 #endif