diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-25 14:16:07 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-01-25 14:16:07 -0500 |
| commit | 384e5b66decbbe3eda00b95690c6a56cb140c4f7 (patch) | |
| tree | acceb68d97d6f907eece4df86ab38d6a2387474d /node/NetworkConfig.hpp | |
| parent | 7e7723e98f1d9d9a6f85665cc87543e7e37ac47c (diff) | |
| download | infinitytier-384e5b66decbbe3eda00b95690c6a56cb140c4f7.tar.gz infinitytier-384e5b66decbbe3eda00b95690c6a56cb140c4f7.zip | |
More work on GitHub issue #666
Diffstat (limited to 'node/NetworkConfig.hpp')
| -rw-r--r-- | node/NetworkConfig.hpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index ebe0d70e..00f5d80f 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -292,9 +292,6 @@ public: return r; } - /** - * @return ZeroTier addresses of "anchor" devices on this network - */ inline std::vector<Address> anchors() const { std::vector<Address> r; @@ -305,9 +302,6 @@ public: return r; } - /** - * @return ZeroTier addresses of multicast replicators - */ inline std::vector<Address> multicastReplicators() const { std::vector<Address> r; @@ -318,10 +312,17 @@ public: return r; } - /** - * Add addresses that we should attempt to stay connected to to a set - */ - inline void getAlwaysContactAddresses(Hashtable< Address,std::vector<InetAddress> > &a) const + inline std::vector<Address> alwaysContactAddresses() const + { + std::vector<Address> r; + for(unsigned int i=0;i<specialistCount;++i) { + if ((specialists[i] & (ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR | ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR)) != 0) + r.push_back(Address(specialists[i])); + } + return r; + } + + inline void alwaysContactAddresses(Hashtable< Address,std::vector<InetAddress> > &a) const { for(unsigned int i=0;i<specialistCount;++i) { if ((specialists[i] & (ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR | ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR)) != 0) { |