summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-11-09 17:11:10 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-11-09 17:11:10 -0800
commit5ebf5077f56442908d4a5ced8d969df9e7de8c4f (patch)
tree19e236c4537112444edcb2b7e4523aae55a83223
parente1c930f1b7a44d2a1c37d4b9b6f348c2ed7260fc (diff)
downloadinfinitytier-5ebf5077f56442908d4a5ced8d969df9e7de8c4f.tar.gz
infinitytier-5ebf5077f56442908d4a5ced8d969df9e7de8c4f.zip
Log last meta-data in controller, and ease up just a bit on keepalives.
-rw-r--r--controller/EmbeddedNetworkController.cpp2
-rw-r--r--node/Constants.hpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
index f91ba533..624c3145 100644
--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@@ -622,8 +622,8 @@ NetworkController::ResultCode EmbeddedNetworkController::doNetworkConfigRequest(
member["recentLog"] = recentLog;
}
- // Update last modified time
member["lastModified"] = now;
+ member["lastRequestMetaData"] = metaData.data();
// If they are not authorized, STOP!
if (!authorizedBy) {
diff --git a/node/Constants.hpp b/node/Constants.hpp
index b7042d5d..6400e289 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -256,12 +256,12 @@
/**
* How frequently to send heartbeats over in-use paths
*/
-#define ZT_PATH_HEARTBEAT_PERIOD 10000
+#define ZT_PATH_HEARTBEAT_PERIOD 14000
/**
* Paths are considered inactive if they have not received traffic in this long
*/
-#define ZT_PATH_ALIVE_TIMEOUT 25000
+#define ZT_PATH_ALIVE_TIMEOUT 45000
/**
* Minimum time between attempts to check dead paths to see if they can be re-awakened