X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=190c5dc15891ac22c2d708532fff6c437ec398be;hb=f6b33a8facd6ca200292786c1061782c41cdd278;hp=e1642a086041bb54bb9b0eb9d1e62c8287f40864;hpb=7770cd985405c7630e9149fc08c314ec824a9c75;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index e1642a086..190c5dc15 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -24,7 +24,7 @@
 #include "iohook.h"
 
 #include "main.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "link.h"
@@ -36,8 +36,8 @@
  * BufferedSocket, we just call DoConnect() for most of the action,
  * and only do minor initialization tasks ourselves.
  */
-TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const std::string& ipaddr)
-	: linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0)
+TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const irc::sockets::sockaddrs& dest)
+	: linkID(link->Name), LinkState(CONNECTING), MyRoot(NULL), proto_version(0)
 	, burstsent(false), age(ServerInstance->Time())
 {
 	capab = new CapabData;
@@ -45,8 +45,28 @@ TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const std::string& ipaddr)
 	capab->ac = myac;
 	capab->capab_phase = 0;
 
-	DoConnect(ipaddr, link->Port, link->Timeout, link->Bind);
-	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, link->Timeout);
+	irc::sockets::sockaddrs bind;
+	memset(&bind, 0, sizeof(bind));
+	if (!link->Bind.empty() && (dest.family() == AF_INET || dest.family() == AF_INET6))
+	{
+		if (!irc::sockets::aptosa(link->Bind, 0, bind))
+		{
+			state = I_ERROR;
+			SetError("Bind address '" + link->Bind + "' is not a valid IPv4 or IPv6 address");
+			TreeSocket::OnError(I_ERR_BIND);
+			return;
+		}
+		else if (bind.family() != dest.family())
+		{
+			state = I_ERROR;
+			SetError("Bind address '" + bind.addr() + "' is not the same address family as destination address '" + dest.addr() + "'");
+			TreeSocket::OnError(I_ERR_BIND);
+			return;
+		}
+	}
+
+	DoConnect(dest, bind, link->Timeout);
+	Utils->timeoutlist[this] = std::pair<std::string, unsigned int>(linkID, link->Timeout);
 	SendCapabilities(1);
 }
 
@@ -63,13 +83,21 @@ TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* cl
 	for (ListenSocket::IOHookProvList::iterator i = via->iohookprovs.begin(); i != via->iohookprovs.end(); ++i)
 	{
 		ListenSocket::IOHookProvRef& iohookprovref = *i;
-		if (iohookprovref)
-			iohookprovref->OnAccept(this, client, server);
+		if (!iohookprovref)
+			continue;
+
+		iohookprovref->OnAccept(this, client, server);
+		// IOHook could have encountered a fatal error, e.g. if the TLS ClientHello was already in the queue and there was no common TLS version
+		if (!getError().empty())
+		{
+			TreeSocket::OnError(I_ERR_OTHER);
+			return;
+		}
 	}
 
 	SendCapabilities(1);
 
-	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, 30);
+	Utils->timeoutlist[this] = std::pair<std::string, unsigned int>(linkID, 30);
 }
 
 void TreeSocket::CleanNegotiationInfo()
@@ -115,7 +143,7 @@ void TreeSocket::OnConnected()
 			static_cast<IOHookProvider*>(prov)->OnConnect(this);
 		}
 
-		ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(),
+		ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002[%s] started.", linkID.c_str(),
 			(capab->link->HiddenFromStats ? "<hidden>" : capab->link->IPAddr.c_str()));
 		this->SendCapabilities(1);
 	}
@@ -137,7 +165,7 @@ void TreeSocket::SendError(const std::string &errormessage)
 	SetError(errormessage);
 }
 
-CmdResult CommandSQuit::HandleServer(TreeServer* server, std::vector<std::string>& params)
+CmdResult CommandSQuit::HandleServer(TreeServer* server, CommandBase::Params& params)
 {
 	TreeServer* quitting = Utils->FindServer(params[0]);
 	if (!quitting)