From 1c64da19e1f08e23fd7020427e89d1d5af35aa1c Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Tue, 9 Dec 2014 12:35:31 +0100 Subject: Add ServerLimits constructor that reads limits from a ConfigTag and use it --- include/configreader.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/configreader.h b/include/configreader.h index 342743991..66bb97ea0 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -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 -- cgit v1.2.3 From b74da78a617c4eeef6c14364ca5a0fef5460d504 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Tue, 9 Dec 2014 12:36:24 +0100 Subject: Pass the empty tag to Limits when constructing a ServerConfig, remove default ServerLimits constructor --- include/configreader.h | 8 -------- src/configreader.cpp | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'include') diff --git a/include/configreader.h b/include/configreader.h index 66bb97ea0..88279004f 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -117,14 +117,6 @@ class ServerLimits /** Maximum hostname length */ size_t MaxHost; - /** 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), - 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 */ diff --git a/src/configreader.cpp b/src/configreader.cpp index 49ef236d4..d52f3de13 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -52,6 +52,7 @@ static ConfigTag* CreateEmptyTag() ServerConfig::ServerConfig() : EmptyTag(CreateEmptyTag()) + , Limits(EmptyTag) { RawLog = HideBans = HideSplits = UndernetMsgPrefix = false; WildcardIPv6 = InvBypassModes = true; -- cgit v1.2.3