Browse Source

Adjust PUSH_DIRECT_PATH circuit breaker, and comment out traces to reduce noise.

Adam Ierymenko 8 years ago
parent
commit
b9c1407013
2 changed files with 6 additions and 6 deletions
  1. 3 3
      node/Constants.hpp
  2. 3 3
      node/IncomingPacket.cpp

+ 3 - 3
node/Constants.hpp

@@ -369,7 +369,7 @@
 /**
 /**
  * Time horizon for push direct paths cutoff
  * Time horizon for push direct paths cutoff
  */
  */
-#define ZT_PUSH_DIRECT_PATHS_CUTOFF_TIME 60000
+#define ZT_PUSH_DIRECT_PATHS_CUTOFF_TIME 30000
 
 
 /**
 /**
  * Maximum number of direct path pushes within cutoff time
  * Maximum number of direct path pushes within cutoff time
@@ -378,12 +378,12 @@
  * per CUTOFF_TIME milliseconds per peer to prevent this from being
  * per CUTOFF_TIME milliseconds per peer to prevent this from being
  * useful for DOS amplification attacks.
  * useful for DOS amplification attacks.
  */
  */
-#define ZT_PUSH_DIRECT_PATHS_CUTOFF_LIMIT 5
+#define ZT_PUSH_DIRECT_PATHS_CUTOFF_LIMIT 8
 
 
 /**
 /**
  * Maximum number of paths per IP scope (e.g. global, link-local) and family (e.g. v4/v6)
  * Maximum number of paths per IP scope (e.g. global, link-local) and family (e.g. v4/v6)
  */
  */
-#define ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY 4
+#define ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY 8
 
 
 /**
 /**
  * Time horizon for VERB_NETWORK_CREDENTIALS cutoff
  * Time horizon for VERB_NETWORK_CREDENTIALS cutoff

+ 3 - 3
node/IncomingPacket.cpp

@@ -1185,7 +1185,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,void *tPt
 
 
 		// First, subject this to a rate limit
 		// First, subject this to a rate limit
 		if (!peer->rateGatePushDirectPaths(now)) {
 		if (!peer->rateGatePushDirectPaths(now)) {
-			TRACE("dropped PUSH_DIRECT_PATHS from %s(%s): circuit breaker tripped",source().toString().c_str(),_path->address().toString().c_str());
+			//TRACE("dropped PUSH_DIRECT_PATHS from %s(%s): circuit breaker tripped",source().toString().c_str(),_path->address().toString().c_str());
 			peer->received(tPtr,_path,hops(),packetId(),Packet::VERB_PUSH_DIRECT_PATHS,0,Packet::VERB_NOP,false);
 			peer->received(tPtr,_path,hops(),packetId(),Packet::VERB_PUSH_DIRECT_PATHS,0,Packet::VERB_NOP,false);
 			return true;
 			return true;
 		}
 		}
@@ -1220,7 +1220,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,void *tPt
 							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
 							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
 							peer->attemptToContactAt(tPtr,InetAddress(),a,now,false,0);
 							peer->attemptToContactAt(tPtr,InetAddress(),a,now,false,0);
 						} else {
 						} else {
-							TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
+							//TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
 						}
 						}
 					}
 					}
 				}	break;
 				}	break;
@@ -1237,7 +1237,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,void *tPt
 							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
 							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
 							peer->attemptToContactAt(tPtr,InetAddress(),a,now,false,0);
 							peer->attemptToContactAt(tPtr,InetAddress(),a,now,false,0);
 						} else {
 						} else {
-							TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
+							//TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
 						}
 						}
 					}
 					}
 				}	break;
 				}	break;