X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigreader.h;h=bb4c03fae2c1f1a9ba8e84bc06f7db382bb5c178;hb=7ef2f87e39bd22c7914caf7f2afbb1a3bf8fbd43;hp=fc8c99d625bb3b9798b57c3802ede0e2a95ee715;hpb=5287af979e5abffb2cfcdadb9a7663b42a5c43e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index fc8c99d62..bb4c03fae 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -45,9 +45,9 @@ 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 = "", 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);
+	long getInt(const std::string& key, long def, 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);
+	double getFloat(const std::string& key, double def);
 	/** Get the value of an option, using def if it does not exist */
 	bool getBool(const std::string& key, bool def = false);
 
@@ -59,7 +59,7 @@ class CoreExport ConfigTag : public refcountbase
 	 * @param max Maximum acceptable value (optional)
 	 * @return The duration in seconds
 	 */
-	long getDuration(const std::string& key, long def = 0, long min = LONG_MIN, long max = LONG_MAX);
+	long getDuration(const std::string& key, long def, long min = LONG_MIN, long max = LONG_MAX);
 
 	/** Get the value of an option
 	 * @param key The option to get
@@ -257,11 +257,7 @@ class CoreExport ServerConfig
 	/** Bind to IPv6 by default */
 	bool WildcardIPv6;
 
-	/** 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 };
-	enum OperSpyWhoisState { SPYWHOIS_NONE, SPYWHOIS_SINGLEMSG, SPYWHOIS_SPLITMSG };
-
-  	/** This holds all the information in the config file,
+	/** This holds all the information in the config file,
 	 * it's indexed by tag name to a vector of key/values.
 	 */
 	ConfigDataHash config_data;
@@ -285,12 +281,12 @@ class CoreExport ServerConfig
 	/** Clones CIDR range for ipv4 (0-32)
 	 * Defaults to 32 (checks clones on all IPs seperately)
 	 */
-	int c_ipv4_range;
+	unsigned char c_ipv4_range;
 
 	/** Clones CIDR range for ipv6 (0-128)
 	 * Defaults to 128 (checks on all IPs seperately)
 	 */
-	int c_ipv6_range;
+	unsigned char c_ipv6_range;
 
 	/** Holds the server name of the local server
 	 * as defined by the administrator.
@@ -373,21 +369,11 @@ class CoreExport ServerConfig
 	 */
 	bool HideBans;
 
-	/** Announce invites to the channel with a server notice
-	 */
-	InviteAnnounceState AnnounceInvites;
-
-	/** If this is enabled then operators will
-	 * see invisible (+i) channels in /whois.
-	 */
-	OperSpyWhoisState OperSpyWhois;
-
 	/** True if raw I/O is being logged */
 	bool RawLog;
 
-	/** Set to a non-empty string to obfuscate the server name of users in WHOIS
-	 */
-	std::string HideWhoisServer;
+	/** Set to a non-empty string to obfuscate server names. */
+	std::string HideServer;
 
 	/** Set to a non empty string to obfuscate nicknames prepended to a KILL.
 	 */
@@ -516,7 +502,7 @@ class CoreExport ConfigReaderThread : public Thread
 		delete Config;
 	}
 
-	void Run();
+	void Run() CXX11_OVERRIDE;
 	/** Run in the main thread to apply the configuration */
 	void Finish();
 	bool IsDone() { return done; }