X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=fa9bbf10587e00535beec9533b30fdf92167dd9c;hb=27f8e788c2a515f63f1f0e5e2b4b0d5e78c3dab4;hp=68630685fd03bd1484822fc89f893d0964537f71;hpb=44489ddf7e90413d8f656aea24d74445bab227af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 68630685f..fa9bbf105 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013-2014, 2016-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014, 2016-2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Justin Crawford <Justasic@Gmail.com>
@@ -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))
 {
 }
 
@@ -57,6 +57,7 @@ ServerConfig::ServerPaths::ServerPaths(ConfigTag* tag)
 	, Data(tag->getString("datadir", INSPIRCD_DATA_PATH, 1))
 	, Log(tag->getString("logdir", INSPIRCD_LOG_PATH, 1))
 	, Module(tag->getString("moduledir", INSPIRCD_MODULE_PATH, 1))
+	, Runtime(tag->getString("runtimedir", INSPIRCD_RUNTIME_PATH, 1))
 {
 }
 
@@ -335,7 +336,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 	}
 }
 
-static std::string GetServerName()
+static std::string GetServerHost()
 {
 #ifndef _WIN32
 	char hostname[256];
@@ -359,7 +360,7 @@ void ServerConfig::Fill()
 	ConfigTag* server = ConfValue("server");
 	if (sid.empty())
 	{
-		ServerName = server->getString("name", GetServerName(), InspIRCd::IsHost);
+		ServerName = server->getString("name", GetServerHost(), InspIRCd::IsHost);
 
 		sid = server->getString("id");
 		if (!sid.empty() && !InspIRCd::IsSID(sid))
@@ -524,9 +525,9 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		// On first run, ports are bound later on
 		FailedPortList pl;
 		ServerInstance->BindPorts(pl);
-		if (pl.size())
+		if (!pl.empty())
 		{
-			std::cout << "Warning! Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl;
+			errstr << "Warning! Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl;
 			for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter)
 			{
 				const FailedPort& fp = *iter;