X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.cpp;h=5330d2eb3fe7ca04943ada951957c4d5c5d32e81;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=cb8a39638266889e05e5ced62180ade099de4a14;hpb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index cb8a39638..5330d2eb3 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -28,6 +28,8 @@
 #include "treesocket.h"
 #include "resolvers.h"
 
+SpanningTreeUtilities* Utils = NULL;
+
 /* Create server sockets off a listener. */
 ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 {
@@ -41,7 +43,7 @@ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from
 		if (*i == "*" || *i == incomingip || irc::sockets::cidr_mask(*i).match(*client))
 		{
 			/* we don't need to do anything with the pointer, creating it stores it in the necessary places */
-			new TreeSocket(Utils, newsock, from, client, server);
+			new TreeSocket(newsock, from, client, server);
 			return MOD_RES_ALLOW;
 		}
 	}
@@ -60,7 +62,7 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 	if (InspIRCd::IsSID(ServerName))
 		return this->FindServerID(ServerName);
 
-	server_hash::iterator iter = serverlist.find(ServerName.c_str());
+	server_hash::iterator iter = serverlist.find(ServerName);
 	if (iter != serverlist.end())
 	{
 		return iter->second;
@@ -79,7 +81,7 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
  */
 TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName)
 {
-	if (ServerName.c_str() == TreeRoot->GetName() || ServerName == ServerInstance->Config->GetSID())
+	if (ServerName == TreeRoot->GetName() || ServerName == ServerInstance->Config->GetSID())
 		return NULL;
 	TreeServer* Found = FindServer(ServerName);
 	if (Found)
@@ -126,11 +128,11 @@ TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id)
 		return NULL;
 }
 
-SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) : Creator(C)
+SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
+	: Creator(C), TreeRoot(NULL)
 {
-	ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
+	ServerInstance->Timers->AddTimer(&RefreshTimer);
 
-	this->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
 	this->ReadConfiguration();
 }
 
@@ -195,7 +197,7 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis
 std::string SpanningTreeUtilities::ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params)
 {
 	std::string FullLine;
-	FullLine.reserve(MAXBUF);
+	FullLine.reserve(1024);
 	FullLine = ":" + prefix + " " + command;
 	for (parameterlist::const_iterator x = params.begin(); x != params.end(); ++x)
 	{
@@ -273,7 +275,7 @@ void SpanningTreeUtilities::RefreshIPCache()
 		Link* L = *i;
 		if (!L->Port)
 		{
-			ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"m_spanningtree: Ignoring a link block without a port.");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring a link block without a port.");
 			/* Invalid link block */
 			continue;
 		}
@@ -285,16 +287,16 @@ void SpanningTreeUtilities::RefreshIPCache()
 		bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy);
 		if ((L->IPAddr == "*") || (ipvalid))
 			ValidIPs.push_back(L->IPAddr);
-		else
+		else if (this->Creator->DNS)
 		{
+			SecurityIPResolver* sr = new SecurityIPResolver(Creator, *this->Creator->DNS, L->IPAddr, L, DNS::QUERY_AAAA);
 			try
 			{
-				bool cached = false;
-				SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L->IPAddr, L, cached, DNS_QUERY_AAAA);
-				ServerInstance->AddResolver(sr, cached);
+				this->Creator->DNS->Process(sr);
 			}
-			catch (...)
+			catch (DNS::Exception &)
 			{
+				delete sr;
 			}
 		}
 	}
@@ -335,7 +337,7 @@ void SpanningTreeUtilities::ReadConfiguration()
 		L->RecvPass = tag->getString("recvpass", tag->getString("password"));
 		L->Fingerprint = tag->getString("fingerprint");
 		L->HiddenFromStats = tag->getBool("statshidden");
-		L->Timeout = tag->getInt("timeout", 30);
+		L->Timeout = tag->getDuration("timeout", 30);
 		L->Hook = tag->getString("ssl");
 		L->Bind = tag->getString("bind");
 		L->Hidden = tag->getBool("hidden");
@@ -364,11 +366,11 @@ void SpanningTreeUtilities::ReadConfiguration()
 		if (L->IPAddr.empty())
 		{
 			L->IPAddr = "*";
-			ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + assign(L->Name) + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
 		}
 
 		if (!L->Port)
-			ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no port defined, you will not be able to /connect it.");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + assign(L->Name) + "' has no port defined, you will not be able to /connect it.");
 
 		L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end());
 		LinkBlocks.push_back(L);
@@ -379,7 +381,7 @@ void SpanningTreeUtilities::ReadConfiguration()
 	{
 		ConfigTag* tag = i->second;
 		reference<Autoconnect> A = new Autoconnect(tag);
-		A->Period = tag->getInt("period");
+		A->Period = tag->getDuration("period", 60, 1);
 		A->NextConnectTime = ServerInstance->Time() + A->Period;
 		A->position = -1;
 		irc::spacesepstream ss(tag->getString("server"));
@@ -389,11 +391,6 @@ void SpanningTreeUtilities::ReadConfiguration()
 			A->servers.push_back(server);
 		}
 
-		if (A->Period <= 0)
-		{
-			throw ModuleException("Invalid configuration for autoconnect, period not a positive integer!");
-		}
-
 		if (A->servers.empty())
 		{
 			throw ModuleException("Invalid configuration for autoconnect, server cannot be empty!");