Convert MySQL to SQLv3

[user/henk/code/inspircd.git] / include / configreader.h

diff --git a/include/configreader.h b/include/configreader.h
index f5ce4b57abceb3e240ec6e3ed0e8344433b491e2..57134390a4d7d3b3a6ca60b53d4387eff5f7b2d3 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -211,6 +211,9 @@ 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 };
 
@@ -219,6 +222,11 @@ class CoreExport ServerConfig
         */
        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 +339,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;
@@ -409,16 +412,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;
@@ -445,14 +438,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.
         */
@@ -565,10 +550,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);