DT_IPADDRESS = 6, /* IP address (v4, v6) */
DT_CHANNEL = 7, /* Channel name */
DT_ALLOW_WILD = 64, /* Allow wildcards/CIDR in DT_IPADDRESS */
- DT_ALLOW_NEWLINE = 128 /* New line characters allowed in DT_CHARPTR */
+ DT_ALLOW_NEWLINE = 128, /* New line characters allowed in DT_CHARPTR */
+ DT_BOOTONLY = 256 /* Can only be set on startup, not on rehash */
};
+/** The maximum number of values in a core configuration tag. Can be increased if needed.
+ */
+#define MAX_VALUES_PER_TAG 18
+
/** Holds a config value, either string, integer or boolean.
* Callback functions receive one or more of these, either on
* their own as a reference, or in a reference to a deque of them.
/** Initialize with a bool */
ValueItem(bool value);
/** Initialize with a char pointer */
- ValueItem(char* value);
+ ValueItem(const char* value);
/** Change value to a char pointer */
- void Set(char* value);
- /** Change value to a const char pointer */
void Set(const char* val);
/** Change value to an int */
void Set(int value);
struct InitialConfig
{
/** Tag name */
- char* tag;
+ const char* tag;
/** Value name */
- char* value;
+ const char* value;
/** Default, if not defined */
- char* default_value;
+ const char* default_value;
/** Value containers */
ValueContainerBase* val;
/** Data types */
- ConfigDataType datatype;
+ int datatype;
/** Validation function */
Validator validation_function;
};
+struct Deprecated
+{
+ const char* tag;
+ const char* value;
+ const char* reason;
+};
+
/** Holds a core configuration item and its callbacks
* where there may be more than one item
*/
/** Tag name */
const char* tag;
/** One or more items within tag */
- char* items[18];
+ const char* items[MAX_VALUES_PER_TAG];
/** One or more defaults for items within tags */
- char* items_default[18];
+ const char* items_default[MAX_VALUES_PER_TAG];
/** One or more data types */
- int datatype[18];
+ int datatype[MAX_VALUES_PER_TAG];
/** Initialization function */
MultiNotify init_function;
/** Validation function */
*/
typedef std::map<irc::string,char*> opertype_t;
+struct operclass_data : public Extensible
+{
+ char* commandlist;
+ char* cmodelist;
+ char* umodelist;
+};
+
/** A Set of oper classes
*/
-typedef std::map<irc::string,char*> operclass_t;
+typedef std::map<irc::string, operclass_data> operclass_t;
+class ServerLimits : public Extensible
+{
+ public:
+ size_t NickMax;
+ size_t ChanMax;
+ size_t MaxModes;
+ size_t IdentMax;
+ size_t MaxQuit;
+ size_t MaxTopic;
+ size_t MaxKick;
+ size_t MaxGecos;
+ size_t MaxAway;
+
+ /* Creating the class initialises it to the defaults
+ * as in 1.1's ./configure script. Reading other values
+ * from the config will change these values.
+ */
+ ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12), MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200)
+ {
+ }
+};
+
/** This class holds the bulk of the runtime configuration for the ircd.
* It allows for reading new config values, accessing configuration files,
* and storage of the configuration data needed to run the ircd, such as
* 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, int pass, std::istream* scan_for_includes_only);
-
- /** Process an include directive
- */
- bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only);
+ bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream);
/** Check that there is only one of each configuration item
*/
- bool CheckOnce(char* tag);
+ bool CheckOnce(const char* tag, ConfigDataHash &newconf);
public:
+ /** Process an include executable directive
+ */
+ bool DoPipe(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream);
+
+ /** Process an include file directive
+ */
+ bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream);
+
+ User* RehashUser;
+
+ std::string RehashParameter;
+
std::ostringstream errstr;
ConfigDataHash newconfig;
std::map<std::string, std::istream*> IncludedFiles;
- std::map<std::string, bool> CompletedFiles;
-
- size_t TotalDownloaded;
- size_t FileErrors;
-
/** 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 };
InspIRCd* GetInstance();
- void DoDownloads();
+ int DoDownloads();
/** This holds all the information in the config file,
* it's indexed by tag name to a vector of key/values.
*/
ConfigDataHash config_data;
+ ServerLimits Limits;
+
/** Max number of WhoWas entries per user.
*/
int WhoWasGroupSize;
*/
int debugging;
- /** The loglevel in use by the IRC server
- */
- int LogLevel;
-
/** How many seconds to wait before exiting
* the program when /DIE is correctly issued.
*/
*/
std::vector<ListenSocket*> ports;
- /** A list of ports claimed by IO Modules
+ /** socket objects that are attached to by modules
*/
- std::map<int,Module*> IOHookModule;
-
std::map<BufferedSocket*, Module*> SocketIOHookModule;
/** The 005 tokens of this server (ISUPPORT)
*/
char sid[MAXBUF];
+ /** True if we have been told to run the testsuite from the commandline,
+ * rather than entering the mainloop.
+ */
+ bool TestSuite;
+
/** Construct a new ServerConfig
*/
ServerConfig(InspIRCd* Instance);
* and initialize this class. All other methods
* should be used only by the core.
*/
- void Read(bool bail, User* user, int pass);
+ void Read(bool bail, User* user);
/** Read a file into a file_cache object
*/
bool ReadFile(file_cache &F, const char* fname);
+ /* Returns true if the given string starts with a windows drive letter
+ */
+ bool StartsWithWindowsDriveLetter(const std::string &path);
+
/** Report a configuration error given in errormessage.
* @param bail If this is set to true, the error is sent to the console, and the program exits
* @param user If this is set to a non-null value, and bail is false, the errors are spooled to
/** Load 'filename' into 'target', with the new config parser everything is parsed into
* tag/key/value at load-time rather than at read-value time.
*/
- bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only);
+ bool LoadConf(ConfigDataHash &target, FILE* &conf, const char* filename, std::ostringstream &errorstream);
/** Load 'filename' into 'target', with the new config parser everything is parsed into
* tag/key/value at load-time rather than at read-value time.
*/
- bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only = NULL);
+ bool LoadConf(ConfigDataHash &target, FILE* &conf, const std::string &filename, std::ostringstream &errorstream);
/* Both these return true if the value existed or false otherwise */
void ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild);
void ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val);
-
- /** Get a pointer to the module which has hooked the given port.
- * @parameter port Port number
- * @return Returns a pointer to the hooking module, or NULL
- */
- Module* GetIOHook(int port);
- /** Hook a module to a client port, so that it can receive notifications
- * of low-level port activity.
- * @param port The port number
- * @param Module the module to hook to the port
- * @return True if the hook was successful.
- */
- bool AddIOHook(int port, Module* iomod);
-
- /** Delete a module hook from a client port.
- * @param port The port to detatch from
- * @return True if successful
- */
- bool DelIOHook(int port);
-
/** Get a pointer to the module which has hooked the given BufferedSocket class.
* @parameter port Port number
* @return Returns a pointer to the hooking module, or NULL
projects / user / henk / code / inspircd.git / blobdiff