summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/configreader.h4
-rw-r--r--src/configreader.cpp22
2 files changed, 13 insertions, 13 deletions
diff --git a/include/configreader.h b/include/configreader.h
index d8866e7d9..7274dfad8 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -95,6 +95,8 @@ class CoreExport ConfigTag : public refcountbase
class ServerLimits
{
public:
+ /** Maximum line length */
+ size_t MaxLine;
/** Maximum nickname length */
size_t NickMax;
/** Maximum channel length */
@@ -113,8 +115,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;
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 68630685f..d06753423 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -38,17 +38,17 @@
#include <iostream>
ServerLimits::ServerLimits(ConfigTag* tag)
- : NickMax(tag->getUInt("maxnick", 30))
- , ChanMax(tag->getUInt("maxchan", 64))
- , MaxModes(tag->getUInt("maxmodes", 20))
- , IdentMax(tag->getUInt("maxident", 10))
- , MaxQuit(tag->getUInt("maxquit", 255))
- , MaxTopic(tag->getUInt("maxtopic", 307))
- , MaxKick(tag->getUInt("maxkick", 255))
- , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128)))
- , MaxAway(tag->getUInt("maxaway", 200))
- , MaxLine(tag->getUInt("maxline", 512))
- , MaxHost(tag->getUInt("maxhost", 64))
+ : MaxLine(tag->getUInt("maxline", 512, 512))
+ , NickMax(tag->getUInt("maxnick", 30, 1, MaxLine))
+ , ChanMax(tag->getUInt("maxchan", 64, 1, MaxLine))
+ , MaxModes(tag->getUInt("maxmodes", 20, 1))
+ , IdentMax(tag->getUInt("maxident", 10, 1))
+ , MaxQuit(tag->getUInt("maxquit", 255, 0, MaxLine))
+ , MaxTopic(tag->getUInt("maxtopic", 307, 1, MaxLine))
+ , MaxKick(tag->getUInt("maxkick", 255, 1, MaxLine))
+ , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128), 1, MaxLine))
+ , MaxAway(tag->getUInt("maxaway", 200, 1, MaxLine))
+ , MaxHost(tag->getUInt("maxhost", 64, 1, MaxLine))
{
}