X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=62d757621815690640e2cc56ba09d429275d9756;hb=c5d8d3e3c6b7a5cb44572d9a9b6e5249d74cb1f7;hp=3293aac83544ea04fda81c4e87c6813b4fad7cd7;hpb=1eae3c2ad42df386967afa42ed13cc95e7a0dd91;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 3293aac83..62d757621 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -53,6 +53,10 @@ enum ConfigDataType
 	DT_BOOTONLY	 = 256		/* Can only be set on startup, not on rehash */
 };
 
+/** The maximum number of values in a core configuration tag. Can be increased if needed.
+ */
+#define MAX_VALUES_PER_TAG 18
+
 /** Holds a config value, either string, integer or boolean.
  * Callback functions receive one or more of these, either on
  * their own as a reference, or in a reference to a deque of them.
@@ -146,6 +150,8 @@ typedef ValueContainer<char*> ValueContainerChar;
  */
 typedef ValueContainer<int*> ValueContainerInt;
 
+typedef ValueContainer<size_t*> ValueContainerST;
+
 /** A set of ValueItems used by multi-value validator functions
  */
 typedef std::deque<ValueItem> ValueList;
@@ -178,6 +184,13 @@ struct InitialConfig
 	Validator validation_function;
 };
 
+struct Deprecated
+{
+	const char* tag;
+	const char* value;
+	const char* reason;
+};
+
 /** Holds a core configuration item and its callbacks
  * where there may be more than one item
  */
@@ -186,11 +199,11 @@ struct MultiConfig
 	/** Tag name */
 	const char*	tag;
 	/** One or more items within tag */
-	const char*	items[18];
+	const char*	items[MAX_VALUES_PER_TAG];
 	/** One or more defaults for items within tags */
-	const char* items_default[18];
+	const char* items_default[MAX_VALUES_PER_TAG];
 	/** One or more data types */
-	int		datatype[18];
+	int		datatype[MAX_VALUES_PER_TAG];
 	/** Initialization function */
 	MultiNotify	init_function;
 	/** Validation function */
@@ -215,6 +228,40 @@ struct operclass_data : public Extensible
 typedef std::map<irc::string, operclass_data> operclass_t;
 
 
+class ServerLimits : public Extensible
+{
+ public:
+	size_t NickMax;
+	size_t ChanMax;
+	size_t MaxModes;
+	size_t IdentMax;
+	size_t MaxQuit;
+	size_t MaxTopic;
+	size_t MaxKick;
+	size_t MaxGecos;
+	size_t MaxAway;
+
+	/* 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)
+	{
+	}
+
+	void Finalise()
+	{
+		NickMax++;
+		ChanMax++;
+		IdentMax++;
+		MaxQuit++;
+		MaxTopic++;
+		MaxKick++;
+		MaxGecos++;
+		MaxAway++;
+	}
+};
+
 /** This class holds the bulk of the runtime configuration for the ircd.
  * It allows for reading new config values, accessing configuration files,
  * and storage of the configuration data needed to run the ircd, such as
@@ -238,11 +285,11 @@ class CoreExport ServerConfig : public Extensible
 	 * configutation, appending errors to errorstream
 	 * and setting error if an error has occured.
 	 */
-	bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream);
+	bool ParseLine(ConfigDataHash &target, const std::string &filename, std::string &line, long &linenumber, std::ostringstream &errorstream);
 
 	/** Check that there is only one of each configuration item
 	 */
-	bool CheckOnce(const char* tag);
+	bool CheckOnce(const char* tag, ConfigDataHash &newconf);
 
  public:
 
@@ -264,11 +311,6 @@ class CoreExport ServerConfig : public Extensible
 
 	std::map<std::string, std::istream*> IncludedFiles;
 
-	std::map<std::string, bool> CompletedFiles;
-
-	size_t TotalDownloaded;
-	size_t FileErrors;
-
 	/** Used to indicate who we announce invites to on a channel */
 	enum InviteAnnounceState { INVITE_ANNOUNCE_NONE, INVITE_ANNOUNCE_ALL, INVITE_ANNOUNCE_OPS, INVITE_ANNOUNCE_DYNAMIC };
 
@@ -284,6 +326,8 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	ConfigDataHash config_data;
 
+	ServerLimits Limits;
+
 	/** Max number of WhoWas entries per user.
 	 */
 	int WhoWasGroupSize;
@@ -674,6 +718,10 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	bool ReadFile(file_cache &F, const char* fname);
 
+	/* Returns true if the given string starts with a windows drive letter
+	 */
+	bool StartsWithWindowsDriveLetter(const std::string &path);
+
 	/** Report a configuration error given in errormessage.
 	 * @param bail If this is set to true, the error is sent to the console, and the program exits
 	 * @param user If this is set to a non-null value, and bail is false, the errors are spooled to