X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=9d327532b27f1c35f6fc45a7210b6622501d9ca0;hb=dbca69da29633abd79ff8ce546d5e2b2b4c43d04;hp=8a432e82f6a74f836038a4ebfdfb1627dd473196;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 8a432e82f..9d327532b 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -328,6 +328,14 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 			me->limit = tag->getInt("limit", me->limit);
 			me->resolvehostnames = tag->getBool("resolvehostnames", me->resolvehostnames);
 
+			std::string ports = tag->getString("port");
+			if (!ports.empty())
+			{
+				irc::portparser portrange(ports, false);
+				while (int port = portrange.GetToken())
+					me->ports.insert(port);
+			}
+
 			ClassMap::iterator oldMask = oldBlocksByMask.find(typeMask);
 			if (oldMask != oldBlocksByMask.end())
 			{
@@ -362,13 +370,13 @@ 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" },
+	{ "gnutls",      "starttls",    "",                 "has been replaced with m_starttls as of 3.0" },
 	{ "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" },
-	{ "module",      "name",        "m_halfop.so",      "has been replaced with m_customprefix as of 2.2" },
-	{ "options",     "cyclehosts",  "",                 "has been replaced with m_hostcycle as of 2.2" },
-	{ "performance", "nouserdns",   "",                 "has been moved to <connect:resolvehostnames> as of 2.2" }
+	{ "module",      "name",        "m_chanprotect.so", "has been replaced with m_customprefix as of 3.0" },
+	{ "module",      "name",        "m_halfop.so",      "has been replaced with m_customprefix as of 3.0" },
+	{ "options",     "cyclehosts",  "",                 "has been replaced with m_hostcycle as of 3.0" },
+	{ "performance", "nouserdns",   "",                 "has been moved to <connect:resolvehostnames> as of 3.0" }
 };
 
 void ServerConfig::Fill()
@@ -433,11 +441,11 @@ void ServerConfig::Fill()
 		throw CoreException(Network + " is not a valid network name. A network name must not contain spaces.");
 
 	std::string defbind = options->getString("defaultbind");
-	if (assign(defbind) == "ipv4")
+	if (stdalgo::string::equalsci(defbind, "ipv4"))
 	{
 		WildcardIPv6 = false;
 	}
-	else if (assign(defbind) == "ipv6")
+	else if (stdalgo::string::equalsci(defbind, "ipv6"))
 	{
 		WildcardIPv6 = true;
 	}