From 490e86dde3532b36617548bdf9d952caa43dffa3 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 30 Jan 2014 14:23:52 -0800 Subject: Bunch of fixes to startup, pinging, and choice of route. Also some TRACE updates. --- node/Node.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'node/Node.cpp') diff --git a/node/Node.cpp b/node/Node.cpp index 323e8b21..fe3407be 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -543,7 +543,7 @@ Node::ReasonForTermination Node::run() Thread::sleep(ZT_SLEEP_WAKE_SETTLE_TIME); } - // If our network environment looks like it changed, also set resynchronize flag. + // If our network environment looks like it changed, resynchronize. if ((resynchronize)||((now - lastNetworkFingerprintCheck) >= ZT_NETWORK_FINGERPRINT_CHECK_DELAY)) { lastNetworkFingerprintCheck = now; uint64_t fp = _r->sysEnv->getNetworkConfigurationFingerprint(_r->nc->networkTapDeviceNames()); @@ -559,8 +559,9 @@ Node::ReasonForTermination Node::run() if ((resynchronize)||((now - lastSupernodePing) >= ZT_PEER_DIRECT_PING_DELAY)) { lastSupernodePing = now; std::vector< SharedPtr > sns(_r->topology->supernodePeers()); + TRACE("pinging %d supernodes",(int)sns.size()); for(std::vector< SharedPtr >::const_iterator p(sns.begin());p!=sns.end();++p) - _r->sw->sendHELLO((*p)->address()); + (*p)->sendPing(_r,now); } if (resynchronize) { -- cgit v1.2.3