Update the module descriptions using mkversion.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket1.cpp

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 062d04222cd78bdd6a1e30fd04e99034b5ab170a..5bc41ea64008357f3aadeabdf14dc0e6df896c4b 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -24,7 +28,6 @@
 #include "iohook.h"
 
 #include "main.h"
-#include "modules/server.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "link.h"
@@ -36,7 +39,7 @@
  * 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)
+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())
 {
@@ -45,7 +48,27 @@ 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);
+       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);
 }
@@ -123,7 +146,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);
        }