From 61cff47f5b9c8071c7f97947032a06250099f418 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 2 Feb 2015 15:24:05 -0800 Subject: [PATCH] Code to track externally visible address surface. --- node/ExternalSurface.hpp | 66 ++++++++++++++++++++++++++++++++++++++++ node/Topology.hpp | 3 ++ 2 files changed, 69 insertions(+) create mode 100644 node/ExternalSurface.hpp diff --git a/node/ExternalSurface.hpp b/node/ExternalSurface.hpp new file mode 100644 index 000000000..2f4bd38de --- /dev/null +++ b/node/ExternalSurface.hpp @@ -0,0 +1,66 @@ +/* + * ZeroTier One - Global Peer to Peer Ethernet + * Copyright (C) 2011-2015 ZeroTier Networks + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * -- + * + * ZeroTier may be used and distributed under the terms of the GPLv3, which + * are available at: http://www.gnu.org/licenses/gpl-3.0.html + * + * If you would like to embed ZeroTier into a commercial application or + * redistribute it in a modified binary form, please contact ZeroTier Networks + * LLC. Start here: http://www.zerotier.com/ + */ + +#ifndef ZT_EXTERNALSURFACE_HPP +#define ZT_EXTERNALSURFACE_HPP + +#include "InetAddress.hpp" + +namespace ZeroTier { + +/** + * Tracks changes to this peer's real world addresses + */ +class ExternalSurface +{ +public: + ExternalSurface() {} + + /** + * Revise our external surface image, return true if it changed + * + * @param remote Remote address as reflected by any trusted peer + * @return True if our external surface has changed + */ + inline bool revise(const InetAddress &remote) + throw() + { + const unsigned long idx = (remote.isV4() ? 0 : 2) | (remote.isLinkLocal() ? 1 : 0); + if (_s[idx] != remote) { + _s[idx] = remote; + return true; + } + return false; + } + +private: + InetAddress _s[4]; // global v4, link-local v4, global v6, link-local v6 +}; + +} // namespace ZeroTier + +#endif diff --git a/node/Topology.hpp b/node/Topology.hpp index 502b3e565..1dd556461 100644 --- a/node/Topology.hpp +++ b/node/Topology.hpp @@ -47,6 +47,7 @@ #include "Packet.hpp" #include "Logger.hpp" #include "Dictionary.hpp" +#include "ExternalSurface.hpp" namespace ZeroTier { @@ -374,6 +375,8 @@ private: std::vector< Address > _supernodeAddresses; std::vector< SharedPtr > _supernodePeers; + ExternalSurface _surface; + Mutex _lock; // Set to true if my identity is in _supernodes