ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-21 10:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(1) Back off a little on default max multicast limit since 128 is pretty bandwidth heavy, (2) add a little to default multicast rate limit since new MC algo is fairerererer, (3) decided not to involve netconf masters in multicast so take that out of list of who gets LIKEs.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-10-10 12:55:06 -07:00
parent 1774e615a1
commit 03dc823ad7
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/Constants.hpp
View File

@ -258,7 +258,7 @@
/** /**
* Default maximum number of peers to address with a single multicast (if unspecified in network) * Default maximum number of peers to address with a single multicast (if unspecified in network)
*/ */
#define ZT_MULTICAST_DEFAULT_LIMIT 128 #define ZT_MULTICAST_DEFAULT_LIMIT 64
/** /**
* Delay between scans of the topology active peer DB for peers that need ping * Delay between scans of the topology active peer DB for peers that need ping

2
node/Network.cpp
View File

@ -123,7 +123,7 @@ public:
inline void operator()(Topology &t,const SharedPtr<Peer> &p) inline void operator()(Topology &t,const SharedPtr<Peer> &p)
{ {
if ( ( (p->hasActiveDirectPath(_now)) && (_network->isAllowed(p->address())) ) || (_network->controller() == p->address()) || (t.isSupernode(p->address())) ) { if ( ( (p->hasActiveDirectPath(_now)) && (_network->isAllowed(p->address())) ) || (t.isSupernode(p->address())) ) {
Packet outp(p->address(),RR->identity.address(),Packet::VERB_MULTICAST_LIKE); Packet outp(p->address(),RR->identity.address(),Packet::VERB_MULTICAST_LIKE);
std::set<MulticastGroup> mgs(_network->multicastGroups()); std::set<MulticastGroup> mgs(_network->multicastGroups());

5
node/NetworkConfig.cpp
View File

@ -33,9 +33,8 @@
namespace ZeroTier { namespace ZeroTier {
// This is fast enough for things like Apple's mDNS spam, so it should serve // This is fast enough for things like Apple's mDNS spam, so it should serve
// as a good default for your average network. It's 64 bytes per second, with // as a good default for your average network.
// a starting and max balance of 64k. const NetworkConfig::MulticastRate NetworkConfig::DEFAULT_MULTICAST_RATE(40000,60000,80);
const NetworkConfig::MulticastRate NetworkConfig::DEFAULT_MULTICAST_RATE(32768,32768,64);
SharedPtr<NetworkConfig> NetworkConfig::createTestNetworkConfig(const Address &self) SharedPtr<NetworkConfig> NetworkConfig::createTestNetworkConfig(const Address &self)
{ {