X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=1a0e700808871b9ec10c3f8a2ef9676098464259;hb=d68c5be901d1d3f3a68e9796f9cd0815a4568a72;hp=35fa178a90b03265f54a436e7c1a919a492860b2;hpb=bc6090c224e2feaeaad63064100a592e5dfa4546;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 35fa178a9..1a0e70080 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -35,14 +35,14 @@
 /** Structure representing a single \<tag> in config */
 class CoreExport ConfigTag : public refcountbase
 {
-	std::vector<KeyVal> items;
+	ConfigItems items;
  public:
 	const std::string tag;
 	const std::string src_name;
 	const int src_line;
 
 	/** Get the value of an option, using def if it does not exist */
-	std::string getString(const std::string& key, const std::string& def = "");
+	std::string getString(const std::string& key, const std::string& def = "", size_t minlen = 0, size_t maxlen = UINT32_MAX);
 	/** Get the value of an option, using def if it does not exist */
 	long getInt(const std::string& key, long def = 0, long min = LONG_MIN, long max = LONG_MAX);
 	/** Get the value of an option, using def if it does not exist */
@@ -80,10 +80,10 @@ class CoreExport ConfigTag : public refcountbase
 
 	std::string getTagLocation();
 
-	inline const std::vector<KeyVal>& getItems() const { return items; }
+	inline const ConfigItems& getItems() const { return items; }
 
-	/** Create a new ConfigTag, giving access to the private KeyVal item list */
-	static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items);
+	/** Create a new ConfigTag, giving access to the private ConfigItems item list */
+	static ConfigTag* create(const std::string& Tag, const std::string& file, int line, ConfigItems*& Items);
  private:
 	ConfigTag(const std::string& Tag, const std::string& file, int line);
 };
@@ -117,13 +117,13 @@ class ServerLimits
 	/** Maximum hostname length */
 	size_t MaxHost;
 
-	/** Creating the class initialises it to the defaults
-	 * as in 1.1's ./configure script. Reading other values
-	 * from the config will change these values.
+	/** Read all limits from a config tag. Limits which aren't specified in the tag are set to a default value.
+	 * @param tag Configuration tag to read the limits from
 	 */
-	ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
-		MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
-		MaxLine(512), MaxHost(64) { }
+	ServerLimits(ConfigTag* tag);
+
+	/** Maximum length of a n!u\@h mask */
+	size_t GetMaxMask() const { return NickMax + 1 + IdentMax + 1 + MaxHost; }
 };
 
 struct CommandLineConf
@@ -165,7 +165,7 @@ struct CommandLineConf
 class CoreExport OperInfo : public refcountbase
 {
  public:
-	typedef std::set<std::string> PrivSet;
+	typedef insp::flat_set<std::string> PrivSet;
 	PrivSet AllowedOperCommands;
 	PrivSet AllowedPrivs;
 
@@ -216,11 +216,7 @@ class CoreExport ServerConfig
 		/** Module path */
 		std::string Module;
 
-		ServerPaths()
-			: Config(INSPIRCD_CONFIG_PATH)
-			, Data(INSPIRCD_DATA_PATH)
-			, Log(INSPIRCD_LOG_PATH)
-			, Module(INSPIRCD_MODULE_PATH) { }
+		ServerPaths(ConfigTag* tag);
 
 		std::string PrependConfig(const std::string& fn) const { return FileSystem::ExpandPath(Config, fn); }
 		std::string PrependData(const std::string& fn) const { return FileSystem::ExpandPath(Data, fn); }
@@ -234,7 +230,7 @@ class CoreExport ServerConfig
 
 	/** Index of valid oper blocks and types
 	 */
-	typedef std::map<std::string, reference<OperInfo> > OperIndex;
+	typedef insp::flat_map<std::string, reference<OperInfo> > OperIndex;
 
 	/** Get a configuration tag
 	 * @param tag The name of the tag to get
@@ -340,11 +336,6 @@ class CoreExport ServerConfig
 	 */
 	bool RestrictBannedUsers;
 
-	/** The number of seconds the DNS subsystem
-	 * will wait before timing out any request.
-	 */
-	int dns_timeout;
-
 	/** The size of the read() buffer in the user
 	 * handling code, used to read data into a user's
 	 * recvQ.
@@ -403,6 +394,10 @@ class CoreExport ServerConfig
 	 */
 	std::string HideKillsServer;
 
+	/** Set to hide kills from clients of ulined servers in snotices.
+	 */
+	bool HideULineKills;
+
 	/** The full pathname and filename of the PID
 	 * file as defined in the configuration.
 	 */
@@ -434,11 +429,6 @@ class CoreExport ServerConfig
 	 */
 	bool CycleHostsFromUser;
 
-	/** If set to true, prefixed channel NOTICEs and PRIVMSGs will have the prefix
-	 *  added to the outgoing text for undernet style msg prefixing.
-	 */
-	bool UndernetMsgPrefix;
-
 	/** If set to true, the full nick!user\@host will be shown in the TOPIC command
 	 * for who set the topic last. If false, only the nick is shown.
 	 */
@@ -452,11 +442,11 @@ class CoreExport ServerConfig
 	 */
 	OperIndex OperTypes;
 
-	/** Default value for <connect:maxchans>, deprecated in 2.2
+	/** Default value for <connect:maxchans>, deprecated in 3.0
 	 */
 	unsigned int MaxChans;
 
-	/** Default value for <oper:maxchans>, deprecated in 2.2
+	/** Default value for <oper:maxchans>, deprecated in 3.0
 	 */
 	unsigned int OperMaxChans;
 
@@ -498,10 +488,6 @@ class CoreExport ServerConfig
 	 */
 	static std::string Escape(const std::string& str, bool xml = true);
 
-	/** If this value is true, invites will bypass more than just +i
-	 */
-	bool InvBypassModes;
-
 	/** If this value is true, snotices will not stack when repeats are sent
 	 */
 	bool NoSnoticeStack;