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

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0ff180a83..8b24b1e22 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -45,7 +45,9 @@ ModuleSpanningTree::ModuleSpanningTree()
 	, commands(this)
 	, currmembid(0)
 	, eventprov(this, "event/server")
+	, sslapi(this)
 	, DNS(this, "DNS")
+	, tagevprov(this, "event/messagetag")
 	, loopCall(false)
 {
 }
@@ -196,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 */
@@ -323,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
 	{
@@ -410,6 +414,7 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
 		if (!IS_LOCAL(d))
 		{
 			CmdBuilder params(user, message_type);
+			params.push_tags(details.tags_out);
 			params.push_back(d->uuid);
 			params.push_last(details.text);
 			params.Unicast(d);
@@ -417,12 +422,13 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
 	}
 	else if (target.type == MessageTarget::TYPE_CHANNEL)
 	{
-		Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.exemptions, message_type);
+		Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.tags_out, details.exemptions, message_type);
 	}
 	else if (target.type == MessageTarget::TYPE_SERVER)
 	{
 		const std::string* serverglob = target.Get<std::string>();
 		CmdBuilder par(user, message_type);
+		par.push_tags(details.tags_out);
 		par.push_back(*serverglob);
 		par.push_last(details.text);
 		par.Broadcast();
@@ -440,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())
@@ -582,9 +592,6 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
 
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
-	if (loopCall)
-		return; // Don't generate a REHASH here if we're in the middle of processing a message that generated this one
-
 	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnPreRehash called with param %s", parameter.c_str());
 
 	// Send out to other servers