mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-12-06 10:31:31 -08:00
Code Issues Projects Releases Wiki Activity

Add network ID to upstream lookup, cleanup, release notes for 1.16.

Browse source
This commit is contained in:
Adam Ierymenko 2025-07-15 13:54:10 -04:00
parent 697011df7b
commit 58c80ff0ab
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
10 changed files with 136 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

31
node/NetworkConfig.hpp
View file

@ -27,7 +27,6 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <vector>
/**
@ -378,28 +377,6 @@ class NetworkConfig {
return false;
}
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_NETWORK_RELAY | ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR)) != 0) {
r.push_back(Address(specialists[i]));
}
}
return r;
}
inline unsigned int alwaysContactAddresses(Address ac[ZT_MAX_NETWORK_SPECIALISTS]) const
{
unsigned int c = 0;
for (unsigned int i = 0; i < specialistCount; ++i) {
if ((specialists[i] & (ZT_NETWORKCONFIG_SPECIALIST_TYPE_NETWORK_RELAY | ZT_NETWORKCONFIG_SPECIALIST_TYPE_MULTICAST_REPLICATOR)) != 0) {
ac[c++] = specialists[i];
}
}
return c;
}
inline void alwaysContactAddresses(Hashtable<Address, std::vector<InetAddress> >& a) const
{
for (unsigned int i = 0; i < specialistCount; ++i) {
@ -427,14 +404,6 @@ class NetworkConfig {
{
return (networkId != 0);
}
inline bool operator==(const NetworkConfig& nc) const
{
return (memcmp(this, &nc, sizeof(NetworkConfig)) == 0);
}
inline bool operator!=(const NetworkConfig& nc) const
{
return (! (*this == nc));
}
/**
* Add a specialist or mask flags if already present