X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=bf5acbbc8a5f0333b559ed504139899211f7ebe3;hb=9d4efff3957f1ad163f726bc44bed3a4870afb94;hp=cc14120963d8ccf5e080ca6ebea78303b6d6820d;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index cc1412096..bf5acbbc8 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -44,7 +44,7 @@ class CoreExport ConfigTag : public refcountbase
 	/** Get the value of an option, using def if it does not exist */
 	std::string getString(const std::string& key, const std::string& def = "");
 	/** Get the value of an option, using def if it does not exist */
-	long getInt(const std::string& key, long def = 0);
+	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 */
 	double getFloat(const std::string& key, double def = 0);
 	/** Get the value of an option, using def if it does not exist */
@@ -93,14 +93,16 @@ class ServerLimits
 	size_t MaxGecos;
 	/** Maximum away message length */
 	size_t MaxAway;
+	/** Maximum line length */
+	size_t MaxLine;
 
 	/** 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.
 	 */
-	ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12), MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200)
-	{
-	}
+	ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
+		MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
+		MaxLine(512) { }
 };
 
 struct CommandLineConf
@@ -182,6 +184,32 @@ class CoreExport ServerConfig
 	void CrossCheckConnectBlocks(ServerConfig* current);
 
  public:
+	class ServerPaths
+	{
+	 public:
+		/** Config path */
+		std::string Config;
+
+		/** Data path */
+		std::string Data;
+
+		/** Log path */
+		std::string Log;
+
+		/** Module path */
+		std::string Module;
+
+		ServerPaths()
+			: Config(CONFIG_PATH)
+			, Data(DATA_PATH)
+			, Log(LOG_PATH)
+			, Module(MOD_PATH) { }
+
+		std::string PrependConfig(const std::string& fn) const { return ServerConfig::ExpandPath(Config, fn); }
+		std::string PrependData(const std::string& fn) const { return ServerConfig::ExpandPath(Data, fn); }
+		std::string PrependLog(const std::string& fn) const { return ServerConfig::ExpandPath(Log, fn); }
+		std::string PrependModule(const std::string& fn) const { return ServerConfig::ExpandPath(Module, fn); }
+	};
 
 	/** Get a configuration tag
 	 * @param tag The name of the tag to get
@@ -218,6 +246,9 @@ class CoreExport ServerConfig
 	 */
 	ServerLimits Limits;
 
+	/** Locations of various types of file (config, module, etc). */
+	ServerPaths Paths;
+
 	/** Configuration parsed from the command line.
 	 */
 	CommandLineConf cmdline;
@@ -237,9 +268,9 @@ class CoreExport ServerConfig
 	 */
 	std::string ServerName;
 
-	/** Notice to give to users when they are Xlined
+	/** Notice to give to users when they are banned by an XLine
 	 */
-	std::string MoronBanner;
+	std::string XLineMessage;
 
 	/* Holds the network name the local server
 	 * belongs to. This is an arbitary field defined
@@ -331,13 +362,6 @@ class CoreExport ServerConfig
 	 */
 	char DisabledCModes[64];
 
-	/** The full path to the modules directory.
-	 * This is either set at compile time, or
-	 * overridden in the configuration file via
-	 * the \<path> tag.
-	 */
-	std::string ModPath;
-
 	/** If set to true, then all opers on this server are
 	 * shown with a generic 'is an IRC operator' line rather
 	 * than the oper type. Oper types are still used internally.
@@ -371,6 +395,13 @@ class CoreExport ServerConfig
 	 */
 	int MaxConn;
 
+	/** If we should check for clones during CheckClass() in AddUser()
+	 * Setting this to false allows to not trigger on maxclones for users
+	 * that may belong to another class after DNS-lookup is complete.
+	 * It does, however, make the server spend more time on users we may potentially not want.
+	 */
+	bool CCOnConnect;
+
 	/** The soft limit value assigned to the irc server.
 	 * The IRC server will not allow more than this
 	 * number of local users.
@@ -441,11 +472,6 @@ class CoreExport ServerConfig
 	 */
 	bool SyntaxHints;
 
-	/** If set to true, users appear to quit then rejoin when their hosts change.
-	 * This keeps clients synchronized properly.
-	 */
-	bool CycleHosts;
-
 	/** If set to true, the CycleHosts mode change will be sourced from the user,
 	 * rather than the server
 	 */
@@ -504,7 +530,7 @@ class CoreExport ServerConfig
 
 	/** Returns true if the given string starts with a windows drive letter
 	 */
-	bool StartsWithWindowsDriveLetter(const std::string &path);
+	static bool StartsWithWindowsDriveLetter(const std::string& path);
 
 	bool ApplyDisabledCommands(const std::string& data);
 
@@ -520,6 +546,18 @@ class CoreExport ServerConfig
 	 */
 	static bool FileExists(const char* file);
 
+	/** Expands a path fragment to a full path.
+	 * @param base The base path to expand from
+	 * @param fragment The path fragment to expand on top of base.
+	 */
+	static std::string ExpandPath(const std::string& base, const std::string& fragment);
+
+	/** Escapes a value for storage in a configuration key.
+	 * @param str The string to escape.
+	 * @param xml Are we using the XML config format?
+	 */
+	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;