Space indents must die.

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

diff --git a/include/configreader.h b/include/configreader.h
index 9e0016bee92f80a6655e51f9053eebdae0af3dde..096d1843afaabaf9e83a071d04d08003518b9607 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -14,6 +14,13 @@
 #ifndef INSPIRCD_CONFIGREADER
 #define INSPIRCD_CONFIGREADER
 
+/* handy defines */
+
+/** Determines if a channel op is exempt from given mode m,
+ * in config of server instance s. 
+ */
+#define CHANOPS_EXEMPT(s, m) (s->Config->ExemptChanOps[(unsigned char)m])
+
 #include <sstream>
 #include <string>
 #include <vector>
@@ -151,9 +158,9 @@ struct InitialConfig
 struct MultiConfig
 {
        const char*     tag;
-       char*           items[12];
-       char*           items_default[12];
-       int             datatype[12];
+       char*           items[13];
+       char*           items_default[13];
+       int             datatype[13];
        MultiNotify     init_function;
        MultiValidator  validation_function;
        MultiNotify     finish_function;
@@ -173,7 +180,7 @@ typedef std::map<irc::string,char*> operclass_t;
  * and storage of the configuration data needed to run the ircd, such as
  * the servername, connect classes, /ADMIN data, MOTDs and filenames etc.
  */
-class ServerConfig : public Extensible
+class CoreExport ServerConfig : public Extensible
 {
   private:
        /** Creator/owner
@@ -276,6 +283,14 @@ class ServerConfig : public Extensible
         */
        char PrefixQuit[MAXBUF];
 
+       /** The quit suffix in use, or an empty string
+        */
+       char SuffixQuit[MAXBUF];
+
+       /** The fixed quit message in use, or an empty string
+        */
+       char FixedQuit[MAXBUF];
+
        /** The last string found within a <die> tag, or
         * an empty string.
         */
@@ -341,6 +356,17 @@ class ServerConfig : public Extensible
         */
        bool AllowHalfop;
 
+       /** If this is set to true, then mode lists (e.g
+        * MODE #chan b) are hidden from unprivileged
+        * users.
+        */
+       bool HideModeLists[256];
+
+       /** If this is set to true, then channel operators
+        * are exempt from this channel mode. Used for +Sc etc.
+        */
+       bool ExemptChanOps[256];
+
        /** The number of seconds the DNS subsystem
         * will wait before timing out any request.
         */
@@ -408,10 +434,9 @@ class ServerConfig : public Extensible
         */
        char HideWhoisServer[MAXBUF];
 
-       /** A list of IP addresses the server is listening
-        * on.
+       /** Set to a non empty string to obfuscate nicknames prepended to a KILL.
         */
-       char addrs[MAXBUF][255];
+       char HideKillsServer[MAXBUF];
 
        /** The MOTD file, cached in a file_cache type.
         */
@@ -435,13 +460,9 @@ class ServerConfig : public Extensible
         */
        std::vector<std::string> module_names;
 
-       /** A list of ports which the server is listening on
-        */
-       int ports[255];
-
-       /** A list of the file descriptors for the listening client ports
+       /** A list of the classes for listening client ports
         */
-       ListenSocket* openSockfd[255];
+       std::vector<ListenSocket*> ports;
 
        /** Boolean sets of which modules implement which functions
         */
@@ -479,7 +500,7 @@ class ServerConfig : public Extensible
 
        /** List of u-lined servers
         */
-       std::vector<irc::string> ulines;
+       std::map<irc::string, bool> ulines;
 
        /** Max banlist sizes for channels (the std::string is a glob)
         */
@@ -642,7 +663,7 @@ class ServerConfig : public Extensible
        
 };
 
-bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance);
+CoreExport bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance);
 
 bool InitTypes(ServerConfig* conf, const char* tag);
 bool InitClasses(ServerConfig* conf, const char* tag);