Add a global fake client to class InspIRCd used instead of instantiating a fake clien...

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

diff --git a/include/configreader.h b/include/configreader.h
index 022978766850785dc143ac4c4d5d7c4368279515..b1eb9b263f21d9fd1faa93e5630145ab954fc871 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -182,11 +182,11 @@ struct MultiConfig
        /** Tag name */
        const char*     tag;
        /** One or more items within tag */
-       char*           items[13];
+       char*           items[17];
        /** One or more defaults for items within tags */
-       char*           items_default[13];
+       char*           items_default[17];
        /** One or more data types */
-       int             datatype[13];
+       int             datatype[17];
        /** Initialization function */
        MultiNotify     init_function;
        /** Validation function */
@@ -227,7 +227,7 @@ class CoreExport ServerConfig : public Extensible
         * configutation, appending errors to errorstream
         * and setting error if an error has occured.
         */
-       bool ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream);
+       bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream);
   
        /** Process an include directive
         */
@@ -239,7 +239,10 @@ class CoreExport ServerConfig : public Extensible
   
   public:
 
-       /* Pointer to function that validates dns server addresses (can be changed depending on platform) */
+       /** 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 };
+
+       /** Pointer to function that validates dns server addresses (can be changed depending on platform) */
        Validator DNSServerValidator;
 
        InspIRCd* GetInstance();
@@ -459,7 +462,7 @@ class CoreExport ServerConfig : public Extensible
 
        /** Announce invites to the channel with a server notice
         */
-       bool AnnounceInvites;
+       InviteAnnounceState AnnounceInvites;
 
        /** If this is enabled then operators will
         * see invisible (+i) channels in /whois.
@@ -600,6 +603,13 @@ class CoreExport ServerConfig : public Extensible
         */
        unsigned int OperMaxChans;
 
+       /** TS6-like server ID.
+        * NOTE: 000...999 are usable for InspIRCd servers. This
+        * makes code simpler. 0AA, 1BB etc with letters are reserved
+        * for services use.
+        */
+       int sid;
+
        /** Construct a new ServerConfig
         */
        ServerConfig(InspIRCd* Instance);