X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=8b24b1e226b7a3e61d996b831679287272c8e473;hb=9f3502de449f3bd4a88163ddc39626305071531f;hp=985762872cc88c17fe16db33ef8adbf721299189;hpb=aafc03bdfc34c9426df44938403c92dbbbc0568e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 985762872..8b24b1e22 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -45,6 +45,7 @@ ModuleSpanningTree::ModuleSpanningTree()
 	, commands(this)
 	, currmembid(0)
 	, eventprov(this, "event/server")
+	, sslapi(this)
 	, DNS(this, "DNS")
 	, tagevprov(this, "event/messagetag")
 	, loopCall(false)
@@ -197,40 +198,38 @@ void ModuleSpanningTree::ConnectServer(Autoconnect* a, bool on_timer)
 
 void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 {
-	bool ipvalid = true;
-
 	if (InspIRCd::Match(ServerInstance->Config->ServerName, x->Name, ascii_case_insensitive_map))
 	{
 		ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
 		return;
 	}
 
+	irc::sockets::sockaddrs sa;
 #ifndef _WIN32
 	if (x->IPAddr.find('/') != std::string::npos)
 	{
 		struct stat sb;
-		if (stat(x->IPAddr.c_str(), &sb) == -1 || !S_ISSOCK(sb.st_mode))
-			ipvalid = false;
-	}
-#endif
-	if (x->IPAddr.find(':') != std::string::npos)
-	{
-		in6_addr n;
-		if (inet_pton(AF_INET6, x->IPAddr.c_str(), &n) < 1)
-			ipvalid = false;
+		if (stat(x->IPAddr.c_str(), &sb) == -1 || !S_ISSOCK(sb.st_mode) || !irc::sockets::untosa(x->IPAddr, sa))
+		{
+			// We don't use the family() != AF_UNSPEC check below for UNIX sockets as
+			// that results in a DNS lookup.
+			ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s is not a UNIX socket!",
+				x->Name.c_str(), x->IPAddr.c_str());
+			return;
+		}
 	}
 	else
+#endif
 	{
-		in_addr n;
-		if (inet_pton(AF_INET, x->IPAddr.c_str(),&n) < 1)
-			ipvalid = false;
+		// If this fails then the IP sa will be AF_UNSPEC.
+		irc::sockets::aptosa(x->IPAddr, x->Port, sa);
 	}
-
+	
 	/* Do we already have an IP? If so, no need to resolve it. */
-	if (ipvalid)
+	if (sa.family() != AF_UNSPEC)
 	{
 		// Create a TreeServer object that will start connecting immediately in the background
-		TreeSocket* newsocket = new TreeSocket(x, y, x->IPAddr);
+		TreeSocket* newsocket = new TreeSocket(x, y, sa);
 		if (newsocket->GetFd() > -1)
 		{
 			/* Handled automatically on success */
@@ -324,8 +323,12 @@ ModResult ModuleSpanningTree::HandleVersion(const CommandBase::Params& parameter
 		// If it's empty it might be that the server is still syncing (full version hasn't arrived yet)
 		// or the server is a 2.0 server and does not send a full version.
 		bool showfull = ((user->IsOper()) && (!found->GetFullVersion().empty()));
-		const std::string& Version = (showfull ? found->GetFullVersion() : found->GetVersion());
-		user->WriteNumeric(RPL_VERSION, Version);
+
+		Numeric::Numeric numeric(RPL_VERSION);
+		irc::tokenstream tokens(showfull ? found->GetFullVersion() : found->GetVersion());
+		for (std::string token; tokens.GetTrailing(token); )
+			numeric.push(token);
+		user->WriteNumeric(numeric);
 	}
 	else
 	{
@@ -443,6 +446,10 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
 	if (user->quitting)
 		return;
 
+	// Create the lazy ssl_cert metadata for this user if not already created.
+	if (sslapi)
+		sslapi->GetCertificate(user);
+
 	CommandUID::Builder(user).Broadcast();
 
 	if (user->IsOper())