X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=f42bf67fea6c1c5adf3bbe820fc84457b1b55b10;hb=2cb47dd7920355b11edd664f7399ca69e0d5d0b4;hp=4b425e03b1ffffae81bf092dce0ba93139010f94;hpb=6fe52cbb3ba72a5ecdded3f51c8515bf75e6801f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 4b425e03b..f42bf67fe 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #ifndef INSPIRCD_CONFIGREADER
 #define INSPIRCD_CONFIGREADER
 
@@ -211,14 +221,23 @@ class CoreExport ServerConfig
 	/** True if this configuration is valid enough to run with */
 	bool valid;
 
+	/** 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,
 	 * it's indexed by tag name to a vector of key/values.
 	 */
 	ConfigDataHash config_data;
 
+	/** This holds all extra files that have been read in the configuration
+	 * (for example, MOTD and RULES files are stored here)
+	 */
+	ConfigFileCache Files;
+
 	/** Length limits, see definition of ServerLimits class
 	 */
 	ServerLimits Limits;
@@ -331,11 +350,6 @@ class CoreExport ServerConfig
 	 */
 	std::string FixedPart;
 
-	/** The last string found within a <die> tag, or
-	 * an empty string.
-	 */
-	std::string DieValue;
-
 	/** The DNS server to use for DNS queries
 	 */
 	std::string DNSServer;
@@ -376,11 +390,6 @@ class CoreExport ServerConfig
 	 */
 	bool RestrictBannedUsers;
 
-	/** If this value is true, halfops have been
-	 * enabled in the configuration file.
-	 */
-	bool AllowHalfop;
-
 	/** If this is set to true, then mode lists (e.g
 	 * MODE #chan b) are hidden from unprivileged
 	 * users.
@@ -414,16 +423,6 @@ class CoreExport ServerConfig
 	 */
 	unsigned int MaxTargets;
 
-	/** The maximum number of /WHO results allowed
-	 * in any single /WHO command.
-	 */
-	int MaxWhoResults;
-
-	/** How many seconds to wait before exiting
-	 * the program when /DIE is correctly issued.
-	 */
-	int DieDelay;
-
 	/** True if we're going to hide netsplits as *.net *.split for non-opers
 	 */
 	bool HideSplits;
@@ -440,7 +439,10 @@ class CoreExport ServerConfig
 	/** If this is enabled then operators will
 	 * see invisible (+i) channels in /whois.
 	 */
-	bool OperSpyWhois;
+	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
 	 */
@@ -450,14 +452,6 @@ class CoreExport ServerConfig
 	 */
 	std::string HideKillsServer;
 
-	/** The MOTD file, cached in a file_cache type.
-	 */
-	file_cache MOTD;
-
-	/** The RULES file, cached in a file_cache type.
-	 */
-	file_cache RULES;
-
 	/** The full pathname and filename of the PID
 	 * file as defined in the configuration.
 	 */
@@ -511,6 +505,11 @@ class CoreExport ServerConfig
 	 */
 	bool CycleHosts;
 
+	/** If set to true, the CycleHosts mode change will be sourced from the user,
+	 * rather than the server
+	 */
+	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.
 	 */
@@ -570,10 +569,6 @@ class CoreExport ServerConfig
 
 	void Fill();
 
-	/** Read a file into a file_cache object
-	 */
-	bool ReadFile(file_cache &F, const std::string& fname);
-
 	/* Returns true if the given string starts with a windows drive letter
 	 */
 	bool StartsWithWindowsDriveLetter(const std::string &path);
@@ -596,6 +591,10 @@ class CoreExport ServerConfig
 	 */
 	bool InvBypassModes;
 
+	/** If this value is true, snotices will not stack when repeats are sent
+	 */
+	bool NoSnoticeStack;
+
 };
 
 /** The background thread for config reading, so that reading from executable includes