Browse Source

(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.

Adam Ierymenko 11 years ago
parent
commit
03dc823ad7
3 changed files with 4 additions and 5 deletions
  1. 1 1
      node/Constants.hpp
  2. 1 1
      node/Network.cpp
  3. 2 3
      node/NetworkConfig.cpp

+ 1 - 1
node/Constants.hpp

@@ -258,7 +258,7 @@
 /**
  * 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

+ 1 - 1
node/Network.cpp

@@ -123,7 +123,7 @@ public:
 
 	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);
 
 			std::set<MulticastGroup> mgs(_network->multicastGroups());

+ 2 - 3
node/NetworkConfig.cpp

@@ -33,9 +33,8 @@
 namespace ZeroTier {
 
 // 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
-// a starting and max balance of 64k.
-const NetworkConfig::MulticastRate NetworkConfig::DEFAULT_MULTICAST_RATE(32768,32768,64);
+// as a good default for your average network.
+const NetworkConfig::MulticastRate NetworkConfig::DEFAULT_MULTICAST_RATE(40000,60000,80);
 
 SharedPtr<NetworkConfig> NetworkConfig::createTestNetworkConfig(const Address &self)
 {