X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=66f7920be7471b6d9f0ad4c9513e407c6506f3b9;hb=c05f81cac83e80c7727594e3929e0709eccca689;hp=2a1f072832ebfb7b322b436244ffe3f2e42c44ea;hpb=d7dd8d193c2e6176e97ec182d65b6ba1d0800aa5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configreader.h b/include/configreader.h index 2a1f07283..66f7920be 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -1,11 +1,18 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2007, 2009 Dennis Friis - * Copyright (C) 2006-2008 Craig Edwards - * Copyright (C) 2006-2008 Robin Burchell - * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018 Chris Novakovic + * Copyright (C) 2013-2014, 2016 Attila Molnar + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012-2014, 2016-2021 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * * 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 @@ -23,14 +30,7 @@ #pragma once -#include -#include -#include -#include #include "inspircd.h" -#include "modules.h" -#include "socketengine.h" -#include "socket.h" #include "token_list.h" /** Structure representing a single \ in config */ @@ -89,6 +89,8 @@ class CoreExport ConfigTag : public refcountbase class ServerLimits { public: + /** Maximum line length */ + size_t MaxLine; /** Maximum nickname length */ size_t NickMax; /** Maximum channel length */ @@ -107,8 +109,6 @@ class ServerLimits size_t MaxReal; /** Maximum away message length */ size_t MaxAway; - /** Maximum line length */ - size_t MaxLine; /** Maximum hostname length */ size_t MaxHost; @@ -150,22 +150,23 @@ struct CommandLineConf /** If this is true, a PID file will be written * to the file given in the "file" variable of - * the tag in the config file. This is + * the \ tag in the config file. This is * the default. * Passing --nopid as a command line argument * sets this to false; in this case, a PID file * will not be written, even the default PID - * file that is usually written when the + * file that is usually written when the \ * tag is not defined in the config file. */ bool writepid; - /** Saved argc from startup - */ + /* Whether the --runasroot option was specified at boot. */ + bool runasroot; + + /** Saved argc from startup. */ int argc; - /** Saved argv from startup - */ + /** Saved argv from startup. */ char** argv; }; @@ -181,6 +182,9 @@ class CoreExport OperInfo : public refcountbase /** Allowed channel modes from oper classes. */ std::bitset<64> AllowedChanModes; + /** Allowed snomasks from oper classes. */ + std::bitset<64> AllowedSnomasks; + /** \ block used for this oper-up. May be NULL. */ reference oper_block; /** \ block used for this oper-up. Valid for local users, may be NULL on remote */ @@ -240,12 +244,16 @@ class CoreExport ServerConfig /** Module path */ std::string Module; + /** Runtime path */ + std::string Runtime; + ServerPaths(ConfigTag* tag); std::string PrependConfig(const std::string& fn) const { return FileSystem::ExpandPath(Config, fn); } std::string PrependData(const std::string& fn) const { return FileSystem::ExpandPath(Data, fn); } std::string PrependLog(const std::string& fn) const { return FileSystem::ExpandPath(Log, fn); } std::string PrependModule(const std::string& fn) const { return FileSystem::ExpandPath(Module, fn); } + std::string PrependRuntime(const std::string& fn) const { return FileSystem::ExpandPath(Runtime, fn); } }; /** Holds a complete list of all connect blocks @@ -303,12 +311,12 @@ class CoreExport ServerConfig CommandLineConf cmdline; /** Clones CIDR range for ipv4 (0-32) - * Defaults to 32 (checks clones on all IPs seperately) + * Defaults to 32 (checks clones on all IPs separately) */ unsigned char c_ipv4_range; /** Clones CIDR range for ipv6 (0-128) - * Defaults to 128 (checks on all IPs seperately) + * Defaults to 128 (checks on all IPs separately) */ unsigned char c_ipv6_range; @@ -322,7 +330,7 @@ class CoreExport ServerConfig std::string XLineMessage; /* Holds the network name the local server - * belongs to. This is an arbitary field defined + * belongs to. This is an arbitrary field defined * by the administrator. */ std::string Network; @@ -332,18 +340,6 @@ class CoreExport ServerConfig */ std::string ServerDesc; - /** Pretend disabled commands don't exist. - */ - bool DisabledDontExist; - - /** This variable identifies which usermodes have been diabled. - */ - std::bitset<64> DisabledUModes; - - /** This variable identifies which chanmodes have been disabled. - */ - std::bitset<64> DisabledCModes; - /** How to treat a user in a channel who is banned. */ BannedUserTreatment RestrictBannedUsers; @@ -376,8 +372,11 @@ class CoreExport ServerConfig */ unsigned int MaxTargets; - /** True if we're going to hide ban reasons for non-opers (e.g. G-Lines, - * K-Lines, Z-Lines) + /** The number of seconds that the server clock can skip by before server operators are warned. */ + time_t TimeSkipWarn; + + /** True if we're going to hide ban reasons for non-opers (e.g. G-lines, + * K-lines, Z-lines) */ bool HideBans; @@ -396,11 +395,6 @@ class CoreExport ServerConfig */ ClassVector Classes; - /** STATS characters in this list are available - * only to operators. - */ - std::string UserStats; - /** Default channel modes */ std::string DefaultModes; @@ -438,7 +432,7 @@ class CoreExport ServerConfig */ unsigned int OperMaxChans; - /** TS6-like server ID. + /** Unique server ID. * NOTE: 000...999 are usable for InspIRCd servers. This * makes code simpler. 0AA, 1BB etc with letters are reserved * for services use. @@ -455,6 +449,12 @@ class CoreExport ServerConfig */ const std::string& GetSID() const { return sid; } + /** Retrieves the server name which should be shown to users. */ + const std::string& GetServerName() const { return HideServer.empty() ? ServerName : HideServer; } + + /** Retrieves the server description which should be shown to users. */ + const std::string& GetServerDesc() const { return HideServer.empty() ? ServerDesc : HideServer; } + /** Read the entire configuration into memory * and initialize this class. All other methods * should be used only by the core. @@ -468,9 +468,6 @@ class CoreExport ServerConfig void Fill(); - /** Disables the commands specified in . */ - bool ApplyDisabledCommands(); - /** Escapes a value for storage in a configuration key. * @param str The string to escape. * @param xml Are we using the XML config format? @@ -507,13 +504,23 @@ class CoreExport ConfigReaderThread : public Thread bool IsDone() { return done; } }; +/** Represents the status of a config load. */ class CoreExport ConfigStatus { public: + /** Whether this is the initial config load. */ + bool const initial; + + /** The user who initiated the config load or NULL if not initiated by a user. */ User* const srcuser; - ConfigStatus(User* user = NULL) - : srcuser(user) + /** Initializes a new instance of the ConfigStatus class. + * @param user The user who initiated the config load or NULL if not initiated by a user. + * @param isinitial Whether this is the initial config load. + */ + ConfigStatus(User* user = NULL, bool isinitial = false) + : initial(isinitial) + , srcuser(user) { } };