X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=5e8c62e0620d9e38bca9a8384b750bdfe37f7969;hb=5e9a6b9186a8cbaaf65ae7d9cd9c0c033c91b497;hp=98a13034d22a88c3f25336f55a1e9bc4832104de;hpb=e65c1d261c26702dac82a6390be3fa757bbed6ec;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 98a13034d..5e8c62e06 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -139,6 +139,7 @@ struct InitialConfig
 {
 	char* tag;
 	char* value;
+	char* default_value;
 	ValueContainerBase* val;
 	ConfigDataType datatype;
 	Validator validation_function;
@@ -151,6 +152,7 @@ struct MultiConfig
 {
 	const char*	tag;
 	char*		items[12];
+	char*		items_default[12];
 	int		datatype[12];
 	MultiNotify	init_function;
 	MultiValidator	validation_function;
@@ -479,6 +481,10 @@ class ServerConfig : public Extensible
 	 */
 	std::map<std::string,int> maxbans;
 
+	/** Directory where the inspircd binary resides
+	 */
+	std::string MyDir;
+
 	/** If set to true, no user DNS lookups are to be performed
 	 */
 	bool NoUserDns;
@@ -492,6 +498,11 @@ class ServerConfig : public Extensible
 	 */
 	bool CycleHosts;
 
+	/** 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;
+
 	/** All oper type definitions from the config file
 	 */
 	opertype_t opertypes;
@@ -500,6 +511,14 @@ class ServerConfig : public Extensible
 	 */
 	operclass_t operclass;
 
+	/** Saved argv from startup
+	 */
+	char** argv;
+
+	/** Saved argc from startup
+	 */
+	int argc;
+
 	/** Construct a new ServerConfig
 	 */
 	ServerConfig(InspIRCd* Instance);
@@ -553,23 +572,30 @@ class ServerConfig : public Extensible
 	/** Writes 'length' chars into 'result' as a string
 	 */
 	bool ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds = false);
+	bool ConfValue(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds = false);
+
 	/** Writes 'length' chars into 'result' as a string
 	 */
 	bool ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds = false);
+	bool ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds = false);
 	
 	/** Tries to convert the value to an integer and write it to 'result'
 	 */
 	bool ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result);
+	bool ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, int &result);
 	/** Tries to convert the value to an integer and write it to 'result'
 	 */
 	bool ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result);
+	bool ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result);
 	
 	/** Returns true if the value exists and has a true value, false otherwise
 	 */
 	bool ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index);
+	bool ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index);
 	/** Returns true if the value exists and has a true value, false otherwise
 	 */
 	bool ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index);
+	bool ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index);
 	
 	/** Returns the number of occurences of tag in the config file
 	 */