diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-26 17:44:09 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-26 17:44:09 -0700 |
| commit | 9c26d10ea645dc1727813ea72a63f526cf0757d0 (patch) | |
| tree | 25ae8e785f07f93f187a34abe204c423613a009b /node/Constants.hpp | |
| parent | bfb152f53f528934583ee76437453a005610a7ea (diff) | |
| parent | 3f71afd0fbb2d87a2c9288166299600da51470dc (diff) | |
| download | infinitytier-9c26d10ea645dc1727813ea72a63f526cf0757d0.tar.gz infinitytier-9c26d10ea645dc1727813ea72a63f526cf0757d0.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Constants.hpp')
| -rw-r--r-- | node/Constants.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Constants.hpp b/node/Constants.hpp index aced6fe7..ac9dbc99 100644 --- a/node/Constants.hpp +++ b/node/Constants.hpp @@ -254,7 +254,7 @@ /** * Delay between scans of the topology active peer DB for peers that need ping * - * This is also how often pings will be retried to upstream peers (rootservers) + * This is also how often pings will be retried to upstream peers (relays, roots) * constantly until something is heard. */ #define ZT_PING_CHECK_INVERVAL 6250 @@ -279,9 +279,9 @@ * * When we send something (including frames), we generally expect a response. * Switching relays if no response in a short period of time causes more - * rapid failover if a rootserver goes down or becomes unreachable. In the + * rapid failover if a root server goes down or becomes unreachable. In the * mistaken case, little harm is done as it'll pick the next-fastest - * rootserver and will switch back eventually. + * root server and will switch back eventually. */ #define ZT_PEER_RELAY_CONVERSATION_LATENCY_THRESHOLD 10000 |