Add ServerLimits constructor that reads limits from a ConfigTag and use it

This commit is contained in:
Attila Molnar 2014-12-09 12:35:31 +01:00
parent 94b3599a48
commit 1c64da19e1
2 changed files with 21 additions and 11 deletions

View File

@ -124,6 +124,11 @@ class ServerLimits
ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
MaxLine(512), MaxHost(64) { }
/** Read all limits from a config tag. Limits which aren't specified in the tag are set to a default value.
* @param tag Configuration tag to read the limits from
*/
ServerLimits(ConfigTag* tag);
};
struct CommandLineConf

View File

@ -29,6 +29,21 @@
#include "configparser.h"
#include <iostream>
ServerLimits::ServerLimits(ConfigTag* tag)
: NickMax(tag->getInt("maxnick", 32))
, ChanMax(tag->getInt("maxchan", 64))
, MaxModes(tag->getInt("maxmodes", 20))
, IdentMax(tag->getInt("maxident", 11))
, MaxQuit(tag->getInt("maxquit", 255))
, MaxTopic(tag->getInt("maxtopic", 307))
, MaxKick(tag->getInt("maxkick", 255))
, MaxGecos(tag->getInt("maxgecos", 128))
, MaxAway(tag->getInt("maxaway", 200))
, MaxLine(tag->getInt("maxline", 512))
, MaxHost(tag->getInt("maxhost", 64))
{
}
static ConfigTag* CreateEmptyTag()
{
std::vector<KeyVal>* items;
@ -405,17 +420,7 @@ void ServerConfig::Fill()
OperMaxChans = ConfValue("channels")->getInt("opers");
c_ipv4_range = ConfValue("cidr")->getInt("ipv4clone", 32);
c_ipv6_range = ConfValue("cidr")->getInt("ipv6clone", 128);
Limits.NickMax = ConfValue("limits")->getInt("maxnick", 32);
Limits.ChanMax = ConfValue("limits")->getInt("maxchan", 64);
Limits.MaxModes = ConfValue("limits")->getInt("maxmodes", 20);
Limits.IdentMax = ConfValue("limits")->getInt("maxident", 11);
Limits.MaxHost = ConfValue("limits")->getInt("maxhost", 64);
Limits.MaxQuit = ConfValue("limits")->getInt("maxquit", 255);
Limits.MaxTopic = ConfValue("limits")->getInt("maxtopic", 307);
Limits.MaxKick = ConfValue("limits")->getInt("maxkick", 255);
Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128);
Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
Limits.MaxLine = ConfValue("limits")->getInt("maxline", 512);
Limits = ServerLimits(ConfValue("limits"));
Paths.Config = ConfValue("path")->getString("configdir", INSPIRCD_CONFIG_PATH);
Paths.Data = ConfValue("path")->getString("datadir", INSPIRCD_DATA_PATH);
Paths.Log = ConfValue("path")->getString("logdir", INSPIRCD_LOG_PATH);