summaryrefslogtreecommitdiff
path: root/node/Node.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-29 09:58:17 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-29 09:58:17 -0800
commit4e85213473472385fd4c11b8a8f3963e09c20114 (patch)
treeb266c6356b27410fec847acd12082f4cd0e678fb /node/Node.cpp
parentd6a346ca6e45c1735a991521ebc4b7c9405abf7e (diff)
downloadinfinitytier-4e85213473472385fd4c11b8a8f3963e09c20114.tar.gz
infinitytier-4e85213473472385fd4c11b8a8f3963e09c20114.zip
Yank RuntimeEnvironment from SysEnv.
Diffstat (limited to 'node/Node.cpp')
-rw-r--r--node/Node.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Node.cpp b/node/Node.cpp
index 8d041a4b..496f49ec 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -447,7 +447,7 @@ Node::ReasonForTermination Node::run()
_r->sw = new Switch(_r);
_r->demarc = new Demarc(_r);
_r->topology = new Topology(_r,Utils::fileExists((_r->homePath + ZT_PATH_SEPARATOR_S + "iddb.d").c_str()));
- _r->sysEnv = new SysEnv(_r);
+ _r->sysEnv = new SysEnv();
try {
_r->nc = new NodeConfig(_r,configAuthToken.c_str(),impl->controlPort);
} catch (std::exception &exc) {
@@ -513,7 +513,7 @@ Node::ReasonForTermination Node::run()
uint64_t lastPingCheck = 0;
uint64_t lastClean = Utils::now(); // don't need to do this immediately
uint64_t lastNetworkFingerprintCheck = 0;
- uint64_t networkConfigurationFingerprint = _r->sysEnv->getNetworkConfigurationFingerprint();
+ uint64_t networkConfigurationFingerprint = _r->sysEnv->getNetworkConfigurationFingerprint(_r->nc->networkTapDeviceNames());
uint64_t lastMulticastCheck = 0;
long lastDelayDelta = 0;
@@ -538,7 +538,7 @@ Node::ReasonForTermination Node::run()
// If our network environment looks like it changed, also set resynchronize flag.
if ((resynchronize)||((now - lastNetworkFingerprintCheck) >= ZT_NETWORK_FINGERPRINT_CHECK_DELAY)) {
lastNetworkFingerprintCheck = now;
- uint64_t fp = _r->sysEnv->getNetworkConfigurationFingerprint();
+ uint64_t fp = _r->sysEnv->getNetworkConfigurationFingerprint(_r->nc->networkTapDeviceNames());
if (fp != networkConfigurationFingerprint) {
LOG("netconf fingerprint change: %.16llx != %.16llx, resyncing with network",networkConfigurationFingerprint,fp);
networkConfigurationFingerprint = fp;