X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigparser.cpp;h=d3723d35036a790d4d360babb6611d3f469e081c;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=31d3141482aaef9452339d1838863daa7c45b09d;hpb=37d97550b147e0d14f6a9e279f8505b7d49c84bb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 31d314148..d3723d350 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -183,7 +183,10 @@ struct Parser
 		std::set<std::string> seen;
 		tag = ConfigTag::create(name, current.filename, current.line, items);
 
-		while (kv(items, seen));
+		while (kv(items, seen))
+		{
+			// Do nothing here (silences a GCC warning).
+		}
 
 		if (name == mandatory_tag)
 		{
@@ -320,9 +323,10 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
 	if (exec && (flags & FLAG_NO_EXEC))
 		throw CoreException("Invalid <execfiles> tag in file included with noexec=\"yes\"");
 
-	FileWrapper file(exec ? popen(name.c_str(), "r") : fopen(name.c_str(), "r"), exec);
+	std::string path = ServerInstance->Config->Paths.PrependConfig(name);
+	FileWrapper file(exec ? popen(name.c_str(), "r") : fopen(path.c_str(), "r"), exec);
 	if (!file)
-		throw CoreException("Could not read \"" + name + "\" for \"" + key + "\" file");
+		throw CoreException("Could not read \"" + path + "\" for \"" + key + "\" file");
 
 	file_cache& cache = FilesOutput[key];
 	cache.clear();
@@ -342,23 +346,24 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
 
 bool ParseStack::ParseFile(const std::string& name, int flags, const std::string& mandatory_tag)
 {
-	ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Reading file %s", name.c_str());
+	std::string path = ServerInstance->Config->Paths.PrependConfig(name);
+	ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Reading file %s", path.c_str());
 	for (unsigned int t = 0; t < reading.size(); t++)
 	{
 		if (std::string(name) == reading[t])
 		{
-			throw CoreException("File " + name + " is included recursively (looped inclusion)");
+			throw CoreException("File " + path + " is included recursively (looped inclusion)");
 		}
 	}
 
 	/* It's not already included, add it to the list of files we've loaded */
 
-	FileWrapper file(fopen(name.c_str(), "r"));
+	FileWrapper file(fopen(path.c_str(), "r"));
 	if (!file)
-		throw CoreException("Could not read \"" + name + "\" for include");
+		throw CoreException("Could not read \"" + path + "\" for include");
 
-	reading.push_back(name);
-	Parser p(*this, flags, file, name, mandatory_tag);
+	reading.push_back(path);
+	Parser p(*this, flags, file, path, mandatory_tag);
 	bool ok = p.outer_parse();
 	reading.pop_back();
 	return ok;
@@ -417,7 +422,7 @@ std::string ConfigTag::getString(const std::string& key, const std::string& def)
 	return res;
 }
 
-long ConfigTag::getInt(const std::string &key, long def)
+long ConfigTag::getInt(const std::string &key, long def, long min, long max)
 {
 	std::string result;
 	if(!readString(key, result))
@@ -431,18 +436,41 @@ long ConfigTag::getInt(const std::string &key, long def)
 	switch (toupper(*res_tail))
 	{
 		case 'K':
-			res= res* 1024;
+			res = res * 1024;
 			break;
 		case 'M':
-			res= res* 1024 * 1024;
+			res = res * 1024 * 1024;
 			break;
 		case 'G':
-			res= res* 1024 * 1024 * 1024;
+			res = res * 1024 * 1024 * 1024;
 			break;
 	}
+
+	CheckRange(key, res, def, min, max);
 	return res;
 }
 
+void ConfigTag::CheckRange(const std::string& key, long& res, long def, long min, long max)
+{
+	if (res < min || res > max)
+	{
+		ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "WARNING: <%s:%s> value of %ld is not between %ld and %ld; set to %ld.",
+			tag.c_str(), key.c_str(), res, min, max, def);
+		res = def;
+	}
+}
+
+time_t ConfigTag::getDuration(const std::string& key, long def, long min, long max)
+{
+	std::string duration;
+	if (!readString(key, duration))
+		return def;
+
+	time_t ret = InspIRCd::Duration(duration);
+	CheckRange(key, ret, def, min, max);
+	return ret;
+}
+
 double ConfigTag::getFloat(const std::string &key, double def)
 {
 	std::string result;