X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=0cdfedf04bc22f8192969f6a876050770d4de615;hb=a5ca8b892c384d5926bf03353ef878023f0f573d;hp=0df69071b532468822600efba1c378d41ff5abe2;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 0df69071b..0cdfedf04 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -36,7 +36,7 @@ ServerConfig::ServerConfig()
 	dns_timeout = 5;
 	MaxTargets = 20;
 	NetBufferSize = 10240;
-	SoftLimit = ServerInstance->SE->GetMaxFds();
+	SoftLimit = SocketEngine::GetMaxFds();
 	MaxConn = SOMAXCONN;
 	MaxChans = 20;
 	OperMaxChans = 30;
@@ -335,6 +335,7 @@ struct DeprecatedConfig
 static const DeprecatedConfig ChangedConfig[] = {
 	{ "bind",        "transport",   "",                 "has been moved to <bind:ssl> as of 2.0" },
 	{ "die",         "value",       "",                 "you need to reread your config" },
+	{ "gnutls",      "starttls",    "",                 "has been replaced with m_starttls as of 2.2" },
 	{ "link",        "autoconnect", "",                 "2.0+ does not use this attribute - define <autoconnect> tags instead" },
 	{ "link",        "transport",   "",                 "has been moved to <link:ssl> as of 2.0" },
 	{ "module",      "name",        "m_chanprotect.so", "has been replaced with m_customprefix as of 2.2" },
@@ -374,7 +375,7 @@ void ServerConfig::Fill()
 	PrefixPart = options->getString("prefixpart");
 	SuffixPart = options->getString("suffixpart");
 	FixedPart = options->getString("fixedpart");
-	SoftLimit = ConfValue("performance")->getInt("softlimit", ServerInstance->SE->GetMaxFds(), 10, ServerInstance->SE->GetMaxFds());
+	SoftLimit = ConfValue("performance")->getInt("softlimit", SocketEngine::GetMaxFds(), 10, SocketEngine::GetMaxFds());
 	CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
 	MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
 	XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
@@ -442,20 +443,7 @@ void ServerConfig::Fill()
 		if (socktest < 0)
 			WildcardIPv6 = false;
 		else
-			ServerInstance->SE->Close(socktest);
-	}
-	ConfigTagList tags = ConfTags("uline");
-	for(ConfigIter i = tags.first; i != tags.second; ++i)
-	{
-		ConfigTag* tag = i->second;
-		std::string server;
-		if (!tag->readString("server", server))
-			throw CoreException("<uline> tag missing server at " + tag->getTagLocation());
-
-		if (ServerName == server)
-			throw CoreException("Servers should not uline themselves (at " + tag->getTagLocation() + ")");
-
-		ulines[assign(server)] = tag->getBool("silent");
+			SocketEngine::Close(socktest);
 	}
 
 	ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z"));
@@ -521,7 +509,7 @@ void ServerConfig::Read()
 	catch (CoreException& err)
 	{
 		valid = false;
-		errstr << err.GetReason();
+		errstr << err.GetReason() << std::endl;
 	}
 }
 
@@ -641,10 +629,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
 		if (file != this->Files.end())
 		      InspIRCd::ProcessColors(file->second);
-
-		file = this->Files.find(tag->getString("rules", "rules"));
-		if (file != this->Files.end())
-		      InspIRCd::ProcessColors(file->second);
 	}
 
 	/* No old configuration -> initial boot, nothing more to do here */
@@ -734,11 +718,6 @@ void ServerConfig::ApplyModules(User* user)
 	}
 }
 
-bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path)
-{
-	return (path.length() > 2 && isalpha(path[0]) && path[1] == ':');
-}
-
 ConfigTag* ServerConfig::ConfValue(const std::string &tag)
 {
 	ConfigTagList found = config_data.equal_range(tag);
@@ -757,18 +736,6 @@ ConfigTagList ServerConfig::ConfTags(const std::string& tag)
 	return config_data.equal_range(tag);
 }
 
-bool ServerConfig::FileExists(const char* file)
-{
-	struct stat sb;
-	if (stat(file, &sb) == -1)
-		return false;
-
-	if ((sb.st_mode & S_IFDIR) > 0)
-		return false;
-
-	return !access(file, F_OK);
-}
-
 std::string ServerConfig::Escape(const std::string& str, bool xml)
 {
 	std::string escaped;
@@ -793,22 +760,6 @@ std::string ServerConfig::Escape(const std::string& str, bool xml)
 	return escaped;
 }
 
-std::string ServerConfig::ExpandPath(const std::string& base, const std::string& fragment)
-{
-	// The fragment is an absolute path, don't modify it.
-	if (fragment[0] == '/' || ServerConfig::StartsWithWindowsDriveLetter(fragment))
-		return fragment;
-
-	return base + '/' + fragment;
-}
-
-const char* ServerConfig::CleanFilename(const char* name)
-{
-	const char* p = name + strlen(name);
-	while ((p != name) && (*p != '/') && (*p != '\\')) p--;
-	return (p != name ? ++p : p);
-}
-
 void ConfigReaderThread::Run()
 {
 	Config->Read();